rgeo 3.0.0.pre.rc.3 → 3.0.0

data/lib/rgeo/coord_sys/cs/wkt_parser.rb

@@ -23,9 +23,11 @@ module RGeo
             next_token
             return value
           end
+
           unless @cur_token.is_a?(TypeString)
             raise Error::ParseError, "Found token #{@cur_token} when we expected a value"
           end
+
           type = @cur_token
           next_token
           consume_tokentype(:begin)
@@ -47,9 +49,11 @@ module RGeo
             obj = AxisInfo.create(args.shift(QuotedString), args.shift(TypeString))
           when "TOWGS84"
             bursa_wolf_params = args.find_all(Numeric)
+
             unless bursa_wolf_params.size == 7
               raise Error::ParseError, "Expected 7 Bursa Wolf parameters but found #{bursa_wolf_params.size}"
             end
+
             obj = WGS84ConversionInfo.create(*bursa_wolf_params)
           when "UNIT"
             klass = case containing_type
@@ -66,7 +70,13 @@ module RGeo
           when "PRIMEM"
             obj = PrimeMeridian.create(args.shift(QuotedString), nil, args.shift(Numeric), *args.create_optionals)
           when "SPHEROID"
-            obj = Ellipsoid.create_flattened_sphere(args.shift(QuotedString), args.shift(Numeric), args.shift(Numeric), args.find_first(LinearUnit), *args.create_optionals)
+            obj = Ellipsoid.create_flattened_sphere(
+              args.shift(QuotedString),
+              args.shift(Numeric),
+              args.shift(Numeric),
+              args.find_first(LinearUnit),
+              *args.create_optionals
+            )
           when "PROJECTION"
             name = args.shift(QuotedString)
             obj = Projection.create(name, name, args.find_all(ProjectionParameter), *args.create_optionals)
@@ -87,15 +97,18 @@ module RGeo
             optionals = args.create_optionals
             obj = CoordinateSystem.create(defn, dim, *optionals)
           when "COMPD_CS"
-            obj = CompoundCoordinateSystem.create(args.shift(QuotedString), args.shift(CoordinateSystem), args.shift(CoordinateSystem), *args.create_optionals)
+            obj = CompoundCoordinateSystem.create(
+              args.shift(QuotedString),
+              args.shift(CoordinateSystem),
+              args.shift(CoordinateSystem),
+              *args.create_optionals
+            )
           when "LOCAL_CS"
             name = args.shift(QuotedString)
             local_datum = args.find_first(LocalDatum)
             unit = args.find_first(Unit)
             axes = args.find_all(AxisInfo)
-            unless axes.size > 0
-              raise Error::ParseError, "Expected at least one AXIS in a LOCAL_CS"
-            end
+            raise Error::ParseError, "Expected at least one AXIS in a LOCAL_CS" unless axes.size > 0
             obj = LocalCoordinateSystem.create(name, local_datum, unit, axes, *args.create_optionals)
           when "GEOCCS"
             name = args.shift(QuotedString)
@@ -103,10 +116,21 @@ module RGeo
             prime_meridian = args.find_first(PrimeMeridian)
             linear_unit = args.find_first(LinearUnit)
             axes = args.find_all(AxisInfo)
+
             unless axes.size == 0 || axes.size == 3
               raise Error::ParseError, "GEOCCS must contain either 0 or 3 AXIS parameters"
             end
-            obj = GeocentricCoordinateSystem.create(name, horizontal_datum, prime_meridian, linear_unit, axes[0], axes[1], axes[2], *args.create_optionals)
+
+            obj = GeocentricCoordinateSystem.create(
+              name,
+              horizontal_datum,
+              prime_meridian,
+              linear_unit,
+              axes[0],
+              axes[1],
+              axes[2],
+              *args.create_optionals
+            )
           when "VERT_CS"
             name = args.shift(QuotedString)
             vertical_datum = args.find_first(VerticalDatum)
@@ -119,10 +143,20 @@ module RGeo
             prime_meridian = args.find_first(PrimeMeridian)
             angular_unit = args.find_first(AngularUnit)
             axes = args.find_all(AxisInfo)
+
             unless axes.size == 0 || axes.size == 2
               raise Error::ParseError, "GEOGCS must contain either 0 or 2 AXIS parameters"
             end
-            obj = GeographicCoordinateSystem.create(name, angular_unit, horizontal_datum, prime_meridian, axes[0], axes[1], *args.create_optionals)
+
+            obj = GeographicCoordinateSystem.create(
+              name,
+              angular_unit,
+              horizontal_datum,
+              prime_meridian,
+              axes[0],
+              axes[1],
+              *args.create_optionals
+            )
           when "PROJCS"
             name = args.shift(QuotedString)
             geographic_coordinate_system = args.find_first(GeographicCoordinateSystem)
@@ -131,10 +165,20 @@ module RGeo
             projection.instance_variable_get(:@parameters).concat(parameters)
             linear_unit = args.find_first(LinearUnit)
             axes = args.find_all(AxisInfo)
+
             unless axes.size == 0 || axes.size == 2
               raise Error::ParseError, "PROJCS must contain either 0 or 2 AXIS parameters"
             end
-            obj = ProjectedCoordinateSystem.create(name, geographic_coordinate_system, projection, linear_unit, axes[0], axes[1], *args.create_optionals)
+
+            obj = ProjectedCoordinateSystem.create(
+              name,
+              geographic_coordinate_system,
+              projection,
+              linear_unit,
+              axes[0],
+              axes[1],
+              *args.create_optionals
+            )
           else
             raise Error::ParseError, "Unrecognized type: #{type}"
           end
@@ -150,9 +194,9 @@ module RGeo
         end
 
         def expect_tokentype(type) # :nodoc:
-          unless type === @cur_token
-            raise Error::ParseError, "#{type.inspect} expected but #{@cur_token.inspect} found."
-          end
+          return if type === @cur_token
+
+          raise Error::ParseError, "#{type.inspect} expected but #{@cur_token.inspect} found."
         end
 
         def next_token # :nodoc:
@@ -176,13 +220,14 @@ module RGeo
           when "", nil
             @cur_token = nil
           else
-            @scanner.scan_until(/[^\s\(\)\[\],"]+/)
+            @scanner.scan_until(/[^\s()\[\],"]+/)
             token = @scanner.matched
-            if token =~ /^[-+]?(\d+(\.\d*)?|\.\d+)(e[-+]?\d+)?$/
-              @cur_token = token.to_f
-            else
+
+            unless token =~ /^[-+]?(\d+(\.\d*)?|\.\d+)(e[-+]?\d+)?$/
               raise Error::ParseError, "Bad token: #{token.inspect}"
             end
+
+            @cur_token = token.to_f
           end
           @cur_token
         end
@@ -207,13 +252,12 @@ module RGeo
         end
 
         class ExtensionClause # :nodoc:
+          attr_reader :key, :value
+
           def initialize(key, value) # :nodoc:
             @key = key
             @value = value
           end
-
-          attr_reader :key # :nodoc:
-          attr_reader :value # :nodoc:
         end
 
         class ArgumentList # :nodoc:
@@ -226,12 +270,13 @@ module RGeo
           end
 
           def assert_empty # :nodoc:
-            if @values.size > 0
-              names = @values.map do |val|
-                val.is_a?(Base) ? val.wkt_typename : val.inspect
-              end
-              raise Error::ParseError, "#{@values.size} unexpected arguments: #{names.join(', ')}"
+            return if @values.empty?
+
+            names = @values.map do |val|
+              val.is_a?(Base) ? val.wkt_typename : val.inspect
             end
+
+            raise Error::ParseError, "#{@values.size} unexpected arguments: #{names.join(', ')}"
           end
 
           def find_first(klass) # :nodoc:
@@ -266,12 +311,8 @@ module RGeo
 
           def shift(klass = nil) # :nodoc:
             val = @values.shift
-            unless val
-              raise Error::ParseError, "No arguments left... expected #{klass}"
-            end
-            if klass && !val.is_a?(klass)
-              raise Error::ParseError, "Expected #{klass} but got #{val.class}"
-            end
+            raise Error::ParseError, "No arguments left... expected #{klass}" unless val
+            raise Error::ParseError, "Expected #{klass} but got #{val.class}" if klass && !val.is_a?(klass)
             val
           end
         end

data/lib/rgeo/feature/curve.rb

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

data/lib/rgeo/feature/factory.rb

@@ -30,12 +30,10 @@ module RGeo
     # is provided. All factory implementation classes MUST include
     # <tt>Factory::Instance</tt>, and you may use it in <tt>is_a?</tt>,
     # <tt>===</tt>, and case-when constructs.
-
     module Factory
       # All factory implementations MUST include this submodule.
       # This serves as a marker that may be used to test an object for
       # factory-ness.
-
       module Instance
       end
 
@@ -74,22 +72,22 @@ module RGeo
       #   information is present about whether the coordinate system is
       #   meant to be so interpreted.
 
-      def property(name)
-        nil
+      def property(_name)
+        raise Error::UnsupportedOperation, "Method #{self.class}##{__method__} not defined."
       end
 
       # Parse the given string in well-known-text format and return the
       # resulting feature. Returns nil if the string couldn't be parsed.
 
-      def parse_wkt(str)
-        nil
+      def parse_wkt(_str)
+        raise Error::UnsupportedOperation, "Method #{self.class}##{__method__} not defined."
       end
 
       # Parse the given string in well-known-binary format and return the
       # resulting feature. Returns nil if the string couldn't be parsed.
 
-      def parse_wkb(str)
-        nil
+      def parse_wkb(_str)
+        raise Error::UnsupportedOperation, "Method #{self.class}##{__method__} not defined."
       end
 
       # Create a feature of type Point.
@@ -99,8 +97,8 @@ module RGeo
       # supported. If both Z and M coordinates are supported, Z should
       # be passed first.
 
-      def point(x, y, *extra)
-        nil
+      def point(_x, _y, *_extra)
+        raise Error::UnsupportedOperation, "Method #{self.class}##{__method__} not defined."
       end
 
       # Create a feature of type LineString.
@@ -112,8 +110,8 @@ module RGeo
       # result of building geometries from objects of the wrong factory
       # is undefined.
 
-      def line_string(points)
-        nil
+      def line_string(_points)
+        raise Error::UnsupportedOperation, "Method #{self.class}##{__method__} not defined."
       end
 
       # Create a feature of type Line.
@@ -125,8 +123,8 @@ module RGeo
       # result of building geometries from objects of the wrong factory
       # is undefined.
 
-      def line(start, stop)
-        nil
+      def line(_start, _stop)
+        raise Error::UnsupportedOperation, "Method #{self.class}##{__method__} not defined."
       end
 
       # Create a feature of type LinearRing.
@@ -141,8 +139,8 @@ module RGeo
       # result of building geometries from objects of the wrong factory
       # is undefined.
 
-      def linear_ring(points)
-        nil
+      def linear_ring(_points)
+        raise Error::UnsupportedOperation, "Method #{self.class}##{__method__} not defined."
       end
 
       # Create a feature of type Polygon.
@@ -157,8 +155,8 @@ module RGeo
       # result of building geometries from objects of the wrong factory
       # is undefined.
 
-      def polygon(outer_ring, inner_rings = nil)
-        nil
+      def polygon(_outer_ring, _inner_rings = nil)
+        raise Error::UnsupportedOperation, "Method #{self.class}##{__method__} not defined."
       end
 
       # Create a feature of type GeometryCollection.
@@ -169,8 +167,8 @@ module RGeo
       # result of building geometries from objects of the wrong factory
       # is undefined.
 
-      def collection(elems)
-        nil
+      def collection(_elems)
+        raise Error::UnsupportedOperation, "Method #{self.class}##{__method__} not defined."
       end
 
       # Create a feature of type MultiPoint.
@@ -184,8 +182,8 @@ module RGeo
       # result of building geometries from objects of the wrong factory
       # is undefined.
 
-      def multi_point(elems)
-        nil
+      def multi_point(_elems)
+        raise Error::UnsupportedOperation, "Method #{self.class}##{__method__} not defined."
       end
 
       # Create a feature of type MultiLineString.
@@ -199,8 +197,8 @@ module RGeo
       # result of building geometries from objects of the wrong factory
       # is undefined.
 
-      def multi_line_string(elems)
-        nil
+      def multi_line_string(_elems)
+        raise Error::UnsupportedOperation, "Method #{self.class}##{__method__} not defined."
       end
 
       # Create a feature of type MultiPolygon.
@@ -216,8 +214,8 @@ module RGeo
       # result of building geometries from objects of the wrong factory
       # is undefined.
 
-      def multi_polygon(elems)
-        nil
+      def multi_polygon(_elems)
+        raise Error::UnsupportedOperation, "Method #{self.class}##{__method__} not defined."
       end
 
       # Returns the coordinate system specification for the features
@@ -264,7 +262,7 @@ module RGeo
       # algorithm to cast the object. Therefore, by default, you should
       # return false.
 
-      def override_cast(original, type, flags)
+      def override_cast(_original, _type, _flags)
         false
       end
     end

data/lib/rgeo/feature/factory_generator.rb

@@ -31,7 +31,6 @@ module RGeo
     # necessarily include this module itself. Therefore, you should not
     # depend on the kind_of? method to determine if an object is a
     # factory generator.
-
     module FactoryGenerator
       # Generate a factory given a configuration as a hash.
       #
@@ -67,7 +66,7 @@ module RGeo
       # [<tt>:has_m_coordinate</tt>]
       #   Support M coordinates. Default is usually false.
 
-      def call(config = {})
+      def call(_config = {})
         nil
       end
 
@@ -75,7 +74,7 @@ module RGeo
       # factory.
 
       def self.single(factory)
-        proc { |c| factory }
+        proc { |_c| factory }
       end
 
       # Return a new FactoryGenerator that calls the given delegate, but
@@ -84,7 +83,7 @@ module RGeo
       # force certain values to override the given configuration.
 
       def self.decorate(delegate, default_config = {}, force_config = {})
-        proc { |c| delegate_.call(default_config.merge(c).merge(force_config)) }
+        proc { |c| delegate.call(default_config.merge(c).merge(force_config)) }
       end
     end
   end

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
 
@@ -294,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
 
@@ -313,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
 
@@ -332,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
 
@@ -351,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
 
@@ -370,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
 
@@ -389,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
 
@@ -408,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
 
@@ -427,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
 
@@ -453,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
 
@@ -499,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
 
@@ -545,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
 
@@ -563,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
 
@@ -581,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
 
@@ -599,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
 
@@ -611,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
 
@@ -647,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
@@ -673,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
@@ -690,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
@@ -699,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
@@ -708,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