rgeo 0.3.16 → 0.3.17

data/History.rdoc

@@ -1,6 +1,10 @@
+=== 0.3.17 / 2012-08-21
+
+* Geos-based implementations crashed when an operation resulted in an empty point, e.g. taking the centroid of an empty MultiPolygon on recent versions of Geos. Fixed. Such operations now return the empty GeometryCollection for the time being, to match the behavior of older versions of Geos. (Reported by Ben Hughes)
+
 === 0.3.16 / 2012-08-19
 
-* Added /usr/lib64 to the list of libraries searched. (Thanks to hunterae.)
+* Added /usr/lib64 to the list of libraries searched. (Thanks to hunterae)
 * Re-added Geos::Factory as an alias of Geos::CAPIFactory, for compatibility with old serializations.
 
 === 0.3.15 / 2012-08-02

data/README.rdoc

@@ -32,7 +32,6 @@ Several optional modules are currently available:
 * Extend ActiveRecord to handle spatial data in MySQL Spatial, SpatiaLite,
   and PostGIS using RGeo's spatial ActiveRecord adapters. These are
   available via the gems:
-  * <b>activerecord-mysqlspatial-adapter</b>
   * <b>activerecord-mysql2spatial-adapter</b>
   * <b>activerecord-spatialite-adapter</b>
   * <b>activerecord-postgis-adapter</b>
@@ -53,17 +52,24 @@ RGeo is known to work with the following Ruby implementations:
 
 Some features also require the following:
 
-* GEOS 3.2 or later is highly recommended. Some functions will not be
-  available without it. This C/C++ library may be available via your
-  operating system's package manager, or you can download it from
-  http://trac.osgeo.org/geos
+* GEOS 3.2 or later is highly recommended. (3.3.3 or later preferred.)
+  Some functions will not be available without it.
+  This C/C++ library may be available via your operating system's package
+  manager, or you can download it from http://trac.osgeo.org/geos
 * Proj 4.7 or later is also recommended. This library is needed if you
   want to translate coordinates between geographic projections. It also
   may be available via your operating system's package manager, or from
   http://trac.osgeo.org/proj
+* On some platforms, you should install the ffi-geos gem (version 0.0.6
+  or later recommended.) JRuby requires this gem to properly link with
+  Geos, and Windows builds probably do as well.
 
 Note: The build system assumes a unix-like environment. Windows builds
-may be possible, but not likely "out of the box".
+may be possible, but not likely "out of the box". I have heard that
+some Windows users have had success getting the ffi-geos implementation
+working, after suitably installing the Geos library. However, since I'm
+not a Windows user myself, I can't provide any direct support for this
+configuration.
 
 === Installation
 

data/Version

@@ -1 +1 @@
-0.3.16
+0.3.17

data/ext/geos_c_impl/factory.c

@@ -696,9 +696,20 @@ VALUE rgeo_wrap_geos_geometry(VALUE factory, GEOSGeometry* geom, VALUE klass)
   if (geom || !NIL_P(klass)) {
     factory_data = NIL_P(factory) ? NULL : RGEO_FACTORY_DATA_PTR(factory);
     factory_context = factory_data ? factory_data->geos_context : NULL;
+    globals = factory_data ? factory_data->globals : NULL;
+
+    // We don't allow "empty" points, so replace such objects with
+    // an empty collection.
+    if (geom && factory) {
+      if (GEOSGeomTypeId_r(factory_context, geom) == GEOS_POINT && GEOSGetNumCoordinates_r(factory_context, geom) == 0) {
+        GEOSGeom_destroy_r(factory_context, geom);
+        geom = GEOSGeom_createCollection_r(factory_context, GEOS_GEOMETRYCOLLECTION, NULL, 0);
+        klass = globals->geos_geometry_collection;
+      }
+    }
+
     klasses = Qnil;
     if (TYPE(klass) != T_CLASS) {
-      globals = factory_data->globals;
       inferred_klass = Qnil;
       is_collection = 0;
       switch (GEOSGeomTypeId_r(factory_context, geom)) {

data/ext/geos_c_impl/geometry.c

@@ -254,14 +254,7 @@ static VALUE method_geometry_envelope(VALUE self)
   if (self_geom) {
     geos_context = self_data->geos_context;
     envelope = GEOSEnvelope_r(geos_context, self_geom);
-    // GEOS returns an "empty" point for an empty collection's envelope.
-    // We don't allow that type, so we replace it with an empty collection.
-    if (!envelope ||
-        GEOSGeomTypeId_r(geos_context, envelope) == GEOS_POINT &&
-        GEOSGetNumCoordinates_r(geos_context, envelope) == 0) {
-      if (envelope) {
-        GEOSGeom_destroy_r(geos_context, envelope);
-      }
+    if (!envelope) {
       envelope = GEOSGeom_createCollection_r(geos_context, GEOS_GEOMETRYCOLLECTION, NULL, 0);
     }
     result = rgeo_wrap_geos_geometry(self_data->factory, envelope, Qnil);

data/lib/rgeo.rb

@@ -94,7 +94,8 @@
 #
 # * <b>mysqlspatial</b>, an adapter for MySQL spatial extensions based on
 #   the mysql adapter. Available as the activerecord-mysqlspatial-adapter
-#   gem.
+#   gem. <i>This adapter is deprecated due to bugs in the legacy mysql
+#   gem. You should use the mysql2spatial adapter instead.</i>
 #
 # * <b>mysql2spatial</b>, an adapter for MySQL spatial extensions based on
 #   the mysql2 adapter. Available as the activerecord-mysql2spatial-adapter

data/lib/rgeo/feature/point.rb

@@ -56,6 +56,14 @@ module RGeo
     # class method (or === operator) defined in the Type module.
     #
     # Some implementations may support higher dimensional points.
+    #
+    # Some libraries, such as GEOS, support "empty" points. Such objects
+    # might be returned as, for example, the centroid of an empty
+    # MultiPolygon. The SFS does not clearly define or even acknowledge
+    # the existence of such a type, so RGeo will currently generally
+    # replace them with empty GeometryCollection objects. Therefore,
+    # currently, every RGeo Point object represents an actual location
+    # with real coordinates.
 
     module Point
 

data/lib/rgeo/geos/ffi_factory.rb

@@ -528,6 +528,14 @@ module RGeo
 
       def _wrap_fg_geom(fg_geom_, klass_)  # :nodoc:
         klasses_ = nil
+
+        # We don't allow "empty" points, so replace such objects with
+        # an empty collection.
+        if fg_geom_.type_id == ::Geos::GeomTypes::GEOS_POINT && fg_geom_.empty?
+          fg_geom_ = ::Geos::Utils.create_geometry_collection
+          klass_ = FFIGeometryCollectionImpl
+        end
+
         unless klass_.kind_of?(::Class)
           is_collection_ = false
           case fg_geom_.type_id

data/lib/rgeo/geos/ffi_feature_methods.rb

@@ -135,13 +135,7 @@ module RGeo
 
 
       def envelope
-        fg_geom_ = @fg_geom.envelope
-        # GEOS returns an "empty" point for an empty collection's envelope.
-        # We don't allow that type, so we replace it with an empty collection.
-        if fg_geom_.type_id == ::Geos::GeomTypes::GEOS_POINT && fg_geom_.empty?
-          fg_geom_ = ::Geos::Utils.create_geometry_collection
-        end
-        @factory._wrap_fg_geom(fg_geom_, nil)
+        @factory._wrap_fg_geom(@fg_geom.envelope, nil)
       end
 
 

data/test/geos_capi/tc_multi_polygon.rb

@@ -56,6 +56,13 @@ module RGeo
         include ::RGeo::Tests::Common::MultiPolygonTests
 
 
+        # Centroid of an empty should return an empty collection rather than crash
+
+        def test_empty_centroid
+          assert_equal(@factory.collection([]), @factory.multi_polygon([]).centroid)
+        end
+
+
       end
 
     end

data/test/geos_ffi/tc_multi_polygon.rb

@@ -57,6 +57,14 @@ module RGeo
         include ::RGeo::Tests::Common::MultiPolygonTests
 
 
+        # Centroid of an empty should return an empty collection
+        # rather than throw a weird exception out of ffi-geos
+
+        def test_empty_centroid
+          assert_equal(@factory.collection([]), @factory.multi_polygon([]).centroid)
+        end
+
+
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies: []
 description: RGeo is a geospatial data library for Ruby. It provides an implementation
   of the Open Geospatial Consortium's Simple Features Specification, used by most