rgeo 2.3.1 → 3.0.1

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

@@ -28,7 +28,6 @@ module RGeo
     # * FittedCoordinateSystem is not implemented.
     # * The defaultEnvelope attribute of CS_CoordinateSystem is not
     #   implemented.
-
     module CS
       # A class implementing the CS_CoordinateSystemFactory interface.
       # It provides methods for building up complex objects from simpler
@@ -37,7 +36,6 @@ module RGeo
       # Note that the methods of CS_CoordinateSystemFactory do not provide
       # facilities for setting the authority. If you need to set authority
       # values, use the create methods for the object classes themselves.
-
       class CoordinateSystemFactory
         # Create a CompoundCoordinateSystem from a name, and two
         # constituent coordinate systems.

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")
+            raise Error::ParseError, "Found token #{@cur_token} when we expected a value"
           end
+
           type = @cur_token
           next_token
           consume_tokentype(:begin)
@@ -47,26 +49,34 @@ 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}")
+              raise Error::ParseError, "Expected 7 Bursa Wolf parameters but found #{bursa_wolf_params.size}"
             end
+
             obj = WGS84ConversionInfo.create(*bursa_wolf_params)
           when "UNIT"
-            case containing_type
-            when "GEOCCS", "VERT_CS", "PROJCS", "SPHEROID"
-              klass = LinearUnit
-            when "GEOGCS"
-              klass = AngularUnit
-            else
-              klass = Unit
-            end
+            klass = case containing_type
+                    when "GEOCCS", "VERT_CS", "PROJCS", "SPHEROID"
+                      LinearUnit
+                    when "GEOGCS"
+                      AngularUnit
+                    else
+                      Unit
+                    end
             obj = klass.create(args.shift(QuotedString), args.shift(Numeric), *args.create_optionals)
           when "PARAMETER"
             obj = ProjectionParameter.create(args.shift(QuotedString), args.shift(Numeric))
           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)
@@ -79,16 +89,26 @@ module RGeo
             obj = VerticalDatum.create(args.shift(QuotedString), args.shift(Numeric), *args.create_optionals)
           when "LOCAL_DATUM"
             obj = LocalDatum.create(args.shift(QuotedString), args.shift(Numeric), *args.create_optionals)
+          when "CS"
+            # Not actually valid WKT, but necessary to load and dump factories
+            # with placeholder coord_sys objects
+            defn = args.shift(QuotedString)
+            dim = args.shift(Float).to_i
+            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)
@@ -96,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")
+              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)
@@ -112,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")
+              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)
@@ -124,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")
+              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
@@ -143,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:
@@ -169,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
@@ -200,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:
@@ -219,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:
@@ -259,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/coord_sys.rb

@@ -9,9 +9,6 @@
 require_relative "coord_sys/cs/factories"
 require_relative "coord_sys/cs/entities"
 require_relative "coord_sys/cs/wkt_parser"
-require_relative "coord_sys/srs_database/entry"
-require_relative "coord_sys/srs_database/url_reader"
-require_relative "coord_sys/srs_database/sr_org"
 
 module RGeo
   # This module provides data structures and tools related to coordinate
@@ -26,23 +23,7 @@ module RGeo
   # This includes classes for representing ellipsoids, datums, coordinate
   # systems, and other related concepts, as well as a parser for the WKT
   # format for specifying coordinate systems.
-  #
-  # The RGeo::CoordSys::SRSDatabase module contains tools for accessing
-  # spatial reference databases, from which you can look up coordinate
-  # system specifications. You can access the <tt>spatial_ref_sys</tt>
-  # table provided with OGC-compliant spatial databases such as PostGIS,
-  # read the databases provided with the proj4 library, or access URLs
-  # such as those provided by spatialreference.org.
-
   module CoordSys
-    # The only valid key is :proj4
-    def self.supported?(key)
-      raise(Error::UnsupportedOperation, "Invalid key. The only valid key is :proj4.") unless key == :proj4
-      defined?(RGeo::CoordSys::Proj4) && RGeo::CoordSys::Proj4.supported?
-    end
-
-    def self.check!(key)
-      supported?(key) || raise(Error::UnsupportedOperation, "Coordinate system '#{key}' is not supported.")
-    end
+    CONFIG = Struct.new(:default_coord_sys_class).new(CS::CoordinateSystem)
   end
 end

data/lib/rgeo/error.rb

@@ -29,5 +29,20 @@ module RGeo
     # Parsing failed
     class ParseError < RGeoError
     end
+
+    # Standard error messages from
+    # https://github.com/locationtech/jts/blob/0afbfb1956ec24912a8b4dc4edff0f1200442857/modules/core/src/main/java/org/locationtech/jts/operation/valid/TopologyValidationError.java#L98-L110
+    TOPOLOGY_VALIDATION_ERR = "Topology Validation Error"
+    REPEATED_POINT = "Repeated Point"
+    HOLE_OUTSIDE_SHELL = "Hole lies outside shell"
+    NESTED_HOLES = "Holes are nested"
+    DISCONNECTED_INTERIOR = "Interior is disconnected"
+    SELF_INTERSECTION = "Self-intersection"
+    RING_SELF_INTERSECTION = "Ring Self-intersection"
+    NESTED_SHELLS = "Nested shells"
+    DUPLICATE_RINGS = "Duplicate Rings"
+    TOO_FEW_POINTS = "Too few distinct points in geometry component"
+    INVALID_COORDINATE = "Invalid Coordinate"
+    UNCLOSED_RING = "Ring is not closed"
   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
@@ -94,11 +93,6 @@ module RGeo
         raise Error::UnsupportedOperation, "Method Curve#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
-
       # === SFS 1.1 Description
       #
       # Returns true if this Curve is closed [StartPoint() = EndPoint()]
@@ -113,11 +107,6 @@ module RGeo
       def ring?
         raise Error::UnsupportedOperation, "Method Curve#ring? not defined."
       end
-
-      def 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
     end
   end
 end

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,16 +214,8 @@ module RGeo
       # result of building geometries from objects of the wrong factory
       # is undefined.
 
-      def multi_polygon(elems)
-        nil
-      end
-
-      # Returns a RGeo::CoordSys::Proj4 representing the projection for
-      # the coordinate system of features created by this factory, or nil
-      # if there is no such proj4 projection.
-
-      def proj4
-        nil
+      def multi_polygon(_elems)
+        raise Error::UnsupportedOperation, "Method #{self.class}##{__method__} not defined."
       end
 
       # Returns the coordinate system specification for the features
@@ -262,7 +252,7 @@ module RGeo
       #   the original is already of the desired factory and type
       # [<tt>:project</tt>]
       #   indicates whether to project the coordinates from the source to
-      #   the destination proj4 coordinate system, if available
+      #   the destination coordinate system, if available
       #
       # It should return either a casted result object, false, or nil.
       # A nil return value indicates that casting should be forced to
@@ -272,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.
       #
@@ -56,25 +55,18 @@ module RGeo
       # [<tt>:srid</tt>]
       #   The SRID for the factory and objects it creates.
       #   Default is usually 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. This is usually an optional parameter; the default
-      #   is usually nil.
       # [<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.
-      #   This is usually an optional parameter; the default is usually
-      #   nil.
-      # [<tt>:srs_database</tt>]
-      #   If provided, look up the Proj4 and OGC coordinate systems from
-      #   the given database and SRID.
+      #   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. The option is usually nil.
       # [<tt>:has_z_coordinate</tt>]
       #   Support Z coordinates. Default is usually false.
       # [<tt>:has_m_coordinate</tt>]
       #   Support M coordinates. Default is usually false.
 
-      def call(config = {})
+      def call(_config = {})
         nil
       end
 
@@ -82,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
@@ -91,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