geo_calc 0.5.3 → 0.6.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_calc
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-22 00:00:00.000000000Z
+date: 2011-05-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161529760 !ruby/object:Gem::Requirement
+  requirement: &2163339360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2161529760
+  version_requirements: *2163339360
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2161528940 !ruby/object:Gem::Requirement
+  requirement: &2163338880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *2161528940
+  version_requirements: *2163338880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2161528040 !ruby/object:Gem::Requirement
+  requirement: &2163338380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2161528040
+  version_requirements: *2163338380
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2161524740 !ruby/object:Gem::Requirement
+  requirement: &2163337860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161524740
+  version_requirements: *2163337860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2161524140 !ruby/object:Gem::Requirement
+  requirement: &2163337360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2161524140
+  version_requirements: *2163337360
 description: Geo calculations in ruby and javascript
 email: kmandrup@gmail.com
 executables: []
@@ -76,6 +76,7 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
+- Changelog.textile
 - Gemfile
 - LICENSE.txt
 - README.textile
@@ -83,16 +84,27 @@ files:
 - VERSION
 - geo_calc.gemspec
 - lib/geo_calc.rb
-- lib/geo_calc/calculations.rb
+- lib/geo_calc/calc.rb
+- lib/geo_calc/calc/bearing.rb
+- lib/geo_calc/calc/destination.rb
+- lib/geo_calc/calc/distance.rb
+- lib/geo_calc/calc/intersection.rb
+- lib/geo_calc/calc/midpoint.rb
+- lib/geo_calc/calc/rhumb.rb
 - lib/geo_calc/core_ext.rb
 - lib/geo_calc/geo.rb
 - lib/geo_calc/geo_point.rb
-- lib/geo_calc/js/geo_calc.js
+- lib/geo_calc/pretty_print.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/geo_point_spec.rb
 - spec/geo_calc/geo_spec.rb
 - spec/spec_helper.rb
+- vendor/assets/javascript/geo_calc.js
 homepage: http://github.com/kristianmandrup/geo_calc
 licenses:
 - MIT
@@ -108,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3503624259360642159
+      hash: 1099117799658716810
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.0
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: Geo calculation library

data/lib/geo_calc/calculations.rb

@@ -1,333 +0,0 @@
-require 'geo_calc/geo'
-require 'geo_calc/core_ext'
-
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  
- #  Latitude/longitude spherical geodesy formulae & scripts (c) Chris Veness 2002-2010            
- #   - www.movable-type.co.uk/scripts/latlong.html
- #                                                                                                
-
-module GeoCalc  
-  # Returns the distance from this point to the supplied point, in km 
-  # (using Haversine formula)
-  # 
-  # 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
-  #
-  # Returns - Numeric distance in km between this point and destination point
-  
-  def distance_to point, precision = 4
-    # default 4 sig figs reflects typical 0.3% accuracy of spherical model
-    precision ||= 4
-
-    lat1 = lat.to_rad
-    lon1 = lon.to_rad
-
-    lat2 = point.lat.to_rad
-    lon2 = point.lon.to_rad
-
-    dlat = lat2 - lat1
-    dlon = lon2 - lon1
-
-    a = Math.sin(dlat/2) * Math.sin(dlat/2) + Math.cos(lat1) * Math.cos(lat2) * Math.sin(dlon/2) * Math.sin(dlon/2)
-    c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a))
-    d = radius * c
-    d.round(precision)
-  end
-  
-  
-  # Returns the (initial) bearing from this point to the supplied point, in degrees
-  #   see http:#williams.best.vwh.net/avform.htm#Crs
-  # 
-  # - Point point: Latitude/longitude of destination point
-  # 
-  # Returns -  Numeric: Initial bearing in degrees from North
-  
-  def bearing_to point
-    lat1 = lat.to_rad
-    lat2 = point.lat.to_rad
-    dlon = (point.lon - lon).to_rad
-
-    y = Math.sin(dlon) * Math.cos(lat2)
-    x = Math.cos(lat1) * Math.sin(lat2) - Math.sin(lat1) * Math.cos(lat2) * Math.cos(dlon)
-    bearing = Math.atan2(y, x)
-
-    (bearing.to_deg + 360) % 360
-  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
-  #
-  # Returns Numeric: Final bearing in degrees from North
-  
-  def final_bearing_to point
-    # get initial bearing from supplied point back to this point...
-    lat1 = point.lat.to_rad
-    lat2 = lat.to_rad
-    dlon = (lon - point.lon).to_rad
-
-    y = Math.sin(dlon) * Math.cos(lat2)
-    x = Math.cos(lat1)*Math.sin(lat2) - Math.sin(lat1)*Math.cos(lat2)*Math.cos(dlon)
-    bearing = Math.atan2(y, x)
-
-    # ... & reverse it by adding 180°
-    (bearing.to_deg+180) % 360
-  end
-  
-  
-  # Returns the midpoint between this point and the supplied point.
-  #   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
-  
-  def midpoint_to point
-    lat1 = lat.to_rad
-    lon1 = lon.to_rad;
-    lat2 = point.lat.to_rad
-    dlon = (point.lon - lon).to_rad
-
-    bx = Math.cos(lat2) * Math.cos(dlon)
-    by = Math.cos(lat2) * Math.sin(dlon)
-
-    lat3 = Math.atan2(Math.sin(lat1)+Math.sin(lat2), Math.sqrt( (Math.cos(lat1)+bx)*(Math.cos(lat1)+bx) + by*by) )
-
-    lon3 = lon1 + Math.atan2(by, Math.cos(lat1) + bx)
-
-    GeoPoint.new lat3.to_deg, lon3.to_deg
-  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
-  # 
-  # - Numeric bearing: Initial bearing in degrees
-  # - Numeric dist: Distance in km
-  # Returns GeoPoint: Destination point
-  
-  def destination_point brng, dist
-    dist = dist / radius  # convert dist to angular distance in radians
-    brng = brng.to_rad 
-    lat1 = lat.to_rad
-    lon1 = lon.to_rad
-
-    lat2 = Math.asin( Math.sin(lat1) * Math.cos(dist) + Math.cos(lat1) * Math.sin(dist) * Math.cos(brng) )
-    lon2 = lon1 + Math.atan2(Math.sin(brng) * Math.sin(dist) * Math.cos(lat1), Math.cos(dist) - Math.sin(lat1) * Math.sin(lat2))
-
-    lon2 = (lon2 + 3*Math::PI) % (2*Math::PI) - Math::PI  # normalise to -180...+180   
-
-    GeoPoint.new lat2.to_deg, lon2.to_deg
-  end
-
-  
-  # Returns the point of intersection of two paths defined by point and bearing
-  # 
-  #   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)
-  
-  def self.intersection p1, brng1, p2, brng2
-    lat1 = p1.lat.to_rad
-    lon1 = p1.lon.to_rad
-
-    lat2 = p2.lat.to_rad
-    lon2 = p2.lon.to_rad
-
-    brng13 = brng1.to_rad
-    brng23 = brng2.to_rad
-        
-    dlat = lat2-lat1
-    dlon = lon2-lon1;
-
-    dist12 = 2*Math.asin( Math.sqrt( Math.sin(dlat/2)*Math.sin(dlat/2) + Math.cos(lat1)*Math.cos(lat2)*Math.sin(dlon/2)*Math.sin(dlon/2) ) )
-    return nil if dist12 == 0
-
-    # initial/final bearings between points
-    brng_a = begin
-      Math.acos( ( Math.sin(lat2) - Math.sin(lat1)*Math.cos(dist12) ) / ( Math.sin(dist12)*Math.cos(lat1) ) )
-    rescue # protect against rounding
-      0
-    end
-    
-    brng_b = Math.acos( ( Math.sin(lat1) - Math.sin(lat2)*Math.cos(dist12) ) / ( Math.sin(dist12)*Math.cos(lat2) ) )
-
-    brng12, brng21 = if Math.sin(lon2-lon1) > 0
-      [brng_a, 2*Math::PI - brng_b] 
-    else
-      [2*Math::PI - brng_a, brng_b]
-    end
-
-    alpha1 = (brng13 - brng12 + Math::PI) % (2*Math::PI) - Math::PI  # angle 2-1-3
-    alpha2 = (brng21 - brng23 + Math::PI) % (2*Math::PI) - Math::PI  # angle 1-2-3
-
-    return nil if (Math.sin(alpha1)==0 && Math.sin(alpha2)==0) # infinite intersections
-    return nil if (Math.sin(alpha1)*Math.sin(alpha2) < 0)    # ambiguous intersection
-
-    # alpha1 = Math.abs(alpha1);
-    # alpha2 = Math.abs(alpha2);
-    # ... Ed Williams takes abs of alpha1/alpha2, but seems to break calculation?
-
-    alpha3 = Math.acos( -Math.cos(alpha1)*Math.cos(alpha2) + Math.sin(alpha1)*Math.sin(alpha2)*Math.cos(dist12) )
-
-    dist13 = Math.atan2( Math.sin(dist12)*Math.sin(alpha1)*Math.sin(alpha2), Math.cos(alpha2)+Math.cos(alpha1)*Math.cos(alpha3) )
-
-    lat3 = Math.asin( Math.sin(lat1)*Math.cos(dist13) + Math.cos(lat1)*Math.sin(dist13)*Math.cos(brng13) )
-
-    dlon13 = Math.atan2( Math.sin(brng13)*Math.sin(dist13)*Math.cos(lat1), Math.cos(dist13)-Math.sin(lat1)*Math.sin(lat3) )
-
-    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
-    
-
-  # 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
-  
-  def rhumb_distance_to point
-    lat1 = lat.to_rad
-    lat2 = point.lat.to_rad
-
-    dlat = (point.lat-lat).to_rad
-    dlon = (point.lon-lon).abs.to_rad
-
-    dphi = Math.log(Math.tan(lat2/2 + Math::PI/4) / Math.tan(lat1/2 + Math::PI/4))
-
-    q = begin
-      dlat / dphi
-    rescue 
-      Math.cos(lat1) # E-W line gives dPhi=0
-    end
-        
-    # if dlon over 180° take shorter rhumb across 180° meridian:
-    dlon = 2*Math::PI - dlon if (dlon > Math::PI)
-
-    dist = Math.sqrt(dlat*dlat + q*q*dlon*dlon) * radius; 
-
-    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
-  # 
-  # - GeoPoint point: Latitude/longitude of destination point
-  # Returns Numeric: Bearing in degrees from North
-  
-  def rhumb_bearing_to point
-    lat1 = lat.to_rad
-    lat2 = point.lat.to_rad
-
-    dlon = (point.lon - lon).to_rad
-
-    dphi = Math.log(Math.tan(lat2/2+Math::PI/4) / Math.tan(lat1/2+Math::PI/4))
-    if dlon.abs > Math::PI
-      dlon = dlon>0 ? -(2*Math::PI-dlon) : (2*Math::PI+dlon);
-    end
-
-    brng = Math.atan2(dlon, dphi);
-
-    (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 {LatLon} Destination point
-  
-  def rhumb_destination_point brng, dist
-    d = dist / radius  # d = angular distance covered on earth's surface
-    lat1 = lat.to_rad
-    lon1 = lon.to_rad
-    brng = brng.to_rad
-
-    lat2 = lat1 + d*Math.cos(brng);
-    dlat = lat2-lat1;
-    dphi = Math.log(Math.tan(lat2/2+Math::PI/4)/Math.tan(lat1/2+Math::PI/4))
-
-    q = begin
-      dlat/dphi
-    rescue 
-      Math.cos(lat1) # E-W line gives dPhi=0
-    end
-
-    dlon = d*Math.sin(brng)/q
-    # check for some daft bugger going past the pole
-
-    if lat2.abs > Math::PI/2
-      lat2 = lat2>0 ? Math::PI-lat2 : -(Math::PI-lat2)
-    end
-    lon2 = (lon1+dlon+3*Math::PI) % (2*Math::PI) - Math::PI
-
-    GeoPoint.new lat2.to_deg, lon2.to_deg
-  end
-
-  
-  # 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
-  #
-  # Returns {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
-  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
-  # 
-  # @requires Geo
-  
-  def to_lon format, dp
-    return lon if !format
-    Geo.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
-  
-  # @returns {String} Comma-separated latitude/longitude
-  # 
-  
-  def to_s format = :dms, dp = 0 
-    format ||= :dms
-  
-    return '-,-' if !lat || !lon
-  
-    _lat = Geo.to_lat lat, format, dp
-    _lon = Geo.to_lon lon, format, dp
-  
-    "#{_lat}, #{_lon}"
-  end
-end
-