rgeo 0.3.13 → 0.3.14

data/lib/rgeo/impl_helper/basic_polygon_methods.rb

@@ -113,6 +113,14 @@ module RGeo
       end
 
 
+      def hash
+        @hash ||= begin
+          hash_ = [geometry_type, @exterior_ring].hash
+          @interior_rings.inject(hash_){ |h_, r_| (1664525 * h_ + r_.hash).hash }
+        end
+      end
+
+
       def _copy_state_from(obj_)  # :nodoc:
         super
         @exterior_ring = obj_.exterior_ring

data/test/common/factory_tests.rb

@@ -76,20 +76,26 @@ module RGeo
         end
 
 
-        def test_srid_preserved_through_dup
+        def test_srid_preserved_through_geometry_dup
           geom1_ = @factory.point(-10, 20)
           geom2_ = geom1_.clone
           assert_equal(_srid, geom2_.srid)
         end
 
 
-        def test_dup_factory
+        def test_dup_factory_results_in_equal_factories
           dup_factory_ = @factory.dup
           assert_equal(@factory, dup_factory_)
           assert_equal(_srid, dup_factory_.srid)
         end
 
 
+        def test_dup_factory_results_in_equal_hashes
+          dup_factory_ = @factory.dup
+          assert_equal(@factory.hash, dup_factory_.hash)
+        end
+
+
         def test_marshal_dump_load_factory
           data_ = ::Marshal.dump(@factory)
           factory2_ = ::Marshal.load(data_)

data/test/common/geometry_collection_tests.rb

@@ -158,6 +158,29 @@ module RGeo
         end
 
 
+        def test_hashes_equal_for_representationally_equivalent_objects
+          geom1_ = @factory.collection([@point1, @line1])
+          geom2_ = @factory.collection([@point1, @line1])
+          assert_equal(geom1_.hash, geom2_.hash)
+        end
+
+
+        def test_nested_equality
+          geom1_ = @factory.collection([@line1, @factory.collection([@point1, @point2])])
+          geom2_ = @factory.collection([@line1, @factory.collection([@point1, @point2])])
+          assert(geom1_.rep_equals?(geom2_))
+          assert_equal(geom1_.hash, geom2_.hash)
+        end
+
+
+        def test_out_of_order_is_not_equal
+          geom1_ = @factory.collection([@line1, @point2])
+          geom2_ = @factory.collection([@point2, @line1])
+          assert(!geom1_.rep_equals?(geom2_))
+          assert_not_equal(geom1_.hash, geom2_.hash)
+        end
+
+
         def test_wkt_creation_simple
           parsed_geom_ = @factory.parse_wkt('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(-4 2, -5 3))')
           built_geom_ = @factory.collection([@point1, @line1])

data/test/common/line_string_tests.rb

@@ -240,6 +240,31 @@ module RGeo
         end
 
 
+        def test_hashes_equal_for_representationally_equivalent_objects
+          point1_ = @factory.point(0, 0)
+          point2_ = @factory.point(0, 1)
+          point3_ = @factory.point(1, 0)
+          line1_ = @factory.line_string([point1_, point2_, point3_])
+          point4_ = @factory.point(0, 0)
+          point5_ = @factory.point(0, 1)
+          point6_ = @factory.point(1, 0)
+          line2_ = @factory.line_string([point4_, point5_, point6_])
+          assert_equal(line1_.hash, line2_.hash)
+        end
+
+
+        def test_out_of_order_is_not_equal
+          point1_ = @factory.point(0, 0)
+          point2_ = @factory.point(0, 1)
+          line1_ = @factory.line_string([point1_, point2_])
+          point4_ = @factory.point(0, 1)
+          point5_ = @factory.point(0, 0)
+          line2_ = @factory.line_string([point4_, point5_])
+          assert(!line1_.rep_equals?(line2_))
+          assert_not_equal(line1_.hash, line2_.hash)
+        end
+
+
         def test_wkt_creation
           line1_ = @factory.parse_wkt('LINESTRING(21 22, 11 12)')
           assert_equal(@factory.point(21, 22), line1_.point_n(0))

data/test/common/multi_line_string_tests.rb

@@ -136,6 +136,13 @@ module RGeo
         end
 
 
+        def test_hashes_equal_for_representationally_equivalent_objects
+          geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
+          geom2_ = @factory.multi_line_string([@linestring1, @linestring2])
+          assert_equal(geom1_.hash, geom2_.hash)
+        end
+
+
         def test_wkt_creation_simple
           parsed_geom_ = @factory.parse_wkt('MULTILINESTRING((0 0, 1 0), (-4 2, -7 6, 5 11))')
           built_geom_ = @factory.multi_line_string([@linestring1, @linestring2])

data/test/common/multi_point_tests.rb

@@ -128,6 +128,13 @@ module RGeo
         end
 
 
+        def test_hashes_equal_for_representationally_equivalent_objects
+          geom1_ = @factory.multi_point([@point1, @point2])
+          geom2_ = @factory.multi_point([@point1, @point2])
+          assert_equal(geom1_.hash, geom2_.hash)
+        end
+
+
         def test_wkt_creation_simple
           parsed_geom_ = @factory.parse_wkt('MULTIPOINT((0 0), (-4 2), (-5 3))')
           built_geom_ = @factory.multi_point([@point1, @point3, @point4])

data/test/common/multi_polygon_tests.rb

@@ -135,6 +135,13 @@ module RGeo
         end
 
 
+        def test_hashes_equal_for_representationally_equivalent_objects
+          geom1_ = @factory.multi_polygon([@poly1, @poly2])
+          geom2_ = @factory.multi_polygon([@poly1, @poly2])
+          assert_equal(geom1_.hash, geom2_.hash)
+        end
+
+
         def test_wkt_creation_simple
           parsed_geom_ = @factory.parse_wkt('MULTIPOLYGON(((0 0, 0 -10, -10 0, 0 0)), ((0 0, 0 10, 10 10, 10 0, 0 0), (4 4, 5 6, 6 4, 4 4)))')
           built_geom_ = @factory.multi_polygon([@poly1, @poly2])

data/test/common/point_tests.rb

@@ -164,6 +164,27 @@ module RGeo
         end
 
 
+        def test_out_of_order_is_not_equal
+          point1_ = @factory.point(11, 12)
+          point2_ = @factory.point(12, 11)
+          assert_not_equal(point1_, point2_)
+          assert_not_equal(point1_.hash, point2_.hash)
+        end
+
+
+        def test_hashes_equal_for_representationally_equivalent_objects
+          point1_ = @factory.point(11, 12)
+          point2_ = @factory.point(11, 12)
+          assert_equal(point1_.hash, point2_.hash)
+        end
+
+
+        def test_point_as_hash_key
+          hash_ = {@factory.point(11, 12) => :hello}
+          assert_equal(:hello, hash_[@factory.point(11, 12)])
+        end
+
+
         def test_disjoint
           point1_ = @factory.point(11, 12)
           point2_ = @factory.point(11, 12)

data/test/common/polygon_tests.rb

@@ -140,6 +140,21 @@ module RGeo
         end
 
 
+        def test_hashes_equal_for_representationally_equivalent_objects
+          point1_ = @factory.point(0, 0)
+          point2_ = @factory.point(0, 1)
+          point3_ = @factory.point(1, 0)
+          exterior1_ = @factory.linear_ring([point1_, point2_, point3_, point1_])
+          poly1_ = @factory.polygon(exterior1_)
+          point4_ = @factory.point(0, 0)
+          point5_ = @factory.point(0, 1)
+          point6_ = @factory.point(1, 0)
+          exterior2_ = @factory.linear_ring([point4_, point5_, point6_, point4_])
+          poly2_ = @factory.polygon(exterior2_)
+          assert_equal(poly1_.hash, poly2_.hash)
+        end
+
+
         def test_wkt_creation_simple
           parsed_poly_ = @factory.parse_wkt('POLYGON((0 0, 0 1, 1 0, 0 0))')
           point1_ = @factory.point(0, 0)

data/test/coord_sys/tc_proj4.rb

@@ -108,11 +108,18 @@ module RGeo
 
         def test_equivalence
           proj1_ = ::RGeo::CoordSys::Proj4.create('+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs')
-          proj2_ = ::RGeo::CoordSys::Proj4.create('+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs')
+          proj2_ = ::RGeo::CoordSys::Proj4.create(' +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs')
           assert_equal(proj1_, proj2_)
         end
 
 
+        def test_hashes_equal_for_equivalent_objects
+          proj1_ = ::RGeo::CoordSys::Proj4.create('+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs')
+          proj2_ = ::RGeo::CoordSys::Proj4.create(' +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs')
+          assert_equal(proj1_.hash, proj2_.hash)
+        end
+
+
         def test_point_projection_cast
           geography_ = ::RGeo::Geos.factory(:proj4 => '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs', :srid =>4326)
           projection_ = ::RGeo::Geos.factory(:proj4 => '+proj=tmerc +lat_0=49 +lon_0=-2 +k=0.9996012717 +x_0=400000 +y_0=-100000 +ellps=airy +datum=OSGB36 +units=m +no_defs', :srid => 27700)

data/test/geos_capi/tc_misc.rb

@@ -51,7 +51,7 @@ module RGeo
 
 
         def test_uninitialized
-          geom_ = ::RGeo::Geos::GeometryImpl.new
+          geom_ = ::RGeo::Geos::CAPIGeometryImpl.new
           assert_equal(false, geom_.initialized?)
           assert_nil(geom_.geometry_type)
         end

data/test/tc_mixins.rb

@@ -86,7 +86,7 @@ module RGeo
 
         def test_basic_mixin_geos_capi
           factory_ = ::RGeo::Geos.factory(:native_interface => :capi)
-          assert_equal(::RGeo::Geos::PointImpl, factory_.point(1, 1).class)
+          assert_equal(::RGeo::Geos::CAPIPointImpl, factory_.point(1, 1).class)
           assert(factory_.point(1, 1).class.include?(Mixin1))
           assert(!factory_.point(1, 1).class.include?(Mixin2))
           assert(factory_.point(1, 1).respond_to?(:mixin1_method))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-07-08 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
@@ -75,14 +75,16 @@ files:
 - lib/rgeo/geographic/spherical_feature_methods.rb
 - lib/rgeo/geographic/spherical_math.rb
 - lib/rgeo/geographic.rb
-- lib/rgeo/geos/factory.rb
-- lib/rgeo/geos/ffi_classes.rb
+- lib/rgeo/geos/capi_factory.rb
+- lib/rgeo/geos/capi_feature_classes.rb
 - lib/rgeo/geos/ffi_factory.rb
-- lib/rgeo/geos/impl_additions.rb
+- lib/rgeo/geos/ffi_feature_classes.rb
+- lib/rgeo/geos/ffi_feature_methods.rb
 - lib/rgeo/geos/interface.rb
 - lib/rgeo/geos/utils.rb
 - lib/rgeo/geos/zm_factory.rb
-- lib/rgeo/geos/zm_impl.rb
+- lib/rgeo/geos/zm_feature_classes.rb
+- lib/rgeo/geos/zm_feature_methods.rb
 - lib/rgeo/geos.rb
 - lib/rgeo/impl_helper/basic_geometry_collection_methods.rb
 - lib/rgeo/impl_helper/basic_geometry_methods.rb
@@ -201,7 +203,7 @@ files:
 - README.rdoc
 - Spatial_Programming_With_RGeo.rdoc
 - Version
-homepage: http://virtuoso.rubyforge.org/rgeo
+homepage: http://dazuma.github.com/rgeo
 licenses: []
 post_install_message: 
 rdoc_options: []