rgeo 2.3.1 → 3.0.1

data/ext/geos_c_impl/line_string.h

@@ -2,30 +2,27 @@
   Line string methods for GEOS wrapper
 */
 
-
 #ifndef RGEO_GEOS_LINE_STRING_INCLUDED
 #define RGEO_GEOS_LINE_STRING_INCLUDED
 
-#include <ruby.h>
 #include <geos_c.h>
-
-#include "factory.h"
+#include <ruby.h>
 
 RGEO_BEGIN_C
 
-
 /*
   Initializes the line string module. This should be called after
   the geometry module is initialized.
 */
-void rgeo_init_geos_line_string(RGeo_Globals* globals);
+void
+rgeo_init_geos_line_string();
 
 /*
   Determines whether the given GEOS line string is closed.
   Returns Qtrue if true, Qfalse if false, or Qnil on an error.
 */
-VALUE rgeo_is_geos_line_string_closed(GEOSContextHandle_t context, const GEOSGeometry* geom);
-
+VALUE
+rgeo_is_geos_line_string_closed(const GEOSGeometry* geom);
 
 RGEO_END_C
 

data/ext/geos_c_impl/main.c

@@ -6,38 +6,38 @@
 
 #ifdef RGEO_GEOS_SUPPORTED
 
-#include <ruby.h>
 #include <geos_c.h>
+#include <ruby.h>
 
+#include "analysis.h"
 #include "errors.h"
-
 #include "factory.h"
 #include "geometry.h"
-#include "point.h"
+#include "geometry_collection.h"
+#include "globals.h"
 #include "line_string.h"
+#include "point.h"
 #include "polygon.h"
-#include "geometry_collection.h"
-#include "analysis.h"
+#include "ruby_more.h"
 
 #endif
 
 RGEO_BEGIN_C
 
-void Init_geos_c_impl()
+void
+Init_geos_c_impl()
 {
 #ifdef RGEO_GEOS_SUPPORTED
-  RGeo_Globals* globals;
-
-  globals = rgeo_init_geos_factory();
-  rgeo_init_geos_geometry(globals);
-  rgeo_init_geos_point(globals);
-  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_globals();
+  rgeo_init_geos_factory();
+  rgeo_init_geos_geometry();
+  rgeo_init_geos_point();
+  rgeo_init_geos_line_string();
+  rgeo_init_geos_polygon();
+  rgeo_init_geos_geometry_collection();
+  rgeo_init_geos_analysis();
   rgeo_init_geos_errors();
 #endif
 }
 
-
 RGEO_END_C

data/ext/geos_c_impl/point.c

@@ -6,19 +6,19 @@
 
 #ifdef RGEO_GEOS_SUPPORTED
 
-#include <ruby.h>
 #include <geos_c.h>
+#include <ruby.h>
 
+#include "coordinates.h"
 #include "factory.h"
 #include "geometry.h"
+#include "globals.h"
 #include "point.h"
 
-#include "coordinates.h"
-
 RGEO_BEGIN_C
 
-
-static VALUE method_point_geometry_type(VALUE self)
+static VALUE
+method_point_geometry_type(VALUE self)
 {
   VALUE result;
   RGeo_GeometryData* self_data;
@@ -26,18 +26,17 @@ static VALUE method_point_geometry_type(VALUE self)
   result = Qnil;
   self_data = RGEO_GEOMETRY_DATA_PTR(self);
   if (self_data->geom) {
-    result = RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->feature_point;
+    result = rgeo_feature_point_module;
   }
   return result;
 }
 
-
-static VALUE method_point_coordinates(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;
 
@@ -45,23 +44,23 @@ static VALUE method_point_coordinates(VALUE 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));
+    zCoordinate = RGEO_FACTORY_DATA_PTR(self_data->factory)->flags &
+                  RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M;
+    coord_sequence = GEOSGeom_getCoordSeq(self_geom);
+    if (coord_sequence) {
+      result = rb_ary_pop(
+        extract_points_from_coordinate_sequence(coord_sequence, zCoordinate));
     }
   }
   return result;
 }
 
-
-static VALUE method_point_x(VALUE self)
+static VALUE
+method_point_x(VALUE self)
 {
   VALUE result;
   RGeo_GeometryData* self_data;
   const GEOSGeometry* self_geom;
-  GEOSContextHandle_t self_context;
   const GEOSCoordSequence* coord_seq;
   double val;
 
@@ -69,10 +68,9 @@ static VALUE method_point_x(VALUE self)
   self_data = RGEO_GEOMETRY_DATA_PTR(self);
   self_geom = self_data->geom;
   if (self_geom) {
-    self_context = self_data->geos_context;
-    coord_seq = GEOSGeom_getCoordSeq_r(self_context, self_geom);
+    coord_seq = GEOSGeom_getCoordSeq(self_geom);
     if (coord_seq) {
-      if (GEOSCoordSeq_getX_r(self_context, coord_seq, 0, &val)) {
+      if (GEOSCoordSeq_getX(coord_seq, 0, &val)) {
         result = rb_float_new(val);
       }
     }
@@ -80,13 +78,12 @@ static VALUE method_point_x(VALUE self)
   return result;
 }
 
-
-static VALUE method_point_y(VALUE self)
+static VALUE
+method_point_y(VALUE self)
 {
   VALUE result;
   RGeo_GeometryData* self_data;
   const GEOSGeometry* self_geom;
-  GEOSContextHandle_t self_context;
   const GEOSCoordSequence* coord_seq;
   double val;
 
@@ -94,10 +91,9 @@ static VALUE method_point_y(VALUE self)
   self_data = RGEO_GEOMETRY_DATA_PTR(self);
   self_geom = self_data->geom;
   if (self_geom) {
-    self_context = self_data->geos_context;
-    coord_seq = GEOSGeom_getCoordSeq_r(self_context, self_geom);
+    coord_seq = GEOSGeom_getCoordSeq(self_geom);
     if (coord_seq) {
-      if (GEOSCoordSeq_getY_r(self_context, coord_seq, 0, &val)) {
+      if (GEOSCoordSeq_getY(coord_seq, 0, &val)) {
         result = rb_float_new(val);
       }
     }
@@ -105,13 +101,12 @@ static VALUE method_point_y(VALUE self)
   return result;
 }
 
-
-static VALUE get_3d_point(VALUE self, int flag)
+static VALUE
+get_3d_point(VALUE self, int flag)
 {
   VALUE result;
   RGeo_GeometryData* self_data;
   const GEOSGeometry* self_geom;
-  GEOSContextHandle_t self_context;
   const GEOSCoordSequence* coord_seq;
   double val;
 
@@ -120,10 +115,9 @@ static VALUE get_3d_point(VALUE self, int flag)
   self_geom = self_data->geom;
   if (self_geom) {
     if (RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & flag) {
-      self_context = self_data->geos_context;
-      coord_seq = GEOSGeom_getCoordSeq_r(self_context, self_geom);
+      coord_seq = GEOSGeom_getCoordSeq(self_geom);
       if (coord_seq) {
-        if (GEOSCoordSeq_getZ_r(self_context, coord_seq, 0, &val)) {
+        if (GEOSCoordSeq_getZ(coord_seq, 0, &val)) {
           result = rb_float_new(val);
         }
       }
@@ -132,20 +126,20 @@ static VALUE get_3d_point(VALUE self, int flag)
   return result;
 }
 
-
-static VALUE method_point_z(VALUE self)
+static VALUE
+method_point_z(VALUE self)
 {
   return get_3d_point(self, RGEO_FACTORYFLAGS_SUPPORTS_Z);
 }
 
-
-static VALUE method_point_m(VALUE self)
+static VALUE
+method_point_m(VALUE self)
 {
   return get_3d_point(self, RGEO_FACTORYFLAGS_SUPPORTS_M);
 }
 
-
-static VALUE method_point_eql(VALUE self, VALUE rhs)
+static VALUE
+method_point_eql(VALUE self, VALUE rhs)
 {
   VALUE result;
   RGeo_GeometryData* self_data;
@@ -153,13 +147,14 @@ static VALUE method_point_eql(VALUE self, VALUE rhs)
   result = rgeo_geos_klasses_and_factories_eql(self, rhs);
   if (RTEST(result)) {
     self_data = RGEO_GEOMETRY_DATA_PTR(self);
-    result = rgeo_geos_coordseqs_eql(self_data->geos_context, self_data->geom, RGEO_GEOMETRY_DATA_PTR(rhs)->geom, RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M);
+    result = rgeo_geos_geometries_strict_eql(self_data->geom,
+                                             RGEO_GEOMETRY_DATA_PTR(rhs)->geom);
   }
   return result;
 }
 
-
-static VALUE method_point_hash(VALUE self)
+static VALUE
+method_point_hash(VALUE self)
 {
   st_index_t hash;
   RGeo_GeometryData* self_data;
@@ -168,60 +163,64 @@ static VALUE method_point_hash(VALUE self)
   self_data = RGEO_GEOMETRY_DATA_PTR(self);
   factory = self_data->factory;
   hash = rb_hash_start(0);
-  hash = rgeo_geos_objbase_hash(factory,
-    RGEO_FACTORY_DATA_PTR(factory)->globals->feature_point, hash);
-  hash = rgeo_geos_coordseq_hash(self_data->geos_context, self_data->geom, hash);
+  hash = rgeo_geos_objbase_hash(factory, rgeo_feature_point_module, hash);
+  hash = rgeo_geos_coordseq_hash(self_data->geom, hash);
   return LONG2FIX(rb_hash_end(hash));
 }
 
-
-static VALUE cmethod_create(VALUE module, VALUE factory, VALUE x, VALUE y, VALUE z)
+static VALUE
+cmethod_create(VALUE module, VALUE factory, VALUE x, VALUE y, VALUE z)
 {
-  return rgeo_create_geos_point(factory, rb_num2dbl(x), rb_num2dbl(y),
-    RGEO_FACTORY_DATA_PTR(factory)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M ? rb_num2dbl(z) : 0);
+  return rgeo_create_geos_point(factory,
+                                rb_num2dbl(x),
+                                rb_num2dbl(y),
+                                RGEO_FACTORY_DATA_PTR(factory)->flags &
+                                    RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M
+                                  ? rb_num2dbl(z)
+                                  : 0);
 }
 
-
-void rgeo_init_geos_point(RGeo_Globals* globals)
+void
+rgeo_init_geos_point()
 {
   VALUE geos_point_methods;
 
   // Class methods for CAPIPointImpl
-  rb_define_module_function(globals->geos_point, "create", cmethod_create, 4);
+  rb_define_module_function(rgeo_geos_point_class, "create", cmethod_create, 4);
 
   // CAPIPointMethods module
-  geos_point_methods = rb_define_module_under(globals->geos_module, "CAPIPointMethods");
+  geos_point_methods =
+    rb_define_module_under(rgeo_geos_module, "CAPIPointMethods");
   rb_define_method(geos_point_methods, "rep_equals?", method_point_eql, 1);
   rb_define_method(geos_point_methods, "eql?", method_point_eql, 1);
   rb_define_method(geos_point_methods, "hash", method_point_hash, 0);
-  rb_define_method(geos_point_methods, "geometry_type", method_point_geometry_type, 0);
+  rb_define_method(
+    geos_point_methods, "geometry_type", method_point_geometry_type, 0);
   rb_define_method(geos_point_methods, "x", method_point_x, 0);
   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);
+  rb_define_method(
+    geos_point_methods, "coordinates", method_point_coordinates, 0);
 }
 
-
-VALUE rgeo_create_geos_point(VALUE factory, double x, double y, double z)
+VALUE
+rgeo_create_geos_point(VALUE factory, double x, double y, double z)
 {
   VALUE result;
-  RGeo_FactoryData* factory_data;
-  GEOSContextHandle_t context;
   GEOSCoordSequence* coord_seq;
   GEOSGeometry* geom;
 
   result = Qnil;
-  factory_data = RGEO_FACTORY_DATA_PTR(factory);
-  context = factory_data->geos_context;
-  coord_seq = GEOSCoordSeq_create_r(context, 1, 3);
+  coord_seq = GEOSCoordSeq_create(1, 3);
   if (coord_seq) {
-    if (GEOSCoordSeq_setX_r(context, coord_seq, 0, x)) {
-      if (GEOSCoordSeq_setY_r(context, coord_seq, 0, y)) {
-        if (GEOSCoordSeq_setZ_r(context, coord_seq, 0, z)) {
-          geom = GEOSGeom_createPoint_r(context, coord_seq);
+    if (GEOSCoordSeq_setX(coord_seq, 0, x)) {
+      if (GEOSCoordSeq_setY(coord_seq, 0, y)) {
+        if (GEOSCoordSeq_setZ(coord_seq, 0, z)) {
+          geom = GEOSGeom_createPoint(coord_seq);
           if (geom) {
-            result = rgeo_wrap_geos_geometry(factory, geom, factory_data->globals->geos_point);
+            result =
+              rgeo_wrap_geos_geometry(factory, geom, rgeo_geos_point_class);
           }
         }
       }
@@ -230,7 +229,6 @@ VALUE rgeo_create_geos_point(VALUE factory, double x, double y, double z)
   return result;
 }
 
-
 RGEO_END_C
 
 #endif

data/ext/geos_c_impl/point.h

@@ -2,28 +2,25 @@
   Point methods for GEOS wrapper
 */
 
-
 #ifndef RGEO_GEOS_POINT_INCLUDED
 #define RGEO_GEOS_POINT_INCLUDED
 
 #include <ruby.h>
 
-#include "factory.h"
-
 RGEO_BEGIN_C
 
-
 /*
   Initializes the point module. This should be called after
   the geometry module is initialized.
 */
-void rgeo_init_geos_point(RGeo_Globals* globals);
+void
+rgeo_init_geos_point();
 
 /*
   Creates a 3d point and returns the ruby object.
 */
-VALUE rgeo_create_geos_point(VALUE factory, double x, double y, double z);
-
+VALUE
+rgeo_create_geos_point(VALUE factory, double x, double y, double z);
 
 RGEO_END_C