rgeo 0.4.0 → 0.5.0

data/ext/geos_c_impl/geometry.c

@@ -741,6 +741,29 @@ static VALUE method_geometry_buffer(VALUE self, VALUE distance)
   return result;
 }
 
+static VALUE method_geometry_buffer_with_style(VALUE self, VALUE distance, VALUE endCapStyle, VALUE joinStyle, VALUE mitreLimit)
+{
+  VALUE result;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+  VALUE factory;
+  int resolution;
+
+  result = Qnil;
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
+  if (self_geom) {
+    factory = self_data->factory;
+    result = rgeo_wrap_geos_geometry(factory, 
+                                     GEOSBufferWithStyle_r(self_data->geos_context, self_geom,
+                                                           rb_num2dbl(distance),
+                                                           RGEO_FACTORY_DATA_PTR(factory)->buffer_resolution,
+                                                           endCapStyle, joinStyle, mitreLimit),
+                                     Qnil);
+  }
+  return result;
+}
+
 static VALUE method_geometry_simplify(VALUE self, VALUE tolerance)
 {
   VALUE result;
@@ -987,6 +1010,7 @@ void rgeo_init_geos_geometry(RGeo_Globals* globals)
   rb_define_method(geos_geometry_methods, "relate?", method_geometry_relate, 2);
   rb_define_method(geos_geometry_methods, "distance", method_geometry_distance, 1);
   rb_define_method(geos_geometry_methods, "buffer", method_geometry_buffer, 1);
+  rb_define_method(geos_geometry_methods, "buffer_with_style", method_geometry_buffer_with_style, 4);
   rb_define_method(geos_geometry_methods, "simplify", method_geometry_simplify, 1);
   rb_define_method(geos_geometry_methods, "convex_hull", method_geometry_convex_hull, 0);
   rb_define_method(geos_geometry_methods, "intersection", method_geometry_intersection, 1);

data/ext/geos_c_impl/geometry_collection.c

@@ -16,6 +16,8 @@
 #include "polygon.h"
 #include "geometry_collection.h"
 
+#include "coordinates.h"
+
 RGEO_BEGIN_C
 
 
@@ -270,7 +272,6 @@ static VALUE method_geometry_collection_each(VALUE self)
   }
 }
 
-
 static VALUE method_multi_point_geometry_type(VALUE self)
 {
   VALUE result;
@@ -301,6 +302,38 @@ static VALUE method_multi_point_hash(VALUE self)
 }
 
 
+static VALUE method_multi_point_coordinates(VALUE self)
+{
+  VALUE result = Qnil;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+  GEOSContextHandle_t context;
+  const GEOSCoordSequence* coord_sequence;
+
+  const GEOSGeometry* point;
+  unsigned int count;
+  unsigned int i;
+  int zCoordinate;
+
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
+
+  if(self_geom) {
+    zCoordinate = RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M;
+    context = self_data->geos_context;
+    count = GEOSGetNumGeometries_r(context, self_geom);
+    result = rb_ary_new2(count);
+    for(i = 0; i < count; ++i) {
+      point = GEOSGetGeometryN_r(context, self_geom, i);
+      coord_sequence = GEOSGeom_getCoordSeq_r(context, point);
+      rb_ary_push(result, rb_ary_pop(extract_points_from_coordinate_sequence(context, coord_sequence, zCoordinate)));
+    }
+  }
+
+  return result;
+}
+
+
 static VALUE method_multi_line_string_geometry_type(VALUE self)
 {
   VALUE result;
@@ -331,6 +364,37 @@ static VALUE method_multi_line_string_hash(VALUE self)
 }
 
 
+static VALUE method_multi_line_string_coordinates(VALUE self)
+{
+  VALUE result = Qnil;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+  GEOSContextHandle_t context;
+  const GEOSCoordSequence* coord_sequence;
+
+  const GEOSGeometry* line_string;
+  unsigned int count;
+  unsigned int i;
+  int zCoordinate;
+
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
+  
+  if(self_geom) {
+    zCoordinate = RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M;
+    context = self_data->geos_context;
+    count = GEOSGetNumGeometries_r(context, self_geom);
+    result = rb_ary_new2(count);
+    for(i = 0; i < count; ++i) {
+      line_string = GEOSGetGeometryN_r(context, self_geom, i);
+      coord_sequence = GEOSGeom_getCoordSeq_r(context, line_string);
+      rb_ary_push(result, extract_points_from_coordinate_sequence(context, coord_sequence, zCoordinate));
+    }
+  }
+
+  return result;
+}
+
 static VALUE method_multi_line_string_length(VALUE self)
 {
   VALUE result;
@@ -413,6 +477,36 @@ static VALUE method_multi_polygon_hash(VALUE self)
 }
 
 
+static VALUE method_multi_polygon_coordinates(VALUE self)
+{
+  VALUE result = Qnil;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+  GEOSContextHandle_t context;
+
+  const GEOSGeometry* poly;
+  unsigned int count;
+  unsigned int i;
+  int zCoordinate;
+
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
+  
+  if(self_geom) {
+    zCoordinate = RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M;
+    context = self_data->geos_context;
+    count = GEOSGetNumGeometries_r(context, self_geom);
+    result = rb_ary_new2(count);
+    for(i = 0; i < count; ++i) {
+      poly = GEOSGetGeometryN_r(context, self_geom, i);
+      rb_ary_push(result, extract_points_from_polygon(context, poly, zCoordinate));
+    }
+  }
+
+  return result;
+}
+
+
 static VALUE method_multi_polygon_area(VALUE self)
 {
   VALUE result;
@@ -516,10 +610,12 @@ void rgeo_init_geos_geometry_collection(RGeo_Globals* globals)
   rb_define_method(geos_geometry_collection_methods, "[]", method_geometry_collection_brackets, 1);
   rb_define_method(geos_geometry_collection_methods, "each", method_geometry_collection_each, 0);
 
+
   // Methods for MultiPointImpl
   geos_multi_point_methods = rb_define_module_under(globals->geos_module, "CAPIMultiPointMethods");
   rb_define_method(geos_multi_point_methods, "geometry_type", method_multi_point_geometry_type, 0);
   rb_define_method(geos_multi_point_methods, "hash", method_multi_point_hash, 0);
+  rb_define_method(geos_multi_point_methods, "coordinates", method_multi_point_coordinates, 0);
 
   // Methods for MultiLineStringImpl
   geos_multi_line_string_methods = rb_define_module_under(globals->geos_module, "CAPIMultiLineStringMethods");
@@ -527,6 +623,7 @@ void rgeo_init_geos_geometry_collection(RGeo_Globals* globals)
   rb_define_method(geos_multi_line_string_methods, "length", method_multi_line_string_length, 0);
   rb_define_method(geos_multi_line_string_methods, "is_closed?", method_multi_line_string_is_closed, 0);
   rb_define_method(geos_multi_line_string_methods, "hash", method_multi_line_string_hash, 0);
+  rb_define_method(geos_multi_line_string_methods, "coordinates", method_multi_line_string_coordinates, 0);
 
   // Methods for MultiPolygonImpl
   geos_multi_polygon_methods = rb_define_module_under(globals->geos_module, "CAPIMultiPolygonMethods");
@@ -535,6 +632,7 @@ void rgeo_init_geos_geometry_collection(RGeo_Globals* globals)
   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/line_string.c

@@ -16,6 +16,8 @@
 #include "point.h"
 #include "line_string.h"
 
+#include "coordinates.h"
+
 RGEO_BEGIN_C
 
 
@@ -96,6 +98,41 @@ static VALUE method_line_string_num_points(VALUE self)
 }
 
 
+static void d(VALUE v) {
+    ID sym_puts = rb_intern("puts");
+    ID sym_inspect = rb_intern("inspect");
+    rb_funcall(rb_mKernel, sym_puts, 1,
+        rb_funcall(v, sym_inspect, 0));
+}
+
+static VALUE method_line_string_coordinates(VALUE self)
+{
+  VALUE result;
+  VALUE point_tuple;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+  const GEOSCoordSequence* coord_sequence;
+  int zCoordinate;
+
+  GEOSContextHandle_t context;
+
+  result = Qnil;
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
+
+  if (self_geom) {
+    zCoordinate = RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M;
+    context = self_data->geos_context;
+    coord_sequence = GEOSGeom_getCoordSeq_r(context, self_geom);
+    if(coord_sequence) {
+      result = extract_points_from_coordinate_sequence(context, coord_sequence, zCoordinate);
+    }
+  }
+  return result;
+}
+
+
+
 static VALUE get_point_from_coordseq(VALUE self, const GEOSCoordSequence* coord_seq, unsigned int i, char has_z)
 {
   VALUE result;
@@ -589,6 +626,7 @@ void rgeo_init_geos_line_string(RGeo_Globals* globals)
   rb_define_method(geos_line_string_methods, "end_point", method_line_string_end_point, 0);
   rb_define_method(geos_line_string_methods, "is_closed?", method_line_string_is_closed, 0);
   rb_define_method(geos_line_string_methods, "is_ring?", method_line_string_is_ring, 0);
+  rb_define_method(geos_line_string_methods, "coordinates", method_line_string_coordinates, 0);
 
   // CAPILinearRingMethods module
   geos_linear_ring_methods = rb_define_module_under(globals->geos_module, "CAPILinearRingMethods");

data/ext/geos_c_impl/mkmf.log

@@ -0,0 +1,123 @@
+find_executable: checking for geos-config... -------------------- yes
+
+--------------------
+
+have_header: checking for geos_c.h... -------------------- yes
+
+"clang -o conftest -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/x86_64-darwin14 -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/ruby/backward -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0 -I. -I/usr/local/Cellar/geos/3.5.0/include -I/Users/tee/.rubies/ruby-2.2.3/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -O3 -Wno-error=shorten-64-to-32  -pipe conftest.c  -L. -L/Users/tee/.rubies/ruby-2.2.3/lib -L. -L/Users/tee/.rubies/ruby-2.2.3/lib  -fstack-protector -L/usr/local/lib     -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lruby-static -framework CoreFoundation  -lpthread -lgmp -ldl -lobjc "
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: int main(int argc, char **argv)
+4: {
+5:   return 0;
+6: }
+/* end */
+
+"clang -E -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/x86_64-darwin14 -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/ruby/backward -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0 -I. -I/usr/local/Cellar/geos/3.5.0/include -I/Users/tee/.rubies/ruby-2.2.3/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -O3 -Wno-error=shorten-64-to-32  -pipe  conftest.c -o conftest.i"
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: #include <geos_c.h>
+/* end */
+
+--------------------
+
+have_func: checking for GEOSSetSRID_r() in geos_c.h... -------------------- yes
+
+"clang -o conftest -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/x86_64-darwin14 -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/ruby/backward -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0 -I. -I/usr/local/Cellar/geos/3.5.0/include -I/Users/tee/.rubies/ruby-2.2.3/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -O3 -Wno-error=shorten-64-to-32  -pipe conftest.c  -L. -L/Users/tee/.rubies/ruby-2.2.3/lib -L. -L/Users/tee/.rubies/ruby-2.2.3/lib  -fstack-protector -L/usr/local/lib     -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lruby-static -framework CoreFoundation  -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lpthread -lgmp -ldl -lobjc "
+checked program was:
+/* begin */
+ 1: #include "ruby.h"
+ 2: 
+ 3: #include <geos_c.h>
+ 4: 
+ 5: /*top*/
+ 6: extern int t(void);
+ 7: int main(int argc, char **argv)
+ 8: {
+ 9:   if (argc > 1000000) {
+10:     printf("%p", &t);
+11:   }
+12: 
+13:   return 0;
+14: }
+15: int t(void) { void ((*volatile p)()); p = (void ((*)()))GEOSSetSRID_r; return 0; }
+/* end */
+
+--------------------
+
+have_func: checking for GEOSPreparedContains_r() in geos_c.h... -------------------- yes
+
+"clang -o conftest -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/x86_64-darwin14 -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/ruby/backward -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0 -I. -I/usr/local/Cellar/geos/3.5.0/include -I/Users/tee/.rubies/ruby-2.2.3/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -O3 -Wno-error=shorten-64-to-32  -pipe conftest.c  -L. -L/Users/tee/.rubies/ruby-2.2.3/lib -L. -L/Users/tee/.rubies/ruby-2.2.3/lib  -fstack-protector -L/usr/local/lib     -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lruby-static -framework CoreFoundation  -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lpthread -lgmp -ldl -lobjc "
+checked program was:
+/* begin */
+ 1: #include "ruby.h"
+ 2: 
+ 3: #include <geos_c.h>
+ 4: 
+ 5: /*top*/
+ 6: extern int t(void);
+ 7: int main(int argc, char **argv)
+ 8: {
+ 9:   if (argc > 1000000) {
+10:     printf("%p", &t);
+11:   }
+12: 
+13:   return 0;
+14: }
+15: int t(void) { void ((*volatile p)()); p = (void ((*)()))GEOSPreparedContains_r; return 0; }
+/* end */
+
+--------------------
+
+have_func: checking for GEOSPreparedDisjoint_r() in geos_c.h... -------------------- yes
+
+"clang -o conftest -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/x86_64-darwin14 -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/ruby/backward -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0 -I. -I/usr/local/Cellar/geos/3.5.0/include -I/Users/tee/.rubies/ruby-2.2.3/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -O3 -Wno-error=shorten-64-to-32  -pipe conftest.c  -L. -L/Users/tee/.rubies/ruby-2.2.3/lib -L. -L/Users/tee/.rubies/ruby-2.2.3/lib  -fstack-protector -L/usr/local/lib     -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lruby-static -framework CoreFoundation  -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lpthread -lgmp -ldl -lobjc "
+checked program was:
+/* begin */
+ 1: #include "ruby.h"
+ 2: 
+ 3: #include <geos_c.h>
+ 4: 
+ 5: /*top*/
+ 6: extern int t(void);
+ 7: int main(int argc, char **argv)
+ 8: {
+ 9:   if (argc > 1000000) {
+10:     printf("%p", &t);
+11:   }
+12: 
+13:   return 0;
+14: }
+15: int t(void) { void ((*volatile p)()); p = (void ((*)()))GEOSPreparedDisjoint_r; return 0; }
+/* end */
+
+--------------------
+
+have_func: checking for rb_memhash() in ruby.h... -------------------- yes
+
+"clang -o conftest -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/x86_64-darwin14 -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/ruby/backward -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0 -I. -I/usr/local/Cellar/geos/3.5.0/include -I/Users/tee/.rubies/ruby-2.2.3/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -O3 -Wno-error=shorten-64-to-32  -pipe conftest.c  -L. -L/Users/tee/.rubies/ruby-2.2.3/lib -L. -L/Users/tee/.rubies/ruby-2.2.3/lib  -fstack-protector -L/usr/local/lib     -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lruby-static -framework CoreFoundation  -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lpthread -lgmp -ldl -lobjc "
+checked program was:
+/* begin */
+ 1: #include "ruby.h"
+ 2: 
+ 3: #include <ruby.h>
+ 4: 
+ 5: /*top*/
+ 6: extern int t(void);
+ 7: int main(int argc, char **argv)
+ 8: {
+ 9:   if (argc > 1000000) {
+10:     printf("%p", &t);
+11:   }
+12: 
+13:   return 0;
+14: }
+15: int t(void) { void ((*volatile p)()); p = (void ((*)()))rb_memhash; return 0; }
+/* end */
+
+--------------------
+

data/ext/geos_c_impl/point.c

@@ -13,6 +13,8 @@
 #include "geometry.h"
 #include "point.h"
 
+#include "coordinates.h"
+
 RGEO_BEGIN_C
 
 
@@ -30,6 +32,30 @@ static VALUE method_point_geometry_type(VALUE self)
 }
 
 
+static VALUE method_point_coordinates(VALUE self)
+{
+  VALUE result = Qnil;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+  GEOSContextHandle_t context;
+  const GEOSCoordSequence* coord_sequence;
+  int zCoordinate;
+
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
+
+  if (self_geom) {
+    zCoordinate = RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M;
+    context = self_data->geos_context;
+    coord_sequence = GEOSGeom_getCoordSeq_r(context, self_geom);
+    if(coord_sequence) {
+      result = rb_ary_pop(extract_points_from_coordinate_sequence(context, coord_sequence, zCoordinate));
+    }
+  }
+  return result;
+}
+
+
 static VALUE method_point_x(VALUE self)
 {
   VALUE result;
@@ -173,6 +199,7 @@ void rgeo_init_geos_point(RGeo_Globals* globals)
   rb_define_method(geos_point_methods, "y", method_point_y, 0);
   rb_define_method(geos_point_methods, "z", method_point_z, 0);
   rb_define_method(geos_point_methods, "m", method_point_m, 0);
+  rb_define_method(geos_point_methods, "coordinates", method_point_coordinates, 0);
 }
 
 

data/ext/geos_c_impl/polygon.c

@@ -15,6 +15,8 @@
 #include "line_string.h"
 #include "polygon.h"
 
+#include "coordinates.h"
+
 RGEO_BEGIN_C
 
 
@@ -113,6 +115,29 @@ static VALUE method_polygon_point_on_surface(VALUE self)
 }
 
 
+static VALUE method_polygon_coordinates(VALUE self)
+{
+  VALUE result = Qnil;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+  GEOSContextHandle_t self_context;
+
+  GEOSGeometry* ring;
+  GEOSCoordSequence* coord_sequence;
+  unsigned int interior_ring_count;
+  int zCoordinate;
+
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
+
+  if (self_geom) {
+    zCoordinate = RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M;
+    self_context = self_data->geos_context;
+    result = extract_points_from_polygon(self_context, self_geom, zCoordinate);
+  }
+  return result;
+}
+
 static VALUE method_polygon_exterior_ring(VALUE self)
 {
   VALUE result;
@@ -274,6 +299,7 @@ void rgeo_init_geos_polygon(RGeo_Globals* globals)
   rb_define_method(geos_polygon_methods, "num_interior_rings", method_polygon_num_interior_rings, 0);
   rb_define_method(geos_polygon_methods, "interior_ring_n", method_polygon_interior_ring_n, 1);
   rb_define_method(geos_polygon_methods, "interior_rings", method_polygon_interior_rings, 0);
+  rb_define_method(geos_polygon_methods, "coordinates", method_polygon_coordinates, 0);
 }