rgeo 0.1.19 → 0.1.20

data/test/projected_geography/tc_multi_line_string.rb

@@ -0,0 +1,62 @@
+# -----------------------------------------------------------------------------
+# 
+# Tests for the simple mercator multi line string implementation
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2010 Daniel Azuma
+# 
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
+require 'test/unit'
+require 'rgeo'
+
+require ::File.expand_path('../common/multi_line_string_tests.rb', ::File.dirname(__FILE__))
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module ProjectedGeography  # :nodoc:
+      
+      class TestMultiLineString < ::Test::Unit::TestCase  # :nodoc:
+        
+        
+        def create_factory
+          ::RGeo::Geography.projected(:projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857)
+        end
+        
+        
+        include ::RGeo::Tests::Common::MultiLineStringTests
+        
+        
+      end
+      
+    end
+  end
+end

data/test/projected_geography/tc_multi_point.rb

@@ -0,0 +1,62 @@
+# -----------------------------------------------------------------------------
+# 
+# Tests for the simple mercator multi point implementation
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2010 Daniel Azuma
+# 
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
+require 'test/unit'
+require 'rgeo'
+
+require ::File.expand_path('../common/multi_point_tests.rb', ::File.dirname(__FILE__))
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module ProjectedGeography  # :nodoc:
+      
+      class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
+        
+        
+        def create_factory
+          ::RGeo::Geography.projected(:projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857)
+        end
+        
+        
+        include ::RGeo::Tests::Common::MultiPointTests
+        
+        
+      end
+      
+    end
+  end
+end

data/test/projected_geography/tc_multi_polygon.rb

@@ -0,0 +1,63 @@
+# -----------------------------------------------------------------------------
+# 
+# Tests for the simple mercator multi polygon implementation
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2010 Daniel Azuma
+# 
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
+require 'test/unit'
+require 'rgeo'
+
+require ::File.expand_path('../common/multi_polygon_tests.rb', ::File.dirname(__FILE__))
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module ProjectedGeography  # :nodoc:
+      
+      class TestMultiPolygon < ::Test::Unit::TestCase  # :nodoc:
+        
+        
+        def create_factories
+          @factory = ::RGeo::Geography.projected(:projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857)
+          @lenient_factory = ::RGeo::Geography.projected(:projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857, :lenient_multi_polygon_assertions => true)
+        end
+        
+        
+        include ::RGeo::Tests::Common::MultiPolygonTests
+        
+        
+      end
+      
+    end
+  end
+end

data/test/projected_geography/tc_point.rb

@@ -0,0 +1,93 @@
+# -----------------------------------------------------------------------------
+# 
+# Tests for the simple mercator point implementation
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2010 Daniel Azuma
+# 
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
+require 'test/unit'
+require 'rgeo'
+
+require ::File.expand_path('../common/point_tests.rb', ::File.dirname(__FILE__))
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module ProjectedGeography  # :nodoc:
+      
+      class TestPoint < ::Test::Unit::TestCase  # :nodoc:
+        
+        
+        def setup
+          @factory = ::RGeo::Geography.projected(:projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857)
+          @zfactory = ::RGeo::Geography.projected(:support_z_coordinate => true, :projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857)
+          @mfactory = ::RGeo::Geography.projected(:support_m_coordinate => true, :projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857)
+          @zmfactory = ::RGeo::Geography.projected(:support_z_coordinate => true, :support_m_coordinate => true, :projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857)
+        end
+        
+        
+        include ::RGeo::Tests::Common::PointTests
+        
+        
+        def test_has_projection
+          point_ = @factory.point(21, -22)
+          assert(point_.respond_to?(:projection))
+        end
+        
+        
+        def test_latlon
+          point_ = @factory.point(21, -22)
+          assert_equal(21, point_.longitude)
+          assert_equal(-22, point_.latitude)
+        end
+        
+        
+        def test_srid
+          point_ = @factory.point(11, 12)
+          assert_equal(4326, point_.srid)
+        end
+        
+        
+        def test_distance
+          point1_ = @factory.point(11, 12)
+          point2_ = @factory.point(11, 12)
+          point3_ = @factory.point(13, 12)
+          assert_in_delta(0, point1_.distance(point2_), 0.0001)
+          assert_in_delta(222638, point1_.distance(point3_), 1)
+        end
+        
+        
+      end
+      
+    end
+  end
+end

data/test/projected_geography/tc_polygon.rb

@@ -0,0 +1,62 @@
+# -----------------------------------------------------------------------------
+# 
+# Tests for the simple mercator polygon implementation
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2010 Daniel Azuma
+# 
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
+require 'test/unit'
+require 'rgeo'
+
+require ::File.expand_path('../common/polygon_tests.rb', ::File.dirname(__FILE__))
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module ProjectedGeography  # :nodoc:
+      
+      class TestPolygon < ::Test::Unit::TestCase  # :nodoc:
+        
+        
+        def setup
+          @factory = ::RGeo::Geography.projected(:projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857)
+        end
+        
+        
+        include ::RGeo::Tests::Common::PolygonTests
+        
+        
+      end
+      
+    end
+  end
+end

data/{tests → test}/shapefile/tc_shapelib_tests.rb

@@ -130,14 +130,14 @@ module RGeo
             assert_equal(has_m_, file_.factory.has_capability?(:m_coordinate))
             rec_ = file_.next
             assert_equal(0, rec_.index)
-            assert_equal(::RGeo::Features::Point, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::Point, rec_.geometry.geometry_type)
             assert_equal(1, rec_.geometry.x)
             assert_equal(2, rec_.geometry.y)
             assert_equal(3, rec_.geometry.z) if has_z_
             assert_equal(4, rec_.geometry.m) if has_m_
             rec_ = file_.next
             assert_equal(1, rec_.index)
-            assert_equal(::RGeo::Features::Point, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::Point, rec_.geometry.geometry_type)
             assert_equal(10, rec_.geometry.x)
             assert_equal(20, rec_.geometry.y)
             assert_equal(30, rec_.geometry.z) if has_z_
@@ -169,7 +169,7 @@ module RGeo
             assert_equal(has_z_, file_.factory.has_capability?(:z_coordinate))
             assert_equal(has_m_, file_.factory.has_capability?(:m_coordinate))
             rec_ = file_.next
-            assert_equal(::RGeo::Features::MultiPoint, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::MultiPoint, rec_.geometry.geometry_type)
             assert_equal(4, rec_.geometry.num_geometries)
             assert_equal(1.15, rec_.geometry[0].x)
             assert_equal(2.25, rec_.geometry[0].y)
@@ -180,10 +180,10 @@ module RGeo
             assert_equal(6.35, rec_.geometry[3].z) if has_z_
             assert_equal(7.45, rec_.geometry[3].m) if has_m_
             rec_ = file_.next
-            assert_equal(::RGeo::Features::MultiPoint, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::MultiPoint, rec_.geometry.geometry_type)
             assert_equal(4, rec_.geometry.num_geometries)
             rec_ = file_.next
-            assert_equal(::RGeo::Features::MultiPoint, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::MultiPoint, rec_.geometry.geometry_type)
             assert_equal(4, rec_.geometry.num_geometries)
             assert_equal(21.15, rec_.geometry[0].x)
             assert_equal(22.25, rec_.geometry[0].y)
@@ -220,7 +220,7 @@ module RGeo
             assert_equal(has_z_, file_.factory.has_capability?(:z_coordinate))
             assert_equal(has_m_, file_.factory.has_capability?(:m_coordinate))
             rec_ = file_.next
-            assert_equal(::RGeo::Features::MultiLineString, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::MultiLineString, rec_.geometry.geometry_type)
             assert_equal(1, rec_.geometry.num_geometries)
             assert_equal(5, rec_.geometry[0].num_points)
             assert_equal(1, rec_.geometry[0].point_n(0).x)
@@ -240,10 +240,10 @@ module RGeo
             assert_equal(7.35, rec_.geometry[0].point_n(4).z) if has_z_
             assert_equal(8.45, rec_.geometry[0].point_n(4).m) if has_m_
             rec_ = file_.next
-            assert_equal(::RGeo::Features::MultiLineString, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::MultiLineString, rec_.geometry.geometry_type)
             assert_equal(1, rec_.geometry.num_geometries)
             rec_ = file_.next
-            assert_equal(::RGeo::Features::MultiLineString, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::MultiLineString, rec_.geometry.geometry_type)
             assert_equal(1, rec_.geometry.num_geometries)
             assert_equal(5, rec_.geometry[0].num_points)
             assert_equal(1, rec_.geometry[0].point_n(0).x)
@@ -263,7 +263,7 @@ module RGeo
             assert_equal(27.35, rec_.geometry[0].point_n(4).z) if has_z_
             assert_equal(28.45, rec_.geometry[0].point_n(4).m) if has_m_
             rec_ = file_.next
-            assert_equal(::RGeo::Features::MultiLineString, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::MultiLineString, rec_.geometry.geometry_type)
             assert_equal(3, rec_.geometry.num_geometries)
             assert_equal(5, rec_.geometry[0].num_points)
             assert_equal(0, rec_.geometry[0].point_n(0).x)
@@ -330,7 +330,7 @@ module RGeo
             assert_equal(has_z_, file_.factory.has_capability?(:z_coordinate))
             assert_equal(has_m_, file_.factory.has_capability?(:m_coordinate))
             rec_ = file_.next
-            assert_equal(::RGeo::Features::MultiPolygon, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::MultiPolygon, rec_.geometry.geometry_type)
             assert_equal(1, rec_.geometry.num_geometries)
             assert_equal(0, rec_.geometry[0].num_interior_rings)
             assert_equal(5, rec_.geometry[0].exterior_ring.num_points)
@@ -351,10 +351,10 @@ module RGeo
             assert_equal(7.35, rec_.geometry[0].exterior_ring.point_n(4).z) if has_z_
             assert_equal(8.45, rec_.geometry[0].exterior_ring.point_n(4).m) if has_m_
             rec_ = file_.next
-            assert_equal(::RGeo::Features::MultiPolygon, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::MultiPolygon, rec_.geometry.geometry_type)
             assert_equal(1, rec_.geometry.num_geometries)
             rec_ = file_.next
-            assert_equal(::RGeo::Features::MultiPolygon, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::MultiPolygon, rec_.geometry.geometry_type)
             assert_equal(1, rec_.geometry.num_geometries)
             assert_equal(0, rec_.geometry[0].num_interior_rings)
             assert_equal(5, rec_.geometry[0].exterior_ring.num_points)
@@ -375,7 +375,7 @@ module RGeo
             assert_equal(27.35, rec_.geometry[0].exterior_ring.point_n(4).z) if has_z_
             assert_equal(28.45, rec_.geometry[0].exterior_ring.point_n(4).m) if has_m_
             rec_ = file_.next
-            assert_equal(::RGeo::Features::MultiPolygon, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::MultiPolygon, rec_.geometry.geometry_type)
             assert_equal(1, rec_.geometry.num_geometries)
             assert_equal(2, rec_.geometry[0].num_interior_rings)
             assert_equal(5, rec_.geometry[0].exterior_ring.num_points)
@@ -446,7 +446,7 @@ module RGeo
             # disabled this test:
             # assert_equal(false, file_.factory.has_capability?(:m_coordinate))
             rec_ = file_.next
-            assert_equal(::RGeo::Features::GeometryCollection, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::GeometryCollection, rec_.geometry.geometry_type)
             assert_equal(1, rec_.geometry.num_geometries)
             assert_equal(0, rec_.geometry[0].num_interior_rings)
             assert_equal(5, rec_.geometry[0].exterior_ring.num_points)
@@ -463,10 +463,10 @@ module RGeo
             assert_equal(1, rec_.geometry[0].exterior_ring.point_n(4).y)
             assert_equal(7.35, rec_.geometry[0].exterior_ring.point_n(4).z)
             rec_ = file_.next
-            assert_equal(::RGeo::Features::GeometryCollection, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::GeometryCollection, rec_.geometry.geometry_type)
             assert_equal(1, rec_.geometry.num_geometries)
             rec_ = file_.next
-            assert_equal(::RGeo::Features::GeometryCollection, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::GeometryCollection, rec_.geometry.geometry_type)
             assert_equal(1, rec_.geometry.num_geometries)
             assert_equal(0, rec_.geometry[0].num_interior_rings)
             assert_equal(5, rec_.geometry[0].exterior_ring.num_points)
@@ -483,7 +483,7 @@ module RGeo
             assert_equal(7, rec_.geometry[0].exterior_ring.point_n(4).y)
             assert_equal(27.35, rec_.geometry[0].exterior_ring.point_n(4).z)
             rec_ = file_.next
-            assert_equal(::RGeo::Features::GeometryCollection, rec_.geometry.geometry_type)
+            assert_equal(::RGeo::Feature::GeometryCollection, rec_.geometry.geometry_type)
             assert_equal(1, rec_.geometry.num_geometries)
             assert_equal(2, rec_.geometry[0].num_interior_rings)
             assert_equal(5, rec_.geometry[0].exterior_ring.num_points)