rgeo 2.4.0 → 3.0.0.pre.rc.1

data/lib/rgeo/geos/ffi_factory.rb

@@ -20,9 +20,6 @@ module RGeo
       # See RGeo::Geos.factory for a list of supported options.
 
       def initialize(opts = {})
-        # Main flags
-        @uses_lenient_multi_polygon_assertions = opts[:uses_lenient_assertions] ||
-          opts[:lenient_multi_polygon_assertions] || opts[:uses_lenient_multi_polygon_assertions]
         @has_z = opts[:has_z_coordinate] ? true : false
         @has_m = opts[:has_m_coordinate] ? true : false
         if @has_z && @has_m
@@ -145,7 +142,6 @@ module RGeo
           "wkbg" => @wkb_generator.properties,
           "wktp" => @wkt_parser.properties,
           "wkbp" => @wkb_parser.properties,
-          "lmpa" => @uses_lenient_multi_polygon_assertions,
           "apre" => @_auto_prepare
         }
         hash["proj4"] = @proj4.marshal_dump if @proj4
@@ -174,7 +170,6 @@ module RGeo
           wkb_generator: symbolize_hash(data["wkbg"]),
           wkt_parser: symbolize_hash(data["wktp"]),
           wkb_parser: symbolize_hash(data["wkbp"]),
-          uses_lenient_multi_polygon_assertions: data["lmpa"],
           auto_prepare: (data["apre"] ? :simple : :disabled),
           proj4: proj4,
           coord_sys: coord_sys
@@ -188,7 +183,6 @@ module RGeo
         coder["has_m_coordinate"] = @has_m
         coder["srid"] = @srid
         coder["buffer_resolution"] = @buffer_resolution
-        coder["lenient_multi_polygon_assertions"] = @uses_lenient_multi_polygon_assertions
         coder["wkt_generator"] = @wkt_generator.properties
         coder["wkb_generator"] = @wkb_generator.properties
         coder["wkt_parser"] = @wkt_parser.properties
@@ -227,7 +221,6 @@ module RGeo
           wkt_parser: symbolize_hash(coder["wkt_parser"]),
           wkb_parser: symbolize_hash(coder["wkb_parser"]),
           auto_prepare: coder["auto_prepare"] == "disabled" ? :disabled : :simple,
-          uses_lenient_multi_polygon_assertions: coder["lenient_multi_polygon_assertions"],
           proj4: proj4,
           coord_sys: coord_sys
         )
@@ -242,14 +235,7 @@ module RGeo
 
       attr_reader :buffer_resolution
 
-      # Returns true if this factory is lenient with MultiPolygon assertions
-
-      def lenient_multi_polygon_assertions?
-        @uses_lenient_multi_polygon_assertions
-      end
-
       # See RGeo::Feature::Factory#property
-
       def property(name_)
         case name_
         when :has_z_coordinate
@@ -260,15 +246,12 @@ module RGeo
           true
         when :buffer_resolution
           @buffer_resolution
-        when :uses_lenient_multi_polygon_assertions
-          @uses_lenient_multi_polygon_assertions
         when :auto_prepare
           @_auto_prepare ? :simple : :disabled
         end
       end
 
       # See RGeo::Feature::Factory#parse_wkt
-
       def parse_wkt(str)
         if @wkt_reader
           wrap_fg_geom(@wkt_reader.read(str), nil)
@@ -417,17 +400,6 @@ module RGeo
           raise(RGeo::Error::InvalidGeometry, "Could not cast to polygon: #{elem}") unless elem
           elem.detach_fg_geom
         end
-        unless @uses_lenient_multi_polygon_assertions
-          (1...elems.size).each do |i|
-            (0...i).each do |j|
-              igeom = elems[i]
-              jgeom = elems[j]
-              if igeom.relate_pattern(jgeom, "2********") || igeom.relate_pattern(jgeom, "****1****")
-                raise(RGeo::Error::InvalidGeometry, "Invalid relate pattern: #{jgeom}")
-              end
-            end
-          end
-        end
         klasses = Array.new(elems.size, FFIPolygonImpl)
         fg_geom = ::Geos::Utils.create_collection(::Geos::GeomTypes::GEOS_MULTIPOLYGON, elems)
         FFIMultiPolygonImpl.new(self, fg_geom, klasses)

data/lib/rgeo/geos/ffi_feature_classes.rb

@@ -6,60 +6,84 @@
 #
 # -----------------------------------------------------------------------------
 
+require_relative "../impl_helper/validity_check"
+
 module RGeo
   module Geos
-    class FFIGeometryImpl # :nodoc:
+    class FFIGeometryImpl
+      include Feature::Geometry
+      include ImplHelper::ValidityCheck
       include FFIGeometryMethods
     end
 
-    class FFIPointImpl # :nodoc:
+    class FFIPointImpl
+      include Feature::Point
+      include ImplHelper::ValidityCheck
       include FFIGeometryMethods
       include FFIPointMethods
     end
 
-    class FFILineStringImpl  # :nodoc:
+    class FFILineStringImpl
+      include Feature::LineString
+      include ImplHelper::ValidityCheck
       include FFIGeometryMethods
       include FFILineStringMethods
     end
 
-    class FFILinearRingImpl  # :nodoc:
+    class FFILinearRingImpl
+      include Feature::LinearRing
+      include ImplHelper::ValidityCheck
       include FFIGeometryMethods
       include FFILineStringMethods
       include FFILinearRingMethods
     end
 
-    class FFILineImpl # :nodoc:
+    class FFILineImpl
+      include Feature::Line
+      include ImplHelper::ValidityCheck
       include FFIGeometryMethods
       include FFILineStringMethods
       include FFILineMethods
     end
 
-    class FFIPolygonImpl # :nodoc:
+    class FFIPolygonImpl
+      include Feature::Polygon
+      include ImplHelper::ValidityCheck
       include FFIGeometryMethods
       include FFIPolygonMethods
     end
 
-    class FFIGeometryCollectionImpl # :nodoc:
+    class FFIGeometryCollectionImpl
+      include Feature::GeometryCollection
+      include ImplHelper::ValidityCheck
       include FFIGeometryMethods
       include FFIGeometryCollectionMethods
     end
 
-    class FFIMultiPointImpl # :nodoc:
+    class FFIMultiPointImpl
+      include Feature::MultiPoint
+      include ImplHelper::ValidityCheck
       include FFIGeometryMethods
       include FFIGeometryCollectionMethods
       include FFIMultiPointMethods
     end
 
-    class FFIMultiLineStringImpl # :nodoc:
+    class FFIMultiLineStringImpl
+      include Feature::MultiLineString
+      include ImplHelper::ValidityCheck
       include FFIGeometryMethods
       include FFIGeometryCollectionMethods
       include FFIMultiLineStringMethods
     end
 
-    class FFIMultiPolygonImpl # :nodoc:
+    class FFIMultiPolygonImpl
+      include Feature::MultiPolygon
+      include ImplHelper::ValidityCheck
       include FFIGeometryMethods
       include FFIGeometryCollectionMethods
       include FFIMultiPolygonMethods
     end
+
+    ImplHelper::ValidityCheck.override_classes
   end
 end

data/lib/rgeo/geos/ffi_feature_methods.rb

@@ -6,6 +6,8 @@
 #
 # -----------------------------------------------------------------------------
 
+require "ffi-geos"
+
 module RGeo
   module Geos
     module FFIGeometryMethods # :nodoc:
@@ -95,11 +97,9 @@ module RGeo
       end
 
       def boundary
-        if self.class == FFIGeometryCollectionImpl
-          nil
-        else
-          @factory.wrap_fg_geom(@fg_geom.boundary, nil)
-        end
+        @factory.wrap_fg_geom(@fg_geom.boundary, nil)
+      rescue ::Geos::GEOSException
+        raise Error::InvalidGeometry, "Operation not supported by GeometryCollection"
       end
 
       def as_text
@@ -131,6 +131,24 @@ module RGeo
         simple?
       end
 
+      def valid?
+        @fg_geom.valid?
+      end
+
+      def invalid_reason
+        # valid_detail gives solely the reason, or nil if valid, which is
+        # what we want.
+        fg_geom.valid_detail&.dig(:detail)&.force_encoding(Encoding::UTF_8)
+      end
+
+      # (see RGeo::ImplHelper::ValidityCheck#make_valid)
+      # Only available since GEOS 3.8+
+      def make_valid
+        @factory.wrap_fg_geom(@fg_geom.make_valid, nil)
+      rescue ::Geos::GEOSException
+        raise Error::UnsupportedOperation
+      end if ::Geos::FFIGeos.respond_to?(:GEOSMakeValid_r)
+
       def equals?(rhs)
         return false unless rhs.is_a?(RGeo::Feature::Instance)
         fg = factory.convert_to_fg_geometry(rhs)

data/lib/rgeo/geos/interface.rb

@@ -116,13 +116,6 @@ module RGeo
       #   Specifies which native interface to use. Possible values are
       #   <tt>:capi</tt> and <tt>:ffi</tt>. The default is the value
       #   of the preferred_native_interface.
-      # [<tt>:uses_lenient_multi_polygon_assertions</tt>]
-      #   If set to true, assertion checking on MultiPolygon is disabled.
-      #   This may speed up creation of MultiPolygon objects, at the
-      #   expense of not doing the proper checking for OGC MultiPolygon
-      #   compliance. See RGeo::Feature::MultiPolygon for details on
-      #   the MultiPolygon assertions. Default is false. Also called
-      #   <tt>:lenient_multi_polygon_assertions</tt>.
       # [<tt>:buffer_resolution</tt>]
       #   The resolution of buffers around geometries created by this
       #   factory. This controls the number of line segments used to

data/lib/rgeo/geos/zm_factory.rb

@@ -53,8 +53,6 @@ module RGeo
         end
         srid ||= coord_sys.authority_code if coord_sys
         config = {
-          uses_lenient_multi_polygon_assertions: opts[:lenient_multi_polygon_assertions] ||
-            opts[:uses_lenient_multi_polygon_assertions],
           buffer_resolution: opts[:buffer_resolution], auto_prepare: opts[:auto_prepare],
           wkt_generator: opts[:wkt_generator], wkt_parser: opts[:wkt_parser],
           wkb_generator: opts[:wkb_generator], wkb_parser: opts[:wkb_parser],
@@ -109,7 +107,6 @@ module RGeo
           "wkbg" => @wkb_generator.properties,
           "wktp" => @wkt_parser.properties,
           "wkbp" => @wkb_parser.properties,
-          "lmpa" => @zfactory.lenient_multi_polygon_assertions?,
           "apre" => @zfactory.property(:auto_prepare) == :simple,
           "nffi" => @zfactory.is_a?(FFIFactory)
         }
@@ -142,7 +139,6 @@ module RGeo
           wkb_generator: symbolize_hash(data["wkbg"]),
           wkt_parser: symbolize_hash(data["wktp"]),
           wkb_parser: symbolize_hash(data["wkbp"]),
-          uses_lenient_multi_polygon_assertions: data["lmpa"],
           auto_prepare: (data["apre"] ? :simple : :disabled),
           proj4: proj4,
           coord_sys: coord_sys
@@ -154,7 +150,6 @@ module RGeo
       def encode_with(coder) # :nodoc:
         coder["srid"] = @zfactory.srid
         coder["buffer_resolution"] = @zfactory.buffer_resolution
-        coder["lenient_multi_polygon_assertions"] = @zfactory.lenient_multi_polygon_assertions?
         coder["wkt_generator"] = @wkt_generator.properties
         coder["wkb_generator"] = @wkb_generator.properties
         coder["wkt_parser"] = @wkt_parser.properties
@@ -197,7 +192,6 @@ module RGeo
           wkt_parser: symbolize_hash(coder["wkt_parser"]),
           wkb_parser: symbolize_hash(coder["wkb_parser"]),
           auto_prepare: coder["auto_prepare"] == "disabled" ? :disabled : :simple,
-          uses_lenient_multi_polygon_assertions: coder["lenient_multi_polygon_assertions"],
           proj4: proj4,
           coord_sys: coord_sys
         )
@@ -216,12 +210,6 @@ module RGeo
         @zfactory.buffer_resolution
       end
 
-      # Returns true if this factory is lenient with MultiPolygon assertions
-
-      def lenient_multi_polygon_assertions?
-        @zfactory.lenient_multi_polygon_assertions?
-      end
-
       # Returns the z-only factory corresponding to this factory.
 
       def z_factory

data/lib/rgeo/impl_helper/basic_geometry_collection_methods.rb

@@ -20,7 +20,7 @@ module RGeo
           raise Error::InvalidGeometry, "Could not cast #{elem}" unless elem
           elem
         end
-        validate_geometry
+        init_geometry
       end
 
       def num_geometries
@@ -91,7 +91,7 @@ module RGeo
           raise Error::InvalidGeometry, "Could not cast #{elem}" unless elem
           elem
         end
-        validate_geometry
+        init_geometry
       end
 
       def geometry_type
@@ -152,7 +152,7 @@ module RGeo
           raise Error::InvalidGeometry, "Could not cast #{elem}" unless elem
           elem
         end
-        validate_geometry
+        init_geometry
       end
 
       def geometry_type
@@ -176,7 +176,7 @@ module RGeo
           raise Error::InvalidGeometry, "Could not cast #{elem}" unless elem
           elem
         end
-        validate_geometry
+        init_geometry
       end
 
       def geometry_type

data/lib/rgeo/impl_helper/basic_geometry_methods.rb

@@ -52,7 +52,7 @@ module RGeo
         @factory = obj.factory
       end
 
-      def validate_geometry
+      def init_geometry
       end
     end
   end

data/lib/rgeo/impl_helper/basic_line_string_methods.rb

@@ -16,7 +16,13 @@ module RGeo
           raise Error::InvalidGeometry, "Could not cast #{elem}" unless elem
           elem
         end
-        validate_geometry
+        # LineStrings in general need to check that there's not one point
+        # GEOS doesn't allow instantiation of single point LineStrings so
+        # we should handle it.
+        if @points.size == 1
+          raise Error::InvalidGeometry, "LineString Cannot Have 1 Point"
+        end
+        init_geometry
       end
 
       def num_points
@@ -143,12 +149,6 @@ module RGeo
         super
         @points = obj.points
       end
-
-      def validate_geometry
-        if @points.size == 1
-          raise Error::InvalidGeometry, "LineString cannot have 1 point"
-        end
-      end
     end
 
     module BasicLineMethods # :nodoc:
@@ -161,7 +161,7 @@ module RGeo
         cstop = Feature.cast(stop, factory, Feature::Point)
         raise Error::InvalidGeometry, "Could not cast end: #{stop}" unless cstop
         @points = [cstart, cstop]
-        validate_geometry
+        init_geometry
       end
 
       def geometry_type
@@ -171,18 +171,16 @@ module RGeo
       def coordinates
         @points.map(&:coordinates)
       end
+    end
 
-      private
-
-      def validate_geometry
+    module BasicLinearRingMethods # :nodoc:
+      def initialize(factory, points)
         super
-        if @points.size > 2
-          raise Error::InvalidGeometry, "Line must have 0 or 2 points"
+        unless @points.size >= 4 || @points.size == 0
+          raise Error::InvalidGeometry, "LinearRings must have 0 or >= 4 points"
         end
       end
-    end
 
-    module BasicLinearRingMethods # :nodoc:
       def geometry_type
         Feature::LinearRing
       end
@@ -193,14 +191,12 @@ module RGeo
 
       private
 
-      def validate_geometry
+      # Close ring if necessary.
+      def init_geometry
         super
         if @points.size > 0
           @points << @points.first if @points.first != @points.last
           @points = @points.chunk { |x| x }.map(&:first)
-          if !@factory.property(:uses_lenient_assertions) && !ring?
-            raise Error::InvalidGeometry, "LinearRing failed ring test"
-          end
         end
       end
     end

data/lib/rgeo/impl_helper/basic_point_methods.rb

@@ -18,7 +18,7 @@ module RGeo
         if extra.size > 0
           raise ArgumentError, "Too many arguments for point initializer"
         end
-        validate_geometry
+        init_geometry
       end
 
       def x

data/lib/rgeo/impl_helper/basic_polygon_methods.rb

@@ -22,7 +22,7 @@ module RGeo
           end
           elem
         end
-        validate_geometry
+        init_geometry
       end
 
       def exterior_ring