geo_calc 0.7.4 → 0.7.5

data/Gemfile

@@ -9,7 +9,7 @@ gem 'activesupport',  '>= 3.0.1'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "geo_point",  ">= 0.2.1"    
+  gem "geo_point",  "~> 0.2.3"    
   gem "rspec",      ">= 2.5.0"
   gem "bundler",    ">= 1"
   gem "jeweler",    ">= 1.5.2"

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.7.5

data/geo_calc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geo_calc}
-  s.version = "0.7.4"
+  s.version = "0.7.5"
 
   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-19}
+  s.date = %q{2011-06-20}
   s.description = %q{Geo calculations in ruby and javascript}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -66,7 +66,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<geo_units>, ["~> 0.2.1"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.1"])
-      s.add_development_dependency(%q<geo_point>, [">= 0.2.1"])
+      s.add_development_dependency(%q<geo_point>, ["~> 0.2.3"])
       s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
       s.add_development_dependency(%q<bundler>, [">= 1"])
       s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
@@ -78,7 +78,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<geo_units>, ["~> 0.2.1"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 3.0.1"])
-      s.add_dependency(%q<geo_point>, [">= 0.2.1"])
+      s.add_dependency(%q<geo_point>, ["~> 0.2.3"])
       s.add_dependency(%q<rspec>, [">= 2.5.0"])
       s.add_dependency(%q<bundler>, [">= 1"])
       s.add_dependency(%q<jeweler>, [">= 1.5.2"])
@@ -91,7 +91,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<geo_units>, ["~> 0.2.1"])
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 3.0.1"])
-    s.add_dependency(%q<geo_point>, [">= 0.2.1"])
+    s.add_dependency(%q<geo_point>, ["~> 0.2.3"])
     s.add_dependency(%q<rspec>, [">= 2.5.0"])
     s.add_dependency(%q<bundler>, [">= 1"])
     s.add_dependency(%q<jeweler>, [">= 1.5.2"])

data/lib/geo_calc/extensions/array.rb

@@ -8,14 +8,25 @@ class Array
     to_lat_lng.reverse
   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?
-    first.to_lat
+    if defined?(GeoPoint) && GeoPoint.respond_to?(:coord_mode) && GeoPoint.coord_mode == :lng_lat
+      self[1].to_lat
+    else
+      first.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]
-    self[1].to_lng
+    if defined?(GeoPoint) && GeoPoint.respond_to?(:coord_mode) &&  GeoPoint.coord_mode == :lng_lat
+      first.to_lng
+    else
+      self[1].to_lng
+    end
   end
   
   def trim

data/lib/geo_calc/extensions/string.rb

@@ -12,11 +12,15 @@ class String
   end
     
   def to_lat_lng  
-    geo_clean.split(',').to_lat_lng
+    a = geo_clean.split(',').map(&:strip)
+    a = (a.last.is_a?(String) && a.last =~ /[N|S]$/) ? a.reverse : a
+    a.to_lat_lng
   end
 
   def to_lng_lat  
-    geo_clean.split(',').to_lng_lat
+    a = geo_clean.split(',')
+    a = (a.last.is_a?(String) && a.last =~ /[N|S]$/) ? a.reverse : a
+    a.to_lng_lat
   end
   
   def to_lat

data/spec/geo_calc/core_ext/array_ext_spec.rb

@@ -1,39 +1,75 @@
 require 'spec_helper'
 
 # - www.movable-type.co.uk/scripts/latlong.html
-describe GeoPoint do 
+describe GeoCalc do 
   describe 'ruby core Class extensions' do
     describe 'Array extension' do
       describe '#to_lat' do              
-        it 'should return latitude as first element' do
-          @arr = [4, 27]
-          @arr.to_lat.should == 4
+        it 'should return latitude as first element' do          
+          [4, 27].to_lat.should == 4
         end
 
         it 'should return latitude as #to_lng of first element' do
-          @arr = ["4.1", 27]
-          @arr.to_lat.should == 4.1
+          ["4.1", 27].to_lat.should == 4.1
         end
       end      
 
       describe '#to_lng' do              
         it 'should return latitude degree value for 360' do
-          @arr = [4, 27]            
-          @arr.to_lng.should == 27
+          [4, 27].to_lng.should == 27
         end
-
-        it 'should return latitude as #to_lng of first element' do
-          @arr = [4, "27.2"]            
-          @arr.to_lng.should == 27.2
+      
+        it 'should return latitude as #to_lng of first element' do          
+          [4, "27.2"].to_lng.should == 27.2
         end
       end   
-
+      
       describe '#to_lat_lng' do              
         it 'should return Array with lat, lng' do
-          @arr = ["3", {:lng => "2"}]
-          @arr.to_lat_lng.should == [3, 2]
+          ["3", {:lng => "2"}].to_lat_lng.should == [3, 2]
+        end
+      end   
+      
+      describe '#to_lng_lat' do              
+        it 'should return Array with lat, lng' do
+          ["3", {:lng => "2"}].to_lng_lat.should == [2, 3]
         end
       end   
     end # Array
   end
-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/hash_ext_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'geo_point'
 
 describe GeoPoint do 
   describe 'ruby core Class extensions' do
@@ -27,12 +28,64 @@ describe GeoPoint do
         end 
       end
 
-      describe '#to_lat_lng' do              
+      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  
+
+      describe '#to_lng_lat' do              
+        it 'should return Array with lat, lng' do
+          @hash = {:lng => 2, :lat => "3"}
+          @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
 end

data/spec/geo_calc/core_ext/string_ext_spec.rb

@@ -44,6 +44,22 @@ describe GeoPoint do
           @str.to_lat_lng.should == [4, 3]
         end
 
+        it 'should return Array with lat, lng' do
+          @str = "04 38 08 W, 58 38 08 N"
+          arr = @str.to_lat_lng
+          # W = west is longitude and should be last! 
+          arr.last.should < 0
+          arr.first.should > 58          
+        end
+
+        it 'should return Array with lng, lat' do
+          @str = "58 38 08 N, 04 38 08 W"
+          arr = @str.to_lat_lng
+          # W = west is longitude and should be last! 
+          arr.last.should < 0
+          arr.first.should > 58          
+        end
+
         it 'should raise error if only latitude' do
           @str = "4"
           lambda { @str.to_lat_lng}.should raise_error
@@ -64,6 +80,50 @@ describe GeoPoint do
           lambda { @str.to_lat_lng}.should raise_error
         end
       end   
+
+      describe '#to_lng_lat' do              
+        it 'should return Array with lng, lat' do
+          @str = "4, 3"
+          @str.to_lng_lat.should == [3, 4]
+        end
+
+        it 'should return Array with lng, lat' do
+          @str = "04 38 08 W, 58 38 08 N"
+          arr = @str.to_lng_lat 
+          # W = west is longitude and should be first!
+          arr.first.should < 5
+          arr.last.should > 58          
+        end
+
+        it 'should return Array with lng, lat' do
+          @str = "58 38 08 N, 04 38 08 W"
+          arr = @str.to_lng_lat
+          # W = west is longitude and should be first!
+          arr.first.should < 5
+          arr.last.should > 58          
+        end
+
+        it 'should raise error if only latitude' do
+          @str = "4"
+          lambda { @str.to_lng_lat}.should raise_error
+        end
+
+        it 'should raise error if "," but only latitude' do
+          @str = "4,"
+          lambda { @str.to_lng_lat}.should raise_error
+        end
+
+        it 'should raise error if "," in bad position' do
+          @str = ", 4 3"
+          lambda { @str.to_lng_lat}.should raise_error
+        end
+
+        it 'should raise error if not using "," as seperator' do
+          @str = "4; 3"
+          lambda { @str.to_lng_lat}.should raise_error
+        end
+      end   
+
     end # String
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_calc
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-19 00:00:00.000000000Z
+date: 2011-06-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &2164287640 !ruby/object:Gem::Requirement
+  requirement: &2156562180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164287640
+  version_requirements: *2156562180
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2164286840 !ruby/object:Gem::Requirement
+  requirement: &2156560820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2164286840
+  version_requirements: *2156560820
 - !ruby/object:Gem::Dependency
   name: geo_units
-  requirement: &2164286060 !ruby/object:Gem::Requirement
+  requirement: &2156558720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2164286060
+  version_requirements: *2156558720
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2164285160 !ruby/object:Gem::Requirement
+  requirement: &2156557460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164285160
+  version_requirements: *2156557460
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2164284460 !ruby/object:Gem::Requirement
+  requirement: &2156556280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,21 +65,21 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2164284460
+  version_requirements: *2156556280
 - !ruby/object:Gem::Dependency
   name: geo_point
-  requirement: &2164283680 !ruby/object:Gem::Requirement
+  requirement: &2156554680 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
   type: :development
   prerelease: false
-  version_requirements: *2164283680
+  version_requirements: *2156554680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164282980 !ruby/object:Gem::Requirement
+  requirement: &2156553040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2164282980
+  version_requirements: *2156553040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164282340 !ruby/object:Gem::Requirement
+  requirement: &2156551140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *2164282340
+  version_requirements: *2156551140
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2162210200 !ruby/object:Gem::Requirement
+  requirement: &2156549160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2162210200
+  version_requirements: *2156549160
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2162209620 !ruby/object:Gem::Requirement
+  requirement: &2156546680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162209620
+  version_requirements: *2156546680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2162209080 !ruby/object:Gem::Requirement
+  requirement: &2156545880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2162209080
+  version_requirements: *2156545880
 description: Geo calculations in ruby and javascript
 email: kmandrup@gmail.com
 executables: []
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3260923342157281303
+      hash: -189258895816106998
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: