rgeo 2.0.0 → 2.3.0

data/ext/geos_c_impl/geometry_collection.c

@@ -559,22 +559,6 @@ static VALUE method_multi_polygon_centroid(VALUE self)
 }
 
 
-static VALUE method_multi_polygon_point_on_surface(VALUE self)
-{
-  VALUE result;
-  RGeo_GeometryData* self_data;
-  const GEOSGeometry* self_geom;
-
-  result = Qnil;
-  self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  self_geom = self_data->geom;
-  if (self_geom) {
-    result = rgeo_wrap_geos_geometry(self_data->factory, GEOSPointOnSurface_r(self_data->geos_context, self_geom), Qnil);
-  }
-  return result;
-}
-
-
 static VALUE cmethod_geometry_collection_create(VALUE module, VALUE factory, VALUE array)
 {
   return create_geometry_collection(module, GEOS_GEOMETRYCOLLECTION, factory, array);
@@ -648,7 +632,6 @@ void rgeo_init_geos_geometry_collection(RGeo_Globals* globals)
   rb_define_method(geos_multi_polygon_methods, "geometry_type", method_multi_polygon_geometry_type, 0);
   rb_define_method(geos_multi_polygon_methods, "area", method_multi_polygon_area, 0);
   rb_define_method(geos_multi_polygon_methods, "centroid", method_multi_polygon_centroid, 0);
-  rb_define_method(geos_multi_polygon_methods, "point_on_surface", method_multi_polygon_point_on_surface, 0);
   rb_define_method(geos_multi_polygon_methods, "hash", method_multi_polygon_hash, 0);
   rb_define_method(geos_multi_polygon_methods, "coordinates", method_multi_polygon_coordinates, 0);
 }

data/ext/geos_c_impl/main.c

@@ -2,7 +2,6 @@
   Main initializer for GEOS wrapper
 */
 
-
 #include "preface.h"
 
 #ifdef RGEO_GEOS_SUPPORTED
@@ -10,18 +9,20 @@
 #include <ruby.h>
 #include <geos_c.h>
 
+#include "errors.h"
+
 #include "factory.h"
 #include "geometry.h"
 #include "point.h"
 #include "line_string.h"
 #include "polygon.h"
 #include "geometry_collection.h"
+#include "analysis.h"
 
 #endif
 
 RGEO_BEGIN_C
 
-
 void Init_geos_c_impl()
 {
 #ifdef RGEO_GEOS_SUPPORTED
@@ -33,6 +34,8 @@ void Init_geos_c_impl()
   rgeo_init_geos_line_string(globals);
   rgeo_init_geos_polygon(globals);
   rgeo_init_geos_geometry_collection(globals);
+  rgeo_init_geos_analysis(globals);
+  rgeo_init_geos_errors();
 #endif
 }
 

data/ext/geos_c_impl/preface.h

@@ -21,6 +21,9 @@
 #ifdef HAVE_GEOSUNARYUNION_R
 #define RGEO_GEOS_SUPPORTS_UNARYUNION
 #endif
+#ifdef HAVE_GEOSCOORDSEQ_ISCCW_R
+#define RGEO_GEOS_SUPPORTS_ISCCW
+#endif
 #ifdef HAVE_RB_MEMHASH
 #define RGEO_SUPPORTS_NEW_HASHING
 #endif

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"

data/lib/rgeo/cartesian.rb

@@ -6,10 +6,10 @@
 # the simple Cartesian implementation. It also provides a namespace
 # for Cartesian-specific analysis tools.
 
-require "rgeo/cartesian/calculations"
-require "rgeo/cartesian/feature_methods"
-require "rgeo/cartesian/feature_classes"
-require "rgeo/cartesian/factory"
-require "rgeo/cartesian/interface"
-require "rgeo/cartesian/bounding_box"
-require "rgeo/cartesian/analysis"
+require_relative "cartesian/calculations"
+require_relative "cartesian/feature_methods"
+require_relative "cartesian/feature_classes"
+require_relative "cartesian/factory"
+require_relative "cartesian/interface"
+require_relative "cartesian/bounding_box"
+require_relative "cartesian/analysis"

data/lib/rgeo/cartesian/analysis.rb

@@ -13,6 +13,28 @@ module RGeo
 
     module Analysis
       class << self
+        # Check orientation of a ring, returns `true` if it is counter-clockwise
+        # and false otherwise.
+        #
+        # If the factory used is GEOS based, use the GEOS implementation to
+        # check that. Otherwise, this methods falls back to `ring_direction`.
+        #
+        # == Note
+        #
+        # This method does not ensure a correct result for an invalid geometry.
+        # You should make sure your ring is valid beforehand using `is_ring?`
+        # if you are using a LineString, or directly `valid?` for a
+        # `linear_ring?`.
+        # This will be subject to changes in v3.
+        def ccw?(ring)
+          if RGeo::Geos.is_capi_geos?(ring) && RGeo::Geos::Analysis.ccw_supported?
+            RGeo::Geos::Analysis.ccw?(ring)
+          else
+            RGeo::Cartesian::Analysis.ring_direction(ring) == 1
+          end
+        end
+        alias counter_clockwise? ccw?
+
         # Given a LineString, which must be a ring, determine whether the
         # ring proceeds clockwise or counterclockwise.
         # Returns 1 for counterclockwise, or -1 for clockwise.

data/lib/rgeo/coord_sys.rb

@@ -6,12 +6,12 @@
 #
 # -----------------------------------------------------------------------------
 
-require "rgeo/coord_sys/cs/factories"
-require "rgeo/coord_sys/cs/entities"
-require "rgeo/coord_sys/cs/wkt_parser"
-require "rgeo/coord_sys/srs_database/entry"
-require "rgeo/coord_sys/srs_database/url_reader"
-require "rgeo/coord_sys/srs_database/sr_org"
+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

data/lib/rgeo/error.rb

@@ -14,6 +14,10 @@ module RGeo
     class RGeoError < RuntimeError
     end
 
+    # RGeo error specific to the GEOS implementation.
+    class GeosError < RGeoError
+    end
+
     # The specified geometry is invalid
     class InvalidGeometry < RGeoError
     end

data/lib/rgeo/feature.rb

@@ -24,20 +24,20 @@
 # itself. The implementation should separately document any such
 # extensions that it may provide.
 
-require "rgeo/feature/factory"
-require "rgeo/feature/types"
-require "rgeo/feature/geometry"
-require "rgeo/feature/point"
-require "rgeo/feature/curve"
-require "rgeo/feature/line_string"
-require "rgeo/feature/linear_ring"
-require "rgeo/feature/line"
-require "rgeo/feature/surface"
-require "rgeo/feature/polygon"
-require "rgeo/feature/geometry_collection"
-require "rgeo/feature/multi_point"
-require "rgeo/feature/multi_curve"
-require "rgeo/feature/multi_line_string"
-require "rgeo/feature/multi_surface"
-require "rgeo/feature/multi_polygon"
-require "rgeo/feature/factory_generator"
+require_relative "feature/factory"
+require_relative "feature/types"
+require_relative "feature/geometry"
+require_relative "feature/point"
+require_relative "feature/curve"
+require_relative "feature/line_string"
+require_relative "feature/linear_ring"
+require_relative "feature/line"
+require_relative "feature/surface"
+require_relative "feature/polygon"
+require_relative "feature/geometry_collection"
+require_relative "feature/multi_point"
+require_relative "feature/multi_curve"
+require_relative "feature/multi_line_string"
+require_relative "feature/multi_surface"
+require_relative "feature/multi_polygon"
+require_relative "feature/factory_generator"

data/lib/rgeo/feature/linear_ring.rb

@@ -23,6 +23,16 @@ module RGeo
     module LinearRing
       include LineString
       extend Type
+
+      # Returns +true+ if the ring is oriented in a counter clockwise direction
+      # otherwise returns +false+.
+      #
+      # == Notes
+      #
+      # Not a standard SFS method for linear rings, but added for convenience.
+      def ccw?
+        raise Error::UnsupportedOperation, "Method LinearRing#ccw? not defined."
+      end
     end
   end
 end

data/lib/rgeo/geographic.rb

@@ -18,13 +18,13 @@
 # See the various class methods of Geographic for more information on
 # the behaviors of the factories they generate.
 
-require "rgeo/geographic/factory"
-require "rgeo/geographic/projected_window"
-require "rgeo/geographic/interface"
-require "rgeo/geographic/spherical_math"
-require "rgeo/geographic/spherical_feature_methods"
-require "rgeo/geographic/spherical_feature_classes"
-require "rgeo/geographic/proj4_projector"
-require "rgeo/geographic/simple_mercator_projector"
-require "rgeo/geographic/projected_feature_methods"
-require "rgeo/geographic/projected_feature_classes"
+require_relative "geographic/factory"
+require_relative "geographic/projected_window"
+require_relative "geographic/interface"
+require_relative "geographic/spherical_math"
+require_relative "geographic/spherical_feature_methods"
+require_relative "geographic/spherical_feature_classes"
+require_relative "geographic/proj4_projector"
+require_relative "geographic/simple_mercator_projector"
+require_relative "geographic/projected_feature_methods"
+require_relative "geographic/projected_feature_classes"

data/lib/rgeo/geographic/projected_feature_methods.rb

@@ -110,6 +110,10 @@ module RGeo
       def sym_difference(rhs)
         factory.unproject(projection.sym_difference(Feature.cast(rhs, factory).projection))
       end
+
+      def point_on_surface
+        factory.unproject(projection.point_on_surface)
+      end
     end
 
     module ProjectedPointMethods # :nodoc:
@@ -125,7 +129,7 @@ module RGeo
         if @x >= -180.0 && @x < 180.0
           self
         else
-          PointImpl.new(@factory, canonical_x, @y)
+          ProjectedPointImpl.new(@factory, canonical_x, @y)
         end
       end
 
@@ -170,10 +174,6 @@ module RGeo
       def centroid
         factory.unproject(projection.centroid)
       end
-
-      def point_on_surface
-        factory.unproject(projection.point_on_surface)
-      end
     end
 
     module ProjectedPolygonMethods # :nodoc:

data/lib/rgeo/geographic/spherical_feature_classes.rb

@@ -47,6 +47,7 @@ module RGeo
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicPolygonMethods
       include SphericalGeometryMethods
+      include SphericalPolygonMethods
     end
 
     class SphericalGeometryCollectionImpl # :nodoc:

data/lib/rgeo/geographic/spherical_feature_methods.rb

@@ -130,5 +130,28 @@ module RGeo
         inject(0.0) { |sum, geom| sum + geom.length }
       end
     end
+
+    module SphericalPolygonMethods # :nodoc:
+      def centroid
+        return super unless num_interior_rings == 0
+
+        centroid_lat = 0.0
+        centroid_lng = 0.0
+        signed_area = 0.0
+
+        exterior_ring.points.each_cons(2) do |p0, p1|
+          area = (p0.x * p1.y) - (p1.x * p0.y)
+          signed_area += area
+          centroid_lat += (p0.x + p1.x) * area
+          centroid_lng += (p0.y + p1.y) * area
+        end
+
+        signed_area *= 0.5
+        centroid_lat /= (6.0 * signed_area)
+        centroid_lng /= (6.0 * signed_area)
+
+        RGeo::Geographic.spherical_factory.point(centroid_lat, centroid_lng)
+      end
+    end
   end
 end

data/lib/rgeo/geos.rb

@@ -21,24 +21,24 @@
 
 module RGeo
   module Geos
-    require "rgeo/geos/utils"
-    require "rgeo/geos/interface"
+    require_relative "geos/utils"
+    require_relative "geos/interface"
     begin
-      require "rgeo/geos/geos_c_impl"
+      require_relative "geos/geos_c_impl"
     rescue LoadError
       # continue
     end
     CAPI_SUPPORTED = RGeo::Geos.const_defined?(:CAPIGeometryMethods)
     if CAPI_SUPPORTED
-      require "rgeo/geos/capi_feature_classes"
-      require "rgeo/geos/capi_factory"
+      require_relative "geos/capi_feature_classes"
+      require_relative "geos/capi_factory"
     end
-    require "rgeo/geos/ffi_feature_methods"
-    require "rgeo/geos/ffi_feature_classes"
-    require "rgeo/geos/ffi_factory"
-    require "rgeo/geos/zm_feature_methods"
-    require "rgeo/geos/zm_feature_classes"
-    require "rgeo/geos/zm_factory"
+    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"
 
     # Determine ffi support.
     begin
@@ -63,15 +63,13 @@ module RGeo
       self.preferred_native_interface = :ffi
     end
 
-    # There is some trouble with END_CAP in GEOS
-    # In docs CAP_ROUND = 1, but it's work properly with 0
-    CAP_ROUND  = 0
-    CAP_FLAT   = 1
-    CAP_SQUARE = 2
+    CAP_ROUND  = 1
+    CAP_FLAT   = 2
+    CAP_SQUARE = 3
 
-    JOIN_ROUND = 0
-    JOIN_MITRE = 1
-    JOIN_BEVEL = 2
+    JOIN_ROUND = 1
+    JOIN_MITRE = 2
+    JOIN_BEVEL = 3
   end
 end
 

data/lib/rgeo/geos/capi_factory.rb

@@ -297,7 +297,11 @@ module RGeo
         if (wkb_parser_ = _wkb_parser)
           wkb_parser_.parse(str_)
         else
-          _parse_wkb_impl(str_)
+          if str_[0] == "\x00" || str_[0] == "\x01"
+            _parse_wkb_impl(str_)
+          else
+            _parse_wkb_impl([str_].pack('H*'))
+          end
         end
       end
 

data/lib/rgeo/geos/capi_feature_classes.rb

@@ -72,6 +72,10 @@ module RGeo
       include CAPIGeometryMethods
       include CAPILineStringMethods
       include CAPILinearRingMethods
+
+      def ccw?
+        RGeo::Cartesian::Analysis.ccw?(self)
+      end
     end
 
     class CAPILineImpl # :nodoc:

data/lib/rgeo/geos/ffi_feature_methods.rb

@@ -266,6 +266,10 @@ module RGeo
         fg
       end
 
+      def point_on_surface
+        @factory.wrap_fg_geom(@fg_geom.point_on_surface, FFIPointImpl)
+      end
+
       private
 
       def request_prepared
@@ -389,6 +393,10 @@ module RGeo
       def geometry_type
         Feature::LinearRing
       end
+
+      def ccw?
+        RGeo::Cartesian::Analysis.ccw?(self)
+      end
     end
 
     module FFILineMethods # :nodoc:
@@ -571,10 +579,6 @@ module RGeo
         @factory.wrap_fg_geom(@fg_geom.centroid, FFIPointImpl)
       end
 
-      def point_on_surface
-        @factory.wrap_fg_geom(@fg_geom.point_on_surface, FFIPointImpl)
-      end
-
       def coordinates
         each.map(&:coordinates)
       end