geo_calc 0.7.3 → 0.7.4

data/Gemfile

@@ -2,16 +2,17 @@ source "http://rubygems.org"
 
 gem "require_all",    "~> 1.2.0"
 gem "sugar-high",     "~> 0.4.6.3"
-gem "geo_units",      ">= 0.2.0"    
+gem "geo_units",      "~> 0.2.1"    
 gem 'i18n'
 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 "rspec",    ">= 2.5.0"
-  gem "bundler",  ">= 1"
-  gem "jeweler",  ">= 1.5.2"
-  gem "rcov",     ">= 0"
-  gem "rake",     ">= 0.9"
+  gem "geo_point",  ">= 0.2.1"    
+  gem "rspec",      ">= 2.5.0"
+  gem "bundler",    ">= 1"
+  gem "jeweler",    ">= 1.5.2"
+  gem "rcov",       ">= 0"
+  gem "rake",       ">= 0.9"
 end

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.4

data/geo_calc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geo_calc}
-  s.version = "0.7.3"
+  s.version = "0.7.4"
 
   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-19}
   s.description = %q{Geo calculations in ruby and javascript}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
     "lib/geo_calc/extensions/hash.rb",
     "lib/geo_calc/extensions/string.rb",
     "lib/geo_calc/extensions/symbol.rb",
+    "lib/geo_calc/geo_calculations.rb",
     "lib/geo_calc/pretty_print.rb",
     "spec/geo_calc/calculations_spec.rb",
     "spec/geo_calc/core_ext/array_ext_spec.rb",
@@ -62,9 +63,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.6.3"])
-      s.add_runtime_dependency(%q<geo_units>, [">= 0.2.0"])
+      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<rspec>, [">= 2.5.0"])
       s.add_development_dependency(%q<bundler>, [">= 1"])
       s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
@@ -73,9 +75,10 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_dependency(%q<sugar-high>, ["~> 0.4.6.3"])
-      s.add_dependency(%q<geo_units>, [">= 0.2.0"])
+      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<rspec>, [">= 2.5.0"])
       s.add_dependency(%q<bundler>, [">= 1"])
       s.add_dependency(%q<jeweler>, [">= 1.5.2"])
@@ -85,9 +88,10 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
     s.add_dependency(%q<sugar-high>, ["~> 0.4.6.3"])
-    s.add_dependency(%q<geo_units>, [">= 0.2.0"])
+    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<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,16 +1,17 @@
 module GeoCalc
   module Bearing
+    # @returns [Numeric] bearing in degrees
     def bearing_to point
-      GeoCalc::Calc::Bearing.bearing_to self, point
+      GeoCalc::Bearing.bearing_to self, point
     end
 
     # Returns the (initial) bearing from this point to the supplied point, in degrees
-    #   see http:#williams.best.vwh.net/avform.htm#Crs
+    # see(http:#williams.best.vwh.net/avform.htm#Crs)
     # 
-    # - Point point: Latitude/longitude of destination point
+    # @param [GeoPoint] Latitude/longitude of destination point
     # 
-    # Returns -  Numeric: Initial bearing in degrees from North
-
+    # @return [Numeric] initial bearing in degrees from North
+    #
     def self.bearing_to base_point, point
       lat1 = base_point.lat.to_rad
       lat2 = point.lat.to_rad
@@ -24,16 +25,16 @@ module GeoCalc
     end
 
     def final_bearing_to point
-      GeoCalc::Calc::Bearing.final_bearing_to self, point
+      GeoCalc::Bearing.final_bearing_to self, point
     end
 
     # Returns final bearing arriving at supplied destination point from this point; the final bearing 
     # will differ from the initial bearing by varying degrees according to distance and latitude
     # 
-    # - GeoPoint point: Latitude/longitude of destination point
+    # @param [GeoPoint] Latitude/longitude of destination point
+    #
+    # @return [Numeric] final bearing in degrees from North
     #
-    # Returns Numeric: Final bearing in degrees from North
-
     def self.final_bearing_to base_point, point
       # get initial bearing from supplied point back to this point...
       lat1 = point.lat.to_rad

data/lib/geo_calc/calc/destination.rb

@@ -1,17 +1,17 @@
 module GeoCalc
   module Destination
     def destination_point brng, dist
-      GeoCalc::Calc::Destination.destination_point self, brng, dist
+      GeoCalc::Destination.destination_point self, brng, dist
     end
 
     # Returns the destination point from this point having travelled the given distance (in km) on the 
     # given initial bearing (bearing may vary before destination is reached)
     # 
-    #   see http:#williams.best.vwh.net/avform.htm#LL
+    # see(http:#williams.best.vwh.net/avform.htm#LL)
     # 
-    # - Numeric bearing: Initial bearing in degrees
-    # - Numeric dist: Distance in km
-    # Returns GeoPoint: Destination point
+    # @param [Numeric] Initial bearing in degrees
+    # @param [Numeric] Distance in km
+    # @return [Array] Destination point
 
     def self.destination_point base_point, brng, dist
       dist = dist / base_point.earth_radius_km  # convert dist to angular distance in radians

data/lib/geo_calc/calc/distance.rb

@@ -6,7 +6,7 @@
 module GeoCalc
   module Distance  
     def distance_to point, precision = 4
-      GeoCalc::Calc::Distance.distance_to self, point, precision
+      GeoCalc::Distance.distance_to self, point, precision
     end
 
     # Returns the distance from this point to the supplied point, in km 
@@ -15,10 +15,10 @@ module GeoCalc
     # from: Haversine formula - R. W. Sinnott, "Virtues of the Haversine",
     #       Sky and Telescope, vol 68, no 2, 1984
     # 
-    # GeoPoint point: Latitude/longitude of destination point
-    # - Numeric precision=4: number of significant digits to use for returned value
+    # @param [GeoPoint] Latitude/longitude of destination point
+    # @param [Numeric] number of significant digits to use for returned value
     #
-    # Returns - Numeric distance in km between this point and destination point
+    # @return [Numeric] distance in km between this point and destination point
   
     def self.distance_to base_point, point, precision = 4
       # default 4 sig figs reflects typical 0.3% accuracy of spherical model

data/lib/geo_calc/calc/intersection.rb

@@ -1,7 +1,7 @@
 module GeoCalc
   module Intersection
     def intersection brng1, p2, brng2
-      GeoCalc::Calc::Intersection.intersection self, brng1, p2, brng2
+      GeoCalc::Intersection.intersection self, brng1, p2, brng2
     end
 
     # Returns the point of intersection of two paths defined by point and bearing
@@ -12,7 +12,7 @@ module GeoCalc
     # @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)
+    # @return [Array] Destination point (null if no unique intersection defined)
 
     def self.intersection p1, brng1, p2, brng2
       lat1 = p1.lat.to_rad

data/lib/geo_calc/calc/midpoint.rb

@@ -1,7 +1,7 @@
 module GeoCalc
   module Midpoint
     def midpoint_to point
-      GeoCalc::Calc::Midpoint.midpoint_to self, point
+      GeoCalc::Midpoint.midpoint_to self, point
     end
 
     # Returns the midpoint between this point and the supplied point.

data/lib/geo_calc/calc/rhumb.rb

@@ -7,7 +7,7 @@ module GeoCalc
     # @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
+      GeoCalc::Rhumb.rhumb_distance_to self, point
     end
 
     # Returns the distance from this point to the supplied point, in km, travelling along a rhumb line
@@ -45,7 +45,7 @@ module GeoCalc
     # @return [Numeric] Bearing in degrees from North
     #
     def rhumb_bearing_to point
-      GeoCalc::Calc::Rhumb.rhumb_bearing_to self, point
+      GeoCalc::Rhumb.rhumb_bearing_to self, point
     end
     # Returns the bearing from this point to the supplied point along a rhumb line, in degrees
     # 
@@ -75,7 +75,7 @@ module GeoCalc
     # @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
+      GeoCalc::Rhumb.rhumb_destination_point self, brng, dist
     end
 
     # Returns the destination point from this point having travelled the given distance (in km) on the 

data/lib/geo_calc/extensions/array.rb

@@ -1,4 +1,4 @@
-class Array  
+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/geo_calculations.rb

@@ -0,0 +1,278 @@
+module GeoCalculations
+  extend self
+
+  ##
+  # Compass point names, listed clockwise starting at North.
+  #
+  # If you want bearings named using more, fewer, or different points
+  # override Geocoder::Calculations.COMPASS_POINTS with your own array.
+  #
+  COMPASS_POINTS = %w[N NE E SE S SW W NW]
+
+  ##
+  # Radius of the Earth, in kilometers.
+  # Value taken from: http://en.wikipedia.org/wiki/Earth_radius
+  #
+  EARTH_RADIUS = 6371.0
+
+  ##
+  # Conversion factor: multiply by kilometers to get miles.
+  #
+  KM_IN_MI = 0.621371192
+
+  ##
+  # Distance spanned by one degree of latitude in the given units.
+  #
+  def latitude_degree_distance(units = :mi)
+    2 * Math::PI * earth_radius(units) / 360
+  end
+
+  ##
+  # Distance spanned by one degree of longitude at the given latitude.
+  # This ranges from around 69 miles at the equator to zero at the poles.
+  #
+  def longitude_degree_distance(latitude, units = :mi)
+    latitude_degree_distance(units) * Math.cos(to_radians(latitude))
+  end
+
+  ##
+  # Distance between two points on Earth (Haversine formula).
+  # Takes two points and an options hash.
+  # The points are given in the same way that points are given to all
+  # Geocoder methods that accept points as arguments. They can be:
+  #
+  # * an array of coordinates ([lat,lon])
+  # * a geocodable address (string)
+  # * a geocoded object (one which implements a +to_coordinates+ method
+  #   which returns a [lat,lon] array
+  #
+  # The options hash supports:
+  #
+  # * <tt>:units</tt> - <tt>:mi</tt> (default) or <tt>:km</tt>
+  #
+  def distance_between(point1, point2, options = {})
+
+    # set default options
+    options[:units] ||= :mi
+
+    # convert to coordinate arrays
+    point1 = extract_coordinates(point1)
+    point2 = extract_coordinates(point2)
+
+    # convert degrees to radians
+    point1 = to_radians(point1)
+    point2 = to_radians(point2)
+
+    # compute deltas
+    dlat = point2[0] - point1[0]
+    dlon = point2[1] - point1[1]
+
+    a = (Math.sin(dlat / 2))**2 + Math.cos(point1[0]) *
+        (Math.sin(dlon / 2))**2 * Math.cos(point2[0])
+    c = 2 * Math.atan2( Math.sqrt(a), Math.sqrt(1-a))
+    c * earth_radius(options[:units])
+  end
+
+  ##
+  # Bearing between two points on Earth.
+  # Returns a number of degrees from due north (clockwise).
+  #
+  # See Geocoder::Calculations.distance_between for
+  # ways of specifying the points. Also accepts an options hash:
+  #
+  # * <tt>:method</tt> - <tt>:linear</tt> (default) or <tt>:spherical</tt>;
+  #   the spherical method is "correct" in that it returns the shortest path
+  #   (one along a great circle) but the linear method is the default as it
+  #   is less confusing (returns due east or west when given two points with
+  #   the same latitude)
+  #
+  # Based on: http://www.movable-type.co.uk/scripts/latlong.html
+  #
+  def bearing_between(point1, point2, options = {})
+
+    # set default options
+    options[:method] = :linear unless options[:method] == :spherical
+
+    # convert to coordinate arrays
+    point1 = extract_coordinates(point1)
+    point2 = extract_coordinates(point2)
+
+    # convert degrees to radians
+    point1 = to_radians(point1)
+    point2 = to_radians(point2)
+
+    # compute deltas
+    dlat = point2[0] - point1[0]
+    dlon = point2[1] - point1[1]
+
+    case options[:method]
+    when :linear
+      y = dlon
+      x = dlat
+
+    when :spherical
+      y = Math.sin(dlon) * Math.cos(point2[0])
+      x = Math.cos(point1[0]) * Math.sin(point2[0]) -
+          Math.sin(point1[0]) * Math.cos(point2[0]) * Math.cos(dlon)
+    end
+
+    bearing = Math.atan2(x,y)
+    # Answer is in radians counterclockwise from due east.
+    # Convert to degrees clockwise from due north:
+    (90 - to_degrees(bearing) + 360) % 360
+  end
+
+  ##
+  # Translate a bearing (float) into a compass direction (string, eg "North").
+  #
+  def compass_point(bearing, points = COMPASS_POINTS)
+    seg_size = 360 / points.size
+    points[((bearing + (seg_size / 2)) % 360) / seg_size]
+  end
+
+  ##
+  # Compute the geographic center (aka geographic midpoint, center of
+  # gravity) for an array of geocoded objects and/or [lat,lon] arrays
+  # (can be mixed). Any objects missing coordinates are ignored. Follows
+  # the procedure documented at http://www.geomidpoint.com/calculation.html.
+  #
+  def geographic_center(points)
+
+    # convert objects to [lat,lon] arrays and convert degrees to radians
+    coords = points.map{ |p| to_radians(extract_coordinates(p)) }
+
+    # convert to Cartesian coordinates
+    x = []; y = []; z = []
+    coords.each do |p|
+      x << Math.cos(p[0]) * Math.cos(p[1])
+      y << Math.cos(p[0]) * Math.sin(p[1])
+      z << Math.sin(p[0])
+    end
+
+    # compute average coordinate values
+    xa, ya, za = [x,y,z].map do |c|
+      c.inject(0){ |tot,i| tot += i } / c.size.to_f
+    end
+
+    # convert back to latitude/longitude
+    lon = Math.atan2(ya, xa)
+    hyp = Math.sqrt(xa**2 + ya**2)
+    lat = Math.atan2(za, hyp)
+
+    # return answer in degrees
+    to_degrees [lat, lon]
+  end
+
+  ##
+  # Returns coordinates of the lower-left and upper-right corners of a box
+  # with the given point at its center. The radius is the shortest distance
+  # from the center point to any side of the box (the length of each side
+  # is twice the radius).
+  #
+  # This is useful for finding corner points of a map viewport, or for
+  # roughly limiting the possible solutions in a geo-spatial search
+  # (ActiveRecord queries use it thusly).
+  #
+  # See Geocoder::Calculations.distance_between for
+  # ways of specifying the point. Also accepts an options hash:
+  #
+  # * <tt>:units</tt> - <tt>:mi</tt> (default) or <tt>:km</tt>
+  #
+  def bounding_box(point, radius, options = {})
+    lat,lon = extract_coordinates(point)
+    radius  = radius.to_f
+    units   = options[:units] || :mi
+    [
+      lat - (radius / latitude_degree_distance(units)),
+      lon - (radius / longitude_degree_distance(lat, units)),
+      lat + (radius / latitude_degree_distance(units)),
+      lon + (radius / longitude_degree_distance(lat, units))
+    ]
+  end
+
+  ##
+  # Convert degrees to radians.
+  # If an array (or multiple arguments) is passed,
+  # converts each value and returns array.
+  #
+  def to_radians(*args)
+    args = args.first if args.first.is_a?(Array)
+    if args.size == 1
+      args.first * (Math::PI / 180)
+    else
+      args.map{ |i| to_radians(i) }
+    end
+  end
+
+  ##
+  # Convert radians to degrees.
+  # If an array (or multiple arguments) is passed,
+  # converts each value and returns array.
+  #
+  def to_degrees(*args)
+    args = args.first if args.first.is_a?(Array)
+    if args.size == 1
+      (args.first * 180.0) / Math::PI
+    else
+      args.map{ |i| to_degrees(i) }
+    end
+  end
+
+  def distance_to_radians(distance, units = :mi)
+    distance.to_f / earth_radius(units)
+  end
+
+  def radians_to_distance(radians, units = :mi)
+    radians * earth_radius(units)
+  end
+
+  ##
+  # Convert miles to kilometers.
+  #
+  def to_kilometers(mi)
+    mi * mi_in_km
+  end
+
+  ##
+  # Convert kilometers to miles.
+  #
+  def to_miles(km)
+    km * km_in_mi
+  end
+
+  ##
+  # Radius of the Earth in the given units (:mi or :km). Default is :mi.
+  #
+  def earth_radius(units = :mi)
+    units == :km ? EARTH_RADIUS : to_miles(EARTH_RADIUS)
+  end
+
+  ##
+  # Conversion factor: km to mi.
+  #
+  def km_in_mi
+    KM_IN_MI
+  end
+
+  ##
+  # Conversion factor: mi to km.
+  #
+  def mi_in_km
+    1.0 / KM_IN_MI
+  end
+
+  ##
+  # Takes an object which is a [lat,lon] array, a geocodable string,
+  # or an object that implements +to_coordinates+ and returns a
+  # [lat,lon] array. Note that if a string is passed this may be a slow-
+  # running method and may return nil.
+  #
+  def extract_coordinates(point)
+    case point
+      when Array; point
+      when String; Geocoder.coordinates(point)
+      else point.to_coordinates
+    end
+  end
+end
+

data/lib/geo_calc.rb

@@ -1,6 +1,7 @@
 require 'geo_units'
 require 'sugar-high/math'
 require 'geo_calc/calc'
+require 'geo_calc/geo_calculations'
 
 module GeoCalc  
   autoload :PrettyPrint,  'geo_calc/pretty_print'

data/spec/geo_calc/calculations_spec.rb

@@ -96,7 +96,7 @@ describe GeoCalc do
     # Intersection point:   50°54′06″N, 004°29′39″E
     describe '#intersection' do      
       it 'should return the intersection between p1 and p2 as (50 54 06 N, 004 29 39 E)' do
-        GeoCalc::Calc::Intersection.intersection(@p1, @brng1, @p2, @brng2).to_dms.should match /50.+54.+06.+N, 004.+29.+39.+E/
+        GeoCalc::Intersection.intersection(@p1, @brng1, @p2, @brng2).to_dms.should match /50.+54.+06.+N, 004.+29.+39.+E/
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_calc
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   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-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &2153783140 !ruby/object:Gem::Requirement
+  requirement: &2164287640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153783140
+  version_requirements: *2164287640
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2153782640 !ruby/object:Gem::Requirement
+  requirement: &2164286840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: 0.4.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153782640
+  version_requirements: *2164286840
 - !ruby/object:Gem::Dependency
   name: geo_units
-  requirement: &2153782120 !ruby/object:Gem::Requirement
+  requirement: &2164286060 !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: *2153782120
+  version_requirements: *2164286060
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153781640 !ruby/object:Gem::Requirement
+  requirement: &2164285160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153781640
+  version_requirements: *2164285160
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153781060 !ruby/object:Gem::Requirement
+  requirement: &2164284460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,21 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153781060
+  version_requirements: *2164284460
+- !ruby/object:Gem::Dependency
+  name: geo_point
+  requirement: &2164283680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :development
+  prerelease: false
+  version_requirements: *2164283680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153780540 !ruby/object:Gem::Requirement
+  requirement: &2164282980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2153780540
+  version_requirements: *2164282980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153779960 !ruby/object:Gem::Requirement
+  requirement: &2164282340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *2153779960
+  version_requirements: *2164282340
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153779440 !ruby/object:Gem::Requirement
+  requirement: &2162210200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2153779440
+  version_requirements: *2162210200
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2153778720 !ruby/object:Gem::Requirement
+  requirement: &2162209620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153778720
+  version_requirements: *2162209620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153778000 !ruby/object:Gem::Requirement
+  requirement: &2162209080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +131,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2153778000
+  version_requirements: *2162209080
 description: Geo calculations in ruby and javascript
 email: kmandrup@gmail.com
 executables: []
@@ -151,6 +162,7 @@ files:
 - lib/geo_calc/extensions/hash.rb
 - lib/geo_calc/extensions/string.rb
 - lib/geo_calc/extensions/symbol.rb
+- lib/geo_calc/geo_calculations.rb
 - lib/geo_calc/pretty_print.rb
 - spec/geo_calc/calculations_spec.rb
 - spec/geo_calc/core_ext/array_ext_spec.rb
@@ -176,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4458324713817276308
+      hash: -3260923342157281303
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: