rgeo 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e65e0bd3f3ad73fe0b4ecbb05adbb7f19a440b504cecfb56ad06a404737b026
-  data.tar.gz: 388abecc5c42a5c4ea09715211d1b593bf1190e3caf7e5ad9bb207fd38b9a280
+  metadata.gz: 2430c81b8d65c3e98a0e4411c4b10d5b71e6eb1d90ae59bffeab5f71c2da2cb3
+  data.tar.gz: 55aca2dc0b4f7b08641d54b40d8248e594a58574c13690e092dcd8718a392c1c
 SHA512:
-  metadata.gz: 6fe60599325d792e895e7be38304e16dd6d8d47eccdd5bf15a7cbacf9f64964d6b2b90cca4558169c9fd4c76ea705c30aa5f01048d41dc814de62b59ff576ace
-  data.tar.gz: 408507969d099f0265dda08b6213d711dc7cd8a9c157cd97f36080db2ccc18f854516d547712c3b0f81e0e8d36b38859b9ead8efc2ed50270737cda5000d59e7
+  metadata.gz: 70f91cfbacb9c87fc6aa974eeeb3863452ebe3a041544249e8a9824864352f9f1f32525c6c952a37091b4f632b29269e9249a57098533c9a971c4d79c6406e29
+  data.tar.gz: 708edf08257aa5f3215aeb43fbcfe3aa36afe1950974b9a1120805d0512b6cd2edeaf334baf44f486cbf766cd1faa44b52d084e1ae415dae5d0f5e6014cd5e04

data/ext/geos_c_impl/geometry.c

@@ -756,7 +756,9 @@ static VALUE method_geometry_buffer_with_style(VALUE self, VALUE distance, VALUE
                                      GEOSBufferWithStyle_r(self_data->geos_context, self_geom,
                                                            rb_num2dbl(distance),
                                                            RGEO_FACTORY_DATA_PTR(factory)->buffer_resolution,
-                                                           endCapStyle, joinStyle, mitreLimit),
+                                                           rb_num2int(endCapStyle),
+                                                           rb_num2int(joinStyle),
+                                                           rb_num2dbl(mitreLimit)),
                                      Qnil);
   }
   return result;
@@ -1053,6 +1055,21 @@ static VALUE method_geometry_invalid_reason(VALUE self)
   return result;
 }
 
+static VALUE method_geometry_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;
+}
+
 
 /**** INITIALIZATION FUNCTION ****/
 
@@ -1107,6 +1124,7 @@ void rgeo_init_geos_geometry(RGeo_Globals* globals)
   rb_define_method(geos_geometry_methods, "sym_difference", method_geometry_sym_difference, 1);
   rb_define_method(geos_geometry_methods, "valid?", method_geometry_is_valid, 0);
   rb_define_method(geos_geometry_methods, "invalid_reason", method_geometry_invalid_reason, 0);
+  rb_define_method(geos_geometry_methods, "point_on_surface", method_geometry_point_on_surface, 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/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:
@@ -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/geos.rb

@@ -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/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
@@ -571,10 +575,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

data/lib/rgeo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-geos
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: RGeo is a geospatial data library for Ruby.