rgeo 0.3.3 → 0.3.4

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 0.3.4 / 2012-02-21
+
+* The FFI-GEOS implementation now uses prepared geometries.
+* Fixed a segfault that sometimes happened when passing a non-GEOS geometry as an argument to a GEOS function under Ruby 1.8.7. (Reported by Greg Hazel.)
+* A few minor optimizations in the C extension for GEOS.
+
 === 0.3.3 / 2011-12-19
 
 * Recognizes MultiPoint WKTs in which individual points are not contained in parens. This is technically incorrect syntax, but apparently there are examples in the wild so we are now supporting it. (Reported by J Smith.)

data/README.rdoc

@@ -49,7 +49,7 @@ RGeo is known to work with the following Ruby implementations:
 * Standard "MRI" Ruby 1.8.7 or later. (1.9.2 or later preferred.)
 * Rubinius 1.1 or later.
 * Partial support for JRuby 1.6.3 or later. The FFI implementation of
-  GEOS is available (ffi-geos gem is required) but CAPI is not.
+  GEOS is available (ffi-geos gem required) but CAPI is not.
   Proj4 support is expected in the future.
 
 Some features also require the following:

data/Version

@@ -1 +1 @@
-0.3.3
+0.3.4

data/ext/geos_c_impl/extconf.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Makefile builder for GEOS wrapper
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# Copyright 2010-2012 Daniel Azuma
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -18,7 +18,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -35,13 +35,13 @@
 
 
 if ::RUBY_DESCRIPTION =~ /^jruby\s/
-  
+
   ::File.open('Makefile', 'w'){ |f_| f_.write(".PHONY: install\ninstall:\n") }
-  
+
 else
-  
+
   require 'mkmf'
-  
+
   header_dirs_ =
     [
      '/usr/local/include',
@@ -66,7 +66,7 @@ else
     ]
   header_dirs_.delete_if{ |path_| !::File.directory?(path_) }
   lib_dirs_.delete_if{ |path_| !::File.directory?(path_) }
-  
+
   found_geos_ = false
   header_dirs_, lib_dirs_ = dir_config('geos', header_dirs_, lib_dirs_)
   if have_header('geos_c.h')
@@ -84,5 +84,5 @@ else
     puts "**** Compiling without GEOS support."
   end
   create_makefile('rgeo/geos/geos_c_impl')
-  
+
 end

data/ext/geos_c_impl/factory.c

@@ -1,16 +1,16 @@
 /*
   -----------------------------------------------------------------------------
-  
+
   Factory and utility functions for GEOS wrapper
-  
+
   -----------------------------------------------------------------------------
-  Copyright 2010 Daniel Azuma
-  
+  Copyright 2010-2012 Daniel Azuma
+
   All rights reserved.
-  
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-  
+
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
   * Neither the name of the copyright holder, nor the names of any other
     contributors to this software, may be used to endorse or promote products
     derived from this software without specific prior written permission.
-  
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -180,7 +180,7 @@ static VALUE method_factory_parse_wkt(VALUE self, VALUE str)
   GEOSWKTReader* wkt_reader;
   VALUE result;
   GEOSGeometry* geom;
-  
+
   Check_Type(str, T_STRING);
   self_data = RGEO_FACTORY_DATA_PTR(self);
   self_context = self_data->geos_context;
@@ -207,7 +207,7 @@ static VALUE method_factory_parse_wkb(VALUE self, VALUE str)
   GEOSWKBReader* wkb_reader;
   VALUE result;
   GEOSGeometry* geom;
-  
+
   Check_Type(str, T_STRING);
   self_data = RGEO_FACTORY_DATA_PTR(self);
   self_context = self_data->geos_context;
@@ -234,7 +234,7 @@ static VALUE cmethod_factory_create(VALUE klass, VALUE flags, VALUE srid, VALUE
   RGeo_FactoryData* data;
   GEOSContextHandle_t context;
   VALUE wrapped_globals;
-  
+
   result = Qnil;
   data = ALLOC(RGeo_FactoryData);
   if (data) {
@@ -277,7 +277,13 @@ RGeo_Globals* rgeo_init_geos_factory()
   globals->geos_module = rb_define_module_under(rgeo_module, "Geos");
   globals->feature_module = rb_define_module_under(rgeo_module, "Feature");
   globals->global_mixins = rb_const_get_at(rb_const_get_at(globals->feature_module, rb_intern("MixinCollection")), rb_intern("GLOBAL"));
-  
+
+  globals->id_cast = rb_intern("cast");
+  globals->id_eql = rb_intern("eql?");
+  globals->id_generate = rb_intern("generate");
+  globals->sym_force_new = ID2SYM(rb_intern("force_new"));
+  globals->sym_keep_subtype = ID2SYM(rb_intern("keep_subtype"));
+
   // Add C methods to the factory.
   geos_factory_class = rb_const_get_at(globals->geos_module, rb_intern("Factory"));
   rb_define_method(geos_factory_class, "_parse_wkt_impl", method_factory_parse_wkt, 1);
@@ -286,12 +292,12 @@ RGeo_Globals* rgeo_init_geos_factory()
   rb_define_method(geos_factory_class, "_buffer_resolution", method_factory_buffer_resolution, 0);
   rb_define_method(geos_factory_class, "_flags", method_factory_flags, 0);
   rb_define_module_function(geos_factory_class, "_create", cmethod_factory_create, 5);
-  
+
   // Wrap the globals in a Ruby object and store it off so we have access
   // to it later. Each factory instance will reference it internally.
   wrapped_globals = Data_Wrap_Struct(rb_cObject, mark_globals_func, destroy_globals_func, globals);
   rb_define_const(geos_factory_class, "INTERNAL_CGLOBALS", wrapped_globals);
-  
+
   return globals;
 }
 
@@ -395,12 +401,14 @@ const GEOSGeometry* rgeo_convert_to_geos_geometry(VALUE factory, VALUE obj, VALU
 {
   VALUE object;
   const GEOSGeometry* geom;
+  RGeo_Globals* globals;
 
-  if (NIL_P(type) && RGEO_GEOMETRY_DATA_PTR(obj)->factory == factory) {
+  if (NIL_P(type) && TYPE(obj) == T_DATA && RDATA(obj)->dfree == (RUBY_DATA_FUNC)destroy_geometry_func && RGEO_GEOMETRY_DATA_PTR(obj)->factory == factory) {
     object = obj;
   }
   else {
-    object = rb_funcall(RGEO_FACTORY_DATA_PTR(factory)->globals->feature_module, rb_intern("cast"), 3, obj, factory, type);
+    globals = RGEO_FACTORY_DATA_PTR(factory)->globals;
+    object = rb_funcall(globals->feature_module, globals->id_cast, 3, obj, factory, type);
   }
   geom = NULL;
   if (!NIL_P(object)) {
@@ -416,11 +424,13 @@ GEOSGeometry* rgeo_convert_to_detached_geos_geometry(VALUE obj, VALUE factory, V
   GEOSGeometry* geom;
   RGeo_GeometryData* object_data;
   const GEOSPreparedGeometry* prep;
+  RGeo_Globals* globals;
 
   if (klasses) {
     *klasses = Qnil;
   }
-  object = rb_funcall(RGEO_FACTORY_DATA_PTR(factory)->globals->feature_module, rb_intern("cast"), 5, obj, factory, type, ID2SYM(rb_intern("force_new")), ID2SYM(rb_intern("keep_subtype")));
+  globals = RGEO_FACTORY_DATA_PTR(factory)->globals;
+  object = rb_funcall(globals->feature_module, globals->id_cast, 5, obj, factory, type, globals->sym_force_new, globals->sym_keep_subtype);
   geom = NULL;
   if (!NIL_P(object)) {
     object_data = RGEO_GEOMETRY_DATA_PTR(object);
@@ -533,13 +543,15 @@ VALUE rgeo_geos_coordseqs_eql(GEOSContextHandle_t context, const GEOSGeometry* g
 VALUE rgeo_geos_klasses_and_factories_eql(VALUE obj1, VALUE obj2)
 {
   VALUE result;
-  
+  VALUE factory;
+
   result = Qnil;
   if (rb_obj_class(obj1) != rb_obj_class(obj2)) {
     result = Qfalse;
   }
   else {
-    result = rb_funcall(RGEO_GEOMETRY_DATA_PTR(obj1)->factory, rb_intern("eql?"), 1, RGEO_GEOMETRY_DATA_PTR(obj2)->factory);
+    factory = RGEO_GEOMETRY_DATA_PTR(obj1)->factory;
+    result = rb_funcall(factory, RGEO_FACTORY_DATA_PTR(factory)->globals->id_eql, 1, RGEO_GEOMETRY_DATA_PTR(obj2)->factory);
   }
   return result;
 }

data/ext/geos_c_impl/factory.h

@@ -1,16 +1,16 @@
 /*
   -----------------------------------------------------------------------------
-  
+
   Factory and utility functions for GEOS wrapper
-  
+
   -----------------------------------------------------------------------------
-  Copyright 2010 Daniel Azuma
-  
+  Copyright 2010-2012 Daniel Azuma
+
   All rights reserved.
-  
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-  
+
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
   * Neither the name of the copyright holder, nor the names of any other
     contributors to this software, may be used to endorse or promote products
     derived from this software without specific prior written permission.
-  
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -46,8 +46,9 @@ RGEO_BEGIN_C
 
 /*
   Per-interpreter globals.
-  Most of these are cached references to commonly used classes and modules
-  so we don't have to do a lot of constant lookups.
+  Most of these are cached references to commonly used classes, modules,
+  and symbols so we don't have to do a lot of constant lookups and calls
+  to rb_intern.
 */
 typedef struct {
   VALUE feature_module;
@@ -73,6 +74,11 @@ typedef struct {
   VALUE geos_multi_point;
   VALUE geos_multi_line_string;
   VALUE geos_multi_polygon;
+  ID id_cast;
+  ID id_eql;
+  ID id_generate;
+  VALUE sym_force_new;
+  VALUE sym_keep_subtype;
 } RGeo_Globals;
 
 
@@ -109,7 +115,7 @@ typedef struct {
   Includes a handle to the underlying GEOS geometry itself (which could
   be null for an uninitialized geometry).
   It also provides a handle to the factory that created this geometry.
-  
+
   The klasses object is used by geometry collections. Its value is
   generally an array of the ruby classes for the colletion's elements,
   so that we can reproduce the exact class for those elements in cases
@@ -117,7 +123,7 @@ typedef struct {
   in Line objects, which have no GEOS type). Any array element, or the
   array itself, could be Qnil, indicating fall back to the default
   inferred from the GEOS type.
-  
+
   The GEOS context handle is also included here. Ideally, it would be
   available by following the factory reference and getting it from the
   factory data. However, one use case is in the destroy_geometry_func
@@ -185,7 +191,7 @@ const GEOSGeometry* rgeo_convert_to_geos_geometry(VALUE factory, VALUE obj, VALU
   disables this auto-cast. The returned GEOS geometry is owned by the
   caller-- that is, if the original ruby object is already of the desired
   factory, the returned GEOS geometry is a clone of the original.
-  
+
   If the klasses parameter is not NULL, its referent is set to the
   klasses saved in the original ruby Geometry object (if any), or else to
   the class of the converted GEOS object. This is so that you can use the

data/ext/geos_c_impl/geometry.c

@@ -1,16 +1,16 @@
 /*
   -----------------------------------------------------------------------------
-  
+
   Geometry base class methods for GEOS wrapper
-  
+
   -----------------------------------------------------------------------------
-  Copyright 2010 Daniel Azuma
-  
+  Copyright 2010-2012 Daniel Azuma
+
   All rights reserved.
-  
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-  
+
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
   * Neither the name of the copyright holder, nor the names of any other
     contributors to this software, may be used to endorse or promote products
     derived from this software without specific prior written permission.
-  
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -310,7 +310,7 @@ static VALUE method_geometry_as_text(VALUE self)
     factory_data = RGEO_FACTORY_DATA_PTR(self_data->factory);
     wkt_generator = factory_data->wkrep_wkt_generator;
     if (!NIL_P(wkt_generator)) {
-      result = rb_funcall(wkt_generator, rb_intern("generate"), 1, self);
+      result = rb_funcall(wkt_generator, factory_data->globals->id_generate, 1, self);
     }
     else {
       wkt_writer = factory_data->wkt_writer;
@@ -349,7 +349,7 @@ static VALUE method_geometry_as_binary(VALUE self)
     factory_data = RGEO_FACTORY_DATA_PTR(self_data->factory);
     wkb_generator = factory_data->wkrep_wkb_generator;
     if (!NIL_P(wkb_generator)) {
-      result = rb_funcall(wkb_generator, rb_intern("generate"), 1, self);
+      result = rb_funcall(wkb_generator, factory_data->globals->id_generate, 1, self);
     }
     else {
       wkb_writer = factory_data->wkb_writer;
@@ -915,7 +915,7 @@ static VALUE method_geometry_initialize_copy(VALUE self, VALUE orig)
   self_data->geos_context = NULL;
   self_data->factory = Qnil;
   self_data->klasses = Qnil;
-  
+
   // Copy value from orig
   geom = rgeo_get_geos_geometry_safe(orig);
   if (geom) {
@@ -949,7 +949,7 @@ void rgeo_init_geos_geometry(RGeo_Globals* globals)
   globals->feature_geometry = rb_const_get_at(globals->feature_module, rb_intern("Geometry"));
   rb_funcall(globals->global_mixins, rb_intern("include_in_class"), 2,
     globals->feature_geometry, geos_geometry_class);
-  
+
   rb_define_alloc_func(geos_geometry_class, alloc_geometry);
   rb_define_method(geos_geometry_class, "_set_factory", method_geometry_set_factory, 1);
   rb_define_method(geos_geometry_class, "initialize_copy", method_geometry_initialize_copy, 1);

data/ext/geos_c_impl/geometry.h

@@ -1,16 +1,16 @@
 /*
   -----------------------------------------------------------------------------
-  
+
   Geometry base class methods for GEOS wrapper
-  
+
   -----------------------------------------------------------------------------
-  Copyright 2010 Daniel Azuma
-  
+  Copyright 2010-2012 Daniel Azuma
+
   All rights reserved.
-  
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-  
+
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
   * Neither the name of the copyright holder, nor the names of any other
     contributors to this software, may be used to endorse or promote products
     derived from this software without specific prior written permission.
-  
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

data/ext/geos_c_impl/geometry_collection.c

@@ -1,16 +1,16 @@
 /*
   -----------------------------------------------------------------------------
-  
+
   Geometry collection methods for GEOS wrapper
-  
+
   -----------------------------------------------------------------------------
-  Copyright 2010 Daniel Azuma
-  
+  Copyright 2010-2012 Daniel Azuma
+
   All rights reserved.
-  
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-  
+
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
   * Neither the name of the copyright holder, nor the names of any other
     contributors to this software, may be used to endorse or promote products
     derived from this software without specific prior written permission.
-  
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -155,7 +155,7 @@ static VALUE create_geometry_collection(VALUE module, int type, VALUE factory, V
     }
     free(geoms);
   }
-  
+
   return result;
 }
 
@@ -466,13 +466,13 @@ void rgeo_init_geos_geometry_collection(RGeo_Globals* globals)
   globals->feature_geometry_collection = rb_const_get_at(globals->feature_module, rb_intern("GeometryCollection"));
   rb_funcall(globals->global_mixins, rb_intern("include_in_class"), 2,
     globals->feature_geometry_collection, geos_geometry_collection_class);
-  
+
   geos_multi_point_class = rb_define_class_under(globals->geos_module, "MultiPointImpl", geos_geometry_collection_class);
   globals->geos_multi_point = geos_multi_point_class;
   globals->feature_multi_point = rb_const_get_at(globals->feature_module, rb_intern("MultiPoint"));
   rb_funcall(globals->global_mixins, rb_intern("include_in_class"), 2,
     globals->feature_multi_point, geos_multi_point_class);
-  
+
   geos_multi_line_string_class = rb_define_class_under(globals->geos_module, "MultiLineStringImpl", geos_geometry_collection_class);
   globals->geos_multi_line_string = geos_multi_line_string_class;
   globals->feature_multi_line_string = rb_const_get_at(globals->feature_module, rb_intern("MultiLineString"));
@@ -480,7 +480,7 @@ void rgeo_init_geos_geometry_collection(RGeo_Globals* globals)
     rb_const_get_at(globals->feature_module, rb_intern("MultiCurve")), geos_multi_line_string_class);
   rb_funcall(globals->global_mixins, rb_intern("include_in_class"), 2,
     globals->feature_multi_line_string, geos_multi_line_string_class);
-  
+
   geos_multi_polygon_class = rb_define_class_under(globals->geos_module, "MultiPolygonImpl", geos_geometry_collection_class);
   globals->geos_multi_polygon = geos_multi_polygon_class;
   globals->feature_multi_polygon = rb_const_get_at(globals->feature_module, rb_intern("MultiPolygon"));
@@ -488,7 +488,7 @@ void rgeo_init_geos_geometry_collection(RGeo_Globals* globals)
     rb_const_get_at(globals->feature_module, rb_intern("MultiSurface")), geos_multi_polygon_class);
   rb_funcall(globals->global_mixins, rb_intern("include_in_class"), 2,
     globals->feature_multi_polygon, geos_multi_polygon_class);
-  
+
   // Methods for GeometryCollectionImpl
   rb_define_module_function(geos_geometry_collection_class, "create", cmethod_geometry_collection_create, 2);
   rb_include_module(geos_geometry_collection_class, rb_define_module("Enumerable"));
@@ -499,17 +499,17 @@ void rgeo_init_geos_geometry_collection(RGeo_Globals* globals)
   rb_define_method(geos_geometry_collection_class, "geometry_n", method_geometry_collection_geometry_n, 1);
   rb_define_method(geos_geometry_collection_class, "[]", method_geometry_collection_brackets, 1);
   rb_define_method(geos_geometry_collection_class, "each", method_geometry_collection_each, 0);
-  
+
   // Methods for MultiPointImpl
   rb_define_module_function(geos_multi_point_class, "create", cmethod_multi_point_create, 2);
   rb_define_method(geos_multi_point_class, "geometry_type", method_multi_point_geometry_type, 0);
-  
+
   // Methods for MultiLineStringImpl
   rb_define_module_function(geos_multi_line_string_class, "create", cmethod_multi_line_string_create, 2);
   rb_define_method(geos_multi_line_string_class, "geometry_type", method_multi_line_string_geometry_type, 0);
   rb_define_method(geos_multi_line_string_class, "length", method_multi_line_string_length, 0);
   rb_define_method(geos_multi_line_string_class, "is_closed?", method_multi_line_string_is_closed, 0);
-  
+
   // Methods for MultiPolygonImpl
   rb_define_module_function(geos_multi_polygon_class, "create", cmethod_multi_polygon_create, 2);
   rb_define_method(geos_multi_polygon_class, "geometry_type", method_multi_polygon_geometry_type, 0);