rgeo 3.0.0.pre.rc.1 → 3.0.0.pre.rc.2

data/lib/rgeo/cartesian/interface.rb

@@ -69,11 +69,6 @@ module RGeo
       #   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.
       # [<tt>:has_z_coordinate</tt>]
       #   Support a Z coordinate. Default is false.
       # [<tt>:has_m_coordinate</tt>]
@@ -101,31 +96,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

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,14 +23,6 @@ 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)

data/lib/rgeo/feature/factory_generator.rb

@@ -66,9 +66,6 @@ module RGeo
       #   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.
       # [<tt>:has_z_coordinate</tt>]
       #   Support Z coordinates. Default is usually false.
       # [<tt>:has_m_coordinate</tt>]

data/lib/rgeo/feature/geometry.rb

@@ -108,6 +108,36 @@ module RGeo
         raise Error::UnsupportedOperation, "Method #{self.class}#dimension not defined."
       end
 
+      # === SFS 1.2 Description
+      #
+      # The coordinate dimension is the dimension of direct positions (coordinate tuples) used in
+      # the definition of this geometric object
+      #
+      # === Notes
+      #
+      # Difference between this and dimension is that this is the dimension of the coordinate
+      # not the dimension of the geometry.
+      #
+      # @return [Integer]
+      def coordinate_dimension
+        raise Error::UnsupportedOperation, "Method #{self.class}#coordinate_dimension not defined."
+      end
+
+      # === SFS 1.2 Description
+      #
+      # The spatial dimension is the dimension of the spatial portion of the direct positions
+      # (coordinate tuples) used in the definition of this geometric object. If the direct positions
+      # do not carry a measure coordinate, this will be equal to the coordinate dimension.
+      #
+      # === Notes
+      #
+      # Similar to coordinate_dimension except it will ignore the M component always.
+      #
+      # @return [Integer]
+      def spatial_dimension
+        raise Error::UnsupportedOperation, "Method #{self.class}#spatial_dimension not defined."
+      end
+
       # === SFS 1.1 Description
       #
       # Returns the instantiable subtype of Geometry of which this
@@ -222,6 +252,28 @@ module RGeo
         simple?
       end
 
+      # === SFS 1.2 Description
+      #
+      # Returns 1 (TRUE) if this geometric object has z coordinate values.
+      #
+      # === Notes
+      #
+      # @return [Boolean]
+      def is_3d?
+        raise Error::UnsupportedOperation, "Method #{self.class}#is_3d? not defined."
+      end
+
+      # === SFS 1.2 Description
+      #
+      # Returns 1 (TRUE) if this geometric object has m coordinate values.
+      #
+      # === Notes
+      #
+      # @return [Boolean]
+      def measured?
+        raise Error::UnsupportedOperation, "Method #{self.class}#measured? not defined."
+      end
+
       # === SFS 1.1 Description
       #
       # Returns the closure of the combinatorial boundary of this geometric
@@ -415,6 +467,33 @@ module RGeo
         raise Error::UnsupportedOperation, "Method #{self.class}#relate not defined."
       end
 
+      # === SFS 1.2 Description
+      #
+      # Returns a derived geometry collection value that matches the
+      # specified m coordinate value.
+      #
+      # === Notes
+      #
+      # @param m_value [Float] value to find matches for
+      # @return [RGeo::Feature::GeometryCollection]
+      def locate_along
+        raise Error::UnsupportedOperation, "Method #{self.class}#locate_along not defined."
+      end
+
+      # === SFS 1.2 Description
+      #
+      # Returns a derived geometry collection value
+      # that matches the specified range of m coordinate values inclusively
+      #
+      # === Notes
+      #
+      # @param m_start [Float] lower bound of value range
+      # @param m_end [Float] upper bound of value range
+      # @return [RGeo::Feature::GeometryCollection]
+      def locate_between
+        raise Error::UnsupportedOperation, "Method #{self.class}#locate_between not defined."
+      end
+
       # === SFS 1.1 Description
       #
       # Returns the shortest distance between any two Points in the two

data/lib/rgeo/geographic/factory.rb

@@ -31,6 +31,11 @@ module RGeo
         @multi_polygon_class = Geographic.const_get("#{impl_prefix}MultiPolygonImpl")
         @support_z = opts[:has_z_coordinate] ? true : false
         @support_m = opts[:has_m_coordinate] ? true : false
+        @coordinate_dimension = 2
+        @coordinate_dimension += 1 if @support_z
+        @coordinate_dimension += 1 if @support_m
+        @spatial_dimension = @support_z ? 3 : 2
+
         @srid = (opts[:srid] || 4326).to_i
         @proj4 = opts[:proj4]
         if @proj4 && CoordSys.check!(:proj4)
@@ -75,6 +80,7 @@ module RGeo
         end
         @projector = nil
       end
+      attr_reader :coordinate_dimension, :spatial_dimension
 
       # Equivalence test.
 

data/lib/rgeo/geographic/interface.rb

@@ -83,11 +83,6 @@ module RGeo
       #   visualization crs". You may alternatively wish to set the srid
       #   to 4326, indicating the WGS84 crs, but note that that value
       #   implies an ellipsoidal datum, not a spherical datum.
-      # [<tt>:srs_database</tt>]
-      #   Optional. If provided, the object should respond to #get and
-      #   #clear_cache. 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.
       # [<tt>:wkt_parser</tt>]
       #   Configure the parser for WKT. The value is a hash of
       #   configuration parameters for WKRep::WKTParser.new. Default is
@@ -112,13 +107,6 @@ module RGeo
         proj4 = opts[:proj4]
         coord_sys = opts[:coord_sys]
         srid = opts[:srid]
-        if (!proj4 || !coord_sys) && srid && (db_ = opts[:srs_database])
-          entry_ = db_.get(srid.to_i)
-          if entry_
-            proj4 ||= entry_.proj4
-            coord_sys ||= entry_.coord_sys
-          end
-        end
         srid ||= coord_sys.authority_code if coord_sys
         Geographic::Factory.new("Spherical",
           has_z_coordinate: opts[:has_z_coordinate],
@@ -247,9 +235,7 @@ module RGeo
       # and let this method construct a projection factory for you (which
       # it will do using the preferred Cartesian factory generator).
       # If you choose this second method, you may provide the proj4
-      # directly via the <tt>:projection_proj4</tt> option, or indirectly
-      # by providing both an <tt>:srid</tt> and a <tt>:srs_database</tt>
-      # to use to look up the coordinate system.
+      # via the <tt>:projection_proj4</tt> option.
       #
       # Following are detailed descriptions of the various options you can
       # pass to this method.
@@ -292,11 +278,6 @@ module RGeo
       #   The SRID value to use for the main geographic factory. Defaults
       #   to the given geographic coordinate system's authority code, or
       #   to 0 if no geographic coordinate system is known.
-      # [<tt>:srs_database</tt>]
-      #   Optional. If provided, the object should respond to #get and
-      #   #clear_cache. 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.
       # [<tt>:has_z_coordinate</tt>]
       #   Support a Z coordinate. Default is false.
       #   Note: this is ignored if a <tt>:projection_factory</tt> is
@@ -335,7 +316,6 @@ module RGeo
 
       def projected_factory(opts = {})
         CoordSys.check!(:proj4)
-        db_ = opts[:srs_database]
         if (projection_factory = opts[:projection_factory])
           # Get the projection coordinate systems from the given factory
           projection_proj4 = projection_factory.proj4
@@ -350,14 +330,6 @@ module RGeo
           proj4 = opts[:proj4]
           coord_sys = opts[:coord_sys]
           srid = opts[:srid]
-          # Lookup srid from srs database if needed
-          if (!proj4 || !coord_sys) && srid && db_
-            entry_ = db_.get(srid.to_i)
-            if entry_
-              proj4 ||= entry_.proj4
-              coord_sys ||= entry_.coord_sys
-            end
-          end
           # Fall back to getting the values from the projection.
           proj4 ||= projection_proj4.get_geographic || _proj_4326
           coord_sys ||= projection_coord_sys.geographic_coordinate_system if projection_coord_sys

data/lib/rgeo/geographic/projected_feature_methods.rb

@@ -22,6 +22,22 @@ module RGeo
         factory.unproject(projection.unsafe_envelope)
       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
+
       def empty?
         projection.empty?
       end

data/lib/rgeo/geographic/spherical_feature_methods.rb

@@ -12,6 +12,22 @@ module RGeo
       def srid
         factory.srid
       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
     end
 
     module SphericalPointMethods # :nodoc:
@@ -216,7 +232,7 @@ module RGeo
         centroid_lat /= (6.0 * signed_area)
         centroid_lng /= (6.0 * signed_area)
 
-        RGeo::Geographic.spherical_factory.point(centroid_lat, centroid_lng)
+        factory.point(centroid_lat, centroid_lng)
       end
     end
   end

data/lib/rgeo/geos/capi_factory.rb

@@ -71,13 +71,6 @@ module RGeo
           if coord_sys_.is_a?(String)
             coord_sys_ = CoordSys::CS.create_from_wkt(coord_sys_)
           end
-          if (!proj4_ || !coord_sys_) && srid_ && (db_ = opts_[:srs_database])
-            entry_ = db_.get(srid_.to_i)
-            if entry_
-              proj4_ ||= entry_.proj4
-              coord_sys_ ||= entry_.coord_sys
-            end
-          end
           srid_ ||= coord_sys_.authority_code if coord_sys_
 
           # Create the factory and set instance variables

data/lib/rgeo/geos/capi_feature_classes.rb

@@ -13,6 +13,17 @@ module RGeo
     module CAPIGeometryMethods
       include Feature::Instance
 
+      def coordinate_dimension
+        dim = 2
+        dim += 1 if factory.supports_z?
+        dim += 1 if factory.supports_m?
+        dim
+      end
+
+      def spatial_dimension
+        factory.supports_z? ? 3 : 2
+      end
+
       def is_empty? # rubocop:disable Naming/PredicateName
         warn "The is_empty? method is deprecated, please use the empty? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
         empty?
@@ -23,6 +34,14 @@ module RGeo
         simple?
       end
 
+      def is_3d?
+        factory.supports_z?
+      end
+
+      def measured?
+        factory.supports_m?
+      end
+
       def inspect
         "#<#{self.class}:0x#{object_id.to_s(16)} #{as_text.inspect}>"
       end

data/lib/rgeo/geos/ffi_factory.rb

@@ -25,6 +25,11 @@ module RGeo
         if @has_z && @has_m
           raise Error::UnsupportedOperation, "GEOS cannot support both Z and M coordinates at the same time."
         end
+        @coordinate_dimension = 2
+        @coordinate_dimension += 1 if @has_z
+        @coordinate_dimension += 1 if @has_m
+        @spatial_dimension = @has_z ? 3 : 2
+
         @_has_3d = @has_z || @has_m
         @buffer_resolution = opts[:buffer_resolution].to_i
         @buffer_resolution = 1 if @buffer_resolution < 1
@@ -70,13 +75,6 @@ module RGeo
         if @coord_sys.is_a?(String)
           @coord_sys = CoordSys::CS.create_from_wkt(@coord_sys)
         end
-        if (!@proj4 || !@coord_sys) && @srid && (db = opts[:srs_database])
-          entry = db.get(@srid.to_i)
-          if entry
-            @proj4 ||= entry.proj4
-            @coord_sys ||= entry.coord_sys
-          end
-        end
         @srid ||= @coord_sys.authority_code if @coord_sys
         @srid = @srid.to_i
 
@@ -106,6 +104,7 @@ module RGeo
           @wkb_reader = nil
         end
       end
+      attr_reader :coordinate_dimension, :spatial_dimension
 
       # Standard object inspection output
 

data/lib/rgeo/geos/ffi_feature_methods.rb

@@ -77,6 +77,14 @@ module RGeo
         Utils.ffi_compute_dimension(@fg_geom)
       end
 
+      def coordinate_dimension
+        factory.coordinate_dimension
+      end
+
+      def spatial_dimension
+        factory.spatial_dimension
+      end
+
       def geometry_type
         Feature::Geometry
       end
@@ -131,6 +139,14 @@ module RGeo
         simple?
       end
 
+      def is_3d?
+        factory.property(:has_z_coordinate)
+      end
+
+      def measured?
+        factory.property(:has_m_coordinate)
+      end
+
       def valid?
         @fg_geom.valid?
       end

data/lib/rgeo/geos/interface.rb

@@ -135,11 +135,6 @@ module RGeo
       #   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 object should respond to #get and
-      #   #clear_cache. 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.
       # [<tt>:has_z_coordinate</tt>]
       #   Support <tt>z_coordinate</tt>. Default is false.
       # [<tt>:has_m_coordinate</tt>]
@@ -194,18 +189,6 @@ module RGeo
           end
         end
       end
-
-      # Returns a Feature::FactoryGenerator that creates Geos-backed
-      # 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 factory_generator(defaults = {})
-        proc { |c| factory(defaults.merge(c)) }
-      end
     end
   end
 end

data/lib/rgeo/geos/zm_factory.rb

@@ -44,13 +44,6 @@ module RGeo
         proj4 = opts[:proj4]
         coord_sys = opts[:coord_sys]
         srid = opts[:srid]
-        if (!proj4 || !coord_sys) && srid && (db = opts[:srs_database])
-          entry = db.get(srid.to_i)
-          if entry
-            proj4 ||= entry.proj4
-            coord_sys ||= entry.coord_sys
-          end
-        end
         srid ||= coord_sys.authority_code if coord_sys
         config = {
           buffer_resolution: opts[:buffer_resolution], auto_prepare: opts[:auto_prepare],

data/lib/rgeo/geos/zm_feature_methods.rb

@@ -45,6 +45,14 @@ module RGeo
         @zgeometry.dimension
       end
 
+      def coordinate_dimension
+        4
+      end
+
+      def spatial_dimension
+        3
+      end
+
       def geometry_type
         @zgeometry.geometry_type
       end
@@ -83,6 +91,14 @@ module RGeo
         simple?
       end
 
+      def is_3d?
+        true
+      end
+
+      def measured?
+        true
+      end
+
       def boundary
         @factory.create_feature(nil, @zgeometry.boundary, @mgeometry.boundary)
       end

data/lib/rgeo/geos.rb

@@ -33,9 +33,6 @@ module RGeo
       require_relative "geos/capi_feature_classes"
       require_relative "geos/capi_factory"
     end
-    require_relative "geos/ffi_feature_methods"
-    require_relative "geos/ffi_feature_classes"
-    require_relative "geos/ffi_factory"
     require_relative "geos/zm_feature_methods"
     require_relative "geos/zm_feature_classes"
     require_relative "geos/zm_factory"
@@ -56,6 +53,12 @@ module RGeo
       FFI_SUPPORT_EXCEPTION = ex
     end
 
+    if FFI_SUPPORTED
+      require_relative "geos/ffi_feature_methods"
+      require_relative "geos/ffi_feature_classes"
+      require_relative "geos/ffi_factory"
+    end
+
     # Default preferred native interface
     if CAPI_SUPPORTED
       self.preferred_native_interface = :capi

data/lib/rgeo/impl_helper/validity_check.rb

@@ -22,13 +22,14 @@ module RGeo
       UNCHECKED_METHODS = [
         # Basic methods
         :factory, :geometry_type, :as_text, :as_binary, :srid,
+        :dimension, :coordinate_dimension, :spatial_dimension,
         # Tests
-        :simple?, :closed?, :empty?,
+        :simple?, :closed?, :empty?, :is_3d?, :measured?,
         # Accessors
         :exterior_ring, :interior_rings, :[], :num_geometries, :num_interior_rings,
         :geometry_n, :each, :points, :point_n, :start_point, :end_point, :x, :y, :z, :m,
         # Trivial methods
-        :num_points,
+        :num_points, :locate_along, :locate_between,
         # Comparison
         :equals?, :rep_equals?, :eql?, :==, :'!='
       ].freeze

data/lib/rgeo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RGeo
-  VERSION = "3.0.0-rc.1"
+  VERSION = "3.0.0-rc.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.rc.1
+  version: 3.0.0.pre.rc.2
 platform: ruby
 authors:
 - Daniel Azuma
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-geos
@@ -81,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: ruby_memcheck
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,8 @@ files:
 - ext/geos_c_impl/polygon.c
 - ext/geos_c_impl/polygon.h
 - ext/geos_c_impl/preface.h
+- ext/geos_c_impl/ruby_more.c
+- ext/geos_c_impl/ruby_more.h
 - lib/rgeo.rb
 - lib/rgeo/cartesian.rb
 - lib/rgeo/cartesian/analysis.rb
@@ -152,9 +168,6 @@ files:
 - lib/rgeo/coord_sys/cs/entities.rb
 - lib/rgeo/coord_sys/cs/factories.rb
 - lib/rgeo/coord_sys/cs/wkt_parser.rb
-- lib/rgeo/coord_sys/srs_database/entry.rb
-- lib/rgeo/coord_sys/srs_database/sr_org.rb
-- lib/rgeo/coord_sys/srs_database/url_reader.rb
 - lib/rgeo/error.rb
 - lib/rgeo/feature.rb
 - lib/rgeo/feature/curve.rb