geo-distance 0.1.2 → 0.2.0

data/lib/geo-distance/spherical.rb

@@ -1,24 +0,0 @@
-require 'geo-distance/core_ext'
-require 'geo-distance/formula'
-
-module GeoDistance
-  class Spherical < DistanceFormula
-    def self.distance( lat1, lon1, lat2, lon2) 
-      from_longitude  = lon1.to_radians
-      from_latitude   = lat1.to_radians
-      to_longitude    = lon2.to_radians
-      to_latitude     = lat2.to_radians
-
-      c = Math.acos(
-          Math.sin(from_latitude) *
-          Math.sin(to_latitude) +
-
-          Math.cos(from_latitude) * 
-          Math.cos(to_latitude) *
-          Math.cos(to_longitude - from_longitude)
-      ) #* EARTH_RADIUS[units.to_sym]
-      
-      GeoDistance::Distance.new c
-    end
-  end
-end

data/lib/geo-distance/vincenty.rb

@@ -1,79 +0,0 @@
-require 'geo-distance/core_ext'
-require 'geo-distance/formula'
-
-module GeoDistance
-  class Vincenty < DistanceFormula
-
-    # Calculate the distance between two Locations using the Vincenty formula
-    #
-    #   Graticule::Distance::Vincenty.distance(
-    #     Graticule::Location.new(:latitude => 42.7654, :longitude => -86.1085),
-    #     Graticule::Location.new(:latitude => 41.849838, :longitude => -87.648193)
-    #   )
-    #   #=> 101.070118000159
-    #
-    def self.distance(lat1, lon1, lat2, lon2)
-      from_longitude  = lon1.to_radians
-      from_latitude   = lat1.to_radians
-      to_longitude    = lon2.to_radians
-      to_latitude     = lat2.to_radians
-    
-      earth_major_axis_radius = EARTH_MAJOR_AXIS_RADIUS[:kilometers]
-      earth_minor_axis_radius = EARTH_MINOR_AXIS_RADIUS[:kilometers]
-
-      f = (earth_major_axis_radius - earth_minor_axis_radius) / earth_major_axis_radius
-
-      l = to_longitude - from_longitude
-      u1 = atan((1-f) * tan(from_latitude))
-      u2 = atan((1-f) * tan(to_latitude))
-      sin_u1 = sin(u1)
-      cos_u1 = cos(u1)
-      sin_u2 = sin(u2)
-      cos_u2 = cos(u2)
-
-      lambda = l
-      lambda_p = 2 * PI
-      iteration_limit = 20
-      while (lambda-lambda_p).abs > 1e-12 && (iteration_limit -= 1) > 0
-        sin_lambda = sin(lambda)
-        cos_lambda = cos(lambda)
-        sin_sigma = sqrt((cos_u2*sin_lambda) * (cos_u2*sin_lambda) + 
-          (cos_u1*sin_u2-sin_u1*cos_u2*cos_lambda) * (cos_u1*sin_u2-sin_u1*cos_u2*cos_lambda))
-        return 0 if sin_sigma == 0  # co-incident points
-        cos_sigma = sin_u1*sin_u2 + cos_u1*cos_u2*cos_lambda
-        sigma = atan2(sin_sigma, cos_sigma)
-        sin_alpha = cos_u1 * cos_u2 * sin_lambda / sin_sigma
-        cosSqAlpha = 1 - sin_alpha*sin_alpha
-        cos2SigmaM = cos_sigma - 2*sin_u1*sin_u2/cosSqAlpha
-
-        cos2SigmaM = 0 if cos2SigmaM.nan?  # equatorial line: cosSqAlpha=0 (§6)
-
-        c = f/16*cosSqAlpha*(4+f*(4-3*cosSqAlpha))
-        lambda_p = lambda
-        lambda = l + (1-c) * f * sin_alpha *
-          (sigma + c*sin_sigma*(cos2SigmaM+c*cos_sigma*(-1+2*cos2SigmaM*cos2SigmaM)))
-     end
-     # formula failed to converge (happens on antipodal points)
-     # We'll call Haversine formula instead.
-     return Haversine.distance(from, to, units) if iteration_limit == 0 
-
-     uSq = cosSqAlpha * (earth_major_axis_radius**2 - earth_minor_axis_radius**2) / (earth_minor_axis_radius**2)
-     a = 1 + uSq/16384*(4096+uSq*(-768+uSq*(320-175*uSq)))
-     b = uSq/1024 * (256+uSq*(-128+uSq*(74-47*uSq)))
-     delta_sigma = b*sin_sigma*(cos2SigmaM+b/4*(cos_sigma*(-1+2*cos2SigmaM*cos2SigmaM)-
-       b/6*cos2SigmaM*(-3+4*sin_sigma*sin_sigma)*(-3+4*cos2SigmaM*cos2SigmaM)))
-     
-      c = earth_minor_axis_radius * a * (sigma-delta_sigma)
-
-      GeoDistance::Distance.new(c / unkilometer)
-    end
-
-    private
-    
-    def self.unkilometer    
-      6378.135
-    end
-      
-
-  end
-end

data/spec/core_ext_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "GeoDistance core extensions" do
-  it "should work" do
-    5.km.should be_kind_of GeoDistance::Distance
-    5.km.distance.should == 5
-    5.km.unit.should == :km
-  end
-end

data/spec/dist_default_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe "GeoDistance default" do
-  it "should work" do
-    lon1 = -104.88544
-    lat1 = 39.06546
-
-    lon2 = -104.80
-    lat2 = lat1
-
-    GeoDistance.default_algorithm = :haversine
-
-    dist = GeoDistance.distance( lat1, lon1, lat2, lon2 )
-
-    puts "the distance from  #{lat1}, #{lon1} to #{lat2}, #{lon2} is: #{dist[:meters].number} meters"
-
-    puts "#{dist[:feet]}"
-    puts "#{dist.meters}"
-    puts "#{dist[:km]}"
-    puts "#{dist[:miles]}"
-    dist[:km].to_s.should match(/7\.376*/)
-  end
-end

data/spec/dist_haversine_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe "GeoDistance::Haversine" do
-  it "should work" do
-    lon1 = -104.88544
-    lat1 = 39.06546
-
-    lon2 = -104.80
-    lat2 = lat1
-
-    dist = GeoDistance::Haversine.distance( lat1, lon1, lat2, lon2 )
-
-    puts "the distance from  #{lat1}, #{lon1} to #{lat2}, #{lon2} is: #{dist[:meters].number} meters"
-
-    puts "#{dist[:feet]}"
-    puts "#{dist.meters}"
-    puts "#{dist[:km]}"
-    puts "#{dist[:miles]}"
-    dist[:km].to_s.should match(/7\.376*/)
-  end
-end

data/spec/dist_spherical_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe "GeoDistance::Spherical" do
-  it "should work" do
-    lon1 = -104.88544
-    lat1 = 39.06546
-
-    lon2 = -104.80
-    lat2 = lat1
-
-    dist = GeoDistance::Spherical.distance( lat1, lon1, lat2, lon2 )
-
-    puts "the distance from  #{lat1}, #{lon1} to #{lat2}, #{lon2} is: #{dist[:meters].number} meters"
-
-    puts "#{dist[:feet]}"
-    puts "#{dist.meters}"
-    puts "#{dist[:km]}"
-    puts "#{dist[:miles]}"
-    dist[:km].to_s.should match(/7\.376*/)
-  end
-end

data/spec/dist_vincenty_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe "GeoDistance::Vincenty" do
-  it "should work" do
-    lon1 = -104.88544
-    lat1 = 39.06546
-
-    lon2 = -104.80
-    lat2 = lat1
-
-    dist = GeoDistance::Vincenty.distance( lat1, lon1, lat2, lon2 )
-
-    puts "the distance from  #{lat1}, #{lon1} to #{lat2}, #{lon2} is: #{dist[:meters].number} meters"
-
-    puts "#{dist[:feet]}"
-    puts "#{dist.meters}"
-    puts "#{dist[:km]}"
-    puts "#{dist[:miles]}"
-    dist[:km].to_s.should match(/7\.38*/)
-  end
-end