vincenty 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d5bab399fe263dce0f8b331aa915144b7f8908b
-  data.tar.gz: 7ec4b70ae9b5282b72e584311c66a1b3fb91d557
+  metadata.gz: 9b6741523510878f999a8ca01552a2c964f224d9
+  data.tar.gz: 3bf382d568ef7a48af1e25cf2ea959a1b59a4126
 SHA512:
-  metadata.gz: 97cb65b1bfba2c8ad34a085901811a13c6269085e89475a733ad112387a775c1ea2b2cdbcd762600ba2b6fe9cb732930b2f608374b82bc3449c495f2a5a071f1
-  data.tar.gz: e31456a68c097ad32bad8bd06d89db7acd3013098322327827dd47c9cd4e161dfb5dbfb0c2680eb5127038bbaf17de74302ec5ac22ac1b0a4f72151aacdc4ac5
+  metadata.gz: b00f63be8f205622eb84632bad057c87f52f494bdae88f21869738703871b94fde50e342a507bc24c0a0cbd7c3fde13833964beead39a849f7e402da6c8d4af5
+  data.tar.gz: 6e49b7d4338d6a437809777f8dbe06cfc6b95035d8561e6d3d5de6eae1951742439681988fa9e93eb904886a71508c5c10d66fdbe77a592d7a2f27cae0b18268

data/History.txt

@@ -1,3 +1,7 @@
+rbur004	Sat Dec 3 17:36:05 2016 +1300
+	Code is old. Needed require change to require_relative
+Rob Burrowes	Fri May 22 14:07:09 2015 +1200
+	Dropped this, as it is auto generated.
 Rob Burrowes	Mon May 18 16:51:05 2015 +1200
 	
 Rob Burrowes	Mon May 18 14:33:16 2015 +1200

data/Rakefile

@@ -1,20 +1,22 @@
 #!/usr/local/bin/ruby
 # -*- ruby -*-
-
-require 'rubygems'
+#need
+#     gem install yard
+#     gem install hoe
+#     gem install hoe-yard
+require 'yard'
 require 'hoe'
 #require 'lib/vincenty.rb'
 Hoe.plugin :yard
 
-Hoe.spec 'vincenty' do 
-  #self.rubyforge_name = "vincenty" 
+Hoe.spec 'vincenty' do
+  #self.rubyforge_name = "vincenty"
   self.developer( "Rob Burrowes","r.burrowes@auckland.ac.nz")
-  
+
   self.yard_title = 'Vincenty'
   self.yard_options = ['--markup', 'markdown', '--protected']
   #self.url = "http://www.wikarekare.org"
-  #self.summary = "Vincenty Algorithm for Distance, Bearing between Map Coordinates." 
+  #self.summary = "Vincenty Algorithm for Distance, Bearing between Map Coordinates."
   #self.description = s.paragraphs_of('README.txt', 1..4).join("\n\n")
   #self.remote_rdoc_dir = '' # Release to root
 end
-

data/lib/angle.rb

@@ -1,6 +1,6 @@
-require 'core_extensions.rb'
+require_relative 'core_extensions.rb'
 
-#Class Angle is a utility class that allows 
+#Class Angle is a utility class that allows
 # * Angle arithmetic ( +,-,*,/,**,% and unary +,-)
 # * Angle comparison ( <=>, hence, <, >, >=, <=, == )
 # * Conversion to and from degrees and radians
@@ -8,13 +8,13 @@ require 'core_extensions.rb'
 
 class Angle
   include Comparable
-  
+
   # @return [Float] stored in radians
-  attr_accessor :angle   
+  attr_accessor :angle
   alias :value :angle    #Older version of angle used volue rather than angle
   alias :value= :angle=  #Older version of angle used volue rather than angle
-  
-  # @param [#to_f,#to_radians] angle may be anything that has a to_f and to_radians. 
+
+  # @param [#to_f,#to_radians] angle may be anything that has a to_f and to_radians.
   # @param [true,false, :radians] radians Angle is in degrees unless radians == true (or set to :radians).
   def initialize(angle=0, radians=false)
     #assumes that we are getting an angle in degrees.
@@ -28,8 +28,8 @@ class Angle
       end
     end
   end
-  
-  
+
+
   #Class level function that converts 4 arguments into decimal degrees.
   # @return [Float] signed decimal degrees.
   # @param [Numeric] degrees
@@ -43,22 +43,22 @@ class Angle
     #Shouldn't have a negative value for degrees if the direction is specified.
     #I am defaulting to the degrees sign if it is set, otherwise the direction given
     sign = degrees.sign == -1 || (degrees == 0 && (minutes < 0 || (minutes == 0 && seconds < 0))) ? -1 : sign
-    sign * (degrees.abs + minutes/60.0 + seconds/3600.0) 
+    sign * (degrees.abs + minutes/60.0 + seconds/3600.0)
   end
-  
+
   #Class level function that takes an array of [degress,minutes, seconds, direction] or [degrees,minutes,seconds]
   # @return [Float] signed decimal degrees.
   # @param [Array] a Array is expanded and passed as degrees,minutes,seconds,direction to Angle#decimal_deg
   def self.decimal_deg_from_ary(a)
     self.decimal_deg(*a)
   end
-  
+
   #Class level utility function to return the angle as deg,min,sec
   #Assumes decimal degress unless radians == true .
   # @return [Array] of signed deg, min, sec.
   #Nb. * That min will be negative if the angle is negative and deg == 0
   #    * That sec will be negative if the angle is negative and deg == 0 && min == 0
-  # @param [#to_f,#to_degrees] angle may be anything that has a to_f and to_radians. 
+  # @param [#to_f,#to_degrees] angle may be anything that has a to_f and to_radians.
   # @param [true,false, :radians] radians Angle is in degrees unless radians == true (or set to :radians).
   def self.dms(angle, radians = false)
     ongle = angle.to_f #means Strings, Numeric, and anything accepting a #to_f will work.
@@ -66,14 +66,14 @@ class Angle
     v = angle.abs
     deg = v.floor
     min = ((v-deg)*60.0).floor
-    sec = ((v-deg-min/60.0)*3600.0) 
-    
+    sec = ((v-deg-min/60.0)*3600.0)
+
     if angle < 0
       if deg == 0
         if min == 0
           sec = -sec
         else
-          min = -min 
+          min = -min
         end
       else
         deg = -deg
@@ -82,28 +82,28 @@ class Angle
 
     return deg,min,sec
   end
-     
+
   #Class level function equivalent to Angle.new(r, true)
   # @return [Angle]
   # @param [#to_f] r Value in radians to create the new Angle class with.
   def self.radians(r=0) #passed in radians.
     self.new(r.to_f, true) #Nb. self is Angle, be we don't Angle.new, as we want subclasses to return their class, not Angle.
   end
-  
+
   #Class level function equivalent to Angle.new(d, false) or just Angle.new(d)
   # @return [Angle]
   # @param [#to_radians] d Angle to convert to radians, to create new Angle object from.
   def self.degrees(d=0) #passed in degrees.
     self.new(d.to_radians, true)
   end
-    
+
   #Provides test for Module Comparable, giving us <,>,<=,>=,== between angles
   # @return [true,false]
   # @param [Angle,Float] angle Can be another Angle, or a Numeric value to compare @angle with.
   def <=>(angle)
     if angle.class == Angle
       @angle <=> angle.angle
-    else 
+    else
       @angle <=> angle
     end
   end
@@ -113,64 +113,64 @@ class Angle
   def +@
     self.class.radians(@angle) #Nb. Not Angle.new, as we want subclasses to return their class, not Angle.
   end
-  
+
   #Unary -
   # @return [Angle,self] -@angle
   def -@
     self.class.radians(-@angle)
   end
-  
+
   # Binary addition operator. Can add angles and numbers, or two angles.
   # @return [Angle,self]
   # @param [Angle,Numeric] angle
   def +(angle)
     self.class.radians(@angle + angle)
   end
-  
+
   # Binary subtraction operator. Can add angles and numbers, or two angles.
   # @return [Angle,self]
   # @param [Angle,Numeric] angle
   def -(angle)
     self.class.radians(@angle - angle)
   end
-    
+
   # Binary multiply operator. Can add angles and numbers, or two angles.
   # @return [Angle,self]
   # @param [Angle,Numeric] angle
   def *(angle)
     self.class.radians(@angle * angle)
   end
-  
+
   # Binary power of operator. Can add angles and numbers, or two angles.
   # @return [Angle,self]
   # @param [Angle,Numeric] angle
   def **(angle)
     self.class.radians(@angle ** angle)
   end
-  
+
   # Binary division operator. Can add angles and numbers, or two angles.
   # @return [Angle,self]
   # @param [Angle,Numeric] angle
   def /(angle)
     self.class.radians(@angle / angle)
   end
-  
+
   # Binary mod operator. Can add angles and numbers, or two angles.
   # @return [Angle,self]
   # @param [Angle,Numeric] angle
   def %(angle)
     self.class.radians(@angle % angle)
   end
-    
+
   # @return [Float] angle in degrees
   def to_degrees
     @angle.to_degrees
   end
- 
+
   # @return [Float] angle in degrees
-  #alias to_d to_degrees
+  #alias to_deg to_degrees
   alias to_deg to_degrees
-  
+
   # @return [Float]  angle in radians
   def to_radians
     @angle
@@ -178,65 +178,65 @@ class Angle
 
   alias to_rad to_radians
   alias to_r to_radians
-  
+
   # Returns @angle as decimal_degrees
   # @return [Array]  of signed Floats: degrees,minutes,seconds
   #Nb. * That min will be negative if the angle is negative and deg == 0
   #    * That sec will be negative if the angle is negative and deg == 0 && min == 0
-  def to_dms 
+  def to_dms
     d = to_degrees.abs
     deg = d.floor
     min = ((d-deg)*60).floor
-    sec = ((d-deg-min/60.0)*3600.0) 
-    
+    sec = ((d-deg-min/60.0)*3600.0)
+
     if @angle < 0
       if deg == 0
         if min == 0
           sec = -sec
         else
-          min = -min 
+          min = -min
         end
       else
         deg = -deg
       end
     end
-    
+
     return deg, min, sec
   end
-  
+
   # @return [Float] the angle in radians as a float (equivalent to to_radians)
   alias to_f to_radians
-  
+
   # @return [Fixnum] the angle truncated to an integer, in radians.
   def to_i
     to_radians.to_i
   end
-  
+
   # @return [Fixnum] the angle truncated to an integer, in radians.
   alias to_int to_i
-  
+
   # @return [Array] the angle parameter as a Float and the @angle parameter from this class.
   # @param [Numeric] angle
   def coerce(angle)
     [Float(angle), @angle]
   end
-  
+
   # @return [Fixnum] the sign of the angle. 1 for positive, -1 for negative.
   def sign
     @angle.sign
   end
-  
+
   # @return [Float] the absolute angle of the angle in radians
   def abs
     @angle.abs
   end
-  
+
   # @return [Float] angle as compass bearing in radians.
   #Compass bearings are clockwise, Math angles are counter clockwise.
   def to_bearing
     self.class.new(Math::PI * 2 - @angle,true)
   end
-  
+
   # @return [Float] the reverse angle in radians. i.e. angle + PI (or angle + 180 degrees)
   def reverse
     if (angle = @angle + Math::PI) > Math::PI * 2
@@ -244,20 +244,20 @@ class Angle
     end
     return self.class.new(angle,true)
   end
-  
-  
+
+
   # @return [String] angle in radians as a string.
   # @param [String] fmt Optional format string passed to Angle#strf
   def to_s(fmt = nil)
     return to_radians.to_s if(fmt == nil)
     return strf(fmt)
   end
-  
+
   #formated output of the angle.
   # @param [String] fmt The default format is a signed deg minutes'seconds" with leading 0's in the minutes and seconds and 4 decimal places for seconds.
   #formats are:
   # * %wd output the degrees as an integer.
-  # **   where w is 0, 1, 2 or 3 and represents the field width. 
+  # **   where w is 0, 1, 2 or 3 and represents the field width.
   # *** 1 is the default, which indicates that at least 1 digit is displayed
   # *** 2 indicates that at least 2 digits are displayed. 1 to 9 will be displayed as 01 0 to 09 0
   # *** 3 indicates that at least 4 digits are displayed. 10 to 99 will be displayed as 010 0 to 099 0
@@ -271,8 +271,8 @@ class Angle
   # * %w.pM outputs minutes as a float .e.g. 01.125'.
   #     * p is the number of decimal places.
   #
-  # * %wW outputs secs/60 as a float without the leading '0.'. 
-  #       Used with %m like this %2m'%4W , to get minute marker before the decimal places. 
+  # * %wW outputs secs/60 as a float without the leading '0.'.
+  #       Used with %m like this %2m'%4W , to get minute marker before the decimal places.
   #       e.g. -37 001'.1167 rather than -37 001.1167'
   #     * p is the number of decimal places.
   #
@@ -314,7 +314,7 @@ class Angle
             when /[NE]/
               have_dir = true
               format = t2
-            when '.' 
+            when '.'
               had_dot = true
             when /[Dr]/
               format = t2
@@ -339,7 +339,7 @@ class Angle
         when 'd'
           s += s_int(deg, t[1], have_dir)
         when 'D'
-          s += s_float(@angle.to_d, t[1], t[2], have_dir)
+          s += s_float(@angle.to_deg, t[1], t[2], have_dir)
         when 'm'
           s += s_int(min, t[1], have_dir)
         when 'M'
@@ -359,11 +359,11 @@ class Angle
         s += t[1] #the fillers.
       end
     end
-    
+
     return s
   end
-  
-  private 
+
+  private
   #Output angle_dec as a string to the number of decimal places specified by places.
   #Assumes the angle is 0 <= angle_dec < 1
   #No leading '0' is output. The string starts with a '.' if places is non-zero.
@@ -379,7 +379,7 @@ class Angle
     end
   end
 
-  #return the angle as a string with fixed width decimal portion with leading 0s 
+  #return the angle as a string with fixed width decimal portion with leading 0s
   #to get at least the width specified
   #Prints the number of places after the decimal point rounded to places places.
   #-1 width means no width format
@@ -408,7 +408,7 @@ class Angle
     s = (abs == false && angle.sign == -1) ? '-' : ''  #catch the case of -0
     s += f % angle.abs
   end
-  
+
   #Return the fractional part of angle as a string,
   #to the number of decimal places specified by 'places'.
   #No leading '0' is output. The string starts with a '.'
@@ -421,12 +421,3 @@ class Angle
     s_places(angle_dec, places)
   end
 end
-
-
-
-
-
-
-
-
-

data/lib/coordinate.rb

@@ -1,37 +1,37 @@
 
-require 'angle.rb'
+require_relative 'angle.rb'
 
 #Holds the latitude, longitude, and the altitude for the coordinate
 class Coordinate
   # @return [Latitude]
-  attr_accessor :latitude  
+  attr_accessor :latitude
   # @return [Longitude]
-  attr_accessor :longitude 
+  attr_accessor :longitude
   # @return [Numeric]
-  attr_accessor :altitude  
-  
+  attr_accessor :altitude
+
   #latitude and longitude can be Strings or Numeric, or anything else with to_radians and to_f
   #latitude and longitude are in degrees unless radians == true (or set to :radians)
   def initialize(latitude=0, longitude=0, altitude=0, radians = false)
-    @latitude = Latitude.new(latitude,radians) 
+    @latitude = Latitude.new(latitude,radians)
     @longitude = Longitude.new(longitude,radians)
     @altitude = altitude.to_f
   end
-  
+
   # @return [String] Latitude longitude and altitude as a single space separated string.
   def to_s
     "#{@latitude.to_s }  #{@longitude.to_s} #{@altitude}m"
   end
-  
+
   # @return [Latitude, Longitude, Float] with members, latitude, longitude and altitude
   def to_ary
     [ @latitude, @longitude, @altitude ]
   end
-  
+
   alias to_a to_ary
-  
+
   # @return [Hash] with keys :latitude, :longitude, and :altitude
   def to_hash
     { :latitude => @latitude, :longitude => @longitude, :altitude => @altitude }
   end
-end
+end

data/lib/latitude.rb

@@ -1,11 +1,11 @@
 
-require 'angle.rb'
+require_relative 'angle.rb'
 
 #Subclass of Angle to add in special treatment of to_d, to_r , to_s
 #Latitude degrees are between -PI and PI, South to North (+/- 90 degrees)
 
 class Latitude < Angle
-  
+
   # @return [Float] angle as degrees in range -90 and 90
   def to_degrees
     degrees = super
@@ -17,7 +17,7 @@ class Latitude < Angle
     else degrees
     end
   end
-  
+
   # @return [Float] angle as degrees in range -PI and PI
   def to_radians
     case
@@ -35,10 +35,10 @@ class Latitude < Angle
   def to_s(fmt="%2d %2m'%2.4s\"%N")
       super(fmt)
   end
-  
+
   alias to_r to_radians
   alias to_rad to_radians
   #alias to_d to_degrees
   alias to_deg to_degrees
 
-end
+end

data/lib/longitude.rb

@@ -1,11 +1,11 @@
 
-require 'angle.rb'
+require_relative 'angle.rb'
 
 #Subclass of Angle to add in special treatment of to_d, to_r and to_s
 #Longitude degrees are between -2PI and 2PI, West to East (+/- 180 degrees)
 
 class Longitude < Angle
-  
+
   # @return [Float] angle as degrees in range -180 and 180
   def to_degrees
     degrees = super
@@ -14,7 +14,7 @@ class Longitude < Angle
       else degrees
     end
   end
-  
+
   # @return [Float] angle as degrees in range -2PI and 2PI
   def to_radians
     case
@@ -22,17 +22,17 @@ class Longitude < Angle
       else @angle
     end
   end
-  
+
   # @return [String] angle as string in degrees minutes seconds direction.
   #A West angle is negative, East is Positive.
   # @param [String] fmt Optional format string passed to Angle#to_s
   def to_s(fmt="%3d %2m'%2.4s\"%E")
     super(fmt)
   end
-  
+
   alias to_r to_radians
   alias to_rad to_radians
   #alias to_d to_degrees
   alias to_deg to_degrees
-  
-end
+
+end

data/lib/track_and_distance.rb

@@ -1,5 +1,5 @@
 
-require 'angle.rb'
+require_relative 'angle.rb'
 
 #Holds a bearing and distance
 class TrackAndDistance
@@ -7,7 +7,7 @@ class TrackAndDistance
     attr_accessor :bearing
     # @return [Float]
     attr_accessor :distance
-    
+
     # @param [String, Numeric, #to_radian, #to_f] Bearing can be a String or Numeric or any object with to_radians and to_f
     # @param [Numeric] distance
     # @param [true,false, :radians] radians Bearing is in degrees unless radians == true (or set to :radians).
@@ -15,7 +15,7 @@ class TrackAndDistance
       @bearing = Angle.new(bearing, radians)
       @distance = distance
     end
-    
+
     #format string fmt is currently just for the bearing angle.
     #Need to change this to include the distance is single format string.
     # @return [String] Bearing angle and distance in meters.
@@ -33,9 +33,9 @@ class TrackAndDistance
     def to_ary
       [ @bearing, @distance ]
     end
-    
+
     # @return [Hash] with keys :bearing and :distance
     def to_hash
       { :bearing => @bearing, :distance => @distance }
     end
-end
+end

data/lib/vincenty.rb

@@ -1,9 +1,9 @@
-require 'core_extensions.rb'
-require 'angle.rb'
-require 'latitude.rb'
-require 'longitude.rb'
-require 'track_and_distance.rb'
-require 'coordinate.rb'
+require_relative 'core_extensions.rb'
+require_relative 'angle.rb'
+require_relative 'latitude.rb'
+require_relative 'longitude.rb'
+require_relative 'track_and_distance.rb'
+require_relative 'coordinate.rb'
 
 #Vincenty's algorithms for finding the bearing and distance between two coordinates and
 #for finding the latitude and longitude, given a start coordinate, distance and bearing.
@@ -12,28 +12,38 @@ require 'coordinate.rb'
 # Modified to incorporate corrections to formulae as found in script on http://www.movable-type.co.uk/scripts/LatLongVincenty.html
 # Added my Modification of the distanceAndAngle formulae to correct the compass bearing.
 class Vincenty < Coordinate
-  VERSION = '1.0.7'
-  
+  VERSION = '1.0.8'
+
   # @return [String] constant VERSION
   def version
     VERSION
   end
-  
+
+  WGS84_ER = 6378137              #Equatorial Radius of earth
+  WGS84_IF = 298.257223563        #Inverse Flattening
+  GRS80_ER = 6378137              #Equatorial Radius of earth
+  GRS80_IF = 298.25722210882711   #Inverse Flattening
+
   #Great Circle formulae  http://en.wikipedia.org/wiki/Great-circle_distance
-  #Reference calculation for testing, assumes the earth is a sphere, which it isn't. 
+  #Reference calculation for testing, assumes the earth is a sphere, which it isn't.
   #This gives us an approximation to verify Vincenty algorithm.
   # @param [Coordinate] p2 is target coordinate that we want the bearing to.
   # @return [TrackAndDistance]  with the compass bearing and distance in meters to P2
-  def sphericalDistanceAndAngle( p2 ) 
-    a = 6378137 #equatorial radius in meters     (+/-2 m) 
-    b = 6356752.31424518 #polar radius in meters
+  def sphericalDistanceAndAngle( p2, equatorial_radius = WGS84_ER, inverse_flattening = WGS84_IF )
+    if self.latitude == p2.latitude && self.longitude == p2.longitude
+      return TrackAndDistance.new(0, 0, true) #No calculations necessary
+    end
+
+    a = equatorial_radius #equatorial radius in meters     (+/-2 m)
+    f = inverse_flattening.
+    b = a - a/f #WGS84 = 6356752.314245179 polar radius in meters
     r = (a+b)/2 #average diametre as a rough estimate for our tests.
-    
+
     sin_lat1 = Math.sin(@latitude.to_rad)
     sin_lat2 = Math.sin(p2.latitude.to_rad)
     cos_lat1 = Math.cos(@latitude.to_rad)
     atan1_2 = Math.atan(1) * 2
-    t1 = cos_lat1 * Math.cos(p2.latitude.to_rad) * ( Math.cos(@longitude.to_rad - p2.longitude.to_rad) ) + sin_lat1 * sin_lat2 
+    t1 = cos_lat1 * Math.cos(p2.latitude.to_rad) * ( Math.cos(@longitude.to_rad - p2.longitude.to_rad) ) + sin_lat1 * sin_lat2
     angular_distance = Math.atan(-t1/Math.sqrt(-t1 * t1 +1)) + atan1_2 #central angle in radians so we can calculate the arc length.
 
     t2 = (sin_lat2 - sin_lat1 * Math.cos(angular_distance)) / (cos_lat1 * Math.sin(angular_distance))
@@ -43,7 +53,7 @@ class Vincenty < Coordinate
       bearing = Math.atan(-t2 / Math.sqrt(-t2 * t2 + 1)) + atan1_2 #Compass Bearing in radians (clockwise)
     end
 
-    #Note that the bearing is a compass angle. That is angles are positive clockwise. 
+    #Note that the bearing is a compass angle. That is angles are positive clockwise.
     return TrackAndDistance.new(bearing, angular_distance * r, true)
   end
 
@@ -52,11 +62,15 @@ class Vincenty < Coordinate
   # @param [Coordinate] p2 is target coordinate that we want the bearing to.
   # @return [TrackAndDistance] with the compass bearing and distance in meters to P2
   def distanceAndAngle( p2 )
+    if self.latitude == p2.latitude && self.longitude == p2.longitude
+      return TrackAndDistance.new(0, 0, true) #No calculations necessary. Solv NAN issue
+    end
+
     # a, b = major & minor semiaxes of the ellipsoid
-    a = 6378137 #equatorial radius in meters     (+/-2 m) 
+    a = 6378137 #equatorial radius in meters     (+/-2 m)
     b = 6356752.31424518 #polar radius in meters
-    f = (a-b)/a #  flattening 
-   
+    f = (a-b)/a #  flattening
+
      lat1 = @latitude.to_rad
      lon1 = @longitude.to_rad
      lat2 = p2.latitude.to_rad
@@ -65,7 +79,7 @@ class Vincenty < Coordinate
      lat2 = lat2.sign * (Math::PI/2-(1e-10)) if (Math::PI/2-lat2.abs).abs < 1.0e-10
 
     #  lat1, lat2 = geodetic latitude
-    
+
       l = (lon2 - lon1).abs #difference in longitude
       l = 2*Math::PI - l if l > Math::PI
       u1 = Math.atan( ( 1 - f) * Math.tan( lat1 ) ) #U is 'reduced latitude'
@@ -74,7 +88,7 @@ class Vincenty < Coordinate
       cos_u1 = Math.cos(u1)
       sin_u2 = Math.sin(u2)
       cos_u2 = Math.cos(u2)
-      
+
       lambda_v = l
       lambda_dash =  Math::PI * 2
       while( (lambda_v - lambda_dash).abs > 1.0e-12   ) #i.e. 0.06 mm error
@@ -83,8 +97,8 @@ class Vincenty < Coordinate
        	sin_sigma = Math.sqrt( ( cos_u2 * sin_lambda_v ) ** 2 + ( cos_u1 * sin_u2 - sin_u1 * cos_u2 * cos_lambda_v ) ** 2 )
     	  cos_sigma = sin_u1 * sin_u2 + cos_u1 * cos_u2 * cos_lambda_v
     	  sigma = Math.atan2(sin_sigma, cos_sigma)
-    	  sin_alpha= cos_u1  * cos_u2 * sin_lambda_v / sin_sigma 
-    	  cos_2_alpha = 1 - sin_alpha * sin_alpha #trig identity 	 
+    	  sin_alpha= cos_u1  * cos_u2 * sin_lambda_v / sin_sigma
+    	  cos_2_alpha = 1 - sin_alpha * sin_alpha #trig identity
     	  cos_2_sigma_m = cos_sigma - 2 * sin_u1 * sin_u2/cos_2_alpha
     	  c = f / 16 * cos_2_alpha * (4 + f*(4-3*cos_2_alpha))
     	  lambda_dash = lambda_v
@@ -102,7 +116,7 @@ class Vincenty < Coordinate
       s = b * a1 * (sigma - delta_sigma)
       sin_lambda_v = Math.sin(lambda_v)
       cos_lambda_v = Math.cos(lambda_v)
-      
+
       #This test isn't in original formulae, and fixes the problem of all angles returned being between 0 - PI (0-180)
       #Also converts the result to compass bearing, rather than the mathmatical anticlockwise angles.
       if(Math.sin(p2.longitude.to_rad - @longitude.to_rad) < 0)
@@ -112,7 +126,7 @@ class Vincenty < Coordinate
         alpha_1 = Math.atan2( cos_u2 * sin_lambda_v, cos_u1 * sin_u2 - sin_u1 * cos_u2 * cos_lambda_v)
         #alpha_2 = Math.atan2(cos_u1 * sin_lambda_v, -sin_u1 * cos_u2 + cos_u1 * sin_u2 * cos_lambda_v)
       end
-  
+
     #Note that the bearing is a compass (i.e. clockwise) angle.
     return TrackAndDistance.new(alpha_1, s, true) #What to do with alpha_2?
   end
@@ -122,10 +136,10 @@ class Vincenty < Coordinate
   # @param [TrackAndDistance] track_and_distance specifying  bearing and distance.
   # @return [Vincenty]  with the destination coordinates.
   def sphereDestination( track_and_distance )
-    a = 6378137 #equatorial radius in meters     (+/-2 m) 
+    a = 6378137 #equatorial radius in meters     (+/-2 m)
     b = 6356752.31424518 #polar radius in meters
     r = (a+b)/2 #average diametre as a rough estimate for our tests.
-    
+
     d = track_and_distance.distance.abs
     sin_dor = Math.sin(d/r)
     cos_dor = Math.cos(d/r)
@@ -133,7 +147,7 @@ class Vincenty < Coordinate
     cos_lat1 = Math.cos(@latitude.to_rad)
     lat2 = Math.asin( sin_lat1 * cos_dor + cos_lat1 * sin_dor * Math.cos(track_and_distance.bearing.to_rad) )
     lon2 = @longitude.to_rad + Math.atan2(Math.sin(track_and_distance.bearing.to_rad) * sin_dor * cos_lat1, cos_dor-sin_lat1 * Math.sin(lat2))
-    
+
     Vincenty.new(lat2, lon2, 0, true);
   end
 
@@ -142,17 +156,17 @@ class Vincenty < Coordinate
   #Assumes earth is a WGS-84 Ellipsod.
   # @param [TrackAndDistance]  specifying bearing and distance.
   # @return [Vincenty] with the destination coordinates.
-  def destination( track_and_distance ) 
+  def destination( track_and_distance )
     # a, b = major & minor semiaxes of the ellipsoid
-    a = 6378137 #equatorial radius in meters     (+/-2 m) 
+    a = 6378137 #equatorial radius in meters     (+/-2 m)
     b = 6356752.31424518 #polar radius in meters
-    f = (a-b)/a #  flattening 
-    
+    f = (a-b)/a #  flattening
+
     s = track_and_distance.distance.abs;
     alpha1 = track_and_distance.bearing.to_rad
     sin_alpha1 = Math.sin(alpha1)
     cos_alpha1 = Math.cos(alpha1)
-  
+
     tanU1 = (1-f)  *  Math.tan(@latitude.to_rad);
     cosU1 = 1 / Math.sqrt((1  +  tanU1 * tanU1))
     sinU1 = tanU1 * cosU1
@@ -162,7 +176,7 @@ class Vincenty < Coordinate
     u_2 = cos_2_alpha  *  (a * a - b * b) / (b * b)
     a1 = 1  +  u_2/16384 * (4096 + u_2 * (-768 + u_2 * (320-175 * u_2)))
     b1 = u_2/1024  *  (256 + u_2 * (-128 + u_2 * (74-47 * u_2)))
-  
+
     sigma = s / (b * a1)
     sigma_dash = 2 * Math::PI
     while ((sigma-sigma_dash).abs > 1.0e-12) #i.e 0.06mm
@@ -181,12 +195,9 @@ class Vincenty < Coordinate
     l = lambda_v - (1-c)  *  f  *  sin_alpha  *  (sigma  +  c * sin_sigma * (cos_2_sigma_m + c * cos_sigma * (-1 + 2 * cos_2_sigma_m * cos_2_sigma_m))) #difference in longitude
 
     #sigma2 = Math.atan2(sin_alpha, -tmp)  # reverse azimuth
-  
+
     return Vincenty.new(lat2, @longitude + l, 0, true);
   end
 
 
 end
-
-
-

data/test/ts_all.rb

@@ -1,11 +1,10 @@
-require 'ts_angle.rb'
-require 'ts_vincenty.rb'
-require 'ts_latitude.rb'
-require 'ts_longitude.rb'
-require 'ts_coordinate.rb'
-require 'ts_track_and_distance.rb'
+#!/usr/bin/env ruby
+require_relative 'ts_angle.rb'
+require_relative 'ts_vincenty.rb'
+require_relative 'ts_latitude.rb'
+require_relative 'ts_longitude.rb'
+require_relative 'ts_coordinate.rb'
+require_relative 'ts_track_and_distance.rb'
 
 puts "Testing from source"
 puts Vincenty.new.version
-
-

data/test/ts_angle.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'vincenty.rb'
+require_relative '../lib/vincenty.rb'
 
 class TestAngle< Test::Unit::TestCase
   #test Angle creation
@@ -28,7 +28,7 @@ class TestAngle< Test::Unit::TestCase
     assert_equal(Angle.decimal_deg_from_ary([1,5,4,'W']), -(1.0 + 5/60.0 + 4/3600.0))
     assert_equal(Angle.decimal_deg_from_ary(Angle.dms( -(1.0 + 5/60.0 + 1.0/3600.0) )),-(1.0 + 5/60.0 + 1.0/3600.0)) #double call, rounding error always produced a failure.
   end
-  
+
   def test_strf
     a = Angle.new("S37 01'7.5\"")
     assert_equal("-37 01'07.5000\"", a.strf) #default format of strf
@@ -50,7 +50,7 @@ class TestAngle< Test::Unit::TestCase
 
   def test_operators
     #Comparable.
-    assert_equal(Angle.radians(-0.646099072472651), Angle.radians(-0.646099072472651)) #<=>   
+    assert_equal(Angle.radians(-0.646099072472651), Angle.radians(-0.646099072472651)) #<=>
     #unary-op Angle
     assert_equal(+Angle.radians(-0.646099072472651), Angle.radians(-0.646099072472651)) #unary +
     assert_equal(-Angle.radians(-0.646099072472651), Angle.radians(0.646099072472651)) #unary -
@@ -67,7 +67,7 @@ class TestAngle< Test::Unit::TestCase
     assert_equal(6, 3 * Angle.radians(2) ) # *
     assert_equal(2, 4 / Angle.radians(2) ) # /
     #Angle op Angle
-    assert_equal(Angle.radians(3.2+2.1), Angle.radians(3.2) + Angle.radians(2.1) ) # +   
+    assert_equal(Angle.radians(3.2+2.1), Angle.radians(3.2) + Angle.radians(2.1) ) # +
     #Sign method.
     assert_equal(1, Angle.radians(3).sign)
     assert_equal(-1, Angle.radians(-3).sign)
@@ -78,4 +78,4 @@ class TestAngle< Test::Unit::TestCase
     #bearing
     assert_equal(Angle.degrees(340), Angle.degrees(20).to_bearing)
   end
-end
+end

data/test/ts_coordinate.rb

@@ -1,7 +1,7 @@
 require 'test/unit'
-require 'vincenty.rb'
+require_relative '../lib/vincenty.rb'
 
-class TestAngle< Test::Unit::TestCase
+class TestCoordinate< Test::Unit::TestCase
   #test Coordinate
   def test_coordinate
     c = Coordinate.new(-36.9923293459124, 174.485341187381,13.5)
@@ -15,4 +15,4 @@ class TestAngle< Test::Unit::TestCase
     assert_equal(13.5, ch[:altitude])
     assert_equal("36 59'32.3856\"S  174 29'07.2283\"E 13.5m", c.to_s)
   end
-end
+end

data/test/ts_latitude.rb

@@ -1,7 +1,7 @@
 require 'test/unit'
-require 'vincenty.rb'
+require_relative '../lib/vincenty.rb'
 
-class TestAngle< Test::Unit::TestCase
+class TestLatitude< Test::Unit::TestCase
   def test_strf
     assert_equal("37 01'07.5000\"S", Latitude.new("S37 01'7.5\"").to_s)
     assert_equal("37 01'07.5000\"S", Latitude.new("-37 01'7.5\"").to_s)
@@ -28,4 +28,4 @@ class TestAngle< Test::Unit::TestCase
     assert_equal(89, Latitude.degrees(89).to_deg)
     assert_equal(89, Latitude.degrees(91).to_deg)
   end
-end
+end

data/test/ts_longitude.rb

@@ -1,7 +1,7 @@
 require 'test/unit'
-require 'vincenty.rb'
+require_relative '../lib/vincenty.rb'
 
-class TestAngle< Test::Unit::TestCase
+class TestLongitude< Test::Unit::TestCase
   def test_strf
     assert_equal("037 01'07.5000\"W", Longitude.new("W37 01'7.5\"").to_s)
     assert_equal("037 01'07.5000\"W", Longitude.new("-37 01'7.5\"").to_s)
@@ -22,4 +22,4 @@ class TestAngle< Test::Unit::TestCase
     assert_equal(-135, Longitude.degrees(225).to_deg)
     assert_equal(-45, Longitude.degrees(315).to_deg)
   end
-end
+end

data/test/ts_track_and_distance.rb

@@ -1,16 +1,19 @@
 require 'test/unit'
-require 'vincenty.rb'
+require_relative '../lib/vincenty.rb'
 
-class TestAngle< Test::Unit::TestCase
+class TestTrackAndDistance< Test::Unit::TestCase
   #test TrackAndDistance
   def test_track_and_distance
     assert_equal("140 14'10.0000\" 12.0m", TrackAndDistance.new(Angle.new("320,14,10").reverse, 12.0).to_s)
     assert_equal("215 03'00.0000\" 19.73m", TrackAndDistance.new("215,3,0", 19.73 ).to_s)
+
     a = TrackAndDistance.new("215,3,0", 19.73 ).to_ary
     assert_equal("215 03'00.0000\"", a[0].strf)
     assert_equal("19.73", a[1].to_s)
+
     a = TrackAndDistance.new("215,3,0", 19.73 ).to_hash
     assert_equal("215 03'00.0000\"", a[:bearing].strf)
     assert_equal("19.73", a[:distance].to_s)
+
   end
 end

data/test/ts_vincenty.rb

@@ -1,12 +1,12 @@
 require 'test/unit'
-require 'vincenty.rb'
+require_relative '../lib/vincenty.rb'
 
 class TestVincenty< Test::Unit::TestCase
 
   def initialize(x)
     super(x)
-    
-    @path = [ #Path starting at peg by kanaka at end of drive 
+
+    @path = [ #Path starting at peg by kanaka at end of drive
        TrackAndDistance.new("215,3,0", 19.73 ) ,
        TrackAndDistance.new(Angle.new("320,14,10").reverse, 12.0), #Note don't need to add the radians=true argument as Angle has to_radians function
        TrackAndDistance.new(Angle.new("281,44,40").reverse, 35.23 ),
@@ -32,20 +32,20 @@ class TestVincenty< Test::Unit::TestCase
         Vincenty.new(-36.9917932943506, 174.485664544705),
         Vincenty.new(-36.9920268289562, 174.485617028991),
         Vincenty.new(-36.9921837292671, 174.485468381511),
-    ]  
+    ]
   end
 
   #The path in @path was entered from the property survey map, with distance and bearings which should form a closed loop
   #verified on google map of my property by creating a KML file and loading the map over the satellite image and checking the
-  #coordinates in google earth, and visually checking the route created was a closed loop (it was with a tiny error). 
+  #coordinates in google earth, and visually checking the route created was a closed loop (it was with a tiny error).
   def test_vincenty_destination
-    start = Vincenty.new(-36.9921838030711, 174.485468469841) 
+    start = Vincenty.new(-36.9921838030711, 174.485468469841)
 
     next_p = start
 #    print "Start at coordinate #{next_p.longitude.to_deg}, #{next_p.latitude.to_deg}\n"
     @path.each_with_index do |leg,i|
       next_p, spherical_ans = next_p.destination( leg ) , next_p.sphereDestination(leg)
- 
+
       assert_equal(@waypoints[i].longitude.to_deg.round(12), next_p.longitude.to_deg.round(12))
       assert_equal(@waypoints[i].latitude.to_deg.round(12), next_p.latitude.to_deg.round(12))
   #    print "Expect  #{waypoints[i].longitude.to_deg.round(4)}, #{waypoints[i].latitude.to_deg.round(4)}\n"
@@ -56,18 +56,18 @@ class TestVincenty< Test::Unit::TestCase
   #  assert_equal(0, next_p.distanceAndAngle(start).distance)
   #  puts "distance from end to start should be 0. Actual #{next_p.distanceAndAngle(start)}"
   end
-  
+
   #The waypoints are the latitudes and longitudes of the corners of my property.
   #The resulting bearing and distances between them should match those in @path.
   def test_vincenty_distance_and_angle
-    start = Vincenty.new(-36.9921838030711, 174.485468469841) 
+    start = Vincenty.new(-36.9921838030711, 174.485468469841)
     next_p = start
 #   print "\nReverse test, c\n"
 #    print "Start at coordinate #{next_p.longitude.to_deg}, #{next_p.latitude.to_deg}\n"
     @waypoints.each_with_index do |point,i|
-      vtrack_and_bearing = next_p.distanceAndAngle( point ) 
+      vtrack_and_bearing = next_p.distanceAndAngle( point )
   #    strack_and_bearing = next_p.sphericalDistanceAndAngle( point )
-      
+
       assert_equal(@path[i].bearing.to_deg.round(4), vtrack_and_bearing.bearing.to_deg.round(4))
       assert_equal(@path[i].distance.round(4), vtrack_and_bearing.distance.round(4))
   #    print "Expected #{path[i].bearing.to_deg.round(4)}(#{((path[i].bearing.to_deg+180)%360).round(4)}), #{path[i].distance.round(4)}m\n"
@@ -79,18 +79,27 @@ class TestVincenty< Test::Unit::TestCase
   # assert_equal(0, next_p.distanceAndAngle(start).distance)
   #  puts "distance from end to start should be 0. Actual #{next_p.distanceAndAngle(start)}\n"
   end
-  
+
+  #Edge case, when points are at same location
+  def test_vincenty_distance_and_angle_when_0
+    start = Vincenty.new(-36.9921838030711, 174.485468469841)
+    vtrack_and_bearing = start.distanceAndAngle( start )
+
+    assert_equal(0, vtrack_and_bearing.bearing.to_deg.round(4))
+    assert_equal(0, vtrack_and_bearing.distance.round(4))
+  end
+
   #Run the Australian Geoscience site example.
   def test_geoscience_au
     flindersPeak = Vincenty.new("-37 57'3.72030″", "144 25'29.52440″" )
     buninyong = Vincenty.new("-37   39 ' 10.15610 ''", "143   55 ' 35.38390 ''") #Buninyong
-    track_and_bearing = flindersPeak.distanceAndAngle( buninyong ) 
+    track_and_bearing = flindersPeak.distanceAndAngle( buninyong )
     assert_equal(Angle.new("306   52 ' 5.37 ''").to_deg.round(4), track_and_bearing.bearing.to_deg.round(4))
     assert_equal(54972.271, track_and_bearing.distance.round(3))
-    
+
     destination = flindersPeak.destination(TrackAndDistance.new("306   52 ' 5.37 ''", 54972.271))
     assert_equal(buninyong.latitude.to_deg.round(4), destination.latitude.to_deg.round(4))
     assert_equal(buninyong.longitude.to_deg.round(4), destination.longitude.to_deg.round(4))
   end
-    
-end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vincenty
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Rob Burrowes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2016-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-yard
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.15'
 description: "* Vincenty wrote an algorithm for calculating the bearing and distance
   between two coordinates on the earth\n  and an algorithm for finding a second coordinate,
   given a starting coordinate, bearing and destination.\n  The algorithms model the
@@ -70,7 +70,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
-- ".gemtest"
 - History.txt
 - Manifest.txt
 - README.md
@@ -115,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: "* Vincenty wrote an algorithm for calculating the bearing and distance between