rgeo 2.4.0 → 3.0.0

data/lib/rgeo/wkrep/wkt_parser.rb

@@ -48,7 +48,6 @@ module RGeo
     # [<tt>:default_srid</tt>]
     #   A SRID to pass to the factory generator if no SRID is present in
     #   the input. Defaults to nil (i.e. don't specify a SRID).
-
     class WKTParser
       # Create and configure a WKT parser. See the WKTParser
       # documentation for the options that can be passed.
@@ -66,9 +65,15 @@ module RGeo
         end
         @support_ewkt = opts[:support_ewkt] ? true : false
         @support_wkt12 = opts[:support_wkt12] ? true : false
-        @strict_wkt11 = @support_ewkt || @support_wkt12 ? false : opts[:strict_wkt11] ? true : false
+        @strict_wkt11 =
+          if @support_ewkt || @support_wkt12
+            false
+          else
+            opts[:strict_wkt11] ? true : false
+          end
         @ignore_extra_tokens = opts[:ignore_extra_tokens] ? true : false
         @default_srid = opts[:default_srid]
+        @mutex = Mutex.new
       end
 
       # Returns the factory generator. See WKTParser for details.
@@ -115,29 +120,32 @@ module RGeo
       # Parse the given string, and return a geometry object.
 
       def parse(str)
-        str = str.downcase
-        @cur_factory = @exact_factory
-        if @cur_factory
-          @cur_factory_support_z = @cur_factory.property(:has_z_coordinate) ? true : false
-          @cur_factory_support_m = @cur_factory.property(:has_m_coordinate) ? true : false
-        end
-        @cur_expect_z = nil
-        @cur_expect_m = nil
-        @cur_srid = @default_srid
-        if @support_ewkt && str =~ /^srid=(\d+);/i
-          str = $'
-          @cur_srid = Regexp.last_match(1).to_i
-        end
-        begin
-          start_scanner(str)
-          obj = parse_type_tag
-          if @cur_token && !@ignore_extra_tokens
-            raise Error::ParseError, "Extra tokens beginning with #{@cur_token.inspect}."
+        @mutex.synchronize do
+          str = str.downcase
+          @cur_factory = @exact_factory
+          if @cur_factory
+            @cur_factory_support_z = @cur_factory.property(:has_z_coordinate) ? true : false
+            @cur_factory_support_m = @cur_factory.property(:has_m_coordinate) ? true : false
           end
-        ensure
-          clean_scanner
+          @cur_expect_z = nil
+          @cur_expect_m = nil
+          @cur_srid = @default_srid
+          if @support_ewkt && str =~ /^srid=(\d+);/i
+            str = Regexp.last_match&.post_match
+            @cur_srid = Regexp.last_match(1).to_i
+          end
+          begin
+            start_scanner(str)
+            obj = parse_type_tag
+
+            if @cur_token && !@ignore_extra_tokens
+              raise Error::ParseError, "Extra tokens beginning with #{@cur_token.inspect}."
+            end
+          ensure
+            clean_scanner
+          end
+          obj
         end
-        obj
       end
 
       private
@@ -146,14 +154,19 @@ module RGeo
         if @cur_expect_z && !@cur_factory_support_z
           raise Error::ParseError, "Geometry calls for Z coordinate but factory doesn't support it."
         end
-        if @cur_expect_m && !@cur_factory_support_m
-          raise Error::ParseError, "Geometry calls for M coordinate but factory doesn't support it."
-        end
+
+        return unless @cur_expect_m && !@cur_factory_support_m
+
+        raise Error::ParseError, "Geometry calls for M coordinate but factory doesn't support it."
       end
 
       def ensure_factory
         unless @cur_factory
-          @cur_factory = @factory_generator.call(srid: @cur_srid, has_z_coordinate: @cur_expect_z, has_m_coordinate: @cur_expect_m)
+          @cur_factory = @factory_generator.call(
+            srid: @cur_srid,
+            has_z_coordinate: @cur_expect_z,
+            has_m_coordinate: @cur_expect_m
+          )
           @cur_factory_support_z = @cur_factory.property(:has_z_coordinate) ? true : false
           @cur_factory_support_m = @cur_factory.property(:has_m_coordinate) ? true : false
           check_factory_support unless @cur_expect_z.nil?
@@ -177,13 +190,13 @@ module RGeo
         end
         if zm.length > 0 || @strict_wkt11
           creating_expectation = @cur_expect_z.nil?
-          expect_z = zm[0, 1] == "z" ? true : false
+          expect_z = zm[0, 1] == "z"
           if @cur_expect_z.nil?
             @cur_expect_z = expect_z
           elsif expect_z != @cur_expect_z
             raise Error::ParseError, "Surrounding collection has Z but contained geometry doesn't."
           end
-          expect_m = zm[-1, 1] == "m" ? true : false
+          expect_m = zm[-1, 1] == "m"
           if @cur_expect_m.nil?
             @cur_expect_m = expect_m
           elsif expect_m != @cur_expect_m
@@ -199,7 +212,7 @@ module RGeo
         end
         case type
         when "point"
-          parse_point(true)
+          parse_point(convert_empty: true)
         when "linestring"
           parse_line_string
         when "polygon"
@@ -235,9 +248,11 @@ module RGeo
           num_extras -= 1 if @cur_expect_z
           @cur_expect_m = num_extras > 0 && (!@cur_factory || @cur_factory_support_m) ? true : false
           num_extras -= 1 if @cur_expect_m
+
           if num_extras > 0
             raise Error::ParseError, "Found #{extra.size + 2} coordinates, which is too many for this factory."
           end
+
           ensure_factory
         else
           val = 0
@@ -258,7 +273,7 @@ module RGeo
         @cur_factory.point(x, y, *extra)
       end
 
-      def parse_point(convert_empty = false)
+      def parse_point(convert_empty: false)
         if convert_empty && @cur_token == "empty"
           point = ensure_factory.multi_point([])
         else
@@ -387,13 +402,11 @@ module RGeo
       end
 
       def expect_token_type(type)
-        unless type === @cur_token
-          raise Error::ParseError, "#{type.inspect} expected but #{@cur_token.inspect} found."
-        end
+        raise Error::ParseError, "#{type.inspect} expected but #{@cur_token.inspect} found." unless type === @cur_token
       end
 
       def next_token
-        if @scanner.scan_until(/\(|\)|\[|\]|,|[^\s\(\)\[\],]+/)
+        if @scanner.scan_until(/\(|\)|\[|\]|,|[^\s()\[\],]+/)
           token = @scanner.matched
           case token
           when /^[-+]?(\d+(\.\d*)?|\.\d+)(e[-+]?\d+)?$/

data/lib/rgeo.rb

@@ -16,9 +16,7 @@
 #   Simple Features Specifiation (SFS). This module forms the core of RGeo.
 #
 # * RGeo::CoordSys contains classes for representing spatial
-#   reference systems and coordinate transformations. For example, it
-#   includes a wrapper for the Proj4 library, supporting many geographic
-#   projections.
+#   reference systems and coordinate transformations.
 #
 # * RGeo::Cartesian is a gateway for geometric data implementations
 #   that operate in Caresian (flat) coordinate systems. It also provides a

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Daniel Azuma
 - Tee Parham
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-geos
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +73,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.36.0
+- !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
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: RGeo is a geospatial data library for Ruby. It provides an implementation
   of the Open Geospatial Consortium's Simple Features Specification, used by most
   standard spatial/geographic data storage systems such as PostGIS. A number of add-on
@@ -90,11 +118,13 @@ email:
 - dazuma@gmail.com
 - parhameter@gmail.com
 - kfdoggett@gmail.com
+- buonomo.ulysse@gmail.com
 executables: []
 extensions:
 - ext/geos_c_impl/extconf.rb
 extra_rdoc_files: []
 files:
+- ".yardopts"
 - LICENSE.txt
 - README.md
 - ext/geos_c_impl/analysis.c
@@ -120,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
@@ -129,13 +161,13 @@ files:
 - lib/rgeo/cartesian/feature_classes.rb
 - lib/rgeo/cartesian/feature_methods.rb
 - lib/rgeo/cartesian/interface.rb
+- lib/rgeo/cartesian/planar_graph.rb
+- lib/rgeo/cartesian/sweepline_intersector.rb
+- lib/rgeo/cartesian/valid_op.rb
 - lib/rgeo/coord_sys.rb
 - 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
@@ -158,10 +190,10 @@ files:
 - lib/rgeo/geographic.rb
 - lib/rgeo/geographic/factory.rb
 - lib/rgeo/geographic/interface.rb
-- lib/rgeo/geographic/proj4_projector.rb
 - lib/rgeo/geographic/projected_feature_classes.rb
 - lib/rgeo/geographic/projected_feature_methods.rb
 - lib/rgeo/geographic/projected_window.rb
+- lib/rgeo/geographic/projector.rb
 - lib/rgeo/geographic/simple_mercator_projector.rb
 - lib/rgeo/geographic/spherical_feature_classes.rb
 - lib/rgeo/geographic/spherical_feature_methods.rb
@@ -185,6 +217,8 @@ files:
 - lib/rgeo/impl_helper/basic_polygon_methods.rb
 - lib/rgeo/impl_helper/math.rb
 - lib/rgeo/impl_helper/utils.rb
+- lib/rgeo/impl_helper/valid_op.rb
+- lib/rgeo/impl_helper/validity_check.rb
 - lib/rgeo/version.rb
 - lib/rgeo/wkrep.rb
 - lib/rgeo/wkrep/wkb_generator.rb
@@ -194,8 +228,9 @@ files:
 homepage: https://github.com/rgeo/rgeo
 licenses:
 - BSD-3-Clause
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -203,15 +238,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: RGeo is a geospatial data library for Ruby.
 test_files: []

data/lib/rgeo/coord_sys/srs_database/entry.rb

@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-# -----------------------------------------------------------------------------
-#
-# SRS database interface
-#
-# -----------------------------------------------------------------------------
-
-module RGeo
-  module CoordSys
-    # This module contains tools for accessing spatial reference
-    # databases. These are databases (either local or remote) from which
-    # you can look up coordinate system specifications, typically in
-    # either OGC or Proj4 format. For example, you can access the
-    # <tt>spatial_ref_sys</tt> table provided with an OGC-compliant RDBMS
-    # such as PostGIS. You can also read the database files provided with
-    # the proj4 library, or access online databases such as the
-    # spatialreference.org site.
-
-    # Spatial reference system database classes must implement these methods:
-    #   get
-    #   clear_cache
-    #
-    # See SrOrg and UrlReader for implementations of SRSDatabase classes.
-    #
-    # Retrieve an Entry given an identifier. The identifier is usually
-    # a numeric spatial reference ID (SRID), but could be a string
-    # value for certain database types.
-    #   get(identifier)
-    #
-    # Clear any cache utilized by this database.
-    #   clear_cache
-
-    module SRSDatabase
-      # An entry in a spatial reference system database.
-      # Every entry has an identifier, but all the other attributes are
-      # optional and may or may not be present depending on the database.
-      class Entry
-        # Create an entry.
-        # You must provide an identifier, which may be numeric or a
-        # string. The data hash should contain any other attributes,
-        # keyed by symbol.
-        #
-        # Some attribute inputs have special behaviors:
-        #
-        # [<tt>:coord_sys</tt>]
-        #   You can pass a CS coordinate system object, or a string in
-        #   WKT format.
-        # [<tt>:proj4</tt>]
-        #   You can pass a Proj4 object, or a proj4-format string.
-        # [<tt>:name</tt>]
-        #   If the name is not provided directly, it is taken from the
-        #   coord_sys.
-        # [<tt>:authority</tt>]
-        #   If the authority name is not provided directly, it is taken
-        #   from the coord_sys.
-        # [<tt>:authority_code</tt>]
-        #   If the authority code is not provided directly, it is taken
-        #   from the coord_sys.
-
-        def initialize(ident, data = {})
-          @identifier = ident
-          @authority = data[:authority]
-          @authority_code = data[:authority_code]
-          @name = data[:name]
-          @description = data[:description]
-          @coord_sys = data[:coord_sys]
-          if @coord_sys.is_a?(String)
-            @coord_sys = CS.create_from_wkt(@coord_sys)
-          end
-          @proj4 = data[:proj4]
-          if @proj4 && CoordSys.check!(:proj4)
-            if @proj4.is_a?(String) || @proj4.is_a?(Hash)
-              @proj4 = Proj4.create(@proj4)
-            end
-          end
-          if @coord_sys
-            @name = @coord_sys.name unless @name
-            @authority = @coord_sys.authority unless @authority
-            @authority_code = @coord_sys.authority unless @authority_code
-          end
-        end
-
-        # The database key or identifier.
-        attr_reader :identifier
-
-        # The authority name, if present. Example: "epsg".
-        attr_reader :authority
-
-        # The authority code, e.g. an EPSG code.
-        attr_reader :authority_code
-
-        # A human-readable name for this coordinate system.
-        attr_reader :name
-
-        # A human-readable description for this coordinate system.
-        attr_reader :description
-
-        # The CS::CoordinateSystem object.
-        attr_reader :coord_sys
-
-        # The Proj4 object.
-        attr_reader :proj4
-      end
-    end
-  end
-end

data/lib/rgeo/coord_sys/srs_database/sr_org.rb

@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-# -----------------------------------------------------------------------------
-#
-# SRS database interface
-#
-# -----------------------------------------------------------------------------
-
-require "net/http"
-
-module RGeo
-  module CoordSys
-    module SRSDatabase
-      # A spatial reference database implementation that fetches data
-      # from the spatialreference.org website.
-
-      class SrOrg
-        # Create a database backed by the given catalog of the
-        # spatialreference.org website. Catalogs currently supported by
-        # spatialreference.org are "epsg", "esri", "iau2000" and "sr-org".
-        #
-        # Options:
-        #
-        # [<tt>:cache</tt>]
-        #   If set to true, lookup results are cached so if the same URL
-        #   is requested again, the result is served from cache rather
-        #   than issuing another HTTP request. Default is false.
-
-        def initialize(catalog, opts = {})
-          @catalog = catalog.to_s.downcase
-          @cache = opts[:cache] ? {} : nil
-        end
-
-        # The spatialreference.org catalog used by this database.
-        attr_reader :catalog
-
-        # Retrieve the Entry from a spatialreference.org catalog given an
-        # integer ID.
-
-        def get(ident)
-          ident = ident.to_s
-          return @cache[ident] if @cache&.include?(ident)
-          coord_sys = nil
-          proj4 = nil
-          Net::HTTP.start("spatialreference.org") do |http|
-            response = http.request_get("/ref/#{@catalog}/#{ident}/ogcwkt/")
-            coord_sys = response.body if response.is_a?(Net::HTTPSuccess)
-            response = http.request_get("/ref/#{@catalog}/#{ident}/proj4/")
-            proj4 = response.body if response.is_a?(Net::HTTPSuccess)
-          end
-          result = Entry.new(ident, coord_sys: coord_sys.strip, proj4: proj4.strip)
-          @cache[ident] = result if @cache
-          result
-        end
-
-        # Clear the cache if one exists.
-
-        def clear_cache
-          @cache&.clear
-        end
-      end
-    end
-  end
-end

data/lib/rgeo/coord_sys/srs_database/url_reader.rb

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-# -----------------------------------------------------------------------------
-#
-# SRS database interface
-#
-# -----------------------------------------------------------------------------
-
-require "net/http"
-
-module RGeo
-  module CoordSys
-    module SRSDatabase
-      # A spatial reference database implementation that fetches data from
-      # internet URLs.
-
-      class UrlReader
-        # Create a URL-based spatial reference database.
-        #
-        # Options:
-        #
-        # [<tt>:cache</tt>]
-        #   If set to true, lookup results are cached so if the same URL
-        #   is requested again, the result is served from cache rather
-        #   than issuing another HTTP request. Default is false.
-
-        def initialize(opts = {})
-          @cache = opts[:cache] ? {} : nil
-        end
-
-        # Retrieve the given URL and return an Entry.
-        # Returns nil if the URL cannot be read as an OGC WKT or Proj4
-        # coordinate system
-
-        def get(ident)
-          ident = ident.to_s
-          return @cache[ident] if @cache&.include?(ident)
-          uri = URI.parse(ident)
-          result = nil
-          Net::HTTP.start(uri.host, uri.port) do |http|
-            request = uri.path
-            request = "#{request}?#{uri.query}" if uri.query
-            response = http.requestget(request)
-            if response.is_a?(Net::HTTPSuccess)
-              response = response.body.strip
-              if response[0, 1] == "+"
-                result = Entry.new(ident, proj4: response)
-              else
-                result = Entry.new(ident, coord_sys: response)
-              end
-            end
-          end
-          @cache[ident] = result if @cache
-          result
-        end
-
-        # Clear the cache if one is present.
-
-        def clear_cache
-          @cache&.clear
-        end
-      end
-    end
-  end
-end