rgeo 2.0.0 → 2.3.0

data/lib/rgeo/geos/interface.rb

@@ -174,7 +174,6 @@ module RGeo
       #   operation that would benefit from it is called. The latter
       #   never automatically generates a prepared geometry (unless you
       #   generate one explicitly using the <tt>prepare!</tt> method).
-
       def factory(opts = {})
         if supported?
           native_interface = opts[:native_interface] || Geos.preferred_native_interface

data/lib/rgeo/impl_helper.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "rgeo/impl_helper/utils"
-require "rgeo/impl_helper/math"
-require "rgeo/impl_helper/basic_geometry_methods"
-require "rgeo/impl_helper/basic_geometry_collection_methods"
-require "rgeo/impl_helper/basic_point_methods"
-require "rgeo/impl_helper/basic_line_string_methods"
-require "rgeo/impl_helper/basic_polygon_methods"
+require_relative "impl_helper/utils"
+require_relative "impl_helper/math"
+require_relative "impl_helper/basic_geometry_methods"
+require_relative "impl_helper/basic_geometry_collection_methods"
+require_relative "impl_helper/basic_point_methods"
+require_relative "impl_helper/basic_line_string_methods"
+require_relative "impl_helper/basic_polygon_methods"

data/lib/rgeo/impl_helper/basic_geometry_collection_methods.rb

@@ -9,6 +9,8 @@
 module RGeo
   module ImplHelper # :nodoc:
     module BasicGeometryCollectionMethods # :nodoc:
+      include Enumerable
+
       attr_reader :elements
 
       def initialize(factory, elements)
@@ -37,6 +39,10 @@ module RGeo
         @elements.each(&block)
       end
 
+      def geometries
+        @elements
+      end
+
       def dimension
         @dimension ||= @elements.map(&:dimension).max || -1
       end
@@ -114,6 +120,12 @@ module RGeo
         @elements.map(&:coordinates)
       end
 
+      def contains?(rhs)
+        return super unless Feature::Point === rhs
+
+        @elements.any? { |line| line.contains?(rhs) }
+      end
+
       private
 
       def add_boundary(hash, point)
@@ -171,12 +183,18 @@ module RGeo
           array << poly.exterior_ring unless poly.is_empty?
           array.concat(poly.interior_rings)
         end
-        factory.multilinestring(array)
+        factory.multi_line_string(array)
       end
 
       def coordinates
         @elements.map(&:coordinates)
       end
+
+      def contains?(rhs)
+        return super unless Feature::Point === rhs
+
+        @elements.any? { |poly| poly.contains?(rhs) }
+      end
     end
   end
 end

data/lib/rgeo/impl_helper/basic_line_string_methods.rb

@@ -87,8 +87,43 @@ module RGeo
         @points.map(&:coordinates)
       end
 
+      def contains?(rhs)
+        if Feature::Point === rhs
+          contains_point?(rhs)
+        else
+          raise(Error::UnsupportedOperation,
+                "Method LineString#contains? is only defined for Point")
+        end
+      end
+
       private
 
+      def contains_point?(point)
+        @points.each_cons(2) do |start_point, end_point|
+          return true if point_intersect_segment?(point, start_point, end_point)
+        end
+        false
+      end
+
+      def point_intersect_segment?(point, start_point, end_point)
+        return false unless point_collinear?(point, start_point, end_point)
+
+        if start_point.x != end_point.x
+          between_coordinate?(point.x, start_point.x, end_point.x)
+        else
+          between_coordinate?(point.y, start_point.y, end_point.y)
+        end
+      end
+
+      def point_collinear?(a, b, c)
+        (b.x - a.x) * (c.y - a.y) == (c.x - a.x) * (b.y - a.y)
+      end
+
+      def between_coordinate?(coord, start_coord, end_coord)
+        end_coord >= coord && coord >= start_coord ||
+          start_coord >= coord && coord >= end_coord
+      end
+
       def copy_state_from(obj)
         super
         @points = obj.points
@@ -137,6 +172,10 @@ module RGeo
         Feature::LinearRing
       end
 
+      def ccw?
+        RGeo::Cartesian::Analysis.ccw?(self)
+      end
+
       private
 
       def validate_geometry

data/lib/rgeo/impl_helper/basic_polygon_methods.rb

@@ -57,7 +57,7 @@ module RGeo
         array = []
         array << @exterior_ring unless @exterior_ring.is_empty?
         array.concat(@interior_rings)
-        factory.multiline_string(array)
+        factory.multi_line_string(array)
       end
 
       def rep_equals?(rhs)
@@ -79,8 +79,45 @@ module RGeo
         ([@exterior_ring] + @interior_rings).map(&:coordinates)
       end
 
+      def contains?(rhs)
+        if Feature::Point === rhs
+          contains_point?(rhs)
+        else
+          raise(Error::UnsupportedOperation,
+            "Method Polygon#contains? is only defined for Point"
+          )
+        end
+      end
+
       private
 
+      def contains_point?(point)
+        ring_encloses_point?(@exterior_ring, point) &&
+          !@interior_rings.any? do |exclusion|
+            ring_encloses_point?(exclusion, point, on_border_return: true)
+          end
+      end
+
+      def ring_encloses_point?(ring, point, on_border_return: false)
+        # This is an implementation of the ray casting algorithm, greatly inspired
+        # by https://wrf.ecse.rpi.edu/Research/Short_Notes/pnpoly.html
+        # Since this algorithm does not handle point on edge, we check first if
+        # the ring is on the border.
+        # on_border_return is used for exclusion ring
+        return on_border_return if ring.contains?(point)
+        encloses_point = false
+        ring.points.each_cons(2) do |start_point, end_point|
+          next unless (point.y < end_point.y) != (point.y < start_point.y)
+
+          if point.x < (end_point.x - start_point.x) * (point.y - start_point.y) /
+                       (end_point.y - start_point.y) + start_point.x
+            encloses_point = !encloses_point
+          end
+        end
+        encloses_point
+      end
+
+
       def copy_state_from(obj)
         super
         @exterior_ring = obj.exterior_ring

data/lib/rgeo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RGeo
-  VERSION = "2.0.0"
+  VERSION = "2.3.0"
 end

data/lib/rgeo/wkrep.rb

@@ -21,7 +21,7 @@
 # To parse a byte string in WKB (well-known binary) format back into a
 # geometry object, use the WKRep::WKBParser class.
 
-require "rgeo/wkrep/wkt_parser"
-require "rgeo/wkrep/wkt_generator"
-require "rgeo/wkrep/wkb_parser"
-require "rgeo/wkrep/wkb_generator"
+require_relative "wkrep/wkt_parser"
+require_relative "wkrep/wkt_generator"
+require_relative "wkrep/wkb_parser"
+require_relative "wkrep/wkb_generator"

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.3.0
 platform: ruby
 authors:
-- Daniel Azuma, Tee Parham
+- Daniel Azuma
+- Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-geos
@@ -25,75 +26,83 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.8.1
 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
   modules are also available to help with writing location-based applications using
   Ruby-based frameworks such as Ruby On Rails.
-email: dazuma@gmail.com, parhameter@gmail.com
+email:
+- dazuma@gmail.com
+- parhameter@gmail.com
+- kfdoggett@gmail.com
 executables: []
 extensions:
 - ext/geos_c_impl/extconf.rb
 extra_rdoc_files: []
 files:
 - LICENSE.txt
+- README.md
+- ext/geos_c_impl/analysis.c
+- ext/geos_c_impl/analysis.h
 - ext/geos_c_impl/coordinates.c
 - ext/geos_c_impl/coordinates.h
+- ext/geos_c_impl/errors.c
+- ext/geos_c_impl/errors.h
 - ext/geos_c_impl/extconf.rb
 - ext/geos_c_impl/factory.c
 - ext/geos_c_impl/factory.h
@@ -181,7 +190,8 @@ files:
 - lib/rgeo/wkrep/wkt_generator.rb
 - lib/rgeo/wkrep/wkt_parser.rb
 homepage: https://github.com/rgeo/rgeo
-licenses: []
+licenses:
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -191,15 +201,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: RGeo is a geospatial data library for Ruby.