geo_units 0.2.6 → 0.3.1

data/spec/geo_units/{dms_converter_spec.rb → converter/dms_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 class Parser
-  include GeoUnits::DmsConverter
+  include GeoUnits::Converter::Dms
 end
 
 def parser
@@ -9,7 +9,7 @@ def parser
 end
 
 # - www.movable-type.co.uk/scripts/latlong.html
-describe GeoUnits::DmsConverter do
+describe GeoUnits::Converter::Dms do
   # # @param   {String|Number} dmsStr: Degrees or deg/min/sec in variety of formats
   # @returns {Number} Degrees as decimal number
   describe '#parse_dms' do
@@ -38,21 +38,21 @@ describe GeoUnits::DmsConverter do
     it 'should convert 58.3 to a String in DMS format' do
       dms = parser.to_dms(58.3)
       dms.should be_a(String)
-      expr = Regexp.escape "058".concat("\u00B0", "18", "\u2032", "00", "\u2033")
+      expr = Regexp.escape "058".concats("\u00B0", "18", "\u2032", "00", "\u2033")
       dms.should match expr
     end
   
     it 'should convert 58.3 to a String in DM format' do
       dm = parser.to_dms(58.3, :dm, 2)
       dm.should be_a(String)
-      expr = Regexp.escape "058".concat("\u00B0", "18", "\u2032")
+      expr = Regexp.escape "058".concats("\u00B0", "18", "\u2032")
       dm.should match expr
     end
   
     it 'should convert 58.3 to a String in D format' do
       d = parser.to_dms(58.3, :d, 2)
       d.should be_a(String)
-      m = Regexp.escape "058".concat("\u00B0")
+      m = Regexp.escape "058".concats("\u00B0")
       d.should match m
     end
   end  

data/spec/geo_units/converter_spec.rb

@@ -10,19 +10,19 @@ end
 
 # - www.movable-type.co.uk/scripts/latlong.html
 describe GeoUnits::Converter do
-  # deg, format, dp      
+  # deg, format, dp
   describe '#to_lat' do
     it 'should convert 58.3 to a latitude String in North direction' do
       str_lat = converter.to_lat(58.3)
       str_lat.should be_a(String)
-      expr = Regexp.escape "58".concat("\u00B0", "18", "\u2032", "00", "\u2033", "N")
+      expr = Regexp.escape "58".concats("\u00B0", "18", "\u2032", "00", "\u2033", "N")
       str_lat.should match expr
     end
 
     it 'should convert -58.3 to a latitude String in South direction' do
       str_lat = converter.to_lat(-58.3)
       str_lat.should be_a(String)
-      expr = Regexp.escape "58".concat("\u00B0", "18", "\u2032", "00", "\u2033", "S")
+      expr = Regexp.escape "58".concats("\u00B0", "18", "\u2032", "00", "\u2033", "S")
       str_lat.should match expr
     end
   end
@@ -32,14 +32,14 @@ describe GeoUnits::Converter do
     it 'should convert 58.3 to a longitude String' do
       str_lat = converter.to_lon(58.3)
       str_lat.should be_a(String)
-      expr = Regexp.escape "58".concat("\u00B0", "18", "\u2032", "00", "\u2033", "E")
+      expr = Regexp.escape "58".concats("\u00B0", "18", "\u2032", "00", "\u2033", "E")
       str_lat.should match expr        
     end
 
     it 'should convert 58.3 to a longitude String' do
       str_lat = converter.to_lon(-58.3)
       str_lat.should be_a(String)
-      expr = Regexp.escape "58".concat("\u00B0", "18", "\u2032", "00", "\u2033", "W")
+      expr = Regexp.escape "58".concats("\u00B0", "18", "\u2032", "00", "\u2033", "W")
       str_lat.should match expr        
     end
   end
@@ -50,8 +50,8 @@ describe GeoUnits::Converter do
     it 'should convert 58.3 to a longitude String' do
       brng = converter.to_brng(-58.3)
       brng.to_f.should be_between(0, 360)
-      expr = Regexp.escape "301".concat("\u00B0", "42", "\u2032", "00")
+      expr = Regexp.escape "301".concats("\u00B0", "42", "\u2032", "00")
       brng.should match expr
     end
   end
-end
+end

data/spec/geo_units/core_ext_spec.rb

@@ -2,16 +2,71 @@ require 'spec_helper'
 
 describe GeoUnits do
   describe 'Core extensions' do
-    describe '#radians_to' do
-      it 'should convert radians to kms' do
-        2.radians_to(:kms).should be_within(0.5).of 111.17 * 2
+
+    describe Numeric do
+      describe '#miles_to' do
+        it 'should convert meters to kms' do
+          100.meters_to(:kms).should == 0.1
+        end
+      end
+
+      describe '#miles_to' do
+        it 'should convert miles to kms' do
+          2.miles_to(:kms).should be_within(0.2).of 3.21
+        end
+      end
+
+      describe '#feet_to' do
+        it 'should convert feet to kms' do
+          2.feet_to(:kms).should be_within(0.5).of (2 * 3.28 * 0.001)
+        end
+      end
+
+      describe '#to_radians' do
+        it 'should convert degrees to radians' do
+          1.to_rad.should be_within(0.002).of 0.017
+          1.to_radians.should be_within(0.002).of 0.017
+          1.deg_to_rad.should be_within(0.002).of 0.017
+          1.degrees_to_rad.should be_within(0.002).of 0.017
+        end
+      end
+    end
+
+    describe String do
+      describe '#parse_dms' do
+        it 'should raise error if no valid compass direction' do
+          lambda { "58 18 00 X".parse_dms }.should raise_error
+        end
+
+        it 'should raise error if invalid format and set to raise' do
+          lambda { "5.8 E".parse_dms }.should raise_error
+        end
+
+        it 'should parse valid format' do
+          "58 E".parse_dms.should == 58.0
+        end
       end
     end
 
-    describe '#miles_to' do
-      it 'should convert miles to kms' do
-        2.miles_to(:kms).should be_within(0.2).of 3.21
+    describe Array do
+      describe '#to_dms' do
+        it 'should convert' do
+        end
+      end
+
+      describe '#parse_dms' do
+        it 'should raise error if no valid compass direction' do
+          lambda { ["15 18 00 X", "53 N"].parse_dms }.should raise_error
+        end
+
+        it 'should parse valid format' do
+          ["58 E", "32 N"].parse_dms.should == [58.0, 32.0]
+        end
+
+        it 'should parse valid but reverse format' do
+          ["32 N", "58 E"].parse_dms.should == [58.0, 32.0]
+        end
       end
     end
   end
-end
+end

data/spec/geo_units/maps/earth_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+class Earth
+  include GeoUnits::Maps::Earth
+end
+
+def earth
+  Earth.new
+end
+
+# - www.movable-type.co.uk/scripts/latlong.html
+describe GeoUnits::Maps::Earth do
+  subject { earth }
+
+  specify { subject.distance_per_latitude_degree[:miles].should be_between(69, 69.5) }
+
+  specify { subject.radius[:miles].should be_between(3963, 3964) }
+
+  specify { subject.major_axis_radius[:miles].should be_between(3963, 3964) }
+
+  specify { subject.minor_axis_radius[:miles].should be_between(3949, 3950) }
+
+  specify { subject.latitude_degrees(:miles).should be_between(57, 58)  }
+end
+

data/spec/geo_units/maps/meters_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+class Meters
+  include GeoUnits::Maps::Meters
+end
+
+def meters
+  Meters.new
+end
+
+# - www.movable-type.co.uk/scripts/latlong.html
+describe GeoUnits::Maps::Meters do
+  subject { meters }
+
+  specify { subject.from_unit[:feet].should   be_between(0.3045, 0.305)  }
+
+  specify { subject.from_unit[:miles].should  be_between(1609, 1610) }
+
+  specify { subject.to_unit[:feet].should     be_between(3.28, 3.29)  }
+
+  specify { subject.to_unit[:miles].should    be_between(0.0006, 0.0007) }
+end
+
+

data/spec/geo_units/maps_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+class Map
+  include GeoUnits::Maps
+end
+
+def map
+  Map.new
+end
+
+# - www.movable-type.co.uk/scripts/latlong.html
+describe GeoUnits::Maps::Earth do
+  subject { map }
+
+  # earth
+  specify { subject.distance_per_latitude_degree[:miles].should be_between(69, 69.5) }
+
+  # meters
+  specify { subject.from_unit[:feet].should   be_between(0.3045, 0.305)  }
+
+  # maps
+  specify { subject.precision[:miles].should == 4  }
+end
+
+

data/spec/geo_units/numeric_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+# - www.movable-type.co.uk/scripts/latlong.html
+describe Array do
+  # deg, format, dp
+  describe '#to_dms' do
+    let (:dms_arr) { [58.3, 4].to_dms }
+
+    it 'should convert [58.3, 4] to string of dms format' do
+      dms_arr.should match /58.*18.*, 04.*00/
+    end
+  end
+
+  describe '#to_dms :reverse' do
+    let (:dms_arr) { [58.3, 4].to_dms :lat_lng}
+
+    it 'should convert [58.3, 4] to string of dms format' do
+      dms_arr.should match /04.*00.*N, 058.*18.*E/
+    end
+  end
+end

data/spec/geo_units_spec.rb

@@ -14,7 +14,7 @@ describe GeoUnits do
 
   describe '#radians_to' do
     it 'should convert radians to kms' do
-      GeoUnits.radians_to(:kms, 2).should be_within(0.5).of 111.17 * 2
+      GeoUnits.radians_to(:kms, 2, 30).should be_within(0.5).of 111.17 * 2
     end
   end
 
@@ -23,4 +23,10 @@ describe GeoUnits do
       GeoUnits.miles_to(:kms, 2).should be_within(0.2).of 3.21
     end
   end
+
+  describe '#kms_to' do
+    it 'should convert miles to kms' do
+      GeoUnits.kilometers_to(:meters, 2).should == 2000
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_units
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: sweetloader
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -126,15 +142,28 @@ files:
 - lib/geo_units.rb
 - lib/geo_units/constants.rb
 - lib/geo_units/converter.rb
+- lib/geo_units/converter/dms.rb
+- lib/geo_units/converter/normalizer.rb
+- lib/geo_units/converter/units.rb
 - lib/geo_units/core_ext.rb
-- lib/geo_units/dms_converter.rb
 - lib/geo_units/maps.rb
-- lib/geo_units/numeric_ext.rb
+- lib/geo_units/maps/earth.rb
+- lib/geo_units/maps/meters.rb
+- lib/geo_units/numeric.rb
+- lib/geo_units/numeric/dms.rb
+- lib/geo_units/numeric/normalizer.rb
 - lib/geo_units/unit_conversions.rb
+- spec/geo_units/converter/dms_spec.rb
+- spec/geo_units/converter/normalizer_spec.rb
+- spec/geo_units/converter/units_spec.rb
 - spec/geo_units/converter_spec.rb
 - spec/geo_units/core_ext_spec.rb
-- spec/geo_units/dms_converter_spec.rb
-- spec/geo_units/numeric_ext_spec.rb
+- spec/geo_units/maps/earth_spec.rb
+- spec/geo_units/maps/meters_spec.rb
+- spec/geo_units/maps_spec.rb
+- spec/geo_units/numeric/dms_spec.rb
+- spec/geo_units/numeric/normalizer_spec.rb
+- spec/geo_units/numeric_spec.rb
 - spec/geo_units_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/kristianmandrup/geo_units
@@ -152,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2047484457319492713
+      hash: 4502680806644763495
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/geo_units/dms_converter.rb

@@ -1,107 +0,0 @@
-require 'sugar-high/numeric'
-require 'sugar-high/string'
-
-module GeoUnits
-  module DmsConverter
-    include NumericCheckExt
-
-    def parse_dms dms_str  
-      # check for signed decimal degrees without NSEW, if so return it directly
-      return dms_str if is_numeric?(dms_str)
-
-      # strip off any sign or compass dir'n & split out separate d/m/s
-      dms = dms_str.strip.gsub(/^-/,'').gsub(/[NSEW]$/i,'').split(/[^0-9.,]+/).map(&:strip).map(&:to_f)
-      return nil if dms.empty?
-
-      # and convert to decimal degrees...
-      deg = case dms.length      
-      when 3 # interpret 3-part result as d/m/s
-         dms[0]/1 + dms[1]/60 + dms[2]/3600
-      when 2 # interpret 2-part result as d/m
-        dms[0]/1 + dms[1]/60        
-      when 1 # just d (possibly decimal) or non-separated dddmmss        
-        d = dms[0];
-        # check for fixed-width unseparated format eg 0033709W
-        d = "0#{d}" if (/[NS]/i.match(dms_str)) # - normalise N/S to 3-digit degrees
-        d = "#{d.slice(0,3)/1}#{deg.slice(3,5)/60}#{deg.slice(5)/3600}" if (/[0-9]{7}/.match(deg)) 
-        d
-      else
-        nil
-      end
-      return nil if !deg
-      deg = (deg * -1) if (/^-|[WS]$/i.match(dms_str.strip)) # take '-', west and south as -ve
-      deg.to_f
-    end
-
-    # Convert decimal degrees to deg/min/sec format
-    #  - degree, prime, double-prime symbols are added, but sign is discarded, though no compass
-    #    direction is added
-    # 
-    # 
-    # @param   {Number} deg: Degrees
-    # @param   {String} [format=dms]: Return value as 'd', 'dm', 'dms'
-    # @param   {Number} [dp=0|2|4]: No of decimal places to use - default 0 for dms, 2 for dm, 4 for d
-    # @returns {String} deg formatted as deg/min/secs according to specified format
-    # @throws  {TypeError} deg is an object, perhaps DOM object without .value?
-
-    def to_dms deg, format = :dms, dp = nil 
-      deg = begin
-        deg.to_f
-      rescue
-        nil
-      end
-      return nil if !deg # give up here if we can't make a number from deg   
-
-      # default values
-      format ||= :dms
-      dp = if dp.nil?
-        case format.to_sym
-        when :d 
-          4
-        when :dm 
-          2
-        else
-          0 # default
-        end
-      end
-      dp ||= 0
-
-      deg = deg.abs # (unsigned result ready for appending compass dir'n)
-
-      case format
-      when :d
-        d = deg.round(dp)       # round degrees
-        ds = "0#{d}" if (d <100)    # pad with leading zeros
-        ds = "0#{ds}" if (d <10) 
-        dms = ds.to_s.concat("\u00B0")  # add º symbol
-      when :dm            
-        min = (deg*60).round(dp)   # convert degrees to minutes & round
-        d = d.to_i
-        d = (min / 60).floor          # get component deg/min
-        m = (min % 60).round(dp)   # pad with trailing zeros
-        ds = d
-        ms = m
-        ds = "0#{d}" if (d<100)        # pad with leading zeros
-        ds = "0#{d}" if (d<10)
-        ms = "0#{m}" if (m<10)               
-        dms = ds.to_s.concat("\u00B0", ms, "\u2032") # add º, ' symbols
-      when :dms
-        sec = (deg * 3600).round   # convert degrees to seconds & round
-        d = (sec / 3600).floor          # get component deg/min/sec
-        m = ((sec / 60) % 60).floor
-        s = (sec % 60).round(dp)     # pad with trailing zeros
-        ds = d
-        ms = m
-        ss = s
-        ds = "0#{d}" if (d < 100)          # pad with leading zeros
-        ds = "0#{ds}" if (d < 10) 
-        ms = "0#{m}" if (m < 10) 
-        ss = "0#{s}" if (s < 10) 
-        dms = ds.to_s.concat("\u00B0", ms, "\u2032", ss, "\u2033")  # add º, ', " symbols
-      end
-      return dms
-    end
-    
-    extend self
-  end
-end