rgeo 2.3.1 → 3.0.1

data/lib/rgeo/cartesian/feature_classes.rb

@@ -6,79 +6,101 @@
 #
 # -----------------------------------------------------------------------------
 
+require_relative "../impl_helper/validity_check"
+
 module RGeo
   module Cartesian
     class PointImpl # :nodoc:
-      include RGeo::Feature::Point
-      include RGeo::ImplHelper::BasicGeometryMethods
-      include RGeo::ImplHelper::BasicPointMethods
-      include RGeo::Cartesian::GeometryMethods
-      include RGeo::Cartesian::PointMethods
+      include Feature::Point
+      include ImplHelper::ValidityCheck
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicPointMethods
+      include ImplHelper::ValidOp
+      include GeometryMethods
+      include PointMethods
     end
 
     class LineStringImpl # :nodoc:
-      include RGeo::Feature::LineString
-      include RGeo::ImplHelper::BasicGeometryMethods
-      include RGeo::ImplHelper::BasicLineStringMethods
-      include RGeo::Cartesian::GeometryMethods
-      include RGeo::Cartesian::LineStringMethods
+      include Feature::LineString
+      include ImplHelper::ValidityCheck
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicLineStringMethods
+      include ImplHelper::ValidOp
+      include GeometryMethods
+      include LineStringMethods
     end
 
     class LineImpl # :nodoc:
-      include RGeo::Feature::Line
-      include RGeo::ImplHelper::BasicGeometryMethods
-      include RGeo::ImplHelper::BasicLineStringMethods
-      include RGeo::ImplHelper::BasicLineMethods
-      include RGeo::Cartesian::GeometryMethods
-      include RGeo::Cartesian::LineStringMethods
+      include Feature::Line
+      include ImplHelper::ValidityCheck
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicLineStringMethods
+      include ImplHelper::BasicLineMethods
+      include ImplHelper::ValidOp
+      include GeometryMethods
+      include LineStringMethods
     end
 
     class LinearRingImpl # :nodoc:
-      include RGeo::Feature::LinearRing
-      include RGeo::ImplHelper::BasicGeometryMethods
-      include RGeo::ImplHelper::BasicLineStringMethods
-      include RGeo::ImplHelper::BasicLinearRingMethods
-      include RGeo::Cartesian::GeometryMethods
-      include RGeo::Cartesian::LineStringMethods
+      include Feature::LinearRing
+      include ImplHelper::ValidityCheck
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicLineStringMethods
+      include ImplHelper::BasicLinearRingMethods
+      include ImplHelper::ValidOp
+      include GeometryMethods
+      include LineStringMethods
     end
 
     class PolygonImpl # :nodoc:
-      include RGeo::Feature::Polygon
-      include RGeo::ImplHelper::BasicGeometryMethods
-      include RGeo::ImplHelper::BasicPolygonMethods
-      include RGeo::Cartesian::GeometryMethods
+      include Feature::Polygon
+      include ImplHelper::ValidityCheck
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicPolygonMethods
+      include ValidOp
+      include GeometryMethods
     end
 
     class GeometryCollectionImpl # :nodoc:
-      include RGeo::Feature::GeometryCollection
-      include RGeo::ImplHelper::BasicGeometryMethods
-      include RGeo::ImplHelper::BasicGeometryCollectionMethods
-      include RGeo::Cartesian::GeometryMethods
+      include Feature::GeometryCollection
+      include ImplHelper::ValidityCheck
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicGeometryCollectionMethods
+      include ImplHelper::ValidOp
+      include GeometryMethods
     end
 
     class MultiPointImpl # :nodoc:
-      include RGeo::Feature::MultiPoint
-      include RGeo::ImplHelper::BasicGeometryMethods
-      include RGeo::ImplHelper::BasicGeometryCollectionMethods
-      include RGeo::ImplHelper::BasicMultiPointMethods
-      include RGeo::Cartesian::GeometryMethods
+      include Feature::MultiPoint
+      include ImplHelper::ValidityCheck
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicGeometryCollectionMethods
+      include ImplHelper::BasicMultiPointMethods
+      include ImplHelper::ValidOp
+      include GeometryMethods
     end
 
     class MultiLineStringImpl # :nodoc:
-      include RGeo::Feature::MultiLineString
-      include RGeo::ImplHelper::BasicGeometryMethods
-      include RGeo::ImplHelper::BasicGeometryCollectionMethods
-      include RGeo::ImplHelper::BasicMultiLineStringMethods
-      include RGeo::Cartesian::GeometryMethods
-      include RGeo::Cartesian::MultiLineStringMethods
+      include Feature::MultiLineString
+      include ImplHelper::ValidityCheck
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicGeometryCollectionMethods
+      include ImplHelper::BasicMultiLineStringMethods
+      include ImplHelper::ValidOp
+      include GeometryMethods
+      include MultiLineStringMethods
     end
 
     class MultiPolygonImpl # :nodoc:
-      include RGeo::Feature::MultiPolygon
-      include RGeo::ImplHelper::BasicGeometryMethods
-      include RGeo::ImplHelper::BasicGeometryCollectionMethods
-      include RGeo::ImplHelper::BasicMultiPolygonMethods
-      include RGeo::Cartesian::GeometryMethods
+      include Feature::MultiPolygon
+      include ImplHelper::ValidityCheck
+      include ImplHelper::BasicGeometryMethods
+      include ImplHelper::BasicGeometryCollectionMethods
+      include ImplHelper::BasicMultiPolygonMethods
+      include ImplHelper::ValidOp
+      include GeometryMethods
     end
+
+    ImplHelper::ValidityCheck.override_classes
   end
 end

data/lib/rgeo/cartesian/feature_methods.rb

@@ -16,6 +16,28 @@ module RGeo
       def envelope
         BoundingBox.new(factory).add(self).to_geometry
       end
+
+      def coordinate_dimension
+        factory.coordinate_dimension
+      end
+
+      def spatial_dimension
+        factory.spatial_dimension
+      end
+
+      def is_3d?
+        factory.property(:has_z_coordinate)
+      end
+
+      def measured?
+        factory.property(:has_m_coordinate)
+      end
+
+      private
+
+      def graph
+        @graph ||= GeometryGraph.new(self)
+      end
     end
 
     module PointMethods # :nodoc:
@@ -50,36 +72,56 @@ module RGeo
       end
 
       def simple?
-        len = segments.length
-        return false if segments.any?(&:degenerate?)
-        return true if len == 1
-        return segments[0].s != segments[1].e if len == 2
-        segments.each_with_index do |seg, index|
-          nindex = index + 1
-          nindex = nil if nindex == len
-          return false if nindex && seg.contains_point?(segments[nindex].e)
-          pindex = index - 1
-          pindex = nil if pindex < 0
-          return false if pindex && seg.contains_point?(segments[pindex].s)
-          next unless nindex
-          oindex = nindex + 1
-          while oindex < len
-            oseg = segments[oindex]
-            return false if !(index == 0 && oindex == len - 1 && seg.s == oseg.e) && seg.intersects_segment?(oseg)
-            oindex += 1
-          end
-        end
-        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?
+        # Use a SweeplineIntersector to determine if there are any self-intersections
+        # in the ring. The GeometryGraph of the ring could be used by comparing the
+        # edges to number of segments (graph.incident_edges.length == segments.length),
+        # but this adds computational and memory overhead if graph isn't already memoized.
+        # Since graph is not used elsewhere in LineStringMethods, we will just use the
+        # SweeplineIntersector for now.
+        li = SweeplineIntersector.new(segments)
+        li.proper_intersections.empty?
       end
 
       def length
         segments.inject(0.0) { |sum, seg| sum + seg.length }
       end
+
+      def crosses?(rhs)
+        case rhs
+        when Feature::LineString
+          crosses_line_string?(rhs)
+        else
+          super
+        end
+      end
+
+      private
+
+      # Determines if a cross occurs with another linestring.
+      # Process is to get the number of proper intersections in each geom
+      # then overlay and get the number of proper intersections from that.
+      # If the overlaid number is higher than the sum of individual self-ints
+      # then there is an intersection. Finally, we need to check the intersection
+      # to see that it is not a boundary point of either segment.
+      #
+      # @param rhs [Feature::LineString]
+      #
+      # @return [Boolean]
+      def crosses_line_string?(rhs)
+        self_ints = SweeplineIntersector.new(segments).proper_intersections
+        self_ints += SweeplineIntersector.new(rhs.segments).proper_intersections
+        overlay_ints = SweeplineIntersector.new(segments + rhs.segments).proper_intersections
+
+        (overlay_ints - self_ints).each do |int|
+          s1s = int.s1.s
+          s1e = int.s1.e
+          s2s = int.s2.s
+          s2e = int.s2.e
+          return true unless [s1s, s1e, s2s, s2e].include?(int.point)
+        end
+
+        false
+      end
     end
 
     module MultiLineStringMethods # :nodoc:

data/lib/rgeo/cartesian/interface.rb

@@ -61,29 +61,19 @@ module RGeo
       # [<tt>:srid</tt>]
       #   Set the SRID returned by geometries created by this factory.
       #   Default is 0.
-      # [<tt>:proj4</tt>]
-      #   The coordinate system in Proj4 format, either as a
-      #   CoordSys::Proj4 object or as a string or hash representing the
-      #   proj4 format. Optional.
       # [<tt>:coord_sys</tt>]
       #   The coordinate system in OGC form, either as a subclass of
       #   CoordSys::CS::CoordinateSystem, or as a string in WKT format.
-      #   Optional.
-      # [<tt>:srs_database</tt>]
-      #   Optional. If provided, the value should be an implementation of
-      #   CoordSys::SRSDatabase::Interface. If both this and an SRID are
-      #   provided, they are used to look up the proj4 and coord_sys
-      #   objects from a spatial reference system database.
+      #   Optional. If no coord_sys is given, but an SRID is the factory
+      #   will try to create one using the CoordSys::CONFIG.default_coord_sys_class
+      #   or the given :coord_sys_class option.
+      # [<tt>:coord_sys_class</tt>]
+      #   CoordSys::CS::CoordinateSystem implementation used to instansiate
+      #   a coord_sys based on the :srid given.
       # [<tt>:has_z_coordinate</tt>]
       #   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>:wkt_parser</tt>]
       #   Configure the parser for WKT. The value is a hash of
       #   configuration parameters for WKRep::WKTParser.new. Default is
@@ -107,31 +97,6 @@ module RGeo
       def simple_factory(opts = {})
         Cartesian::Factory.new(opts)
       end
-
-      # Returns a Feature::FactoryGenerator that creates preferred
-      # factories. The given options are used as the default options.
-      #
-      # A common case for this is to provide the <tt>:srs_database</tt>
-      # as a default. Then, the factory generator need only be passed
-      # an SRID and it will automatically fetch the appropriate Proj4
-      # and CoordSys objects.
-
-      def preferred_factory_generator(defaults = {})
-        proc { |c| preferred_factory(defaults.merge(c)) }
-      end
-      alias factory_generator preferred_factory_generator
-
-      # Returns a Feature::FactoryGenerator that creates simple factories.
-      # The given options are used as the default options.
-      #
-      # A common case for this is to provide the <tt>:srs_database</tt>
-      # as a default. Then, the factory generator need only be passed
-      # an SRID and it will automatically fetch the appropriate Proj4
-      # and CoordSys objects.
-
-      def simple_factory_generator(defaults = {})
-        proc { |c| simple_factory(defaults.merge(c)) }
-      end
     end
   end
 end