geo_point 0.2.1 → 0.2.3

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
-gem "geo_calc",   '~> 0.7.3'
-gem "geo_units",  '>= 0.2.0'
+gem "geo_calc",   '~> 0.7.4'
+gem "geo_units",  '>= 0.2.1'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/README.textile

@@ -7,7 +7,7 @@ Adds the concept of a GeoPoint for geo libraries. A GeoPoint encapsulates latitu
 * parsing from various String, Hash or Array formats, including from DMS string format, such as "58 38 38N, 003 04 12W"
 
 Using GeoPoints makes it much easier and more efficient to transport location point data and various geo libraries adds additional functionality such as 
-vector operations on top (see fx _geo_vectors_ gem). Enjoy!
+vector operations on top (see fx "geo_vectors":https://github.com/kristianmandrup/geo_vectors gem). Enjoy!
 
 h2. Install
 
@@ -77,14 +77,19 @@ h2. GeoPoint functionality
 
 A GeoPoint always has the following calculation API available:
 
-* bearing
-* destination
-* distancer
-* intersection
-* midpoint 
-* rhumb (distance)
+* bearing_to(point)
+* final_bearing_to(point)
+* destination_point(brng, dist)
+* distance_to(point)
+* intersection_point(brng1, p2, brng2)
+* midpoint_to(point) 
 
-See the _geo_calc_ gem for details on how to use this Api
+Rhumb: (see "Rhumb_line":http://en.wikipedia.org/wiki/Rhumb_line)
+* rhumb_distance_to(point)
+* rhumb_bearing_to(point)
+* rhumb_destination_point(brng, dist)
+
+See the "geo_calc":https://github.com/kristianmandrup/geo_calc gem for details on how to use this Api
 
 h2. Contributing to geo_point
  

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.3

data/geo_point.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geo_point}
-  s.version = "0.2.1"
+  s.version = "0.2.3"
 
   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-14}
+  s.date = %q{2011-06-19}
   s.description = %q{Allows for easy parsing of Strings, Hashes and Arrays into a GeoPoint with lat/long}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
     "spec/geo_point/class_methods_spec.rb",
     "spec/geo_point/coord_mode_spec.rb",
     "spec/geo_point/initializer_spec.rb",
-    "spec/geo_point/lat_lon.rb",
+    "spec/geo_point/lat_lon_spec.rb",
     "spec/geo_point_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -47,23 +47,23 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<geo_calc>, ["~> 0.7.3"])
-      s.add_runtime_dependency(%q<geo_units>, [">= 0.2.0"])
+      s.add_runtime_dependency(%q<geo_calc>, ["~> 0.7.4"])
+      s.add_runtime_dependency(%q<geo_units>, [">= 0.2.1"])
       s.add_development_dependency(%q<rspec>, [">= 2.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.6"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<geo_calc>, ["~> 0.7.3"])
-      s.add_dependency(%q<geo_units>, [">= 0.2.0"])
+      s.add_dependency(%q<geo_calc>, ["~> 0.7.4"])
+      s.add_dependency(%q<geo_units>, [">= 0.2.1"])
       s.add_dependency(%q<rspec>, [">= 2.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.6"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<geo_calc>, ["~> 0.7.3"])
-    s.add_dependency(%q<geo_units>, [">= 0.2.0"])
+    s.add_dependency(%q<geo_calc>, ["~> 0.7.4"])
+    s.add_dependency(%q<geo_units>, [">= 0.2.1"])
     s.add_dependency(%q<rspec>, [">= 2.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.6"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])

data/lib/geo_point/calc.rb

@@ -28,13 +28,13 @@ class GeoPoint
     module Intersection
       # see(#intersection)
       # @returns [GeoPoint] Destination point (null if no unique intersection defined)    
-      def self.intersection_point p1, brng1, p2, brng2    
+      def self.intersection_point p1, brng1, p2, brng2
         GeoPoint.new GeoCalc::Intersection.intersection(p1, brng1, p2, brng2).to_coords
       end
 
       # see(#intersection)
       # @returns [GeoPoint] Destination point (null if no unique intersection defined)    
-      def intersection_point brng1, p2, brng2    
+      def intersection_point brng1, p2, brng2
         GeoPoint.new GeoCalc::Intersection.intersection(self, brng1, p2, brng2).to_coords
       end
     end  

data/lib/geo_point/core_extension.rb

@@ -5,7 +5,7 @@ class GeoPoint
     end
 
     def geo_point
-      GeoPoint.new to_coords
+      GeoPoint.new self
     end
   end
 end  

data/lib/geo_point.rb

@@ -132,9 +132,9 @@ class GeoPoint
   end
   
   def create_from_one args
-    args = args.first 
+    args = args.first
     array = to_coords(args)
-    array = coord_mode == :lng_lat ? array.reverse : array
+    array = (coord_mode == :lng_lat && args.is_a?(Hash) ) ? array.reverse : array
     create_from_two *array
   end
   

data/spec/geo_point/coord_mode_spec.rb

@@ -33,4 +33,40 @@ describe Array do
       [5, 2].to_lng.should == 2
     end
   end
+end
+
+describe Hash do  
+  describe '#coord_mode' do
+    it 'should parse as lng, lat' do
+      GeoPoint.coord_mode = :lng_lat        
+      p = {:lng => 2, :lat => 5}.geo_point
+      p.to_lat.should == 5
+      p.to_lng.should == 2
+    end
+    
+    it 'should parse as lat, lng' do
+      GeoPoint.coord_mode = :lat_lng        
+      p = {:lng => 2, :lat => 5}.geo_point
+      p.to_lat.should == 5
+      p.to_lng.should == 2
+    end
+  end
+end
+
+describe String do  
+  describe '#coord_mode' do
+    it 'should parse as lng, lat' do
+      GeoPoint.coord_mode = :lng_lat        
+      p = "2, 5".geo_point
+      p.to_lat.should == 5
+      p.to_lng.should == 2
+    end
+    
+    it 'should parse as lat, lng' do
+      GeoPoint.coord_mode = :lat_lng        
+      p = "2, 5".geo_point
+      p.to_lat.should == 2
+      p.to_lng.should == 5
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_point
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-14 00:00:00.000000000Z
+date: 2011-06-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo_calc
-  requirement: &2156168400 !ruby/object:Gem::Requirement
+  requirement: &2154397860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.7.4
   type: :runtime
   prerelease: false
-  version_requirements: *2156168400
+  version_requirements: *2154397860
 - !ruby/object:Gem::Dependency
   name: geo_units
-  requirement: &2156165340 !ruby/object:Gem::Requirement
+  requirement: &2154397280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156165340
+  version_requirements: *2154397280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156164180 !ruby/object:Gem::Requirement
+  requirement: &2154396740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156164180
+  version_requirements: *2154396740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156162640 !ruby/object:Gem::Requirement
+  requirement: &2154396220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2156162640
+  version_requirements: *2154396220
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156160060 !ruby/object:Gem::Requirement
+  requirement: &2154395620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *2156160060
+  version_requirements: *2154395620
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156156320 !ruby/object:Gem::Requirement
+  requirement: &2154395040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156156320
+  version_requirements: *2154395040
 description: Allows for easy parsing of Strings, Hashes and Arrays into a GeoPoint
   with lat/long
 email: kmandrup@gmail.com
@@ -102,7 +102,7 @@ files:
 - spec/geo_point/class_methods_spec.rb
 - spec/geo_point/coord_mode_spec.rb
 - spec/geo_point/initializer_spec.rb
-- spec/geo_point/lat_lon.rb
+- spec/geo_point/lat_lon_spec.rb
 - spec/geo_point_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/kristianmandrup/geo_point
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -646464585705380862
+      hash: 1136387806736178930
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: