rgeo 0.1.19 → 0.1.20

data/lib/rgeo/wkrep/wkt_generator.rb

@@ -180,22 +180,22 @@ module RGeo
             tag_ << ' M'
           end
         end
-        if type_ == Features::Point
+        if type_ == Feature::Point
           tag_ + _generate_point(obj_)
-        elsif type_.subtype_of?(Features::LineString)
+        elsif type_.subtype_of?(Feature::LineString)
           tag_ + _generate_line_string(obj_)
-        elsif type_ == Features::Polygon
+        elsif type_ == Feature::Polygon
           tag_ + _generate_polygon(obj_)
-        elsif type_ == Features::GeometryCollection
+        elsif type_ == Feature::GeometryCollection
           tag_ + _generate_geometry_collection(obj_)
-        elsif type_ == Features::MultiPoint
+        elsif type_ == Feature::MultiPoint
           tag_ + _generate_multi_point(obj_)
-        elsif type_ == Features::MultiLineString
+        elsif type_ == Feature::MultiLineString
           tag_ + _generate_multi_line_string(obj_)
-        elsif type_ == Features::MultiPolygon
+        elsif type_ == Feature::MultiPolygon
           tag_ + _generate_multi_polygon(obj_)
         else
-          raise Errors::ParseError, "Unrecognized geometry type: #{type_}"
+          raise Error::ParseError, "Unrecognized geometry type: #{type_}"
         end
       end
       

data/lib/rgeo/wkrep/wkt_parser.rb

@@ -64,7 +64,7 @@ module RGeo
     #   srid and dimension settings in the input. The factory generator
     #   should understand the configuration options <tt>:srid</tt>,
     #   <tt>:support_z_coordinate</tt>, and <tt>:support_m_coordinate</tt>.
-    #   See RGeo::Features::FactoryGenerator for more information.
+    #   See RGeo::Feature::FactoryGenerator for more information.
     #   If no generator is provided, the <tt>:default_factory</tt> is
     #   used.
     # <tt>:support_ewkt</tt>::
@@ -192,7 +192,7 @@ module RGeo
           _start_scanner(str_)
           obj_ = _parse_type_tag(false)
           if @cur_token && !@ignore_extra_tokens
-            raise Errors::ParseError, "Extra tokens beginning with #{@cur_token.inspect}."
+            raise Error::ParseError, "Extra tokens beginning with #{@cur_token.inspect}."
           end
         ensure
           _clean_scanner
@@ -203,10 +203,10 @@ module RGeo
       
       def _check_factory_support  # :nodoc:
         if @cur_expect_z && !@cur_factory_support_z
-          raise Errors::ParseError, "Geometry calls for Z coordinate but factory doesn't support it."
+          raise Error::ParseError, "Geometry calls for Z coordinate but factory doesn't support it."
         end
         if @cur_expect_m && !@cur_factory_support_m
-          raise Errors::ParseError, "Geometry calls for M coordinate but factory doesn't support it."
+          raise Error::ParseError, "Geometry calls for M coordinate but factory doesn't support it."
         end
       end
       
@@ -245,13 +245,13 @@ module RGeo
           if @cur_expect_z.nil?
             @cur_expect_z = expect_z_
           elsif expect_z_ != @cur_expect_z
-            raise Errors::ParseError, "Surrounding collection has Z but contained geometry doesn't."
+            raise Error::ParseError, "Surrounding collection has Z but contained geometry doesn't."
           end
           expect_m_ = zm_[-1,1] == 'm' ? true : false
           if @cur_expect_m.nil?
             @cur_expect_m = expect_m_
           else expect_m_ != @cur_expect_m
-            raise Errors::ParseError, "Surrounding collection has M but contained geometry doesn't."
+            raise Error::ParseError, "Surrounding collection has M but contained geometry doesn't."
           end
           if creating_expectation_
             if @cur_factory
@@ -277,7 +277,7 @@ module RGeo
         when 'multipolygon'
           _parse_multi_polygon
         else
-          raise Errors::ParseError, "Unknown type tag: #{type_.inspect}."
+          raise Error::ParseError, "Unknown type tag: #{type_.inspect}."
         end
       end
       
@@ -301,7 +301,7 @@ module RGeo
           @cur_expect_m = num_extras_ > 0 && (!@cur_factory || @cur_factory_support_m) ? true : false
           num_extras_ -= 1 if @cur_expect_m
           if num_extras_ > 0
-            raise Errors::ParseError, "Found #{extra_.size+2} coordinates, which is too many for this factory."
+            raise Error::ParseError, "Found #{extra_.size+2} coordinates, which is too many for this factory."
           end
           _ensure_factory
         else
@@ -461,7 +461,7 @@ module RGeo
       
       def _expect_token_type(type_)  # :nodoc:
         unless type_ === @cur_token
-          raise Errors::ParseError, "#{type_.inspect} expected but #{@cur_token.inspect} found."
+          raise Error::ParseError, "#{type_.inspect} expected but #{@cur_token.inspect} found."
         end
       end
       
@@ -481,7 +481,7 @@ module RGeo
           when ']',')'
             @cur_token = :end
           else
-            raise Errors::ParseError, "Bad token: #{token_.inspect}"
+            raise Error::ParseError, "Bad token: #{token_.inspect}"
           end
         else
           @cur_token = nil

data/{tests → test}/active_record/tc_mysqlspatial.rb

@@ -111,7 +111,7 @@ if ::File.exists?(::File.dirname(__FILE__)+'/database.yml')
             klass_.connection.create_table(:spatial_test) do |t_|
               t_.column 'latlon', :geometry
             end
-            assert_equal(::RGeo::Features::Geometry, klass_.columns.last.geometric_type)
+            assert_equal(::RGeo::Feature::Geometry, klass_.columns.last.geometric_type)
             assert(klass_.cached_attributes.include?('latlon'))
           end
           
@@ -121,7 +121,7 @@ if ::File.exists?(::File.dirname(__FILE__)+'/database.yml')
             klass_.connection.create_table(:spatial_test) do |t_|
               t_.column 'latlon', :point
             end
-            assert_equal(::RGeo::Features::Point, klass_.columns.last.geometric_type)
+            assert_equal(::RGeo::Feature::Point, klass_.columns.last.geometric_type)
             assert(klass_.cached_attributes.include?('latlon'))
           end
           

data/{tests → test}/common/geometry_collection_tests.rb

@@ -59,8 +59,8 @@ module RGeo
         def test_creation_simple
           geom_ = @factory.collection([@point1, @line1])
           assert_not_nil(geom_)
-          assert(::RGeo::Features::GeometryCollection === geom_)
-          assert_equal(::RGeo::Features::GeometryCollection, geom_.geometry_type)
+          assert(::RGeo::Feature::GeometryCollection === geom_)
+          assert_equal(::RGeo::Feature::GeometryCollection, geom_.geometry_type)
           assert_equal(2, geom_.num_geometries)
           assert(@point1.eql?(geom_[0]))
           assert(@line1.eql?(geom_[1]))
@@ -70,8 +70,8 @@ module RGeo
         def test_creation_empty
           geom_ = @factory.collection([])
           assert_not_nil(geom_)
-          assert(::RGeo::Features::GeometryCollection === geom_)
-          assert_equal(::RGeo::Features::GeometryCollection, geom_.geometry_type)
+          assert(::RGeo::Feature::GeometryCollection === geom_)
+          assert_equal(::RGeo::Feature::GeometryCollection, geom_.geometry_type)
           assert_equal(0, geom_.num_geometries)
           assert_equal([], geom_.to_a)
         end
@@ -80,8 +80,8 @@ module RGeo
         def test_creation_save_klass
           geom_ = @factory.collection([@point1, @line3])
           assert_not_nil(geom_)
-          assert(::RGeo::Features::GeometryCollection === geom_)
-          assert_equal(::RGeo::Features::GeometryCollection, geom_.geometry_type)
+          assert(::RGeo::Feature::GeometryCollection === geom_)
+          assert_equal(::RGeo::Feature::GeometryCollection, geom_.geometry_type)
           assert_equal(2, geom_.num_geometries)
           assert(geom_[1].eql?(@line3))
         end
@@ -91,8 +91,8 @@ module RGeo
           geom1_ = @factory.collection([@point1, @line1])
           geom2_ = @factory.collection([@point2, geom1_])
           assert_not_nil(geom2_)
-          assert(::RGeo::Features::GeometryCollection === geom2_)
-          assert_equal(::RGeo::Features::GeometryCollection, geom2_.geometry_type)
+          assert(::RGeo::Feature::GeometryCollection === geom2_)
+          assert_equal(::RGeo::Feature::GeometryCollection, geom2_.geometry_type)
           assert_equal(2, geom2_.num_geometries)
           assert(geom2_[1].eql?(geom1_))
         end
@@ -103,10 +103,10 @@ module RGeo
           geom2_ = @factory.collection([@point2, geom1_])
           ::GC.start
           assert_not_nil(geom2_)
-          assert(::RGeo::Features::GeometryCollection === geom2_)
-          assert_equal(::RGeo::Features::GeometryCollection, geom2_.geometry_type)
+          assert(::RGeo::Feature::GeometryCollection === geom2_)
+          assert_equal(::RGeo::Feature::GeometryCollection, geom2_.geometry_type)
           assert_equal(2, geom2_.num_geometries)
-          assert_equal(::RGeo::Features::Line, geom2_[1][1].geometry_type)
+          assert_equal(::RGeo::Feature::Line, geom2_[1][1].geometry_type)
         end
         
         
@@ -160,7 +160,7 @@ module RGeo
           geom1_ = @factory.collection([@point1, @line1])
           geom2_ = geom1_.clone
           assert(geom1_.eql?(geom2_))
-          assert_equal(::RGeo::Features::GeometryCollection, geom2_.geometry_type)
+          assert_equal(::RGeo::Feature::GeometryCollection, geom2_.geometry_type)
           assert_equal(2, geom2_.num_geometries)
           assert(@point1.eql?(geom2_[0]))
           assert(@line1.eql?(geom2_[1]))
@@ -169,15 +169,15 @@ module RGeo
         
         def test_type_check
           geom1_ = @factory.collection([@point1, @line1])
-          assert(::RGeo::Features::Geometry.check_type(geom1_))
-          assert(!::RGeo::Features::Point.check_type(geom1_))
-          assert(::RGeo::Features::GeometryCollection.check_type(geom1_))
-          assert(!::RGeo::Features::MultiPoint.check_type(geom1_))
+          assert(::RGeo::Feature::Geometry.check_type(geom1_))
+          assert(!::RGeo::Feature::Point.check_type(geom1_))
+          assert(::RGeo::Feature::GeometryCollection.check_type(geom1_))
+          assert(!::RGeo::Feature::MultiPoint.check_type(geom1_))
           geom2_ = @factory.collection([@point1, @point2])
-          assert(::RGeo::Features::Geometry.check_type(geom2_))
-          assert(!::RGeo::Features::Point.check_type(geom2_))
-          assert(::RGeo::Features::GeometryCollection.check_type(geom2_))
-          assert(!::RGeo::Features::MultiPoint.check_type(geom2_))
+          assert(::RGeo::Feature::Geometry.check_type(geom2_))
+          assert(!::RGeo::Feature::Point.check_type(geom2_))
+          assert(::RGeo::Feature::GeometryCollection.check_type(geom2_))
+          assert(!::RGeo::Feature::MultiPoint.check_type(geom2_))
         end
         
         
@@ -218,7 +218,7 @@ module RGeo
         def test_empty_collection_envelope
           empty_ = @factory.collection([])
           envelope_ = empty_.envelope
-          assert_equal(Features::GeometryCollection, envelope_.geometry_type)
+          assert_equal(Feature::GeometryCollection, envelope_.geometry_type)
           assert_equal(0, envelope_.num_geometries)
         end
         
@@ -226,7 +226,7 @@ module RGeo
         def test_empty_collection_boundary
           empty_ = @factory.collection([])
           boundary_ = empty_.boundary
-          assert_equal(Features::GeometryCollection, boundary_.geometry_type)
+          assert_equal(Feature::GeometryCollection, boundary_.geometry_type)
           assert_equal(0, boundary_.num_geometries)
         end
         

data/{tests → test}/common/line_string_tests.rb

@@ -49,7 +49,7 @@ module RGeo
           point2_ = @factory.point(0, 1)
           line1_ = @factory.line_string([point1_, point2_])
           assert_not_nil(line1_)
-          assert_equal(::RGeo::Features::LineString, line1_.geometry_type)
+          assert_equal(::RGeo::Feature::LineString, line1_.geometry_type)
           assert_equal(2, line1_.num_points)
           assert_equal(point1_, line1_.point_n(0))
           assert_equal(point2_, line1_.point_n(1))
@@ -64,7 +64,7 @@ module RGeo
           point3_ = @factory.point(1, 0)
           line2_ = @factory.line_string([point1_, point2_, point3_])
           assert_not_nil(line2_)
-          assert_equal(::RGeo::Features::LineString, line2_.geometry_type)
+          assert_equal(::RGeo::Feature::LineString, line2_.geometry_type)
           assert_equal(3, line2_.num_points)
           assert_equal(point1_, line2_.point_n(0))
           assert_equal(point2_, line2_.point_n(1))
@@ -79,7 +79,7 @@ module RGeo
           point1_ = @factory.point(0, 0)
           line3_ = @factory.line_string([point1_, point1_])
           assert_not_nil(line3_)
-          assert_equal(::RGeo::Features::LineString, line3_.geometry_type)
+          assert_equal(::RGeo::Feature::LineString, line3_.geometry_type)
           assert_equal(2, line3_.num_points)
           assert_equal(point1_, line3_.point_n(0))
           assert_equal(point1_, line3_.point_n(1))
@@ -91,7 +91,7 @@ module RGeo
         def test_creation_points_empty
           line4_ = @factory.line_string([])
           assert_not_nil(line4_)
-          assert_equal(::RGeo::Features::LineString, line4_.geometry_type)
+          assert_equal(::RGeo::Feature::LineString, line4_.geometry_type)
           assert_equal(0, line4_.num_points)
           assert_nil(line4_.start_point)
           assert_nil(line4_.end_point)
@@ -104,10 +104,10 @@ module RGeo
           point3_ = @factory.point(1, 1)
           line1_ = @factory.line_string([point1_, point2_, point3_])
           assert_not_nil(line1_)
-          assert(::RGeo::Features::LineString === line1_)
-          assert(!(::RGeo::Features::LinearRing === line1_))
-          assert(!(::RGeo::Features::Line === line1_))
-          assert_equal(::RGeo::Features::LineString, line1_.geometry_type)
+          assert(::RGeo::Feature::LineString === line1_)
+          assert(!(::RGeo::Feature::LinearRing === line1_))
+          assert(!(::RGeo::Feature::Line === line1_))
+          assert_equal(::RGeo::Feature::LineString, line1_.geometry_type)
         end
         
         
@@ -118,14 +118,14 @@ module RGeo
           line1_ = @factory.linear_ring([point1_, point2_, point3_, point1_])
           assert_not_nil(line1_)
           assert(line1_.is_ring?)
-          assert(::RGeo::Features::LinearRing === line1_)
-          assert_equal(::RGeo::Features::LinearRing, line1_.geometry_type)
+          assert(::RGeo::Feature::LinearRing === line1_)
+          assert_equal(::RGeo::Feature::LinearRing, line1_.geometry_type)
           line2_ = @factory.linear_ring([point1_, point2_, point3_])
           assert_not_nil(line2_)
           assert(line2_.is_ring?)
-          assert(::RGeo::Features::LinearRing === line2_)
+          assert(::RGeo::Feature::LinearRing === line2_)
           assert_equal(4, line2_.num_points)
-          assert_equal(::RGeo::Features::LinearRing, line2_.geometry_type)
+          assert_equal(::RGeo::Feature::LinearRing, line2_.geometry_type)
         end
         
         
@@ -134,8 +134,8 @@ module RGeo
           point2_ = @factory.point(0, 1)
           line1_ = @factory.line(point1_, point2_)
           assert_not_nil(line1_)
-          assert(::RGeo::Features::Line === line1_)
-          assert_equal(::RGeo::Features::Line, line1_.geometry_type)
+          assert(::RGeo::Feature::Line === line1_)
+          assert_equal(::RGeo::Feature::Line, line1_.geometry_type)
         end
         
         
@@ -254,12 +254,12 @@ module RGeo
           point1_ = @factory.point(0, 0)
           point2_ = @factory.point(0, 1)
           line_ = @factory.line_string([point1_, point2_])
-          assert(::RGeo::Features::Geometry.check_type(line_))
-          assert(!::RGeo::Features::Point.check_type(line_))
-          assert(!::RGeo::Features::GeometryCollection.check_type(line_))
-          assert(::RGeo::Features::Curve.check_type(line_))
-          assert(::RGeo::Features::LineString.check_type(line_))
-          assert(!::RGeo::Features::LinearRing.check_type(line_))
+          assert(::RGeo::Feature::Geometry.check_type(line_))
+          assert(!::RGeo::Feature::Point.check_type(line_))
+          assert(!::RGeo::Feature::GeometryCollection.check_type(line_))
+          assert(::RGeo::Feature::Curve.check_type(line_))
+          assert(::RGeo::Feature::LineString.check_type(line_))
+          assert(!::RGeo::Feature::LinearRing.check_type(line_))
         end
         
         

data/{tests → test}/common/multi_line_string_tests.rb

@@ -61,8 +61,8 @@ module RGeo
         def test_creation_simple
           geom_ = @factory.multi_line_string([@linestring1, @linestring2])
           assert_not_nil(geom_)
-          assert(::RGeo::Features::MultiLineString === geom_)
-          assert_equal(::RGeo::Features::MultiLineString, geom_.geometry_type)
+          assert(::RGeo::Feature::MultiLineString === geom_)
+          assert_equal(::RGeo::Feature::MultiLineString, geom_.geometry_type)
           assert_equal(2, geom_.num_geometries)
           assert(@linestring1.eql?(geom_[0]))
           assert(@linestring2.eql?(geom_[1]))
@@ -72,8 +72,8 @@ module RGeo
         def test_creation_empty
           geom_ = @factory.multi_line_string([])
           assert_not_nil(geom_)
-          assert(::RGeo::Features::MultiLineString === geom_)
-          assert_equal(::RGeo::Features::MultiLineString, geom_.geometry_type)
+          assert(::RGeo::Feature::MultiLineString === geom_)
+          assert_equal(::RGeo::Feature::MultiLineString, geom_.geometry_type)
           assert_equal(0, geom_.num_geometries)
           assert_equal([], geom_.to_a)
         end
@@ -82,8 +82,8 @@ module RGeo
         def test_creation_save_types
           geom_ = @factory.multi_line_string([@linestring1, @linearring1, @line1])
           assert_not_nil(geom_)
-          assert(::RGeo::Features::MultiLineString === geom_)
-          assert_equal(::RGeo::Features::MultiLineString, geom_.geometry_type)
+          assert(::RGeo::Feature::MultiLineString === geom_)
+          assert_equal(::RGeo::Feature::MultiLineString, geom_.geometry_type)
           assert_equal(3, geom_.num_geometries)
           assert(geom_[1].eql?(@linearring1))
           assert(geom_[2].eql?(@line1))
@@ -95,7 +95,7 @@ module RGeo
           mls2_ = @factory.multi_line_string([@linearring1])
           geom_ = @factory.multi_line_string([@linestring1, @linestring2, mls1_, mls2_])
           assert_not_nil(geom_)
-          assert_equal(::RGeo::Features::MultiLineString, geom_.geometry_type)
+          assert_equal(::RGeo::Feature::MultiLineString, geom_.geometry_type)
           assert_equal(4, geom_.num_geometries)
           assert(@linestring1.eql?(geom_[0]))
           assert(@linestring2.eql?(geom_[1]))
@@ -137,7 +137,7 @@ module RGeo
         
         def test_wkt_creation_empty
           parsed_geom_ = @factory.parse_wkt('MULTILINESTRING EMPTY')
-          assert_equal(::RGeo::Features::MultiLineString, parsed_geom_.geometry_type)
+          assert_equal(::RGeo::Feature::MultiLineString, parsed_geom_.geometry_type)
           assert_equal(0, parsed_geom_.num_geometries)
           assert_equal([], parsed_geom_.to_a)
         end
@@ -147,7 +147,7 @@ module RGeo
           geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
           geom2_ = geom1_.clone
           assert(geom1_.eql?(geom2_))
-          assert_equal(::RGeo::Features::MultiLineString, geom2_.geometry_type)
+          assert_equal(::RGeo::Feature::MultiLineString, geom2_.geometry_type)
           assert_equal(2, geom2_.num_geometries)
           assert(@linestring1.eql?(geom2_[0]))
           assert(@linestring2.eql?(geom2_[1]))
@@ -156,17 +156,17 @@ module RGeo
         
         def test_type_check
           geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
-          assert(::RGeo::Features::Geometry.check_type(geom1_))
-          assert(!::RGeo::Features::LineString.check_type(geom1_))
-          assert(::RGeo::Features::GeometryCollection.check_type(geom1_))
-          assert(!::RGeo::Features::MultiPoint.check_type(geom1_))
-          assert(::RGeo::Features::MultiLineString.check_type(geom1_))
+          assert(::RGeo::Feature::Geometry.check_type(geom1_))
+          assert(!::RGeo::Feature::LineString.check_type(geom1_))
+          assert(::RGeo::Feature::GeometryCollection.check_type(geom1_))
+          assert(!::RGeo::Feature::MultiPoint.check_type(geom1_))
+          assert(::RGeo::Feature::MultiLineString.check_type(geom1_))
           geom2_ = @factory.multi_line_string([])
-          assert(::RGeo::Features::Geometry.check_type(geom2_))
-          assert(!::RGeo::Features::LineString.check_type(geom2_))
-          assert(::RGeo::Features::GeometryCollection.check_type(geom2_))
-          assert(!::RGeo::Features::MultiPoint.check_type(geom2_))
-          assert(::RGeo::Features::MultiLineString.check_type(geom2_))
+          assert(::RGeo::Feature::Geometry.check_type(geom2_))
+          assert(!::RGeo::Feature::LineString.check_type(geom2_))
+          assert(::RGeo::Feature::GeometryCollection.check_type(geom2_))
+          assert(!::RGeo::Feature::MultiPoint.check_type(geom2_))
+          assert(::RGeo::Feature::MultiLineString.check_type(geom2_))
         end
         
         

data/{tests → test}/common/multi_point_tests.rb

@@ -57,8 +57,8 @@ module RGeo
         def test_creation_simple
           geom_ = @factory.multi_point([@point1, @point2])
           assert_not_nil(geom_)
-          assert(::RGeo::Features::MultiPoint === geom_)
-          assert_equal(::RGeo::Features::MultiPoint, geom_.geometry_type)
+          assert(::RGeo::Feature::MultiPoint === geom_)
+          assert_equal(::RGeo::Feature::MultiPoint, geom_.geometry_type)
           assert_equal(2, geom_.num_geometries)
           assert(@point1.eql?(geom_[0]))
           assert(@point2.eql?(geom_[1]))
@@ -68,8 +68,8 @@ module RGeo
         def test_creation_empty
           geom_ = @factory.multi_point([])
           assert_not_nil(geom_)
-          assert(::RGeo::Features::MultiPoint === geom_)
-          assert_equal(::RGeo::Features::MultiPoint, geom_.geometry_type)
+          assert(::RGeo::Feature::MultiPoint === geom_)
+          assert_equal(::RGeo::Feature::MultiPoint, geom_.geometry_type)
           assert_equal(0, geom_.num_geometries)
           assert_equal([], geom_.to_a)
         end
@@ -80,7 +80,7 @@ module RGeo
           mp2_ = @factory.multi_point([@point4])
           geom_ = @factory.multi_point([@point1, @point2, mp1_, mp2_])
           assert_not_nil(geom_)
-          assert_equal(::RGeo::Features::MultiPoint, geom_.geometry_type)
+          assert_equal(::RGeo::Feature::MultiPoint, geom_.geometry_type)
           assert_equal(4, geom_.num_geometries)
           assert(@point1.eql?(geom_[0]))
           assert(@point2.eql?(geom_[1]))
@@ -129,7 +129,7 @@ module RGeo
         
         def test_wkt_creation_empty
           parsed_geom_ = @factory.parse_wkt('MULTIPOINT EMPTY')
-          assert(::RGeo::Features::MultiPoint === parsed_geom_)
+          assert(::RGeo::Feature::MultiPoint === parsed_geom_)
           assert_equal(0, parsed_geom_.num_geometries)
           assert_equal([], parsed_geom_.to_a)
         end
@@ -139,7 +139,7 @@ module RGeo
           geom1_ = @factory.multi_point([@point1, @point2])
           geom2_ = geom1_.clone
           assert(geom1_.eql?(geom2_))
-          assert_equal(::RGeo::Features::MultiPoint, geom2_.geometry_type)
+          assert_equal(::RGeo::Feature::MultiPoint, geom2_.geometry_type)
           assert_equal(2, geom2_.num_geometries)
           assert(@point1.eql?(geom2_[0]))
           assert(@point2.eql?(geom2_[1]))
@@ -148,17 +148,17 @@ module RGeo
         
         def test_type_check
           geom1_ = @factory.multi_point([@point1, @point2])
-          assert(::RGeo::Features::Geometry.check_type(geom1_))
-          assert(!::RGeo::Features::Point.check_type(geom1_))
-          assert(::RGeo::Features::GeometryCollection.check_type(geom1_))
-          assert(::RGeo::Features::MultiPoint.check_type(geom1_))
-          assert(!::RGeo::Features::MultiLineString.check_type(geom1_))
+          assert(::RGeo::Feature::Geometry.check_type(geom1_))
+          assert(!::RGeo::Feature::Point.check_type(geom1_))
+          assert(::RGeo::Feature::GeometryCollection.check_type(geom1_))
+          assert(::RGeo::Feature::MultiPoint.check_type(geom1_))
+          assert(!::RGeo::Feature::MultiLineString.check_type(geom1_))
           geom2_ = @factory.multi_point([])
-          assert(::RGeo::Features::Geometry.check_type(geom2_))
-          assert(!::RGeo::Features::Point.check_type(geom2_))
-          assert(::RGeo::Features::GeometryCollection.check_type(geom2_))
-          assert(::RGeo::Features::MultiPoint.check_type(geom2_))
-          assert(!::RGeo::Features::MultiLineString.check_type(geom2_))
+          assert(::RGeo::Feature::Geometry.check_type(geom2_))
+          assert(!::RGeo::Feature::Point.check_type(geom2_))
+          assert(::RGeo::Feature::GeometryCollection.check_type(geom2_))
+          assert(::RGeo::Feature::MultiPoint.check_type(geom2_))
+          assert(!::RGeo::Feature::MultiLineString.check_type(geom2_))
         end