rgeo 3.0.0.pre.rc.2 → 3.0.0

data/lib/rgeo/feature/geometry.rb

@@ -78,7 +78,6 @@ module RGeo
     # Therefore, if an implementation cannot provide a suitable test for
     # their equivalence types, they must degrade to use a stronger form
     # of equivalence.
-
     module Geometry
       extend Type
 
@@ -225,11 +224,6 @@ module RGeo
         raise Error::UnsupportedOperation, "Method #{self.class}#empty? not defined."
       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
-
       # === SFS 1.1 Description
       #
       # Returns true if this geometric object has no anomalous geometric
@@ -247,11 +241,6 @@ module RGeo
         raise Error::UnsupportedOperation, "Method #{self.class}#simple? not defined."
       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
-
       # === SFS 1.2 Description
       #
       # Returns 1 (TRUE) if this geometric object has z coordinate values.
@@ -304,7 +293,7 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def equals?(another_geometry)
+      def equals?(_another_geometry)
         raise Error::UnsupportedOperation, "Method #{self.class}#equals? not defined."
       end
 
@@ -323,7 +312,7 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def disjoint?(another_geometry)
+      def disjoint?(_another_geometry)
         raise Error::UnsupportedOperation, "Method #{self.class}#disjoint? not defined."
       end
 
@@ -342,7 +331,7 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def intersects?(another_geometry)
+      def intersects?(_another_geometry)
         raise Error::UnsupportedOperation, "Method #{self.class}#intersects? not defined."
       end
 
@@ -361,7 +350,7 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def touches?(another_geometry)
+      def touches?(_another_geometry)
         raise Error::UnsupportedOperation, "Method #{self.class}#touches? not defined."
       end
 
@@ -380,7 +369,7 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def crosses?(another_geometry)
+      def crosses?(_another_geometry)
         raise Error::UnsupportedOperation, "Method #{self.class}#crosses? not defined."
       end
 
@@ -399,7 +388,7 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def within?(another_geometry)
+      def within?(_another_geometry)
         raise Error::UnsupportedOperation, "Method #{self.class}#within? not defined."
       end
 
@@ -418,7 +407,7 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def contains?(another_geometry)
+      def contains?(_another_geometry)
         raise Error::UnsupportedOperation, "Method #{self.class}#contains? not defined."
       end
 
@@ -437,7 +426,7 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def overlaps?(another_geometry)
+      def overlaps?(_another_geometry)
         raise Error::UnsupportedOperation, "Method #{self.class}#overlaps? not defined."
       end
 
@@ -463,7 +452,7 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def relate?(another_geometry, _intersection_pattern_matrix_)
+      def relate?(_another_geometry, _intersection_pattern_matrix_)
         raise Error::UnsupportedOperation, "Method #{self.class}#relate not defined."
       end
 
@@ -509,7 +498,7 @@ module RGeo
       # this geometry, strictly speaking, the result of measuring the
       # distance between objects from different factories is undefined.
 
-      def distance(another_geometry)
+      def distance(_another_geometry)
         raise Error::UnsupportedOperation, "Method #{self.class}#distance not defined."
       end
 
@@ -555,7 +544,7 @@ module RGeo
       # this geometry, strictly speaking, the result of performing
       # operations on objects from different factories is undefined.
 
-      def intersection(another_geometry)
+      def intersection(_another_geometry)
         raise Error::UnsupportedOperation, "Method #{self.class}#intersection not defined."
       end
 
@@ -573,7 +562,7 @@ module RGeo
       # this geometry, strictly speaking, the result of performing
       # operations on objects from different factories is undefined.
 
-      def union(another_geometry)
+      def union(_another_geometry)
         raise Error::UnsupportedOperation, "Method #{self.class}#union not defined."
       end
 
@@ -591,7 +580,7 @@ module RGeo
       # this geometry, strictly speaking, the result of performing
       # operations on objects from different factories is undefined.
 
-      def difference(another_geometry)
+      def difference(_another_geometry)
         raise Error::UnsupportedOperation, "Method #{self.class}#difference not defined."
       end
 
@@ -609,7 +598,7 @@ module RGeo
       # this geometry, strictly speaking, the result of performing
       # operations on objects from different factories is undefined.
 
-      def sym_difference(another_geometry)
+      def sym_difference(_another_geometry)
         raise Error::UnsupportedOperation, "Method #{self.class}#sym_difference not defined."
       end
 
@@ -621,7 +610,7 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def rep_equals?(another_geometry)
+      def rep_equals?(_another_geometry)
         raise Error::UnsupportedOperation, "Method #{self.class}#rep_equals? not defined."
       end
 
@@ -657,12 +646,12 @@ module RGeo
       # representational equivalence test, this method must fall back on
       # objective equivalence.
 
-      def eql?(rhs)
-        if rhs.is_a?(RGeo::Feature::Instance)
+      def eql?(other)
+        if other.is_a?(RGeo::Feature::Instance)
           begin
-            rep_equals?(rhs)
+            rep_equals?(other)
           rescue Error::UnsupportedOperation
-            equal?(rhs)
+            equal?(other)
           end
         else
           false
@@ -683,12 +672,12 @@ module RGeo
       # test, the == operator must fall back on representational or
       # objective equivalence.
 
-      def ==(rhs)
-        if rhs.is_a?(RGeo::Feature::Instance)
+      def ==(other)
+        if other.is_a?(RGeo::Feature::Instance)
           begin
-            equals?(rhs)
+            equals?(other)
           rescue Error::UnsupportedOperation
-            eql?(rhs)
+            eql?(other)
           end
         else
           false
@@ -700,8 +689,8 @@ module RGeo
       # types is not specified; an implementation may choose to provide
       # additional capabilities as appropriate.
 
-      def -(rhs)
-        difference(rhs)
+      def -(other)
+        difference(other)
       end
 
       # If the given rhs is a geometry object, this operator must behave
@@ -709,8 +698,8 @@ module RGeo
       # is not specified; an implementation may choose to provide
       # additional capabilities as appropriate.
 
-      def +(rhs)
-        union(rhs)
+      def +(other)
+        union(other)
       end
 
       # If the given rhs is a geometry object, this operator must behave
@@ -718,8 +707,20 @@ module RGeo
       # types is not specified; an implementation may choose to provide
       # additional capabilities as appropriate.
 
-      def *(rhs)
-        intersection(rhs)
+      def *(other)
+        intersection(other)
+      end
+
+      # Convenience method to transform/project a geometry
+      # to a different coordinate system from the geometry itself
+      # instead of the cast method.
+      #
+      # @note: Not an OGC SFS method
+      #
+      # @param [RGeo::Feature::Factory] other_factory
+      # @return [RGeo::Feature::Geometry]
+      def transform(other_factory)
+        Feature.cast(self, factory: other_factory, project: true)
       end
     end
   end

data/lib/rgeo/feature/geometry_collection.rb

@@ -28,7 +28,6 @@ module RGeo
     # include this module itself. Therefore, you should not depend on the
     # kind_of? method to check type. Instead, use the provided check_type
     # class method (or === operator) defined in the Type module.
-
     module GeometryCollection
       include Geometry
       extend Type
@@ -58,7 +57,7 @@ module RGeo
       # Also note that this method is different from GeometryCollection#[]
       # in that it does not support negative indexes.
 
-      def geometry_n(n)
+      def geometry_n(_idx)
         raise Error::UnsupportedOperation, "Method #{self.class}#geometry_n not defined."
       end
 
@@ -78,7 +77,7 @@ module RGeo
       # the same way Ruby's array indexing works. Hence, geometry_n(-1)
       # returns nil, where [-1] returns the last element of the collection.
 
-      def [](n)
+      def [](_idx)
         raise Error::UnsupportedOperation, "Method #{self.class}#[] not defined."
       end
 
@@ -95,7 +94,7 @@ module RGeo
       # Note that all GeometryCollection implementations must also
       # include the Enumerable mixin.
 
-      def each(&block)
+      def each(&_block)
         raise Error::UnsupportedOperation, "Method #{self.class}#each not defined."
       end
 

data/lib/rgeo/feature/line_string.rb

@@ -20,7 +20,6 @@ module RGeo
     # include this module itself. Therefore, you should not depend on the
     # kind_of? method to check type. Instead, use the provided check_type
     # class method (or === operator) defined in the Type module.
-
     module LineString
       include Curve
       extend Type
@@ -47,7 +46,7 @@ module RGeo
       # if the given N is out of range. N is zero-based.
       # Does not support negative indexes.
 
-      def point_n(n)
+      def point_n(_idx)
         raise Error::UnsupportedOperation, "Method #{self.class}#point_n not defined."
       end
 

data/lib/rgeo/feature/linear_ring.rb

@@ -19,7 +19,6 @@ module RGeo
     # include this module itself. Therefore, you should not depend on the
     # kind_of? method to check type. Instead, use the provided check_type
     # class method (or === operator) defined in the Type module.
-
     module LinearRing
       include LineString
       extend Type

data/lib/rgeo/feature/multi_curve.rb

@@ -37,7 +37,6 @@ module RGeo
     # include this module itself. Therefore, you should not depend on the
     # kind_of? method to check type. Instead, use the provided check_type
     # class method (or === operator) defined in the Type module.
-
     module MultiCurve
       include GeometryCollection
       extend Type
@@ -68,11 +67,6 @@ module RGeo
       def closed?
         raise Error::UnsupportedOperation, "Method MultiCurve#closed? not defined."
       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
     end
   end
 end

data/lib/rgeo/feature/multi_surface.rb

@@ -28,7 +28,6 @@ module RGeo
     # include this module itself. Therefore, you should not depend on the
     # kind_of? method to check type. Instead, use the provided check_type
     # class method (or === operator) defined in the Type module.
-
     module MultiSurface
       include GeometryCollection
       extend Type

data/lib/rgeo/feature/point.rb

@@ -33,7 +33,6 @@ module RGeo
     # replace them with empty GeometryCollection objects. Therefore,
     # currently, every RGeo Point object represents an actual location
     # with real coordinates.
-
     module Point
       include Geometry
       extend Type

data/lib/rgeo/feature/polygon.rb

@@ -45,7 +45,6 @@ module RGeo
     # include this module itself. Therefore, you should not depend on the
     # kind_of? method to check type. Instead, use the provided check_type
     # class method (or === operator) defined in the Type module.
-
     module Polygon
       include Surface
       extend Type
@@ -84,7 +83,7 @@ module RGeo
       # if the given N is out of range. N is zero-based.
       # Does not support negative indexes.
 
-      def interior_ring_n(n)
+      def interior_ring_n(_idx)
         raise Error::UnsupportedOperation, "Method Polygon#interior_ring_n not defined."
       end
 

data/lib/rgeo/feature/surface.rb

@@ -34,7 +34,6 @@ module RGeo
     # class method (or === operator) defined in the Type module.
     #
     # Some implementations may support higher dimensional points.
-
     module Surface
       include Geometry
       extend Type

data/lib/rgeo/feature/types.rb

@@ -11,7 +11,6 @@ module RGeo
     # All geometry implementations MUST include this submodule.
     # This serves as a marker that may be used to test an object for
     # feature-ness.
-
     module Instance
     end
 
@@ -49,7 +48,6 @@ module RGeo
     # a particular object is a feature type:
     #
     #   RGeo::Feature::Type === object.geometry_type  # true
-
     module Type
       # Returns true if the given object is this type or a subtype
       # thereof, or if it is a feature object whose geometry_type is
@@ -192,92 +190,84 @@ module RGeo
           # Types are the same
           if nfactory == factory
             force_new ? obj.dup : obj
-          else
-            if type == Point
-              proj = nproj = nil
-              if project
-                proj = factory.proj4
-                nproj = nfactory.proj4
-              end
-              hasz = factory.property(:has_z_coordinate)
-              nhasz = nfactory.property(:has_z_coordinate)
-              if proj && nproj && CoordSys.check!(:proj4)
-                coords = CoordSys::Proj4.transform_coords(proj, nproj, obj.x, obj.y, hasz ? obj.z : nil)
-                coords << (hasz ? obj.z : 0.0) if nhasz && coords.size < 3
-              else
-                coords = [obj.x, obj.y]
-                coords << (hasz ? obj.z : 0.0) if nhasz
-              end
-              coords << (factory.property(:has_m_coordinate) ? obj.m : 0.0) if nfactory.property(:has_m_coordinate)
-              nfactory.point(*coords)
-            elsif type == Line
-              nfactory.line(cast(obj.start_point, nfactory, opts), cast(obj.end_point, nfactory, opts))
-            elsif type == LinearRing
-              nfactory.linear_ring(obj.points.map { |p| cast(p, nfactory, opts) })
-            elsif type == LineString
-              nfactory.line_string(obj.points.map { |p| cast(p, nfactory, opts) })
-            elsif type == Polygon
-              nfactory.polygon(cast(obj.exterior_ring, nfactory, opts),
-                                obj.interior_rings.map { |r| cast(r, nfactory, opts) })
-            elsif type == MultiPoint
-              nfactory.multi_point(obj.map { |g| cast(g, nfactory, opts) })
-            elsif type == MultiLineString
-              nfactory.multi_line_string(obj.map { |g| cast(g, nfactory, opts) })
-            elsif type == MultiPolygon
-              nfactory.multi_polygon(obj.map { |g| cast(g, nfactory, opts) })
-            elsif type == GeometryCollection
-              nfactory.collection(obj.map { |g| cast(g, nfactory, opts) })
-            end
-          end
-        else
-          # Types are different
-          if ntype == Point && (type == MultiPoint || type == GeometryCollection) ||
-              (ntype == Line || ntype == LineString || ntype == LinearRing) && (type == MultiLineString || type == GeometryCollection) ||
-              ntype == Polygon && (type == MultiPolygon || type == GeometryCollection)
-            if obj.num_geometries == 1
-              cast(obj.geometry_n(0), nfactory, ntype, opts)
-            end
-          elsif ntype == Point
-            raise(Error::InvalidGeometry, "Cannot cast to Point")
-          elsif ntype == Line
-            if type == LineString && obj.num_points == 2
-              nfactory.line(cast(obj.point_n(0), nfactory, opts), cast(obj.point_n(1), nfactory, opts))
-            end
-          elsif ntype == LinearRing
-            if type == LineString
-              nfactory.linear_ring(obj.points.map { |p| cast(p, nfactory, opts) })
-            end
-          elsif ntype == LineString
-            if type == Line || type == LinearRing
-              nfactory.line_string(obj.points.map { |p| cast(p, nfactory, opts) })
+          elsif type == Point
+            cs = ncs = nil
+            if project
+              cs = factory.coord_sys
+              ncs = nfactory.coord_sys
             end
-          elsif ntype == MultiPoint
-            if type == Point
-              nfactory.multi_point([cast(obj, nfactory, opts)])
-            elsif type == GeometryCollection
-              nfactory.multi_point(obj.map { |p| cast(p, nfactory, opts) })
-            end
-          elsif ntype == MultiLineString
-            if type == Line || type == LinearRing || type == LineString
-              nfactory.multi_line_string([cast(obj, nfactory, opts)])
-            elsif type == GeometryCollection
-              nfactory.multi_line_string(obj.map { |p| cast(p, nfactory, opts) })
-            end
-          elsif ntype == MultiPolygon
-            if type == Polygon
-              nfactory.multi_polygon([cast(obj, nfactory, opts)])
-            elsif type == GeometryCollection
-              nfactory.multi_polygon(obj.map { |p| cast(p, nfactory, opts) })
-            end
-          elsif ntype == GeometryCollection
-            if type == MultiPoint || type == MultiLineString || type == MultiPolygon
-              nfactory.collection(obj.map { |p| cast(p, nfactory, opts) })
+            hasz = factory.property(:has_z_coordinate)
+            nhasz = nfactory.property(:has_z_coordinate)
+            if cs && ncs
+              coords = cs.transform_coords(ncs, obj.x, obj.y, hasz ? obj.z : nil)
+              coords << (hasz ? obj.z : 0.0) if nhasz && coords.size < 3
             else
-              nfactory.collection([cast(obj, nfactory, opts)])
+              coords = [obj.x, obj.y]
+              coords << (hasz ? obj.z : 0.0) if nhasz
             end
+            coords << (factory.property(:has_m_coordinate) ? obj.m : 0.0) if nfactory.property(:has_m_coordinate)
+            nfactory.point(*coords)
+          elsif type == Line
+            nfactory.line(cast(obj.start_point, nfactory, opts), cast(obj.end_point, nfactory, opts))
+          elsif type == LinearRing
+            nfactory.linear_ring(obj.points.map { |p| cast(p, nfactory, opts) })
+          elsif type == LineString
+            nfactory.line_string(obj.points.map { |p| cast(p, nfactory, opts) })
+          elsif type == Polygon
+            nfactory.polygon(
+              cast(obj.exterior_ring, nfactory, opts),
+              obj.interior_rings.map { |r| cast(r, nfactory, opts) }
+            )
+          elsif type == MultiPoint
+            nfactory.multi_point(obj.map { |g| cast(g, nfactory, opts) })
+          elsif type == MultiLineString
+            nfactory.multi_line_string(obj.map { |g| cast(g, nfactory, opts) })
+          elsif type == MultiPolygon
+            nfactory.multi_polygon(obj.map { |g| cast(g, nfactory, opts) })
+          elsif type == GeometryCollection
+            nfactory.collection(obj.map { |g| cast(g, nfactory, opts) })
+          end
+        # Types are different
+        elsif ntype == Point && [MultiPoint, GeometryCollection].include?(type) ||
+            [Line, LineString, LinearRing].include?(ntype) && [MultiLineString, GeometryCollection].include?(type) ||
+            ntype == Polygon && [MultiPolygon, GeometryCollection].include?(type)
+          cast(obj.geometry_n(0), nfactory, ntype, opts) if obj.num_geometries == 1
+        elsif ntype == Point
+          raise(Error::InvalidGeometry, "Cannot cast to Point")
+        elsif ntype == Line
+          if type == LineString && obj.num_points == 2
+            nfactory.line(cast(obj.point_n(0), nfactory, opts), cast(obj.point_n(1), nfactory, opts))
+          end
+        elsif ntype == LinearRing
+          nfactory.linear_ring(obj.points.map { |p| cast(p, nfactory, opts) }) if type == LineString
+        elsif ntype == LineString
+          nfactory.line_string(obj.points.map { |p| cast(p, nfactory, opts) }) if [Line, LinearRing].include?(type)
+        elsif ntype == MultiPoint
+          if type == Point
+            nfactory.multi_point([cast(obj, nfactory, opts)])
+          elsif type == GeometryCollection
+            nfactory.multi_point(obj.map { |p| cast(p, nfactory, opts) })
+          end
+        elsif ntype == MultiLineString
+          if [Line, LinearRing, LineString].include?(type)
+            nfactory.multi_line_string([cast(obj, nfactory, opts)])
+          elsif type == GeometryCollection
+            nfactory.multi_line_string(obj.map { |p| cast(p, nfactory, opts) })
+          end
+        elsif ntype == MultiPolygon
+          if type == Polygon
+            nfactory.multi_polygon([cast(obj, nfactory, opts)])
+          elsif type == GeometryCollection
+            nfactory.multi_polygon(obj.map { |p| cast(p, nfactory, opts) })
+          end
+        elsif ntype == GeometryCollection
+          if [MultiPoint, MultiLineString, MultiPolygon].include?(type)
+            nfactory.collection(obj.map { |p| cast(p, nfactory, opts) })
           else
-            raise(RGeo::Error::InvalidGeometry, "Undefined type cast from #{type.name} to #{ntype.name}")
+            nfactory.collection([cast(obj, nfactory, opts)])
           end
+        else
+          raise(RGeo::Error::InvalidGeometry, "Undefined type cast from #{type.name} to #{ntype.name}")
         end
       end
     end