geo_point 0.2.0 → 0.2.1

data/README.textile

@@ -3,7 +3,7 @@ h1. Geo Point
 Adds the concept of a GeoPoint for geo libraries. A GeoPoint encapsulates latitude and longitude, and: 
 
 * a coordinates mode (coord_mode) that can be set to either :lng_lat or :lat_lng
-* calculations such as distance, bearing, midpoint etc.
+* calculations such as: distance_to, bearing_to, midpoint, intersection and destination point
 * 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 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/geo_point.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geo_point}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   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-13}
+  s.date = %q{2011-06-14}
   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 = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/geo_point/core_extension.rb",
     "lib/geo_point/shared.rb",
     "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_spec.rb",

data/lib/geo_point/core_extension.rb

@@ -14,3 +14,34 @@ end
   cls.send :include, GeoPoint::CoreExtension
 end
 
+class Array
+  def to_lat
+    raise "Array must contain at least one element to return the latitude" if empty?
+    case GeoPoint.coord_mode
+    when :lng_lat
+      self[1].to_lat 
+    else
+      first.to_lat
+    end
+  end
+
+  def to_lng
+    raise "Array must contain at least two elements to return the longitude" if !self[1]
+    case GeoPoint.coord_mode
+    when :lng_lat
+      first.to_lng
+    else
+      self[1].to_lng      
+    end      
+  end
+  
+  def to_lat_lng
+    raise "Array must contain at least two elements to be converted to latitude and longitude" if !(size >= 2)
+    [first.to_lat, self[1].to_lng]
+  end 
+
+  def to_lng_lat
+    to_lat_lng.reverse
+    # [first.to_lng, self[1].to_lat]
+  end   
+end  

data/lib/geo_point.rb

@@ -29,8 +29,8 @@ class GeoPoint
   # - :mode - coordinates mode, either :lng_lat or :lat_lng, otherwise uses global setting as per GeoPoint.coord_mode
   def initialize *args
     options = args.is_a?(GeoPoint) ? {} : args.last_option
-    earth_radius_km = options[:radius]
-    coord_mode = options[:mode]
+    earth_radius_km = options[:radius] if options[:radius]
+    coord_mode = options[:mode] if options[:mode]
     
     case args.size
     when 1
@@ -127,12 +127,15 @@ class GeoPoint
   end
 
   def to_coords points
-    points.send(:"to_#{coord_mode}")
+    meth = :"to_#{coord_mode}"
+    points.send(meth)
   end
   
   def create_from_one args
-    args = args.first
-    create_from_two *to_coords(args)
+    args = args.first 
+    array = to_coords(args)
+    array = coord_mode == :lng_lat ? array.reverse : array
+    create_from_two *array
   end
   
   def create_from_two lat, lon

data/spec/geo_point/coord_mode_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+# - www.movable-type.co.uk/scripts/latlong.html
+describe GeoPoint do  
+  describe '#coord_mode' do
+    it 'should parse as lng, lat' do
+      GeoPoint.coord_mode = :lng_lat        
+      point = [2, 5].geo_point
+      point.lat.should == 5
+      point.lng.should == 2        
+    end
+    
+    it 'should parse as lat, lng' do
+      GeoPoint.coord_mode = :lat_lng        
+      point = [5, 2].geo_point
+      point.lat.should == 5
+      point.lng.should == 2                
+    end
+  end
+end
+
+describe Array do  
+  describe '#coord_mode' do
+    it 'should parse as lng, lat' do
+      GeoPoint.coord_mode = :lng_lat        
+      [2, 5].to_lat.should == 5
+      [2, 5].to_lng.should == 2
+    end
+    
+    it 'should parse as lat, lng' do
+      GeoPoint.coord_mode = :lat_lng        
+      [5, 2].to_lat.should == 5
+      [5, 2].to_lng.should == 2
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_point
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-13 00:00:00.000000000Z
+date: 2011-06-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo_calc
-  requirement: &2153026520 !ruby/object:Gem::Requirement
+  requirement: &2156168400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153026520
+  version_requirements: *2156168400
 - !ruby/object:Gem::Dependency
   name: geo_units
-  requirement: &2153024900 !ruby/object:Gem::Requirement
+  requirement: &2156165340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153024900
+  version_requirements: *2156165340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153023220 !ruby/object:Gem::Requirement
+  requirement: &2156164180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153023220
+  version_requirements: *2156164180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153021760 !ruby/object:Gem::Requirement
+  requirement: &2156162640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2153021760
+  version_requirements: *2156162640
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153019700 !ruby/object:Gem::Requirement
+  requirement: &2156160060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *2153019700
+  version_requirements: *2156160060
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2153018380 !ruby/object:Gem::Requirement
+  requirement: &2156156320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153018380
+  version_requirements: *2156156320
 description: Allows for easy parsing of Strings, Hashes and Arrays into a GeoPoint
   with lat/long
 email: kmandrup@gmail.com
@@ -100,6 +100,7 @@ files:
 - lib/geo_point/core_extension.rb
 - lib/geo_point/shared.rb
 - 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_spec.rb
@@ -119,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1472290565497148887
+      hash: -646464585705380862
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: