vincenty 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37c0c0922bddbfdd5dcef8f791bfabdaa154392b34b87ae9a12211c2e3d97de6
-  data.tar.gz: 3cf931671b138ab6552b90aafc9d483fce1fbe8329a46f4573526a1bd6c1d750
+  metadata.gz: d378b30cc2863c4fbdb032cf44473d75c2a5e479eb226e3e24d956a0c9a77e66
+  data.tar.gz: b3b552e6a59501707b76c848aa7e1fae795a2430d91d1f180c177b16a23bc604
 SHA512:
-  metadata.gz: 416ffed90caaa6f501b3114585934fa406e212782075b3cabd38acebf9b7d15414dd05d17ce1d2032469c497ca8107d1c3238022a714f016801595ced91b9307
-  data.tar.gz: d5f2ca7b476ffafc99da3a517e849ce3d6ccb05448c7565f586d6d2e92684c8c8ac7ed91241ce06b293abeb1566777af4f95c9c62be1abb0721a10102a096a4e
+  metadata.gz: 201e6694807048f2029f6b8779f70c9a068aace73ff8495fb29ee6cfda76de7e941bed8ca1e861e970d4e5c8ce67818554f4254ea5a4bb3aff86d2867afa86e0
+  data.tar.gz: f0770e50a4225648bd054bbfeb4bab51024452536456bb9b69c6244b516514be0c93ee9d80cb4960997464c036c073208413ceac0e1d8f4e9930942274121d9a

data/History.txt

@@ -1,3 +1,11 @@
+robertburrowes	Thu Oct 14 15:09:23 2021 +1300
+	bumped version
+robertburrowes	Thu Oct 14 15:06:18 2021 +1300
+	Bump version.
+robertburrowes	Thu Oct 14 14:43:00 2021 +1300
+	Bearing 0 and 180 edgecase for spherical test method resulted in negative sqrt
+robertburrowes	Sun Oct 10 12:09:10 2021 +1300
+	#{PROJECT} release 1.0.10
 robertburrowes	Sun Oct 10 12:07:45 2021 +1300
 	Inc version
 robertburrowes	Sun Oct 10 12:05:54 2021 +1300

data/lib/vincenty.rb

@@ -12,7 +12,7 @@ require_relative '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.10'
+  VERSION = '1.0.11'
 
   # @return [String] constant VERSION
   def version
@@ -30,13 +30,11 @@ 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 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
+    # No calculations necessary, if these are the same point.
+    return TrackAndDistance.new(0, 0, true) if @latitude == p2.latitude && @longitude == p2.longitude
 
     a = equatorial_radius # equatorial radius in meters     (+/-2 m)
-    f = inverse_flattening
-    b = a - a / f # WGS84 = 6356752.314245179 polar radius in meters
+    b = a - a / inverse_flattening # 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)
@@ -45,9 +43,11 @@ class Vincenty < Coordinate
     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
     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))
-    bearing = if Math.sin(p2.longitude.to_rad - @longitude.to_rad) < 0
+
+    bearing = if @longitude == p2.longitude
+                @latitude > p2.latitude ? Math::PI : 0
+              elsif Math.sin(p2.longitude.to_rad - @longitude.to_rad) < 0
                 2 * Math::PI - (Math.atan(-t2 / Math.sqrt(-t2 * t2 + 1)) + atan1_2) # Compass Bearing in radians (clockwise)
               else
                 Math.atan(-t2 / Math.sqrt(-t2 * t2 + 1)) + atan1_2 # Compass Bearing in radians (clockwise)

data/test/ts_vincenty.rb

@@ -90,6 +90,36 @@ class TestVincenty < Test::Unit::TestCase
     assert_equal(0, vtrack_and_bearing.distance.round(4))
   end
 
+  # Edge case, when points are close, and 180 degrees
+  def test_vincenty_angle_when_180
+    start_track = Vincenty.new(-36.98684848301985, 174.4873448681314)
+    end_track = Vincenty.new(-36.989952870042174, 174.4873448681314)
+
+    vtrack_and_bearing = start_track.distanceAndAngle( end_track )
+    assert_equal(180.0, vtrack_and_bearing.bearing.to_deg.round(4))
+
+    vtrack_and_bearing = end_track.distanceAndAngle( start_track )
+    assert_equal(0.0, vtrack_and_bearing.bearing.to_deg.round(4))
+  end
+
+  # Edge case, when points are close, and 180 degrees
+  def test_spherical_angle_when_180
+    start_track = Vincenty.new(-36.98684848301985, 174.4873448681314)
+    end_track = Vincenty.new(-36.989952870042174, 174.4873448681314)
+
+    vtrack_and_bearing = start_track.sphericalDistanceAndAngle( end_track )
+    assert_equal(180.0, vtrack_and_bearing.bearing.to_deg.round(4))
+  end
+
+  #Edgecase when points are close and 0 degress
+  def test_spherical_angle_when_0
+    start_track = Vincenty.new(-36.98684848301985, 174.4873448681314)
+    end_track = Vincenty.new(-36.989952870042174, 174.4873448681314)
+
+    vtrack_and_bearing = end_track.sphericalDistanceAndAngle( start_track )
+    assert_equal(0.0, vtrack_and_bearing.bearing.to_deg.round(4))
+  end
+
   # Run the Australian Geoscience site example.
   def test_geoscience_au
     flindersPeak = Vincenty.new("-37 57'3.72030″", "144 25'29.52440″" )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vincenty
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Rob Burrowes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-09 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-yard