rgeo 2.3.0 → 3.0.0.pre.rc.1

data/lib/rgeo/geos/interface.rb

@@ -31,32 +31,47 @@ module RGeo
       # Returns true if the given feature is a CAPI GEOS feature, or if
       # the given factory is a CAPI GEOS factory.
 
-      def is_capi_geos?(object)
+      def capi_geos?(object)
         CAPI_SUPPORTED &&
           (CAPIFactory === object || CAPIGeometryMethods === object ||
           ZMFactory === object && CAPIFactory === object.z_factory ||
           ZMGeometryMethods === object && CAPIGeometryMethods === object.z_geometry)
       end
 
+      def is_capi_geos?(object)
+        warn "The is_capi_geos? method is deprecated, please use the capi_geos? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        capi_geos?(object)
+      end
+
       # Returns true if the given feature is an FFI GEOS feature, or if
       # the given factory is an FFI GEOS factory.
 
-      def is_ffi_geos?(object)
+      def ffi_geos?(object)
         FFI_SUPPORTED &&
           (FFIFactory === object || FFIGeometryMethods === object ||
           ZMFactory === object && FFIFactory === object.z_factory ||
           ZMGeometryMethods === object && FFIGeometryMethods === object.z_geometry)
       end
 
+      def is_ffi_geos?(object)
+        warn "The is_ffi_geos? method is deprecated, please use the ffi_geos? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        ffi_geos?(object)
+      end
+
       # Returns true if the given feature is a GEOS feature, or if the given
       # factory is a GEOS factory. Does not distinguish between CAPI and FFI.
 
-      def is_geos?(object)
+      def geos?(object)
         CAPI_SUPPORTED && (CAPIFactory === object || CAPIGeometryMethods === object) ||
           FFI_SUPPORTED && (FFIFactory === object || FFIGeometryMethods === object) ||
           ZMFactory === object || ZMGeometryMethods === object
       end
 
+      def is_geos?(object)
+        warn "The is_geos? method is deprecated, please use the geos? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        geos?(object)
+      end
+
       # Returns the GEOS library version as a string of the format "x.y.z".
       # Returns nil if GEOS is not available.
 
@@ -101,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/geos/zm_feature_methods.rb

@@ -65,12 +65,22 @@ module RGeo
         @factory.instance_variable_get(:@wkb_generator).generate(self)
       end
 
+      def empty?
+        @zgeometry.empty?
+      end
+
       def is_empty?
-        @zgeometry.is_empty?
+        warn "The is_empty? method is deprecated, please use the empty? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        empty?
+      end
+
+      def simple?
+        @zgeometry.simple?
       end
 
       def is_simple?
-        @zgeometry.is_simple?
+        warn "The is_simple? method is deprecated, please use the simple? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        simple?
       end
 
       def boundary
@@ -222,12 +232,22 @@ module RGeo
         point_n(num_points - 1)
       end
 
+      def closed?
+        @zgeometry.closed?
+      end
+
       def is_closed?
-        @zgeometry.is_closed?
+        warn "The is_closed? method is deprecated, please use the closed? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        closed?
+      end
+
+      def ring?
+        @zgeometry.ring?
       end
 
       def is_ring?
-        @zgeometry.is_ring?
+        warn "The is_ring? method is deprecated, please use the ring? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        ring?
       end
 
       def num_points
@@ -323,8 +343,13 @@ module RGeo
         @zgeometry.length
       end
 
+      def closed?
+        @zgeometry.closed?
+      end
+
       def is_closed?
-        @zgeometry.is_closed?
+        warn "The is_closed? method is deprecated, please use the closed? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        closed?
       end
 
       def coordinates

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
@@ -51,10 +51,15 @@ module RGeo
         Feature::GeometryCollection
       end
 
-      def is_empty?
+      def empty?
         @elements.size == 0
       end
 
+      def is_empty?
+        warn "The is_empty? method is deprecated, please use the empty? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        empty?
+      end
+
       def rep_equals?(rhs)
         if rhs.is_a?(self.class) && rhs.factory.eql?(@factory) && @elements.size == rhs.num_geometries
           rhs.each_with_index { |p, i| return false unless @elements[i].rep_equals?(p) }
@@ -86,15 +91,20 @@ module RGeo
           raise Error::InvalidGeometry, "Could not cast #{elem}" unless elem
           elem
         end
-        validate_geometry
+        init_geometry
       end
 
       def geometry_type
         Feature::MultiLineString
       end
 
+      def closed?
+        all?(&:closed?)
+      end
+
       def is_closed?
-        all?(&:is_closed?)
+        warn "The is_closed? method is deprecated, please use the closed? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        closed?
       end
 
       def length
@@ -104,7 +114,7 @@ module RGeo
       def boundary
         hash = {}
         @elements.each do |line|
-          if !line.is_empty? && !line.is_closed?
+          if !line.empty? && !line.closed?
             add_boundary(hash, line.start_point)
             add_boundary(hash, line.end_point)
           end
@@ -142,7 +152,7 @@ module RGeo
           raise Error::InvalidGeometry, "Could not cast #{elem}" unless elem
           elem
         end
-        validate_geometry
+        init_geometry
       end
 
       def geometry_type
@@ -166,7 +176,7 @@ module RGeo
           raise Error::InvalidGeometry, "Could not cast #{elem}" unless elem
           elem
         end
-        validate_geometry
+        init_geometry
       end
 
       def geometry_type
@@ -180,7 +190,7 @@ module RGeo
       def boundary
         array = []
         @elements.each do |poly|
-          array << poly.exterior_ring unless poly.is_empty?
+          array << poly.exterior_ring unless poly.empty?
           array.concat(poly.interior_rings)
         end
         factory.multi_line_string(array)

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
@@ -39,13 +45,18 @@ module RGeo
         Feature::LineString
       end
 
-      def is_empty?
+      def empty?
         @points.size == 0
       end
 
+      def is_empty?
+        warn "The is_empty? method is deprecated, please use the empty? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        empty?
+      end
+
       def boundary
         array = []
-        array << @points.first << @points.last if !is_empty? && !is_closed?
+        array << @points.first << @points.last if !empty? && !closed?
         factory.multipoint([array])
       end
 
@@ -57,15 +68,25 @@ module RGeo
         @points.last
       end
 
-      def is_closed?
-        unless defined?(@is_closed)
-          @is_closed = @points.size > 2 && @points.first == @points.last
+      def closed?
+        unless defined?(@closed)
+          @closed = @points.size > 2 && @points.first == @points.last
         end
-        @is_closed
+        @closed
+      end
+
+      def is_closed?
+        warn "The is_closed? method is deprecated, please use the closed? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        closed?
+      end
+
+      def ring?
+        closed? && simple?
       end
 
       def is_ring?
-        is_closed? && is_simple?
+        warn "The is_ring? method is deprecated, please use the ring? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        ring?
       end
 
       def rep_equals?(rhs)
@@ -128,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:
@@ -146,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
@@ -156,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
@@ -178,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) && !is_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
@@ -45,14 +45,24 @@ module RGeo
         Feature::Point
       end
 
-      def is_empty?
+      def empty?
         false
       end
 
-      def is_simple?
+      def is_empty?
+        warn "The is_empty? method is deprecated, please use the empty? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        empty?
+      end
+
+      def simple?
         true
       end
 
+      def is_simple?
+        warn "The is_simple? method is deprecated, please use the simple? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        simple?
+      end
+
       def envelope
         self
       end

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
@@ -49,13 +49,18 @@ module RGeo
         Feature::Polygon
       end
 
+      def empty?
+        @exterior_ring.empty?
+      end
+
       def is_empty?
-        @exterior_ring.is_empty?
+        warn "The is_empty? method is deprecated, please use the empty? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        empty?
       end
 
       def boundary
         array = []
-        array << @exterior_ring unless @exterior_ring.is_empty?
+        array << @exterior_ring unless @exterior_ring.empty?
         array.concat(@interior_rings)
         factory.multi_line_string(array)
       end