rgeo 2.1.0 → 2.3.1

data/lib/rgeo/impl_helper/basic_line_string_methods.rb

@@ -39,13 +39,18 @@ module RGeo
         Feature::LineString
       end
 
-      def is_empty?
+      def empty?
         @points.size == 0
       end
 
+      def is_empty?
+        warn "The is_empty? method is deprecated, please use the empty? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        empty?
+      end
+
       def boundary
         array = []
-        array << @points.first << @points.last if !is_empty? && !is_closed?
+        array << @points.first << @points.last if !empty? && !closed?
         factory.multipoint([array])
       end
 
@@ -57,15 +62,25 @@ module RGeo
         @points.last
       end
 
-      def is_closed?
-        unless defined?(@is_closed)
-          @is_closed = @points.size > 2 && @points.first == @points.last
+      def closed?
+        unless defined?(@closed)
+          @closed = @points.size > 2 && @points.first == @points.last
         end
-        @is_closed
+        @closed
+      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
+
+      def ring?
+        closed? && simple?
       end
 
       def is_ring?
-        is_closed? && is_simple?
+        warn "The is_ring? method is deprecated, please use the ring? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        ring?
       end
 
       def rep_equals?(rhs)
@@ -87,8 +102,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 +187,10 @@ module RGeo
         Feature::LinearRing
       end
 
+      def ccw?
+        RGeo::Cartesian::Analysis.ccw?(self)
+      end
+
       private
 
       def validate_geometry
@@ -144,7 +198,7 @@ module RGeo
         if @points.size > 0
           @points << @points.first if @points.first != @points.last
           @points = @points.chunk { |x| x }.map(&:first)
-          if !@factory.property(:uses_lenient_assertions) && !is_ring?
+          if !@factory.property(:uses_lenient_assertions) && !ring?
             raise Error::InvalidGeometry, "LinearRing failed ring test"
           end
         end

data/lib/rgeo/impl_helper/basic_point_methods.rb

@@ -45,14 +45,24 @@ module RGeo
         Feature::Point
       end
 
-      def is_empty?
+      def empty?
         false
       end
 
-      def is_simple?
+      def is_empty?
+        warn "The is_empty? method is deprecated, please use the empty? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        empty?
+      end
+
+      def simple?
         true
       end
 
+      def is_simple?
+        warn "The is_simple? method is deprecated, please use the simple? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        simple?
+      end
+
       def envelope
         self
       end

data/lib/rgeo/impl_helper/basic_polygon_methods.rb

@@ -49,15 +49,20 @@ module RGeo
         Feature::Polygon
       end
 
+      def empty?
+        @exterior_ring.empty?
+      end
+
       def is_empty?
-        @exterior_ring.is_empty?
+        warn "The is_empty? method is deprecated, please use the empty? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
+        empty?
       end
 
       def boundary
         array = []
-        array << @exterior_ring unless @exterior_ring.is_empty?
+        array << @exterior_ring unless @exterior_ring.empty?
         array.concat(@interior_rings)
-        factory.multiline_string(array)
+        factory.multi_line_string(array)
       end
 
       def rep_equals?(rhs)
@@ -79,8 +84,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/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/version.rb

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

data/lib/rgeo/wkrep/wkb_generator.rb

@@ -178,7 +178,7 @@ module RGeo
           emit_line_string_coords(obj)
         elsif type == Feature::Polygon
           exterior_ring = obj.exterior_ring
-          if exterior_ring.is_empty?
+          if exterior_ring.empty?
             emit_integer(0)
           else
             emit_integer(1 + obj.num_interior_rings)

data/lib/rgeo/wkrep/wkt_generator.rb

@@ -160,7 +160,7 @@ module RGeo
       end
 
       def generate_line_string(obj)
-        if obj.is_empty?
+        if obj.empty?
           "EMPTY"
         else
           "#{@begin_bracket}#{obj.points.map { |p| generate_coords(p) }.join(', ')}#{@end_bracket}"
@@ -168,7 +168,7 @@ module RGeo
       end
 
       def generate_polygon(obj)
-        if obj.is_empty?
+        if obj.empty?
           "EMPTY"
         else
           "#{@begin_bracket}#{([generate_line_string(obj.exterior_ring)] + obj.interior_rings.map { |r| generate_line_string(r) }).join(', ')}#{@end_bracket}"
@@ -176,7 +176,7 @@ module RGeo
       end
 
       def generate_geometry_collection(obj)
-        if obj.is_empty?
+        if obj.empty?
           "EMPTY"
         else
           "#{@begin_bracket}#{obj.map { |f| generate_feature(f) }.join(', ')}#{@end_bracket}"
@@ -184,7 +184,7 @@ module RGeo
       end
 
       def generate_multi_point(obj)
-        if obj.is_empty?
+        if obj.empty?
           "EMPTY"
         else
           "#{@begin_bracket}#{obj.map { |f| generate_point(f) }.join(', ')}#{@end_bracket}"
@@ -192,7 +192,7 @@ module RGeo
       end
 
       def generate_multi_line_string(obj)
-        if obj.is_empty?
+        if obj.empty?
           "EMPTY"
         else
           "#{@begin_bracket}#{obj.map { |f| generate_line_string(f) }.join(', ')}#{@end_bracket}"
@@ -200,7 +200,7 @@ module RGeo
       end
 
       def generate_multi_polygon(obj)
-        if obj.is_empty?
+        if obj.empty?
           "EMPTY"
         else
           "#{@begin_bracket}#{obj.map { |f| generate_polygon(f) }.join(', ')}#{@end_bracket}"

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"

data/lib/rgeo.rb

@@ -75,12 +75,12 @@
 #   database, and based on the postgresql adapter. Available as the
 #   activerecord-postgis-adapter gem.
 
-require "rgeo/version"
-require "rgeo/error"
-require "rgeo/feature"
-require "rgeo/coord_sys"
-require "rgeo/impl_helper"
-require "rgeo/wkrep"
-require "rgeo/geos"
-require "rgeo/cartesian"
-require "rgeo/geographic"
+require_relative "rgeo/version"
+require_relative "rgeo/error"
+require_relative "rgeo/feature"
+require_relative "rgeo/coord_sys"
+require_relative "rgeo/impl_helper"
+require_relative "rgeo/wkrep"
+require_relative "rgeo/geos"
+require_relative "rgeo/cartesian"
+require_relative "rgeo/geographic"

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.1
 platform: ruby
 authors:
-- Daniel Azuma, Tee Parham
+- Daniel Azuma
+- Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-geos
@@ -44,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +73,36 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: 1.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        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,14 +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: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: RGeo is a geospatial data library for Ruby.