rgeo 0.3.19 → 0.3.20

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.3.20 / 2012-12-08
+
+* Distances computed by the spherical factory were incorrect when covering more than 90 degrees of the globe. Fixed. (reported by exoth)
+
 === 0.3.19 / 2012-09-20
 
 * The Geos factories, as well as the projected geographic convenience factories such as simple_mercator, now support the :uses_lenient_assertions option.

data/README.rdoc

@@ -61,7 +61,7 @@ Some features also require the following:
   may be available via your operating system's package manager, or from
   http://trac.osgeo.org/proj
 * On some platforms, you should install the ffi-geos gem (version 0.0.6
-  or later recommended.) JRuby requires this gem to properly link with
+  or later recommended.) JRuby requires this gem to link properly with
   Geos, and Windows builds probably do as well.
 
 Note: The build system assumes a unix-like environment. Windows builds

data/Version

@@ -1 +1 @@
-0.3.19
+0.3.20

data/lib/rgeo/geographic/spherical_math.rb

@@ -118,12 +118,16 @@ module RGeo
           rx_ = rhs_.x
           ry_ = rhs_.y
           rz_ = rhs_.z
-          x_ = @y*rz_-@z*ry_
-          y_ = @z*rx_-@x*rz_
-          z_ = @x*ry_-@y*rx_
-          r_ = ::Math.sqrt(x_*x_ + y_*y_ + z_*z_)
-          r_ = 1.0 if r_ > 1.0
-          ::Math.asin(r_)
+          dot_ = @x * rx_ + @y * ry_ + @z * rz_
+          if dot_ > -0.8 && dot_ < 0.8
+            ::Math.acos(dot_)
+          else
+            x_ = @y*rz_-@z*ry_
+            y_ = @z*rx_-@x*rz_
+            z_ = @x*ry_-@y*rx_
+            as_ = ::Math.asin(::Math.sqrt(x_*x_ + y_*y_ + z_*z_))
+            dot_ > 0.0 ? as_ : ::Math::PI - as_
+          end
         end
 
 

data/test/spherical_geographic/tc_calculations.rb

@@ -110,6 +110,27 @@ module RGeo
         end
 
 
+        def test_distance_coincident
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0, 0)
+          assert_equal(0.0, point1_.dist_to_point(point2_))
+        end
+
+
+        def test_distance_opposite
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(-1, 0, 0)
+          assert_close_enough(::Math::PI, point1_.dist_to_point(point2_))
+        end
+
+
+        def test_distance_right_angle
+          point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 0, 0)
+          point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(0, -1, 0)
+          assert_close_enough(::Math::PI / 2, point1_.dist_to_point(point2_))
+        end
+
+
         def test_arc_axis
           point1_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, 1, 0)
           point2_ = ::RGeo::Geographic::SphericalMath::PointXYZ.new(1, -1, 0)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 0.3.19
+  version: 0.3.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies: []
 description: RGeo is a geospatial data library for Ruby. It provides an implementation
   of the Open Geospatial Consortium's Simple Features Specification, used by most