geo_calc 0.7.1 → 0.7.3

data/Gemfile

@@ -1,7 +1,10 @@
 source "http://rubygems.org"
 
 gem "require_all",    "~> 1.2.0"
-gem "sugar-high",     "~> 0.4.5.2"
+gem "sugar-high",     "~> 0.4.6.3"
+gem "geo_units",      ">= 0.2.0"    
+gem 'i18n'
+gem 'activesupport',  '>= 3.0.1'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/README.textile

@@ -2,17 +2,12 @@ h1. Geo calculations
 
 Geo Calculation library. Useful functions to add to your geo arsenal, fx when designing your own Geo library. 
 
-h2. Status update (June 10, 2011)
+h2. Status update (June 14, 2011)
 
-- Major refactoring splitting into more logical file/modular structure
-- Use autoload
-- Extract GeoUnits
-- Extract Dms with converter
-- GeoPoint can now have set :coords_mode which affects how Ruby Core objects such as String and Array are parsed into :lng and :lat. 
+Extracted GeoUnits and GeoPoint into separate gems: 
 
-TODO:
-- The GeoPoint class should be extracted into separate gem, then this geo_calc gem should only have the more generic geo functionality as modules to be included
-where needed in other gems!
+* "geo_units":https://github.com/kristianmandrup/geo_units 
+* "geo_point":https://github.com/kristianmandrup/geo_point
 
 h2. Install
 
@@ -28,46 +23,14 @@ From command line, run bundler
 
 @$ bundle@
 
-h2. Objetive
+h2. Objective
 
 The objective of this library is to act as a base for other geo libraries. 
 
-Please take a look at "geo vectors":https://github.com/kristianmandrup/geo_vectors which builds on _geo calc_ and provides various vector operations on geo points. 
-I also have plans to include _geo calc_ in "mongoid geo":https://github.com/kristianmandrup/mongoid_geo, the geo extension library for _Mongoid 2_. 
+The geo calculation API only requires that the point objects used, have a #lat and #lon method, which return the latitude and longitude respectively.
+The lat/lng should each be a Numeric (ie. Float or Fixnum) within respective 'geo ranges': (-90 to 90, -180 to 180).
 
-h2. Quick start (Usage)
-
-First define the points on the globe you want to work with.
-The GeoPoint initializer is very flexible with regards to the arguments it can handle.
-
-<pre>
-  # factory method on core ruby classes
-  "51 12 03 N, 24 10 02 E".geo_point
-  [51.5136, -0.0983].geo_point
-  {:latitude => 27.3, :longitude => "24 10 02 E"}.geo_point
-
-  # two arguments
-  p1 = GeoPoint.new 51.5136, -0.0983
-  p2 = GeoPoint.new "14 11 01 N", "-0.0983"
-  p3 = GeoPoint.new 51.5136, "24 10 02 E"
-
-  # a String
-  p1 = GeoPoint.new "51.5136, -0.0983"
-  p1 = GeoPoint.new "51.5136, 24 10 02 E"
-  p3 = GeoPoint.new "51.4778, -0.0015"  
-  p1 = GeoPoint.new "51 12 03 N, 24 10 02 E"
-
-  # an Array
-  p2 = GeoPoint.new [51.5136, -0.0983]
-  p2 = GeoPoint.new [51.5136, "24 10 02 E"]
-  p2 = GeoPoint.new [51.5136, {:lon => 27.3}]
-
-  # a Hash
-  p4 = GeoPoint.new {:lat => 27.3, :lng => "24 10 02 E"}
-  p4 = GeoPoint.new {:latitude => 27.3, :longitude => "24 10 02 E"}  
-</pre>
-
-h3. Shortes distance
+h3. Shortest distance
 
 Calculate *distance in kms between points p1 and p2*
 
@@ -129,20 +92,6 @@ h2. Rhumb lines
   p1.rhumb_destination_point(brng, dist)  
 </pre>    
 
-h2. Utility methods
-
-These are some of the utility methods you can use on a GeoPoint object
-  
-<pre>
-  p1 = GeoPoint.new 5.1, -7
-  p1.lat          # latitude
-  p1.lon          # longitude
-  p1.to_arr       # array representation of [lat, lng]
-  p1.reverse_arr! # reverse to_arr to instead return [lng, lat]
-  p1.normal_arr!  # return to normal to_arr functionality: [lat, lng]
-  p1.to_s         # string representation
-</pre>  
-
 h2. Core Extensions
 
 The library also extends core Ruby classes with geo related functions (see _core_ext_spec.rb_)

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.3

data/geo_calc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geo_calc}
-  s.version = "0.7.1"
+  s.version = "0.7.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-11}
+  s.date = %q{2011-06-13}
   s.description = %q{Geo calculations in ruby and javascript}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -34,35 +34,19 @@ Gem::Specification.new do |s|
     "lib/geo_calc/calc/intersection.rb",
     "lib/geo_calc/calc/midpoint.rb",
     "lib/geo_calc/calc/rhumb.rb",
-    "lib/geo_calc/dms.rb",
-    "lib/geo_calc/dms/converter.rb",
     "lib/geo_calc/extensions.rb",
     "lib/geo_calc/extensions/array.rb",
     "lib/geo_calc/extensions/hash.rb",
-    "lib/geo_calc/extensions/math.rb",
-    "lib/geo_calc/extensions/numeric.rb",
     "lib/geo_calc/extensions/string.rb",
     "lib/geo_calc/extensions/symbol.rb",
-    "lib/geo_calc/geo_point.rb",
-    "lib/geo_calc/geo_point/class_methods.rb",
-    "lib/geo_calc/geo_point/core_extension.rb",
-    "lib/geo_calc/geo_point/shared.rb",
     "lib/geo_calc/pretty_print.rb",
-    "lib/geo_units.rb",
-    "lib/geo_units/converter.rb",
-    "lib/geo_units/numeric_ext.rb",
     "spec/geo_calc/calculations_spec.rb",
     "spec/geo_calc/core_ext/array_ext_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",
     "spec/geo_calc/core_ext_spec.rb",
-    "spec/geo_calc/dms/converter_spec.rb",
-    "spec/geo_calc/geo_point/class_methods_spec.rb",
-    "spec/geo_calc/geo_point/initializer_spec.rb",
-    "spec/geo_calc/geo_point/lat_lon.rb",
-    "spec/geo_calc/geo_point_spec.rb",
-    "spec/geo_units/converter_spec.rb",
+    "spec/geo_calc/include_apis_spec.rb",
     "spec/spec_helper.rb",
     "vendor/assets/javascript/geo_calc.js"
   ]
@@ -77,7 +61,10 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.4.5.2"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.4.6.3"])
+      s.add_runtime_dependency(%q<geo_units>, [">= 0.2.0"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.1"])
       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"])
@@ -85,7 +72,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rake>, [">= 0.9"])
     else
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.4.5.2"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.4.6.3"])
+      s.add_dependency(%q<geo_units>, [">= 0.2.0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.1"])
       s.add_dependency(%q<rspec>, [">= 2.5.0"])
       s.add_dependency(%q<bundler>, [">= 1"])
       s.add_dependency(%q<jeweler>, [">= 1.5.2"])
@@ -94,7 +84,10 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.4.5.2"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.4.6.3"])
+    s.add_dependency(%q<geo_units>, [">= 0.2.0"])
+    s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.1"])
     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/calc/bearing.rb

@@ -1,4 +1,4 @@
-module GeoCalc::Calc
+module GeoCalc
   module Bearing
     def bearing_to point
       GeoCalc::Calc::Bearing.bearing_to self, point

data/lib/geo_calc/calc/destination.rb

@@ -1,4 +1,4 @@
-module GeoCalc::Calc
+module GeoCalc
   module Destination
     def destination_point brng, dist
       GeoCalc::Calc::Destination.destination_point self, brng, dist
@@ -24,7 +24,8 @@ module GeoCalc::Calc
 
       lon2 = (lon2 + 3*Math::PI) % (2*Math::PI) - Math::PI  # normalise to -180...+180   
 
-      GeoPoint.new lat2.to_deg, lon2.to_deg
+      [lat2.to_deg, lon2.to_deg]
+      # GeoPoint.new lat2.to_deg, lon2.to_deg      
     end
   end
 end

data/lib/geo_calc/calc/distance.rb

@@ -3,7 +3,7 @@
  #   - www.movable-type.co.uk/scripts/latlong.html
  #                                                                                                
 
-module GeoCalc::Calc
+module GeoCalc
   module Distance  
     def distance_to point, precision = 4
       GeoCalc::Calc::Distance.distance_to self, point, precision

data/lib/geo_calc/calc/intersection.rb

@@ -1,4 +1,4 @@
-module GeoCalc::Calc
+module GeoCalc
   module Intersection
     def intersection brng1, p2, brng2
       GeoCalc::Calc::Intersection.intersection self, brng1, p2, brng2
@@ -8,11 +8,11 @@ module GeoCalc::Calc
     # 
     #   see http:#williams.best.vwh.net/avform.htm#Intersection
     # 
-    # @param   {LatLon} p1: First point
-    # @param   {Number} brng1: Initial bearing from first point
-    # @param   {LatLon} p2: Second point
-    # @param   {Number} brng2: Initial bearing from second point
-    # @returns {LatLon} Destination point (null if no unique intersection defined)
+    # @param   [GeoPoint] p1: First point
+    # @param   [Number] brng1: Initial bearing from first point
+    # @param   [GeoPoint] p2: Second point
+    # @param   [Number] brng2: Initial bearing from second point
+    # @returns [Array] Destination point (null if no unique intersection defined)
 
     def self.intersection p1, brng1, p2, brng2
       lat1 = p1.lat.to_rad
@@ -66,7 +66,7 @@ module GeoCalc::Calc
       lon3 = lon1 + dlon13;
       lon3 = (lon3 + Math::PI) % (2*Math::PI) - Math::PI  # normalise to -180..180º
 
-      GeoPoint.new lat3.to_deg, lon3.to_deg
-    end    
+      [lat3.to_deg, lon3.to_deg]
+    end
   end
 end

data/lib/geo_calc/calc/midpoint.rb

@@ -1,15 +1,16 @@
-module GeoCalc::Calc
+module GeoCalc
   module Midpoint
     def midpoint_to point
       GeoCalc::Calc::Midpoint.midpoint_to self, point
     end
 
     # Returns the midpoint between this point and the supplied point.
-    #   see http:#mathforum.org/library/drmath/view/51822.html for derivation
+    # see(http:#mathforum.org/library/drmath/view/51822.html for derivation)
     # 
-    # - GeoPoint point: Latitude/longitude of destination point
-    # Returns GeoPoint: Midpoint between this point and the supplied point
-  
+    # @param [GeoPoint] base_point: Starting point (latitude, longitude)
+    # @param [GeoPoint] point: Destination point (latitude, longitude)
+    # @return [Array] Midpoint between this point and the supplied point
+    #
     def self.midpoint_to base_point, point
       lat1 = base_point.lat.to_rad
       lon1 = base_point.lon.to_rad;
@@ -23,7 +24,8 @@ module GeoCalc::Calc
 
       lon3 = lon1 + Math.atan2(by, Math.cos(lat1) + bx)
 
-      GeoPoint.new lat3.to_deg, lon3.to_deg
+      [lat3.to_deg, lon3.to_deg]
+      # GeoPoint.new 
     end    
   end
 end

data/lib/geo_calc/calc/rhumb.rb

@@ -1,16 +1,21 @@
-module GeoCalc::Calc
+module GeoCalc
   module Rhumb
+    # Returns the distance from this point to the supplied point, in km, travelling along a rhumb line
+    # 
+    # see(http:#williams.best.vwh.net/avform.htm#Rhumb)
+    #
+    # @param  [GeoPoint] Destination point latitude and longitude of 
+    # @return [Numeric] Distance in km between start and destination point
     def rhumb_distance_to point
       GeoCalc::Calc::Rhumb.rhumb_distance_to self, point
     end
 
     # Returns the distance from this point to the supplied point, in km, travelling along a rhumb line
-    # 
-    #   see http:#williams.best.vwh.net/avform.htm#Rhumb
-    # 
-    # - GeoPoint point: Latitude/longitude of destination point
-    # Returns Numeric: Distance in km between this point and destination point
-
+    #
+    # @param  [GeoPoint] Start point with (latitude, longitude)
+    # @param  [GeoPoint] Destination point (latitude, longitude)
+    # @return [Numeric] Distance in km between start and destination point
+    #
     def self.rhumb_distance_to base_point, point
       lat1 = base_point.lat.to_rad
       lat2 = point.lat.to_rad
@@ -34,14 +39,19 @@ module GeoCalc::Calc
       dist.round(4)  # 4 sig figures reflects typical 0.3% accuracy of spherical model
     end
 
+    # Returns the bearing from this point to the supplied point along a rhumb line, in degrees
+    #
+    # @param  [GeoPoint] Destination point (latitude, longitude)
+    # @return [Numeric] Bearing in degrees from North
+    #
     def rhumb_bearing_to point
       GeoCalc::Calc::Rhumb.rhumb_bearing_to self, point
     end
     # Returns the bearing from this point to the supplied point along a rhumb line, in degrees
     # 
-    # - GeoPoint point: Latitude/longitude of destination point
-    # Returns Numeric: Bearing in degrees from North
-
+    # @param  [GeoPoint] Destination point (latitude, longitude)
+    # @return [Numeric] Bearing in degrees from North
+    #
     def self.rhumb_bearing_to base_point, point
       lat1 = base_point.lat.to_rad
       lat2 = point.lat.to_rad
@@ -58,16 +68,24 @@ module GeoCalc::Calc
       (brng.to_deg+360) % 360
     end
 
+    # Returns the destination point from this point having travelled the given distance (in km) on the 
+    # given bearing along a rhumb line
+    #
+    # @param   [Number] brng: Bearing in degrees from North
+    # @param   [Number] dist: Distance in km
+    # @returns [Array] Destination point as an array [lat, long]
     def rhumb_destination_point brng, dist
       GeoCalc::Calc::Rhumb.rhumb_destination_point self, brng, dist
     end
+
     # Returns the destination point from this point having travelled the given distance (in km) on the 
     # given bearing along a rhumb line
-    # 
-    # @param   {Number} brng: Bearing in degrees from North
-    # @param   {Number} dist: Distance in km
-    # @returns {LatLon} Destination point
-
+    #
+    # @param   [GeoPoint] Starting point (latitude, longitude)     
+    # @param   [Number] brng: Bearing in degrees from North
+    # @param   [Number] dist: Distance in km
+    # @returns [Array] Destination point as an array [lat, long]
+    #
     def self.rhumb_destination_point base_point, brng, dist
       d = dist / base_point.earth_radius_km  # d = angular distance covered on earth's surface
       lat1 = base_point.lat.to_rad
@@ -92,7 +110,8 @@ module GeoCalc::Calc
       end
       lon2 = (lon1+dlon+3*Math::PI) % (2*Math::PI) - Math::PI
 
-      GeoPoint.new lat2.to_deg, lon2.to_deg
+      [lat2.to_deg, lon2.to_deg]
+      # GeoPoint.new 
     end
   end
 end

data/lib/geo_calc/calc.rb

@@ -1,26 +1,20 @@
-module GeoCalc
-  autoload :PrettyPrint,  'geo_calc/pretty_print'
-end
+require 'active_support/inflector'
 
 module GeoCalc
-  module Calc
-    autoload :Bearing,      'geo_calc/calc/bearing'
-    autoload :Destination,  'geo_calc/calc/destination'
-    autoload :Distance,     'geo_calc/calc/distance'
-    autoload :Intersection, 'geo_calc/calc/intersection'
-    autoload :Midpoint,     'geo_calc/calc/midpoint'  
-    autoload :Rhumb,        'geo_calc/calc/rhumb'    
+  autoload :Bearing,      'geo_calc/calc/bearing'
+  autoload :Destination,  'geo_calc/calc/destination'
+  autoload :Distance,     'geo_calc/calc/distance'
+  autoload :Intersection, 'geo_calc/calc/intersection'
+  autoload :Midpoint,     'geo_calc/calc/midpoint'  
+  autoload :Rhumb,        'geo_calc/calc/rhumb'    
+  
+  def self.included base
+    apis.each do |api|           
+      base.send :include, "GeoCalc::#{api}".constantize
+    end
+  end
   
-    module All
-      def self.included base
-        base.send :include, GeoCalc::Calc::Bearing
-        base.send :include, GeoCalc::Calc::Destination
-        base.send :include, GeoCalc::Calc::Distance
-        base.send :include, GeoCalc::Calc::Intersection
-        base.send :include, GeoCalc::Calc::Midpoint
-        base.send :include, GeoCalc::Calc::Rhumb
-        base.send :include, GeoCalc::PrettyPrint
-      end
-    end  
+  def self.apis
+    [:Bearing, :Destination, :Distance, :Intersection, :Midpoint, :Rhumb]
   end
 end

data/lib/geo_calc/extensions/array.rb

@@ -1,6 +1,4 @@
-class Array
-  include ::GeoPoint::CoreExtension
-  
+class Array  
   def to_lat_lng
     raise "Array must contain at least two elements to be converted to latitude and longitude" if !(size >= 2)
     [to_lat, to_lng]

data/lib/geo_calc/extensions/hash.rb

@@ -1,6 +1,4 @@
-class Hash
-  include GeoPoint::CoreExtension  
-  
+class Hash  
   def to_lat_lng
     [to_lat, to_lng]
   end

data/lib/geo_calc/extensions/string.rb

@@ -1,17 +1,4 @@
 class String
-  include ::GeoPoint::CoreExtension
-  
-  def concat *args
-    args.inject(self) do |res, arg| 
-      res << arg.to_s
-      res
-    end
-  end
-
-  def parse_dms
-    GeoCalc::Dms::Converter.parse_dms self
-  end
-
   def to_rad
     parse_dms.to_rad
   end
@@ -33,12 +20,16 @@ class String
   end
   
   def to_lat
-    raise "An empty String has no latitude" if empty?
-    geo_clean.parse_dms.to_f.to_lat
+    raise "An empty String has no latitude" if self.empty?
+    s = geo_clean
+    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 empty?
-    geo_clean.parse_dms.to_f.to_lng
+    raise "An empty String has no latitude" if self.empty?
+    s = geo_clean
+    s = s.parse_dms if s.respond_to? :parse_dms    
+    s.to_f.to_lng
   end
 end

data/lib/geo_calc/extensions.rb

@@ -1,4 +1,3 @@
 require 'require_all'
-require 'geo_calc/geo_point/core_extension'
 
 require_all File.dirname(__FILE__) + '/extensions'

data/lib/geo_calc/pretty_print.rb

@@ -1,41 +1,41 @@
+require 'geo_units'
+
 module GeoCalc
   module PrettyPrint
+
     # Returns the latitude of this point; signed numeric degrees if no format, otherwise format & dp 
-    # as per Geo.to_lat
     # 
-    # - String [format]: Return value as 'd', 'dm', 'dms'
-    # - Numeric [dp=0|2|4]: No of decimal places to display
+    # @param [String] format: Return value as 'd', 'dm', 'dms'
+    # @param [Numeric] dp: No of decimal places to display (0|2|4)
     #
-    # Returns {Numeric|String}: Numeric degrees if no format specified, otherwise deg/min/sec
+    # @return   [Numeric|String]: Numeric degrees if no format specified, otherwise deg/min/sec
     # 
-
     def to_lat format = :dms, dp = 0
       return lat if !format
-      Geo.to_lat lat, format, dp
+      GeoUnits::Converter.to_lat lat, format, dp
     end
 
-
     # Returns the longitude of this point; signed numeric degrees if no format, otherwise format & dp 
     # as per Geo.toLon()
     # 
-    # @param   {String} [format]: Return value as 'd', 'dm', 'dms'
-    # @param   {Number} [dp=0|2|4]: No of decimal places to display
-    # @returns {Number|String} Numeric degrees if no format specified, otherwise deg/min/sec
+    # @param   [String} [format]: Return value as 'd', 'dm', 'dms'
+    # @param   [Number} [dp=0|2|4]: No of decimal places to display
+    # @return [Number|String} Numeric degrees if no format specified, otherwise deg/min/sec
     # 
     # @requires Geo
 
     def to_lon format, dp
       return lon if !format
-      Geo.to_lon lon, format, dp
+      GeoUnits::Converter.to_lon lon, format, dp
     end
 
 
     # Returns a string representation of this point; format and dp as per lat()/lon()
     # 
-    # @param   {String} [format]: Return value as 'd', 'dm', 'dms'
-    # @param   {Number} [dp=0|2|4]: No of decimal places to display
+    # @param   [String] format: Return value as 'd', 'dm', 'dms'
+    # @param   [Number] dp: No of decimal places to display (0|2|4)
 
-    # @returns {String} Comma-separated latitude/longitude
+    # @return [String] Comma-separated latitude/longitude
     # 
 
     def to_s format = :dms, dp = 0 

data/lib/geo_calc.rb

@@ -1,6 +1,9 @@
-require 'geo_calc/geo_point'
 require 'geo_units'
+require 'sugar-high/math'
+require 'geo_calc/calc'
 
-module GeoCalc
-  autoload :Dms, 'geo_calc/dms'
-end
+module GeoCalc  
+  autoload :PrettyPrint,  'geo_calc/pretty_print'
+end
+
+require 'geo_calc/extensions'

data/spec/geo_calc/calculations_spec.rb

@@ -17,8 +17,9 @@ require 'spec_helper'
 # For miles, divide km by 1.609344
 # For nautical miles, divide km by 1.852
 
-describe GeoCalc do 
+require 'geo_point'
 
+describe GeoCalc do 
   # Point 1: 50 03 59N, 005 42 53W
   # Point 2: 58 38 38N, 003 04 12W
   context 'p1= (50 03 59N, 005 42 53W) .. p2= (58 38 38N, 003 04 12W)' do

data/spec/geo_calc/core_ext/array_ext_spec.rb

@@ -33,15 +33,7 @@ describe GeoPoint do
           @arr = ["3", {:lng => "2"}]
           @arr.to_lat_lng.should == [3, 2]
         end
-      end 
-  
-      describe '#geo_point' do              
-        it 'should return a GeoPoint' do
-          @p = [3, 2].geo_point
-          @p.should be_a(GeoPoint)
-          @p.to_lat_lng.should == [3, 2]
-        end
-      end                            
+      end   
     end # Array
   end
 end

data/spec/geo_calc/core_ext/hash_ext_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe GeoPoint do 
   describe 'ruby core Class extensions' do
     describe 'Hash extension' do
@@ -30,15 +32,7 @@ describe GeoPoint do
           @hash = {:lng => 2, :lat => "3"}
           @hash.to_lat_lng.should == [3, 2]
         end
-      end 
-  
-      describe '#geo_point' do              
-        it 'should return a GeoPoint' do
-          @p = {:lng => 2, :lat => "3"}.geo_point
-          @p.should be_a(GeoPoint)            
-          @p.to_lat_lng.should == [3, 2]
-        end
-      end         
+      end  
     end # Hash 
   end
 end

data/spec/geo_calc/core_ext/string_ext_spec.rb

@@ -63,15 +63,7 @@ describe GeoPoint do
           @str = "4; 3"
           lambda { @str.to_lat_lng}.should raise_error
         end
-      end 
-  
-      describe '#geo_point' do              
-        it 'should return a GeoPoint' do
-          @p = "3, 2".geo_point
-          @p.should be_a(GeoPoint)            
-          @p.to_lat_lng.should == [3, 2]
-        end
-      end                 
+      end   
     end # String
   end
 end

data/spec/geo_calc/core_ext_spec.rb

@@ -4,13 +4,7 @@ require 'spec_helper'
 describe GeoPoint do 
   describe 'ruby core Class extensions' do
     describe 'Fixnum extension' do
-      describe '#to_lat' do              
-        it 'should set origin at 0,0' do
-          origin = [0, 0].geo_point
-          origin.lat.should == 0       
-          origin.lng.should == 0
-        end
-
+      describe '#to_lat' do
         it 'should return latitude degree value for 360' do
           360.to_lat.should == 0
         end