rgeo 2.4.0 → 3.0.0.pre.rc.1

data/lib/rgeo/feature/geometry.rb

@@ -90,7 +90,7 @@ module RGeo
       # operations on them.)
 
       def factory
-        raise Error::UnsupportedOperation, "Method Geometry#factory not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#factory not defined."
       end
 
       # === SFS 1.1 Description
@@ -105,7 +105,7 @@ module RGeo
       # point geometries, 1 for curves, and 2 for surfaces.
 
       def dimension
-        raise Error::UnsupportedOperation, "Method Geometry#dimension not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#dimension not defined."
       end
 
       # === SFS 1.1 Description
@@ -122,7 +122,7 @@ module RGeo
       # call the +type_name+ method of the returned module.
 
       def geometry_type
-        raise Error::UnsupportedOperation, "Method Geometry#geometry_type not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#geometry_type not defined."
       end
 
       # === SFS 1.1 Description
@@ -137,7 +137,7 @@ module RGeo
       # stored in either the same or some other datastore.
 
       def srid
-        raise Error::UnsupportedOperation, "Method Geometry#srid not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#srid not defined."
       end
 
       # === SFS 1.1 Description
@@ -151,7 +151,7 @@ module RGeo
       # Returns an object that supports the Geometry interface.
 
       def envelope
-        raise Error::UnsupportedOperation, "Method Geometry#envelope not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#envelope not defined."
       end
 
       # === SFS 1.1 Description
@@ -164,7 +164,7 @@ module RGeo
       # Returns an ASCII string.
 
       def as_text
-        raise Error::UnsupportedOperation, "Method Geometry#as_text not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#as_text not defined."
       end
 
       # === SFS 1.1 Description
@@ -177,7 +177,7 @@ module RGeo
       # Returns a binary string.
 
       def as_binary
-        raise Error::UnsupportedOperation, "Method Geometry#as_binary not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#as_binary not defined."
       end
 
       # === SFS 1.1 Description
@@ -192,7 +192,7 @@ module RGeo
       # specification, which stipulates an integer return value.
 
       def empty?
-        raise Error::UnsupportedOperation, "Method Geometry#empty? not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#empty? not defined."
       end
 
       def is_empty?
@@ -214,7 +214,7 @@ module RGeo
       # specification, which stipulates an integer return value.
 
       def simple?
-        raise Error::UnsupportedOperation, "Method Geometry#simple? not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#simple? not defined."
       end
 
       def is_simple?
@@ -234,7 +234,7 @@ module RGeo
       # Returns an object that supports the Geometry interface.
 
       def boundary
-        raise Error::UnsupportedOperation, "Method Geometry#boundary not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#boundary not defined."
       end
 
       # === SFS 1.1 Description
@@ -253,7 +253,7 @@ module RGeo
       # from different factories is undefined.
 
       def equals?(another_geometry)
-        raise Error::UnsupportedOperation, "Method Geometry#equals? not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#equals? not defined."
       end
 
       # === SFS 1.1 Description
@@ -272,7 +272,7 @@ module RGeo
       # from different factories is undefined.
 
       def disjoint?(another_geometry)
-        raise Error::UnsupportedOperation, "Method Geometry#disjoint? not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#disjoint? not defined."
       end
 
       # === SFS 1.1 Description
@@ -291,7 +291,7 @@ module RGeo
       # from different factories is undefined.
 
       def intersects?(another_geometry)
-        raise Error::UnsupportedOperation, "Method Geometry#intersects? not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#intersects? not defined."
       end
 
       # === SFS 1.1 Description
@@ -310,7 +310,7 @@ module RGeo
       # from different factories is undefined.
 
       def touches?(another_geometry)
-        raise Error::UnsupportedOperation, "Method Geometry#touches? not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#touches? not defined."
       end
 
       # === SFS 1.1 Description
@@ -329,7 +329,7 @@ module RGeo
       # from different factories is undefined.
 
       def crosses?(another_geometry)
-        raise Error::UnsupportedOperation, "Method Geometry#crosses? not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#crosses? not defined."
       end
 
       # === SFS 1.1 Description
@@ -348,7 +348,7 @@ module RGeo
       # from different factories is undefined.
 
       def within?(another_geometry)
-        raise Error::UnsupportedOperation, "Method Geometry#within? not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#within? not defined."
       end
 
       # === SFS 1.1 Description
@@ -367,7 +367,7 @@ module RGeo
       # from different factories is undefined.
 
       def contains?(another_geometry)
-        raise Error::UnsupportedOperation, "Method Geometry#contains? not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#contains? not defined."
       end
 
       # === SFS 1.1 Description
@@ -386,7 +386,7 @@ module RGeo
       # from different factories is undefined.
 
       def overlaps?(another_geometry)
-        raise Error::UnsupportedOperation, "Method Geometry#overlaps? not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#overlaps? not defined."
       end
 
       # === SFS 1.1 Description
@@ -412,7 +412,7 @@ module RGeo
       # from different factories is undefined.
 
       def relate?(another_geometry, _intersection_pattern_matrix_)
-        raise Error::UnsupportedOperation, "Method Geometry#relate not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#relate not defined."
       end
 
       # === SFS 1.1 Description
@@ -431,7 +431,7 @@ module RGeo
       # distance between objects from different factories is undefined.
 
       def distance(another_geometry)
-        raise Error::UnsupportedOperation, "Method Geometry#distance not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#distance not defined."
       end
 
       # === SFS 1.1 Description
@@ -446,7 +446,7 @@ module RGeo
       # Returns an object that supports the Geometry interface.
 
       def buffer(_distance_)
-        raise Error::UnsupportedOperation, "Method Geometry#buffer not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#buffer not defined."
       end
 
       # === SFS 1.1 Description
@@ -459,7 +459,7 @@ module RGeo
       # Returns an object that supports the Geometry interface.
 
       def convex_hull
-        raise Error::UnsupportedOperation, "Method Geometry#convex_hull not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#convex_hull not defined."
       end
 
       # === SFS 1.1 Description
@@ -477,7 +477,7 @@ module RGeo
       # operations on objects from different factories is undefined.
 
       def intersection(another_geometry)
-        raise Error::UnsupportedOperation, "Method Geometry#intersection not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#intersection not defined."
       end
 
       # === SFS 1.1 Description
@@ -495,7 +495,7 @@ module RGeo
       # operations on objects from different factories is undefined.
 
       def union(another_geometry)
-        raise Error::UnsupportedOperation, "Method Geometry#union not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#union not defined."
       end
 
       # === SFS 1.1 Description
@@ -513,7 +513,7 @@ module RGeo
       # operations on objects from different factories is undefined.
 
       def difference(another_geometry)
-        raise Error::UnsupportedOperation, "Method Geometry#difference not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#difference not defined."
       end
 
       # === SFS 1.1 Description
@@ -531,7 +531,7 @@ module RGeo
       # operations on objects from different factories is undefined.
 
       def sym_difference(another_geometry)
-        raise Error::UnsupportedOperation, "Method Geometry#sym_difference not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#sym_difference not defined."
       end
 
       # Returns true if this geometric object is representationally
@@ -543,7 +543,7 @@ module RGeo
       # from different factories is undefined.
 
       def rep_equals?(another_geometry)
-        raise Error::UnsupportedOperation, "Method Geometry#rep_equals? not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#rep_equals? not defined."
       end
 
       # Unions a collection of Geometry or a single Geometry
@@ -560,7 +560,7 @@ module RGeo
       # returns nil.
       #
       def unary_union
-        raise Error::UnsupportedOperation, "Method Geometry#unary_union not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#unary_union not defined."
       end
 
       # This method should behave almost the same as the rep_equals?

data/lib/rgeo/feature/geometry_collection.rb

@@ -44,7 +44,7 @@ module RGeo
       # Returns an integer.
 
       def num_geometries
-        raise Error::UnsupportedOperation, "Method GeometryCollection#num_geometries not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#num_geometries not defined."
       end
 
       # === SFS 1.1 Description
@@ -59,7 +59,7 @@ module RGeo
       # in that it does not support negative indexes.
 
       def geometry_n(n)
-        raise Error::UnsupportedOperation, "Method GeometryCollection#geometry_n not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#geometry_n not defined."
       end
 
       # Alias of the num_geometries method.
@@ -79,13 +79,13 @@ module RGeo
       # returns nil, where [-1] returns the last element of the collection.
 
       def [](n)
-        raise Error::UnsupportedOperation, "Method GeometryCollection#[] not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#[] not defined."
       end
 
       # Nodes the linework in a list of Geometries
       #
       def node
-        raise Error::UnsupportedOperation, "Method GeometryCollection#node not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#node not defined."
       end
 
       # Iterates over the geometries of this GeometryCollection.
@@ -96,7 +96,15 @@ module RGeo
       # include the Enumerable mixin.
 
       def each(&block)
-        raise Error::UnsupportedOperation, "Method GeometryCollection#each not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#each not defined."
+      end
+
+      # Gives a point that is guaranteed to be within the geometry.
+      #
+      # Extends OGC SFS 1.1 and follows PostGIS standards.
+      # @see https://postgis.net/docs/ST_PointOnSurface.html
+      def point_on_surface
+        raise Error::UnsupportedOperation, "Method #{self.class}#each not defined."
       end
     end
   end

data/lib/rgeo/feature/line_string.rb

@@ -34,7 +34,7 @@ module RGeo
       # Returns an integer.
 
       def num_points
-        raise Error::UnsupportedOperation, "Method LineString#num_points not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#num_points not defined."
       end
 
       # === SFS 1.1 Description
@@ -48,14 +48,14 @@ module RGeo
       # Does not support negative indexes.
 
       def point_n(n)
-        raise Error::UnsupportedOperation, "Method LineString#point_n not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#point_n not defined."
       end
 
       # Returns the constituent points as an array of objects that
       # support the Point interface.
 
       def points
-        raise Error::UnsupportedOperation, "Method LineString#points not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#points not defined."
       end
     end
   end

data/lib/rgeo/feature/multi_surface.rb

@@ -43,7 +43,7 @@ module RGeo
       # Returns a floating-point scalar value.
 
       def area
-        raise Error::UnsupportedOperation, "Method MultiSurface#area not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#area not defined."
       end
 
       # === SFS 1.1 Description
@@ -56,7 +56,7 @@ module RGeo
       # Returns an object that supports the Point interface.
 
       def centroid
-        raise Error::UnsupportedOperation, "Method MultiSurface#centroid not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#centroid not defined."
       end
 
       # === SFS 1.1 Description
@@ -68,7 +68,7 @@ module RGeo
       # Returns an object that supports the Point interface.
 
       def point_on_surface
-        raise Error::UnsupportedOperation, "Method MultiSurface#point_on_surface not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#point_on_surface not defined."
       end
     end
   end

data/lib/rgeo/feature/point.rb

@@ -47,7 +47,7 @@ module RGeo
       # Returns a floating-point scalar value.
 
       def x
-        raise Error::UnsupportedOperation, "Method Point#x not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#x not defined."
       end
 
       # === SFS 1.1 Description
@@ -59,7 +59,7 @@ module RGeo
       # Returns a floating-point scalar value.
 
       def y
-        raise Error::UnsupportedOperation, "Method Point#y not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#y not defined."
       end
 
       # Returns the z-coordinate for this Point as a floating-point
@@ -69,7 +69,7 @@ module RGeo
       # not support Z coordinates.
 
       def z
-        raise Error::UnsupportedOperation, "Method Point#z not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#z not defined."
       end
 
       # Returns the m-coordinate for this Point as a floating-point
@@ -79,7 +79,7 @@ module RGeo
       # not support M coordinates.
 
       def m
-        raise Error::UnsupportedOperation, "Method Point#m not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class}#m not defined."
       end
     end
   end

data/lib/rgeo/feature/surface.rb

@@ -49,7 +49,7 @@ module RGeo
       # Returns a floating-point scalar value.
 
       def area
-        raise Error::UnsupportedOperation, "Method Surface#area not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class.name}#area not defined."
       end
 
       # === SFS 1.1 Description
@@ -62,7 +62,7 @@ module RGeo
       # Returns an object that supports the Point interface.
 
       def centroid
-        raise Error::UnsupportedOperation, "Method Surface#centroid not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class.name}#centroid not defined."
       end
 
       # === SFS 1.1 Description
@@ -74,7 +74,7 @@ module RGeo
       # Returns an object that supports the Point interface.
 
       def point_on_surface
-        raise Error::UnsupportedOperation, "Method Surface#point_on_surface not defined."
+        raise Error::UnsupportedOperation, "Method #{self.class.name}#point_on_surface not defined."
       end
     end
   end

data/lib/rgeo/geographic/factory.rb

@@ -42,7 +42,6 @@ module RGeo
         if @coord_sys.is_a?(String)
           @coord_sys = CoordSys::CS.create_from_wkt(@coord_sys)
         end
-        @lenient_assertions = opts[:uses_lenient_assertions] ? true : false
         @buffer_resolution = opts[:buffer_resolution].to_i
         @buffer_resolution = 1 if @buffer_resolution < 1
 
@@ -106,7 +105,6 @@ module RGeo
           "wkbg" => @wkb_generator.properties,
           "wktp" => @wkt_parser.properties,
           "wkbp" => @wkb_parser.properties,
-          "lena" => @lenient_assertions,
           "bufr" => @buffer_resolution
         }
         hash_["proj4"] = @proj4.marshal_dump if @proj4
@@ -138,7 +136,6 @@ module RGeo
           wkb_generator: symbolize_hash(data_["wkbg"]),
           wkt_parser: symbolize_hash(data_["wktp"]),
           wkb_parser: symbolize_hash(data_["wkbp"]),
-          uses_lenient_assertions: data_["lena"],
           buffer_resolution: data_["bufr"],
           proj4: proj4,
           coord_sys: coord_sys
@@ -164,7 +161,6 @@ module RGeo
         coder["wkb_generator"] = @wkb_generator.properties
         coder["wkt_parser"] = @wkt_parser.properties
         coder["wkb_parser"] = @wkb_parser.properties
-        coder["lenient_assertions"] = @lenient_assertions
         coder["buffer_resolution"] = @buffer_resolution
         if @proj4
           str = @proj4.original_str || @proj4.canonical_str
@@ -201,7 +197,6 @@ module RGeo
           wkb_generator: symbolize_hash(coder["wkb_generator"]),
           wkt_parser: symbolize_hash(coder["wkt_parser"]),
           wkb_parser: symbolize_hash(coder["wkb_parser"]),
-          uses_lenient_assertions: coder["lenient_assertions"],
           buffer_resolution: coder["buffer_resolution"],
           proj4: proj4,
           coord_sys: coord_sys
@@ -293,8 +288,6 @@ module RGeo
           @support_z
         when :has_m_coordinate
           @support_m
-        when :uses_lenient_assertions
-          @lenient_assertions
         when :buffer_resolution
           @buffer_resolution
         when :is_geographic

data/lib/rgeo/geographic/interface.rb

@@ -54,12 +54,6 @@ module RGeo
       #   Support a Z coordinate. Default is false.
       # [<tt>:has_m_coordinate</tt>]
       #   Support an M coordinate. Default is false.
-      # [<tt>:uses_lenient_assertions</tt>]
-      #   If set to true, assertion checking is disabled. This includes
-      #   simplicity checking on LinearRing, and validity checks on
-      #   Polygon and MultiPolygon. This may speed up creation of certain
-      #   objects, at the expense of not doing the proper checking for
-      #   OGC compliance. Default is false.
       # [<tt>:buffer_resolution</tt>]
       #   The resolution of buffers around geometries created by this
       #   factory. This controls the number of line segments used to
@@ -131,7 +125,6 @@ module RGeo
           has_m_coordinate: opts[:has_m_coordinate],
           proj4: proj4 || proj_4055,
           coord_sys: coord_sys || coord_sys_4055,
-          uses_lenient_assertions: opts[:uses_lenient_assertions],
           buffer_resolution: opts[:buffer_resolution],
           wkt_parser: opts[:wkt_parser],
           wkb_parser: opts[:wkb_parser],
@@ -207,10 +200,8 @@ module RGeo
       #
       # You may also provide options understood by the underlying
       # projected Cartesian factory. For example, if GEOS is used for the
-      # projected factory, you may also set the
-      # <tt>:lenient_multi_polygon_assertions</tt> and
-      # <tt>:buffer_resolution</tt> options. See RGeo::Geos.factory for
-      # more details.
+      # projected factory, you may also set the <tt>:buffer_resolution</tt>
+      # options. See RGeo::Geos.factory for more details.
 
       def simple_mercator_factory(opts = {})
         factory = Geographic::Factory.new("Projected",
@@ -222,12 +213,9 @@ module RGeo
           wkt_generator: opts[:wkt_generator],
           wkb_generator: opts[:wkb_generator],
           has_z_coordinate: opts[:has_z_coordinate],
-          has_m_coordinate: opts[:has_m_coordinate],
-          uses_lenient_assertions: opts[:uses_lenient_assertions])
+          has_m_coordinate: opts[:has_m_coordinate])
         projector = Geographic::SimpleMercatorProjector.new(factory,
           buffer_resolution: opts[:buffer_resolution],
-          lenient_multi_polygon_assertions: opts[:lenient_multi_polygon_assertions],
-          uses_lenient_assertions: opts[:uses_lenient_assertions],
           has_z_coordinate: opts[:has_z_coordinate],
           has_m_coordinate: opts[:has_m_coordinate])
         factory.projector = projector
@@ -342,9 +330,8 @@ module RGeo
       # If a <tt>:projection_factory</tt> is _not_ provided, you may also
       # provide options for configuring the projected Cartesian factory.
       # For example, if GEOS is used for the projected factory, you may
-      # also set the <tt>:lenient_multi_polygon_assertions</tt> and
-      # <tt>:buffer_resolution</tt> options. See RGeo::Geos.factory for
-      # more details.
+      # also set the <tt>:buffer_resolution</tt> option. See RGeo::Geos.factory
+      # for more details.
 
       def projected_factory(opts = {})
         CoordSys.check!(:proj4)
@@ -447,8 +434,6 @@ module RGeo
             srid: projection_srid,
             coord_sys: projection_coord_sys,
             buffer_resolution: opts[:buffer_resolution],
-            lenient_multi_polygon_assertions: opts[:lenient_multi_polygon_assertions],
-            uses_lenient_assertions: opts[:uses_lenient_assertions],
             has_z_coordinate: opts[:has_z_coordinate],
             has_m_coordinate: opts[:has_m_coordinate],
             wkt_parser: opts[:wkt_parser], wkt_generator: opts[:wkt_generator],

data/lib/rgeo/geographic/proj4_projector.rb

@@ -48,8 +48,6 @@ module RGeo
               proj4: proj4,
               coord_sys: opts[:coord_sys], srid: opts[:srid],
               buffer_resolution: opts[:buffer_resolution],
-              lenient_multi_polygon_assertions: opts[:lenient_multi_polygon_assertions],
-              uses_lenient_assertions: opts[:uses_lenient_assertions],
               has_z_coordinate: opts[:has_z_coordinate],
               has_m_coordinate: opts[:has_m_coordinate],
               wkt_parser: opts[:wkt_parser], wkt_generator: opts[:wkt_generator],

data/lib/rgeo/geographic/projected_feature_classes.rb

@@ -8,16 +8,18 @@
 
 module RGeo
   module Geographic
-    class ProjectedPointImpl # :nodoc:
+    class ProjectedPointImpl
       include Feature::Point
+      include ImplHelper::ValidityCheck
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicPointMethods
       include ProjectedGeometryMethods
       include ProjectedPointMethods
     end
 
-    class ProjectedLineStringImpl  # :nodoc:
+    class ProjectedLineStringImpl
       include Feature::LineString
+      include ImplHelper::ValidityCheck
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicLineStringMethods
       include ProjectedGeometryMethods
@@ -25,18 +27,21 @@ module RGeo
       include ProjectedLineStringMethods
     end
 
-    class ProjectedLinearRingImpl  # :nodoc:
+    class ProjectedLinearRingImpl
       include Feature::LinearRing
+      include ImplHelper::ValidityCheck
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicLineStringMethods
       include ImplHelper::BasicLinearRingMethods
       include ProjectedGeometryMethods
       include ProjectedNCurveMethods
       include ProjectedLineStringMethods
+      include ProjectedLinearRingMethods
     end
 
-    class ProjectedLineImpl # :nodoc:
+    class ProjectedLineImpl
       include Feature::Line
+      include ImplHelper::ValidityCheck
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicLineStringMethods
       include ImplHelper::BasicLineMethods
@@ -45,8 +50,9 @@ module RGeo
       include ProjectedLineStringMethods
     end
 
-    class ProjectedPolygonImpl # :nodoc:
+    class ProjectedPolygonImpl
       include Feature::Polygon
+      include ImplHelper::ValidityCheck
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicPolygonMethods
       include ProjectedGeometryMethods
@@ -54,23 +60,26 @@ module RGeo
       include ProjectedPolygonMethods
     end
 
-    class ProjectedGeometryCollectionImpl # :nodoc:
+    class ProjectedGeometryCollectionImpl
       include Feature::GeometryCollection
+      include ImplHelper::ValidityCheck
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicGeometryCollectionMethods
       include ProjectedGeometryMethods
     end
 
-    class ProjectedMultiPointImpl # :nodoc:
+    class ProjectedMultiPointImpl
       include Feature::MultiPoint
+      include ImplHelper::ValidityCheck
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicGeometryCollectionMethods
       include ImplHelper::BasicMultiPointMethods
       include ProjectedGeometryMethods
     end
 
-    class ProjectedMultiLineStringImpl # :nodoc:
+    class ProjectedMultiLineStringImpl
       include Feature::MultiLineString
+      include ImplHelper::ValidityCheck
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicGeometryCollectionMethods
       include ImplHelper::BasicMultiLineStringMethods
@@ -78,8 +87,9 @@ module RGeo
       include ProjectedNCurveMethods
     end
 
-    class ProjectedMultiPolygonImpl # :nodoc:
+    class ProjectedMultiPolygonImpl
       include Feature::MultiPolygon
+      include ImplHelper::ValidityCheck
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicGeometryCollectionMethods
       include ImplHelper::BasicMultiPolygonMethods
@@ -87,5 +97,7 @@ module RGeo
       include ProjectedNSurfaceMethods
       include ProjectedMultiPolygonMethods
     end
+
+    ImplHelper::ValidityCheck.override_classes
   end
 end