geo_calc 0.7.5 → 0.7.6

data/VERSION

@@ -1 +1 @@
-0.7.5
+0.7.6

data/geo_calc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geo_calc}
-  s.version = "0.7.5"
+  s.version = "0.7.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kristian Mandrup}]
-  s.date = %q{2011-06-20}
+  s.date = %q{2011-06-21}
   s.description = %q{Geo calculations in ruby and javascript}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -43,6 +43,8 @@ Gem::Specification.new do |s|
     "lib/geo_calc/pretty_print.rb",
     "spec/geo_calc/calculations_spec.rb",
     "spec/geo_calc/core_ext/array_ext_spec.rb",
+    "spec/geo_calc/core_ext/coord_mode_spec.rb",
+    "spec/geo_calc/core_ext/dms_coord_mode_spec.rb",
     "spec/geo_calc/core_ext/hash_ext_spec.rb",
     "spec/geo_calc/core_ext/numeric_geo_ext_spec.rb",
     "spec/geo_calc/core_ext/string_ext_spec.rb",

data/lib/geo_calc/extensions/array.rb

@@ -5,27 +5,30 @@ class Array
   end 
 
   def to_lng_lat
-    to_lat_lng.reverse
+    [to_lng, to_lat]
   end 
 
   # Assumes by default that the order is lat, lng
   # If GeoPoint is defined, can reverse this order depending on #coord_mode class variable
   def to_lat
     raise "Array must contain at least one element to return the latitude" if empty?
-    if defined?(GeoPoint) && GeoPoint.respond_to?(:coord_mode) && GeoPoint.coord_mode == :lng_lat
-      self[1].to_lat
-    else
-      first.to_lat
-    end
+    subject, other = (defined?(GeoPoint) && GeoPoint.respond_to?(:coord_mode) && GeoPoint.coord_mode == :lng_lat) ? [self[1], first] : [first, self[1]]
+    
+    begin
+      subject.to_lat
+    rescue GeoDirectionMisMatch
+      other.to_lat
+    end    
   end
 
   # see(#to_lat)
   def to_lng
     raise "Array must contain at least two elements to return the longitude" if !self[1]
-    if defined?(GeoPoint) && GeoPoint.respond_to?(:coord_mode) &&  GeoPoint.coord_mode == :lng_lat
-      first.to_lng
-    else
-      self[1].to_lng
+    subject, other = (defined?(GeoPoint) && GeoPoint.respond_to?(:coord_mode) && GeoPoint.coord_mode == :lng_lat) ? [first, self[1]] : [self[1], first]
+    begin
+      subject.to_lng
+    rescue GeoDirectionMisMatch
+      other.to_lng
     end
   end
   

data/lib/geo_calc/extensions/string.rb

@@ -1,3 +1,5 @@
+class GeoDirectionMisMatch < StandardError; end;
+
 class String
   def to_rad
     parse_dms.to_rad
@@ -19,20 +21,22 @@ class String
 
   def to_lng_lat  
     a = geo_clean.split(',')
-    a = (a.last.is_a?(String) && a.last =~ /[N|S]$/) ? a.reverse : a
+    a = (a.last.is_a?(String) && a.last =~ /[N|S]$/) ? a.reverse : a    
     a.to_lng_lat
   end
   
   def to_lat
     raise "An empty String has no latitude" if self.empty?
     s = geo_clean
+    raise GeoDirectionMisMatch, "Direction E and W signify longitude and thus can't be converted to latitude, was: #{self}" if s =~ /[W|E]$/
     s = s.parse_dms if s.respond_to? :parse_dms
     s.to_f.to_lat
   end
 
   def to_lng
     raise "An empty String has no latitude" if self.empty?
-    s = geo_clean
+    s = geo_clean                 
+    raise GeoDirectionMisMatch, "Direction N and S signify latitude and thus can't be converted to longitude, was: #{self}" if s =~ /[N|S]$/
     s = s.parse_dms if s.respond_to? :parse_dms    
     s.to_f.to_lng
   end

data/spec/geo_calc/core_ext/array_ext_spec.rb

@@ -39,37 +39,3 @@ describe GeoCalc do
   end
 end
 
-class GeoPoint
-  mattr_accessor :coord_mode
-end
-
-describe 'coord mode' do
-  context 'coord_mode = :lng_lat' do
-    before do
-      GeoPoint.coord_mode = :lng_lat
-    end
-    
-    it 'should not reverse array' do
-      [2, 3].to_lng_lat.should == [2, 3]
-    end
-
-    it 'should reverse array' do
-      [2, 3].to_lat_lng.should == [3, 2]
-    end
-  end
-
-  context 'coord_mode = :lat_lng' do
-    before do
-      GeoPoint.coord_mode = :lat_lng
-    end
-    
-    it 'should not reverse array' do
-      [2, 3].to_lat_lng.should == [2, 3]
-    end
-
-    it 'should reverse array' do
-      [2, 3].to_lng_lat.should == [3, 2]
-    end
-  end
-end
-    

data/spec/geo_calc/core_ext/coord_mode_spec.rb

@@ -0,0 +1,108 @@
+require 'spec_helper'
+
+class GeoPoint
+  mattr_accessor :coord_mode
+end
+
+describe 'GeoPoint.coord_mode' do
+  # make shared example for default mode!
+  context 'coord_mode is :lat_lng' do  
+    before do
+      GeoPoint.coord_mode = :lat_lng
+    end
+
+    describe 'Array' do
+      describe '#to_lng_lat' do
+        it 'should reverse array' do
+          [2, 3].to_lng_lat.should == [3, 2]
+        end
+
+        it 'should reverse array and convert strings to floats' do
+          ["23.5", "-48"].to_lng_lat.should == [-48, 23.5]
+        end
+      end
+
+      describe '#to_lat_lng' do
+        it 'should not reverse array' do
+          [2, 3].to_lat_lng.should == [2, 3]
+        end
+        
+        it 'should not reverse array but convert strings to floats' do
+          ["23.5", "-48"].to_lat_lng.should == [23.5, -48]
+        end        
+      end
+    end # Array
+    
+    describe 'String' do
+      describe '#to_lat_lng' do
+        it 'should return Array in same order' do
+          "4, 3".to_lat_lng.should == [4, 3]
+        end
+      end
+
+      describe '#to_lng_lat' do
+        it 'should return reversed Array' do
+          "4, 3".to_lng_lat.should == [3,4]
+        end
+      end
+    end # String    
+  end
+
+  context 'coord_mode is :lng_lat' do  
+    before do
+      GeoPoint.coord_mode = :lng_lat
+    end
+
+    describe 'Array' do
+      describe '#to_lng_lat' do
+        it 'should not reverse array' do
+          [2, 3].to_lng_lat.should == [2, 3]
+        end
+        
+        it 'should not reverse array but convert strings to floats' do
+          ["23.5", "-48"].to_lng_lat.should == [23.5, -48]
+        end                        
+      end
+      
+      describe '#to_lat_lng' do
+        it 'should reverse array' do
+          [2, 3].to_lat_lng.should == [3, 2]
+        end 
+        
+        it 'should reverse array and convert strings to floats' do
+          ["23.5", "-48"].to_lat_lng.should == [-48, 23.5]
+        end                
+      end      
+    end # Array
+
+    describe 'String' do
+      describe '#to_lng_lat' do
+        it 'should return Array in same order' do
+          "4, 3".to_lng_lat.should == [4, 3]
+        end
+      end
+
+      describe '#to_lat_lng' do
+        it 'should return reversed Array' do
+          "4, 3".to_lat_lng.should == [3,4]
+        end
+      end
+    end # String 
+    
+    describe 'Hash' do
+      describe '#to_lng_lat' do
+        it 'should return Array with lng, lat' do
+          hash = {:lng => 2, :lat => "3"}
+          hash.to_lng_lat.should == [2, 3]
+        end
+      end  
+
+      describe '#to_lat_lng' do              
+        it 'should return Array with lat, lng' do
+          hash = {:lng => 2, :lat => "3"}
+          hash.to_lat_lng.should == [3, 2]
+        end
+      end
+    end
+  end
+end

data/spec/geo_calc/core_ext/dms_coord_mode_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+# require 'geo_point'
+
+class GeoPoint
+  mattr_accessor :coord_mode
+end
+
+describe 'GeoPoint.coord_mode' do
+  # make shared example for default mode!
+  context 'coord_mode is :lng_lat' do  
+    before do
+      GeoPoint.coord_mode = :lng_lat
+    end
+
+    after do
+      GeoPoint.coord_mode = :lat_lng
+    end
+
+    describe 'DMS Array' do
+      it 'should convert to (lng, lat) floats' do
+        arr = ["58 38 38N", "003 04 12W"].to_lng_lat
+        arr.first.should < 4
+        arr.last.should > 58
+      end
+      
+      it 'should convert to (lng, lat) floats' do
+        arr = ["003 04 12W", "58 38 38N"].to_lng_lat
+        arr.first.should < 4
+        arr.last.should > 58
+      end
+    end
+  end
+  
+  context 'coord_mode is :lat_lng' do  
+    before do
+      GeoPoint.coord_mode = :lat_lng
+    end
+  
+    describe 'DMS Array' do
+      it 'should convert to (lat, lng) floats' do
+        arr = ["58 38 38N", "003 04 12W"].to_lng_lat
+        arr.first.should < 4
+        arr.last.should > 58
+      end
+      
+      it 'should convert to (lng, lat) floats' do
+        arr = ["003 04 12W", "58 38 38N"].to_lng_lat
+        arr.first.should < 4
+        arr.last.should > 58
+      end
+    end
+  end  
+end
+      

data/spec/geo_calc/core_ext/hash_ext_spec.rb

@@ -41,50 +41,6 @@ describe GeoPoint do
           @hash.to_lng_lat.should == [2, 3]
         end
       end  
-
-      context 'GeoPoint.coord_mode == :lng_lat' do
-        describe '#to_coords' do              
-          it 'should return Array with lng, lat' do
-            GeoPoint.coord_mode = :lng_lat
-            @hash = {:lng => 2, :lat => "3"}
-            @hash.to_coords.should == [2, 3]
-          end
-        end  
-      end
-
-      context 'GeoPoint.coord_mode == :lat_lng' do
-        describe '#to_coords' do              
-          it 'should return Array with lat, lng' do
-            GeoPoint.coord_mode = :lat_lng
-            @hash = {:lng => 2, :lat => "3"}
-            @hash.to_coords.should == [3, 2]
-          end
-        end  
-      end
-      
-      describe '#geo_point' do              
-        context 'GeoPoint.coord_mode == :lat_lng' do
-          it 'should return Array with lng, lat' do
-            GeoPoint.coord_mode = :lat_lng
-            @hash = {:lng => 2, :lat => "3"}
-            p = @hash.geo_point
-            puts p.inspect
-
-            p.to_lng_lat.should == [2, 3]
-          end
-        end
-
-        context 'GeoPoint.coord_mode == :lng_lat' do
-          it 'should return Array with lng, lat' do
-            GeoPoint.coord_mode = :lng_lat
-            @hash = {:lng => 2, :lat => "3"}   
-            p = @hash.geo_point
-            puts p.inspect
-            
-            p.to_lng_lat.should == [2, 3]
-          end
-        end
-      end  
       
     end # Hash 
   end

data/spec/geo_calc/core_ext/string_ext_spec.rb

@@ -19,6 +19,11 @@ describe GeoPoint do
           @str = "50 03 59N"
           @str.to_lat.should be_within(0.4).of(50)
         end
+        
+        it 'should not allow conversion of longitude format to latitude' do
+          str = "50 03 59E"
+          lambda { str.to_lat}.should raise_error GeoDirectionMisMatch 
+        end        
       end      
 
       describe '#to_lng' do              
@@ -29,12 +34,17 @@ describe GeoPoint do
 
         it 'should return latitude' do
           @str = "4"
-          @str.to_lat.should == 4
+          @str.to_lng.should == 4
         end
 
         it 'should convert to latitude' do
           @str = "50 03 59E"
-          @str.to_lat.should be_within(0.4).of(50)
+          @str.to_lng.should be_within(0.4).of(50)
+        end
+
+        it 'should not allow conversion of latitude format to longitude' do
+          str = "50 03 59N"
+          lambda { str.to_lng}.should raise_error GeoDirectionMisMatch 
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_calc
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-20 00:00:00.000000000Z
+date: 2011-06-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &2156562180 !ruby/object:Gem::Requirement
+  requirement: &2156297360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156562180
+  version_requirements: *2156297360
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2156560820 !ruby/object:Gem::Requirement
+  requirement: &2156295980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156560820
+  version_requirements: *2156295980
 - !ruby/object:Gem::Dependency
   name: geo_units
-  requirement: &2156558720 !ruby/object:Gem::Requirement
+  requirement: &2156295020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156558720
+  version_requirements: *2156295020
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2156557460 !ruby/object:Gem::Requirement
+  requirement: &2156293800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156557460
+  version_requirements: *2156293800
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156556280 !ruby/object:Gem::Requirement
+  requirement: &2156292260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156556280
+  version_requirements: *2156292260
 - !ruby/object:Gem::Dependency
   name: geo_point
-  requirement: &2156554680 !ruby/object:Gem::Requirement
+  requirement: &2156290460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.3
   type: :development
   prerelease: false
-  version_requirements: *2156554680
+  version_requirements: *2156290460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156553040 !ruby/object:Gem::Requirement
+  requirement: &2156289600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2156553040
+  version_requirements: *2156289600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156551140 !ruby/object:Gem::Requirement
+  requirement: &2156288620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *2156551140
+  version_requirements: *2156288620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156549160 !ruby/object:Gem::Requirement
+  requirement: &2156287480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2156549160
+  version_requirements: *2156287480
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156546680 !ruby/object:Gem::Requirement
+  requirement: &2156286380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156546680
+  version_requirements: *2156286380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156545880 !ruby/object:Gem::Requirement
+  requirement: &2156285480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2156545880
+  version_requirements: *2156285480
 description: Geo calculations in ruby and javascript
 email: kmandrup@gmail.com
 executables: []
@@ -166,6 +166,8 @@ files:
 - lib/geo_calc/pretty_print.rb
 - spec/geo_calc/calculations_spec.rb
 - spec/geo_calc/core_ext/array_ext_spec.rb
+- spec/geo_calc/core_ext/coord_mode_spec.rb
+- spec/geo_calc/core_ext/dms_coord_mode_spec.rb
 - spec/geo_calc/core_ext/hash_ext_spec.rb
 - spec/geo_calc/core_ext/numeric_geo_ext_spec.rb
 - spec/geo_calc/core_ext/string_ext_spec.rb
@@ -188,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -189258895816106998
+      hash: 1564414330621469388
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: