rgeo 2.3.1 → 3.0.1

data/ext/geos_c_impl/geometry_collection.c

@@ -2,38 +2,35 @@
   Geometry collection methods for GEOS wrapper
 */
 
-
 #include "preface.h"
 
 #ifdef RGEO_GEOS_SUPPORTED
 
-#include <ruby.h>
 #include <geos_c.h>
+#include <ruby.h>
 
+#include "coordinates.h"
+#include "errors.h"
 #include "factory.h"
 #include "geometry.h"
+#include "geometry_collection.h"
+#include "globals.h"
 #include "line_string.h"
 #include "polygon.h"
-#include "geometry_collection.h"
-
-#include "coordinates.h"
 
 RGEO_BEGIN_C
 
-
 /**** INTERNAL IMPLEMENTATION OF CREATE ****/
 
-
 // Main implementation of the "create" class method for geometry collections.
 // You must pass in the correct GEOS geometry type ID.
 
-static VALUE create_geometry_collection(VALUE module, int type, VALUE factory, VALUE array)
+static VALUE
+create_geometry_collection(VALUE module, int type, VALUE factory, VALUE array)
 {
   VALUE result;
   unsigned int len;
   GEOSGeometry** geoms;
-  RGeo_FactoryData* factory_data;
-  GEOSContextHandle_t geos_context;
   VALUE klass;
   unsigned int i;
   unsigned int j;
@@ -41,99 +38,73 @@ static VALUE create_geometry_collection(VALUE module, int type, VALUE factory, V
   VALUE cast_type;
   GEOSGeometry* geom;
   GEOSGeometry* collection;
-  char problem;
-  GEOSGeometry* igeom;
-  GEOSGeometry* jgeom;
+  int state = 0;
 
   result = Qnil;
   Check_Type(array, T_ARRAY);
   len = (unsigned int)RARRAY_LEN(array);
   geoms = ALLOC_N(GEOSGeometry*, len == 0 ? 1 : len);
-  if (geoms) {
-    factory_data = RGEO_FACTORY_DATA_PTR(factory);
-    geos_context = factory_data->geos_context;
-    klasses = Qnil;
-    cast_type = Qnil;
-    switch (type) {
+  if (!geoms) {
+    rb_raise(rb_eRGeoError, "not enough memory available");
+  }
+
+  klasses = Qnil;
+  cast_type = Qnil;
+  switch (type) {
     case GEOS_MULTIPOINT:
-      cast_type = factory_data->globals->feature_point;
+      cast_type = rgeo_feature_point_module;
       break;
     case GEOS_MULTILINESTRING:
-      cast_type = factory_data->globals->feature_line_string;
+      cast_type = rgeo_feature_line_string_module;
       break;
     case GEOS_MULTIPOLYGON:
-      cast_type = factory_data->globals->feature_polygon;
+      cast_type = rgeo_feature_polygon_module;
       break;
-    }
-    for (i=0; i<len; ++i) {
-      geom = rgeo_convert_to_detached_geos_geometry(rb_ary_entry(array, i), factory, cast_type, &klass);
-      if (!geom) {
-        break;
-      }
-      geoms[i] = geom;
-      if (!NIL_P(klass) && NIL_P(klasses)) {
-        klasses = rb_ary_new2(len);
-        for (j=0; j<i; ++j) {
-          rb_ary_push(klasses, Qnil);
-        }
-      }
-      if (!NIL_P(klasses)) {
-        rb_ary_push(klasses, klass);
+  }
+  for (i = 0; i < len; ++i) {
+    geom = rgeo_convert_to_detached_geos_geometry(
+      rb_ary_entry(array, i), factory, cast_type, &klass, &state);
+    if (state) {
+      for (j = 0; j < i; j++) {
+        GEOSGeom_destroy(geoms[j]);
       }
+      FREE(geoms);
+      rb_jump_tag(state);
     }
-    if (i != len) {
-      for (j=0; j<i; ++j) {
-        GEOSGeom_destroy_r(geos_context, geoms[j]);
+
+    geoms[i] = geom;
+    if (!NIL_P(klass) && NIL_P(klasses)) {
+      klasses = rb_ary_new2(len);
+      for (j = 0; j < i; ++j) {
+        rb_ary_push(klasses, Qnil);
       }
     }
-    else {
-      collection = GEOSGeom_createCollection_r(geos_context, type, geoms, len);
-      // Due to a limitation of GEOS, the MultiPolygon assertions are not checked.
-      // We do that manually here.
-      if (collection && type == GEOS_MULTIPOLYGON && (factory_data->flags & 1) == 0) {
-        problem = 0;
-        for (i=1; i<len; ++i) {
-          for (j=0; j<i; ++j) {
-            igeom = geoms[i];
-            jgeom = geoms[j];
-            problem = GEOSRelatePattern_r(geos_context, igeom, jgeom, "2********");
-            if (problem) {
-              break;
-            }
-            problem = GEOSRelatePattern_r(geos_context, igeom, jgeom, "****1****");
-            if (problem) {
-              break;
-            }
-          }
-          if (problem) {
-            break;
-          }
-        }
-        if (problem) {
-          GEOSGeom_destroy_r(geos_context, collection);
-          collection = NULL;
-        }
-      }
-      if (collection) {
-        result = rgeo_wrap_geos_geometry(factory, collection, module);
-        RGEO_GEOMETRY_DATA_PTR(result)->klasses = klasses;
-      }
-      // NOTE: We are assuming that GEOS will do its own cleanup of the
-      // element geometries if it fails to create the collection, so we
-      // are not doing that ourselves. If that turns out not to be the
-      // case, this will be a memory leak.
+    if (!NIL_P(klasses)) {
+      rb_ary_push(klasses, klass);
     }
-    free(geoms);
+  }
+  collection = GEOSGeom_createCollection(type, geoms, len);
+  if (collection) {
+    result = rgeo_wrap_geos_geometry(factory, collection, module);
+    RGEO_GEOMETRY_DATA_PTR(result)->klasses = klasses;
+  }
+
+  // NOTE: We are assuming that GEOS will do its own cleanup of the
+  // element geometries if it fails to create the collection, so we
+  // are not doing that ourselves. If that turns out not to be the
+  // case, this will be a memory leak.
+  FREE(geoms);
+  if (state) {
+    rb_jump_tag(state);
   }
 
   return result;
 }
 
-
 /**** RUBY METHOD DEFINITIONS ****/
 
-
-static VALUE method_geometry_collection_eql(VALUE self, VALUE rhs)
+static VALUE
+method_geometry_collection_eql(VALUE self, VALUE rhs)
 {
   VALUE result;
   RGeo_GeometryData* self_data;
@@ -141,13 +112,14 @@ static VALUE method_geometry_collection_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_geometry_collections_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_geometry_collection_hash(VALUE self)
+static VALUE
+method_geometry_collection_hash(VALUE self)
 {
   st_index_t hash;
   RGeo_GeometryData* self_data;
@@ -156,14 +128,14 @@ static VALUE method_geometry_collection_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_geometry_collection, hash);
-  hash = rgeo_geos_geometry_collection_hash(self_data->geos_context, self_data->geom, hash);
+  hash = rgeo_geos_objbase_hash(
+    factory, rgeo_feature_geometry_collection_module, hash);
+  hash = rgeo_geos_geometry_collection_hash(self_data->geom, hash);
   return LONG2FIX(rb_hash_end(hash));
 }
 
-
-static VALUE method_geometry_collection_geometry_type(VALUE self)
+static VALUE
+method_geometry_collection_geometry_type(VALUE self)
 {
   VALUE result;
   RGeo_GeometryData* self_data;
@@ -171,13 +143,13 @@ static VALUE method_geometry_collection_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_geometry_collection;
+    result = rgeo_feature_geometry_collection_module;
   }
   return result;
 }
 
-
-static VALUE method_geometry_collection_num_geometries(VALUE self)
+static VALUE
+method_geometry_collection_num_geometries(VALUE self)
 {
   VALUE result;
   RGeo_GeometryData* self_data;
@@ -187,13 +159,13 @@ static VALUE method_geometry_collection_num_geometries(VALUE self)
   self_data = RGEO_GEOMETRY_DATA_PTR(self);
   self_geom = self_data->geom;
   if (self_geom) {
-    result = INT2NUM(GEOSGetNumGeometries_r(self_data->geos_context, self_geom));
+    result = INT2NUM(GEOSGetNumGeometries(self_geom));
   }
   return result;
 }
 
-
-static VALUE impl_geometry_n(VALUE self, VALUE n, char allow_negatives)
+static VALUE
+impl_geometry_n(VALUE self, VALUE n, char allow_negatives)
 {
   VALUE result;
   RGeo_GeometryData* self_data;
@@ -207,16 +179,16 @@ static VALUE impl_geometry_n(VALUE self, VALUE n, char allow_negatives)
   self_geom = self_data->geom;
   if (self_geom) {
     klasses = self_data->klasses;
-    i = NUM2INT(n);
+    i = RB_NUM2INT(n);
     if (allow_negatives || i >= 0) {
-      GEOSContextHandle_t self_context = self_data->geos_context;
-      len = GEOSGetNumGeometries_r(self_context, self_geom);
+      len = GEOSGetNumGeometries(self_geom);
       if (i < 0) {
         i += len;
       }
       if (i >= 0 && i < len) {
-        result = rgeo_wrap_geos_geometry_clone(self_data->factory,
-          GEOSGetGeometryN_r(self_context, self_geom, i),
+        result = rgeo_wrap_geos_geometry_clone(
+          self_data->factory,
+          GEOSGetGeometryN(self_geom, i),
           NIL_P(klasses) ? Qnil : rb_ary_entry(klasses, i));
       }
     }
@@ -224,21 +196,24 @@ static VALUE impl_geometry_n(VALUE self, VALUE n, char allow_negatives)
   return result;
 }
 
-
-static VALUE method_geometry_collection_geometry_n(VALUE self, VALUE n)
+static VALUE
+method_geometry_collection_geometry_n(VALUE self, VALUE n)
 {
   return impl_geometry_n(self, n, 0);
 }
 
-
-static VALUE method_geometry_collection_brackets(VALUE self, VALUE n)
+static VALUE
+method_geometry_collection_brackets(VALUE self, VALUE n)
 {
   return impl_geometry_n(self, n, 1);
 }
 
-
-static VALUE method_geometry_collection_each(VALUE self)
+static VALUE
+method_geometry_collection_each(VALUE self)
 {
+  RETURN_ENUMERATOR(
+    self, 0, 0); /* return enum_for(__callee__) unless block_given? */
+
   RGeo_GeometryData* self_data;
   const GEOSGeometry* self_geom;
   int len;
@@ -249,30 +224,28 @@ static VALUE method_geometry_collection_each(VALUE self)
 
   self_data = RGEO_GEOMETRY_DATA_PTR(self);
 
-  if (rb_block_given_p()) {
-    self_geom = self_data->geom;
-    if (self_geom) {
-      GEOSContextHandle_t self_context = self_data->geos_context;
-      len = GEOSGetNumGeometries_r(self_context, self_geom);
-      if (len > 0) {
-        klasses = self_data->klasses;
-        for (i=0; i<len; ++i) {
-          elem_geom = GEOSGetGeometryN_r(self_context, self_geom, i);
-          elem = rgeo_wrap_geos_geometry_clone(self_data->factory, elem_geom, NIL_P(klasses) ? Qnil : rb_ary_entry(klasses, i));
-          if (!NIL_P(elem)) {
-            rb_yield(elem);
-          }
+  self_geom = self_data->geom;
+  if (self_geom) {
+    len = GEOSGetNumGeometries(self_geom);
+    if (len > 0) {
+      klasses = self_data->klasses;
+      for (i = 0; i < len; ++i) {
+        elem_geom = GEOSGetGeometryN(self_geom, i);
+        elem = rgeo_wrap_geos_geometry_clone(
+          self_data->factory,
+          elem_geom,
+          NIL_P(klasses) ? Qnil : rb_ary_entry(klasses, i));
+        if (!NIL_P(elem)) {
+          rb_yield(elem);
         }
       }
     }
-    return self;
-  }
-  else {
-    return rb_funcall(self, RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->id_enum_for, 0);
   }
+  return self;
 }
 
-static VALUE method_multi_point_geometry_type(VALUE self)
+static VALUE
+method_multi_point_geometry_type(VALUE self)
 {
   VALUE result;
   RGeo_GeometryData* self_data;
@@ -280,13 +253,13 @@ static VALUE method_multi_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_multi_point;
+    result = rgeo_feature_multi_point_module;
   }
   return result;
 }
 
-
-static VALUE method_multi_point_hash(VALUE self)
+static VALUE
+method_multi_point_hash(VALUE self)
 {
   st_index_t hash;
   RGeo_GeometryData* self_data;
@@ -295,19 +268,17 @@ static VALUE method_multi_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_multi_point, hash);
-  hash = rgeo_geos_geometry_collection_hash(self_data->geos_context, self_data->geom, hash);
+  hash = rgeo_geos_objbase_hash(factory, rgeo_feature_multi_point_module, hash);
+  hash = rgeo_geos_geometry_collection_hash(self_data->geom, hash);
   return LONG2FIX(rb_hash_end(hash));
 }
 
-
-static VALUE method_multi_point_coordinates(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;
@@ -318,23 +289,26 @@ static VALUE method_multi_point_coordinates(VALUE self)
   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);
+  if (self_geom) {
+    zCoordinate = RGEO_FACTORY_DATA_PTR(self_data->factory)->flags &
+                  RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M;
+
+    count = GEOSGetNumGeometries(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)));
+    for (i = 0; i < count; ++i) {
+      point = GEOSGetGeometryN(self_geom, i);
+      coord_sequence = GEOSGeom_getCoordSeq(point);
+      rb_ary_push(result,
+                  rb_ary_pop(extract_points_from_coordinate_sequence(
+                    coord_sequence, zCoordinate)));
     }
   }
 
   return result;
 }
 
-
-static VALUE method_multi_line_string_geometry_type(VALUE self)
+static VALUE
+method_multi_line_string_geometry_type(VALUE self)
 {
   VALUE result;
   RGeo_GeometryData* self_data;
@@ -342,13 +316,13 @@ static VALUE method_multi_line_string_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_multi_line_string;
+    result = rgeo_feature_multi_line_string_module;
   }
   return result;
 }
 
-
-static VALUE method_multi_line_string_hash(VALUE self)
+static VALUE
+method_multi_line_string_hash(VALUE self)
 {
   st_index_t hash;
   RGeo_GeometryData* self_data;
@@ -357,36 +331,35 @@ static VALUE method_multi_line_string_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_multi_line_string, hash);
-  hash = rgeo_geos_geometry_collection_hash(self_data->geos_context, self_data->geom, hash);
+  hash = rgeo_geos_objbase_hash(
+    factory, rgeo_feature_multi_line_string_module, hash);
+  hash = rgeo_geos_geometry_collection_hash(self_data->geom, hash);
   return LONG2FIX(rb_hash_end(hash));
 }
 
-static VALUE method_geometry_collection_node(VALUE self)
+static VALUE
+method_geometry_collection_node(VALUE self)
 {
   VALUE result = Qnil;
   RGeo_GeometryData* self_data;
   const GEOSGeometry* self_geom;
   GEOSGeometry* noded;
-  GEOSContextHandle_t context;
 
   self_data = RGEO_GEOMETRY_DATA_PTR(self);
   self_geom = self_data->geom;
-  context = self_data->geos_context;
 
-  noded = GEOSNode_r(context, self_geom);
+  noded = GEOSNode(self_geom);
   result = rgeo_wrap_geos_geometry(self_data->factory, noded, Qnil);
 
   return result;
 }
 
-static VALUE method_multi_line_string_coordinates(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;
@@ -396,23 +369,26 @@ static VALUE method_multi_line_string_coordinates(VALUE self)
 
   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);
+
+  if (self_geom) {
+    zCoordinate = RGEO_FACTORY_DATA_PTR(self_data->factory)->flags &
+                  RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M;
+    count = GEOSGetNumGeometries(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));
+    for (i = 0; i < count; ++i) {
+      line_string = GEOSGetGeometryN(self_geom, i);
+      coord_sequence = GEOSGeom_getCoordSeq(line_string);
+      rb_ary_push(
+        result,
+        extract_points_from_coordinate_sequence(coord_sequence, zCoordinate));
     }
   }
 
   return result;
 }
 
-static VALUE method_multi_line_string_length(VALUE self)
+static VALUE
+method_multi_line_string_length(VALUE self)
 {
   VALUE result;
   RGeo_GeometryData* self_data;
@@ -423,20 +399,19 @@ static VALUE method_multi_line_string_length(VALUE self)
   self_data = RGEO_GEOMETRY_DATA_PTR(self);
   self_geom = self_data->geom;
   if (self_geom) {
-    if (GEOSLength_r(self_data->geos_context, self_geom, &len)) {
+    if (GEOSLength(self_geom, &len)) {
       result = rb_float_new(len);
     }
   }
   return result;
 }
 
-
-static VALUE method_multi_line_string_is_closed(VALUE self)
+static VALUE
+method_multi_line_string_is_closed(VALUE self)
 {
   VALUE result;
   RGeo_GeometryData* self_data;
   const GEOSGeometry* self_geom;
-  GEOSContextHandle_t self_context;
   int len;
   int i;
   const GEOSGeometry* geom;
@@ -445,14 +420,13 @@ static VALUE method_multi_line_string_is_closed(VALUE self)
   self_data = RGEO_GEOMETRY_DATA_PTR(self);
   self_geom = self_data->geom;
   if (self_geom) {
-    self_context = self_data->geos_context;
     result = Qtrue;
-    len = GEOSGetNumGeometries_r(self_context, self_geom);
+    len = GEOSGetNumGeometries(self_geom);
     if (len > 0) {
-      for (i=0; i<len; ++i) {
-        geom = GEOSGetGeometryN_r(self_context, self_geom, i);
+      for (i = 0; i < len; ++i) {
+        geom = GEOSGetGeometryN(self_geom, i);
         if (geom) {
-          result = rgeo_is_geos_line_string_closed(self_context, self_geom);
+          result = rgeo_is_geos_line_string_closed(self_geom);
           if (result != Qtrue) {
             break;
           }
@@ -463,8 +437,8 @@ static VALUE method_multi_line_string_is_closed(VALUE self)
   return result;
 }
 
-
-static VALUE method_multi_polygon_geometry_type(VALUE self)
+static VALUE
+method_multi_polygon_geometry_type(VALUE self)
 {
   VALUE result;
   RGeo_GeometryData* self_data;
@@ -472,13 +446,13 @@ static VALUE method_multi_polygon_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_multi_polygon;
+    result = rgeo_feature_multi_polygon_module;
   }
   return result;
 }
 
-
-static VALUE method_multi_polygon_hash(VALUE self)
+static VALUE
+method_multi_polygon_hash(VALUE self)
 {
   st_index_t hash;
   RGeo_GeometryData* self_data;
@@ -487,19 +461,18 @@ static VALUE method_multi_polygon_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_multi_polygon, hash);
-  hash = rgeo_geos_geometry_collection_hash(self_data->geos_context, self_data->geom, hash);
+  hash =
+    rgeo_geos_objbase_hash(factory, rgeo_feature_multi_polygon_module, hash);
+  hash = rgeo_geos_geometry_collection_hash(self_data->geom, hash);
   return LONG2FIX(rb_hash_end(hash));
 }
 
-
-static VALUE method_multi_polygon_coordinates(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;
@@ -508,23 +481,23 @@ static VALUE method_multi_polygon_coordinates(VALUE self)
 
   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);
+
+  if (self_geom) {
+    zCoordinate = RGEO_FACTORY_DATA_PTR(self_data->factory)->flags &
+                  RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M;
+    count = GEOSGetNumGeometries(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));
+    for (i = 0; i < count; ++i) {
+      poly = GEOSGetGeometryN(self_geom, i);
+      rb_ary_push(result, extract_points_from_polygon(poly, zCoordinate));
     }
   }
 
   return result;
 }
 
-
-static VALUE method_multi_polygon_area(VALUE self)
+static VALUE
+method_multi_polygon_area(VALUE self)
 {
   VALUE result;
   RGeo_GeometryData* self_data;
@@ -535,15 +508,15 @@ static VALUE method_multi_polygon_area(VALUE self)
   self_data = RGEO_GEOMETRY_DATA_PTR(self);
   self_geom = self_data->geom;
   if (self_geom) {
-    if (GEOSArea_r(self_data->geos_context, self_geom, &area)) {
+    if (GEOSArea(self_geom, &area)) {
       result = rb_float_new(area);
     }
   }
   return result;
 }
 
-
-static VALUE method_multi_polygon_centroid(VALUE self)
+static VALUE
+method_multi_polygon_centroid(VALUE self)
 {
   VALUE result;
   RGeo_GeometryData* self_data;
@@ -553,40 +526,42 @@ static VALUE method_multi_polygon_centroid(VALUE self)
   self_data = RGEO_GEOMETRY_DATA_PTR(self);
   self_geom = self_data->geom;
   if (self_geom) {
-    result = rgeo_wrap_geos_geometry(self_data->factory, GEOSGetCentroid_r(self_data->geos_context, self_geom), Qnil);
+    result = rgeo_wrap_geos_geometry(
+      self_data->factory, GEOSGetCentroid(self_geom), Qnil);
   }
   return result;
 }
 
-
-static VALUE cmethod_geometry_collection_create(VALUE module, VALUE factory, VALUE array)
+static VALUE
+cmethod_geometry_collection_create(VALUE module, VALUE factory, VALUE array)
 {
-  return create_geometry_collection(module, GEOS_GEOMETRYCOLLECTION, factory, array);
+  return create_geometry_collection(
+    module, GEOS_GEOMETRYCOLLECTION, factory, array);
 }
 
-
-static VALUE cmethod_multi_point_create(VALUE module, VALUE factory, VALUE array)
+static VALUE
+cmethod_multi_point_create(VALUE module, VALUE factory, VALUE array)
 {
   return create_geometry_collection(module, GEOS_MULTIPOINT, factory, array);
 }
 
-
-static VALUE cmethod_multi_line_string_create(VALUE module, VALUE factory, VALUE array)
+static VALUE
+cmethod_multi_line_string_create(VALUE module, VALUE factory, VALUE array)
 {
-  return create_geometry_collection(module, GEOS_MULTILINESTRING, factory, array);
+  return create_geometry_collection(
+    module, GEOS_MULTILINESTRING, factory, array);
 }
 
-
-static VALUE cmethod_multi_polygon_create(VALUE module, VALUE factory, VALUE array)
+static VALUE
+cmethod_multi_polygon_create(VALUE module, VALUE factory, VALUE array)
 {
   return create_geometry_collection(module, GEOS_MULTIPOLYGON, factory, array);
 }
 
-
 /**** INITIALIZATION FUNCTION ****/
 
-
-void rgeo_init_geos_geometry_collection(RGeo_Globals* globals)
+void
+rgeo_init_geos_geometry_collection()
 {
   VALUE geos_geometry_collection_methods;
   VALUE geos_multi_point_methods;
@@ -594,127 +569,120 @@ void rgeo_init_geos_geometry_collection(RGeo_Globals* globals)
   VALUE geos_multi_polygon_methods;
 
   // Class methods for geometry collection classes
-  rb_define_module_function(globals->geos_geometry_collection, "create", cmethod_geometry_collection_create, 2);
-  rb_define_module_function(globals->geos_multi_point, "create", cmethod_multi_point_create, 2);
-  rb_define_module_function(globals->geos_multi_line_string, "create", cmethod_multi_line_string_create, 2);
-  rb_define_module_function(globals->geos_multi_polygon, "create", cmethod_multi_polygon_create, 2);
+  rb_define_module_function(rgeo_geos_geometry_collection_class,
+                            "create",
+                            cmethod_geometry_collection_create,
+                            2);
+  rb_define_module_function(
+    rgeo_geos_multi_point_class, "create", cmethod_multi_point_create, 2);
+  rb_define_module_function(rgeo_geos_multi_line_string_class,
+                            "create",
+                            cmethod_multi_line_string_create,
+                            2);
+  rb_define_module_function(
+    rgeo_geos_multi_polygon_class, "create", cmethod_multi_polygon_create, 2);
 
   // Methods for GeometryCollectionImpl
-  geos_geometry_collection_methods = rb_define_module_under(globals->geos_module, "CAPIGeometryCollectionMethods");
-  rb_define_method(geos_geometry_collection_methods, "rep_equals?", method_geometry_collection_eql, 1);
-  rb_define_method(geos_geometry_collection_methods, "eql?", method_geometry_collection_eql, 1);
-  rb_define_method(geos_geometry_collection_methods, "hash", method_geometry_collection_hash, 0);
-  rb_define_method(geos_geometry_collection_methods, "geometry_type", method_geometry_collection_geometry_type, 0);
-  rb_define_method(geos_geometry_collection_methods, "num_geometries", method_geometry_collection_num_geometries, 0);
-  rb_define_method(geos_geometry_collection_methods, "size", method_geometry_collection_num_geometries, 0);
-  rb_define_method(geos_geometry_collection_methods, "geometry_n", method_geometry_collection_geometry_n, 1);
-  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);
-  rb_define_method(geos_geometry_collection_methods, "node", method_geometry_collection_node, 0);
-
+  geos_geometry_collection_methods =
+    rb_define_module_under(rgeo_geos_module, "CAPIGeometryCollectionMethods");
+  rb_define_method(geos_geometry_collection_methods,
+                   "rep_equals?",
+                   method_geometry_collection_eql,
+                   1);
+  rb_define_method(geos_geometry_collection_methods,
+                   "eql?",
+                   method_geometry_collection_eql,
+                   1);
+  rb_define_method(geos_geometry_collection_methods,
+                   "hash",
+                   method_geometry_collection_hash,
+                   0);
+  rb_define_method(geos_geometry_collection_methods,
+                   "geometry_type",
+                   method_geometry_collection_geometry_type,
+                   0);
+  rb_define_method(geos_geometry_collection_methods,
+                   "num_geometries",
+                   method_geometry_collection_num_geometries,
+                   0);
+  rb_define_method(geos_geometry_collection_methods,
+                   "size",
+                   method_geometry_collection_num_geometries,
+                   0);
+  rb_define_method(geos_geometry_collection_methods,
+                   "geometry_n",
+                   method_geometry_collection_geometry_n,
+                   1);
+  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);
+  rb_define_method(geos_geometry_collection_methods,
+                   "node",
+                   method_geometry_collection_node,
+                   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);
+  geos_multi_point_methods =
+    rb_define_module_under(rgeo_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");
-  rb_define_method(geos_multi_line_string_methods, "geometry_type", method_multi_line_string_geometry_type, 0);
-  rb_define_method(geos_multi_line_string_methods, "length", method_multi_line_string_length, 0);
-  rb_define_method(geos_multi_line_string_methods, "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);
+  geos_multi_line_string_methods =
+    rb_define_module_under(rgeo_geos_module, "CAPIMultiLineStringMethods");
+  rb_define_method(geos_multi_line_string_methods,
+                   "geometry_type",
+                   method_multi_line_string_geometry_type,
+                   0);
+  rb_define_method(geos_multi_line_string_methods,
+                   "length",
+                   method_multi_line_string_length,
+                   0);
+  rb_define_method(geos_multi_line_string_methods,
+                   "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");
-  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, "hash", method_multi_polygon_hash, 0);
-  rb_define_method(geos_multi_polygon_methods, "coordinates", method_multi_polygon_coordinates, 0);
+  geos_multi_polygon_methods =
+    rb_define_module_under(rgeo_geos_module, "CAPIMultiPolygonMethods");
+  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, "hash", method_multi_polygon_hash, 0);
+  rb_define_method(geos_multi_polygon_methods,
+                   "coordinates",
+                   method_multi_polygon_coordinates,
+                   0);
 }
 
-
 /**** OTHER PUBLIC FUNCTIONS ****/
 
-
-VALUE rgeo_geos_geometry_collections_eql(GEOSContextHandle_t context, const GEOSGeometry* geom1, const GEOSGeometry* geom2, char check_z)
-{
-  VALUE result;
-  int len1;
-  int len2;
-  int i;
-  const GEOSGeometry* sub_geom1;
-  const GEOSGeometry* sub_geom2;
-  int type1;
-  int type2;
-
-  result = Qnil;
-  if (geom1 && geom2) {
-    len1 = GEOSGetNumGeometries_r(context, geom1);
-    len2 = GEOSGetNumGeometries_r(context, geom2);
-    if (len1 >= 0 && len2 >= 0) {
-      if (len1 == len2) {
-        result = Qtrue;
-        for (i=0; i<len1; ++i) {
-          sub_geom1 = GEOSGetGeometryN_r(context, geom1, i);
-          sub_geom2 = GEOSGetGeometryN_r(context, geom2, i);
-          if (sub_geom1 && sub_geom2) {
-            type1 = GEOSGeomTypeId_r(context, sub_geom1);
-            type2 = GEOSGeomTypeId_r(context, sub_geom2);
-            if (type1 >= 0 && type2 >= 0) {
-              if (type1 == type2) {
-                switch (type1) {
-                case GEOS_POINT:
-                case GEOS_LINESTRING:
-                case GEOS_LINEARRING:
-                  result = rgeo_geos_coordseqs_eql(context, sub_geom1, sub_geom2, check_z);
-                  break;
-                case GEOS_POLYGON:
-                  result = rgeo_geos_polygons_eql(context, sub_geom1, sub_geom2, check_z);
-                  break;
-                case GEOS_GEOMETRYCOLLECTION:
-                case GEOS_MULTIPOINT:
-                case GEOS_MULTILINESTRING:
-                case GEOS_MULTIPOLYGON:
-                  result = rgeo_geos_geometry_collections_eql(context, sub_geom1, sub_geom2, check_z);
-                  break;
-                default:
-                  result = Qnil;
-                  break;
-                }
-                if (!RTEST(result)) {
-                  break;
-                }
-              }
-              else {
-                result = Qfalse;
-                break;
-              }
-            }
-            else {
-              result = Qnil;
-              break;
-            }
-          }
-          else {
-            result = Qnil;
-            break;
-          }
-        }
-      }
-      else {
-        result = Qfalse;
-      }
-    }
-  }
-  return result;
-}
-
-
-st_index_t rgeo_geos_geometry_collection_hash(GEOSContextHandle_t context, const GEOSGeometry* geom, st_index_t hash)
+st_index_t
+rgeo_geos_geometry_collection_hash(const GEOSGeometry* geom, st_index_t hash)
 {
   const GEOSGeometry* sub_geom;
   int type;
@@ -722,28 +690,28 @@ st_index_t rgeo_geos_geometry_collection_hash(GEOSContextHandle_t context, const
   unsigned int i;
 
   if (geom) {
-    len = GEOSGetNumGeometries_r(context, geom);
-    for (i=0; i<len; ++i) {
-      sub_geom = GEOSGetGeometryN_r(context, geom, i);
+    len = GEOSGetNumGeometries(geom);
+    for (i = 0; i < len; ++i) {
+      sub_geom = GEOSGetGeometryN(geom, i);
       if (sub_geom) {
-        type = GEOSGeomTypeId_r(context, sub_geom);
+        type = GEOSGeomTypeId(sub_geom);
         if (type >= 0) {
           hash = hash ^ type;
           switch (type) {
-          case GEOS_POINT:
-          case GEOS_LINESTRING:
-          case GEOS_LINEARRING:
-            hash = rgeo_geos_coordseq_hash(context, sub_geom, hash);
-            break;
-          case GEOS_POLYGON:
-            hash = rgeo_geos_polygon_hash(context, sub_geom, hash);
-            break;
-          case GEOS_GEOMETRYCOLLECTION:
-          case GEOS_MULTIPOINT:
-          case GEOS_MULTILINESTRING:
-          case GEOS_MULTIPOLYGON:
-            hash = rgeo_geos_geometry_collection_hash(context, sub_geom, hash);
-            break;
+            case GEOS_POINT:
+            case GEOS_LINESTRING:
+            case GEOS_LINEARRING:
+              hash = rgeo_geos_coordseq_hash(sub_geom, hash);
+              break;
+            case GEOS_POLYGON:
+              hash = rgeo_geos_polygon_hash(sub_geom, hash);
+              break;
+            case GEOS_GEOMETRYCOLLECTION:
+            case GEOS_MULTIPOINT:
+            case GEOS_MULTILINESTRING:
+            case GEOS_MULTIPOLYGON:
+              hash = rgeo_geos_geometry_collection_hash(sub_geom, hash);
+              break;
           }
         }
       }
@@ -752,7 +720,6 @@ st_index_t rgeo_geos_geometry_collection_hash(GEOSContextHandle_t context, const
   return hash;
 }
 
-
 RGEO_END_C
 
 #endif