rgeo 0.2.9 → 0.3.0

data/lib/rgeo/geos/impl_additions.rb

@@ -53,7 +53,7 @@ module RGeo
       
       
       # :stopdoc:
-      if ::RGeo::Geos.supported?
+      if defined?(::RGeo::Geos::PointImpl)
         IMPL_CLASSES = {
           Feature::Point => PointImpl,
           Feature::LineString => LineStringImpl,

data/lib/rgeo/geos/interface.rb

@@ -38,16 +38,48 @@ module RGeo
   
   module Geos
     
-    @supported = nil
-    
     class << self
       
       
-      # Returns true if GEOS implementation is supported.
-      # If this returns false, GEOS features are not available.
+      # Returns true if CAPI GEOS implementation is supported.
+      
+      def capi_supported?
+        CAPI_SUPPORTED
+      end
+      
+      
+      # Returns true if FFI GEOS implementation is supported.
+      
+      def ffi_supported?
+        FFI_SUPPORTED
+      end
+      
+      
+      # Returns true if any GEOS implementation is supported.
+      # If this returns false, GEOS features are not available at all.
       
       def supported?
-        @supported.nil? ? (@supported = Factory.respond_to?(:_create)) : @supported
+        FFI_SUPPORTED || CAPI_SUPPORTED
+      end
+      
+      
+      # Returns true if the given feature is a CAPI GEOS feature, or if
+      # the given factory is a native GEOS factory.
+      
+      def is_capi_geos?(object_)
+        Factory === object_ || GeometryImpl === object_ ||
+          ZMFactory === object_ && Factory === object_.z_factory ||
+          ZMGeometryImpl === object_ && GeometryImpl === object_.z_geometry
+      end
+      
+      
+      # Returns true if the given feature is an FFI GEOS feature, or if
+      # the given factory is an FFI GEOS factory.
+      
+      def is_ffi_geos?(object_)
+        FFIFactory === object_ || FFIGeometryImpl === object_ ||
+          ZMFactory === object_ && FFIFactory === object_.z_factory ||
+          ZMGeometryImpl === object_ && FFIGeometryImpl === object_.z_geometry
       end
       
       
@@ -55,10 +87,25 @@ module RGeo
       # factory is a GEOS factory.
       
       def is_geos?(object_)
-        supported? && (Factory === object_ || GeometryImpl === object_ || ZMFactory === object_ || ZMGeometryImpl === object_)
+        Factory === object_ || GeometryImpl === object_ ||
+          FFIFactory === object_ || FFIGeometryImpl === object_ ||
+          ZMFactory === object_ || ZMGeometryImpl === object_
       end
       
       
+      # The preferred native interface. This is the native interface
+      # used by default when a factory is created.
+      # Supported values are <tt>:capi</tt> and <tt>:ffi</tt>.
+      # 
+      # This is set automatically when RGeo loads, to <tt>:capi</tt>
+      # if the CAPI interface is available, otheriwse to <tt>:ffi</tt>
+      # if FFI is available, otherwise to nil if no GEOS interface is
+      # available. You can override this setting if you want to prefer
+      # FFI over CAPI.
+      
+      attr_accessor :preferred_native_interface
+      
+      
       # Returns a factory for the GEOS implementation.
       # Returns nil if the GEOS implementation is not supported.
       # 
@@ -71,12 +118,17 @@ module RGeo
       # 
       # Options include:
       # 
-      # [<tt>:lenient_multi_polygon_assertions</tt>]
+      # [<tt>:native_interface</tt>]
+      #   Specifies which native interface to use. Possible values are
+      #   <tt>:capi</tt> and <tt>:ffi</tt>. The default is the value
+      #   of the preferred_native_interface.
+      # [<tt>:uses_lenient_multi_polygon_assertions</tt>]
       #   If set to true, assertion checking on MultiPolygon is disabled.
       #   This may speed up creation of MultiPolygon objects, at the
       #   expense of not doing the proper checking for OGC MultiPolygon
       #   compliance. See RGeo::Feature::MultiPolygon for details on
-      #   the MultiPolygon assertions. Default is false.
+      #   the MultiPolygon assertions. Default is false. Also called
+      #   <tt>:lenient_multi_polygon_assertions</tt>.
       # [<tt>:buffer_resolution</tt>]
       #   The resolution of buffers around geometries created by this
       #   factory. This controls the number of line segments used to
@@ -139,8 +191,11 @@ module RGeo
       
       def factory(opts_={})
         if supported?
+          native_interface_ = opts_[:native_interface] || Geos.preferred_native_interface
           if opts_[:has_z_coordinate] && opts_[:has_m_coordinate]
             ZMFactory.new(opts_)
+          elsif native_interface_ == :ffi
+            FFIFactory.new(opts_)
           else
             Factory.create(opts_)
           end

data/lib/rgeo/geos/zm_factory.rb

@@ -80,8 +80,14 @@ module RGeo
           :wkb_generator => opts_[:wkb_generator], :wkb_parser => opts_[:wkb_parser],
           :srid => srid_.to_i, :proj4 => proj4_, :coord_sys => coord_sys_,
         }
-        @zfactory = Factory.create(config_.merge(:has_z_coordinate => true))
-        @mfactory = Factory.create(config_.merge(:has_m_coordinate => true))
+        native_interface_ = opts_[:native_interface] || Geos.preferred_native_interface
+        if native_interface_ == :ffi
+          @zfactory = FFIFactory.new(config_.merge(:has_z_coordinate => true))
+          @mfactory = FFIFactory.new(config_.merge(:has_m_coordinate => true))
+        else
+          @zfactory = Factory.create(config_.merge(:has_z_coordinate => true))
+          @mfactory = Factory.create(config_.merge(:has_m_coordinate => true))
+        end
         
         wkt_generator_ = opts_[:wkt_generator]
         case wkt_generator_
@@ -117,7 +123,7 @@ module RGeo
       # Returns the SRID of geometries created by this factory.
       
       def srid
-        @zfactory._srid
+        @zfactory.srid
       end
       
       
@@ -125,7 +131,7 @@ module RGeo
       # created by this factory
       
       def buffer_resolution
-        @zfactory._buffer_resolution
+        @zfactory.buffer_resolution
       end
       
       

data/test/common/geometry_collection_tests.rb

@@ -233,9 +233,7 @@ module RGeo
         
         def test_empty_collection_boundary
           empty_ = @factory.collection([])
-          boundary_ = empty_.boundary
-          assert_equal(Feature::GeometryCollection, boundary_.geometry_type)
-          assert_equal(0, boundary_.num_geometries)
+          assert_nil(empty_.boundary)
         end
         
         

data/test/coord_sys/tc_ogc_cs.rb

@@ -45,6 +45,17 @@ module RGeo
       class TestOgcCs < ::Test::Unit::TestCase  # :nodoc:
         
         
+        # Handle differences in floating-point output.
+        
+        def _lenient_regex_for(str_)
+          ::Regexp.new(str_.gsub(/(\d)\.(\d{10,})/) do |m_|
+            before_ = $1
+            after_ = $2[0,10]
+            "#{before_}.#{after_}\\d*"
+          end.gsub(/(\.|\[|\]|\(|\)|\$|\^|\||\+)/){ |m_| "\\#{$1}"})
+        end
+        
+        
         def test_axis_info_by_value
           obj_ = ::RGeo::CoordSys::CS::AxisInfo.create('N', ::RGeo::CoordSys::CS::AO_NORTH)
           assert_equal('N', obj_.name)
@@ -277,7 +288,7 @@ module RGeo
           assert_nil(obj_.get_axis(1))
           assert_equal('degree', obj_.get_units(0).name)
           assert_equal('degree', obj_.get_units(1).name)
-          assert_equal('GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137.0,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0.0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]', obj_.to_wkt)
+          assert_match(_lenient_regex_for('GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137.0,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0.0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]'), obj_.to_wkt)
         end
         
         
@@ -345,7 +356,7 @@ module RGeo
           assert_kind_of(::RGeo::CoordSys::CS::ProjectedCoordinateSystem, obj_.head)
           assert_kind_of(::RGeo::CoordSys::CS::VerticalCoordinateSystem, obj_.tail)
           assert_equal(3, obj_.dimension)
-          assert_equal(input_, obj_.to_wkt)
+          assert_match(_lenient_regex_for(input_), obj_.to_wkt)
         end
         
         

data/test/coord_sys/tc_proj4_srs_data.rb

@@ -73,4 +73,4 @@ module RGeo
       
     end
   end
-end
+end if ::RGeo::CoordSys::Proj4.supported?

data/test/{geos → geos_capi}/tc_factory.rb

@@ -40,7 +40,7 @@ require 'rgeo'
 
 module RGeo
   module Tests  # :nodoc:
-    module Geos  # :nodoc:
+    module GeosCAPI  # :nodoc:
       
       class TestFactory < ::Test::Unit::TestCase  # :nodoc:
         
@@ -88,4 +88,4 @@ module RGeo
       
     end
   end
-end if ::RGeo::Geos.supported?
+end if ::RGeo::Geos.capi_supported?

data/test/{geos → geos_capi}/tc_geometry_collection.rb

@@ -42,7 +42,7 @@ require ::File.expand_path('../common/geometry_collection_tests.rb', ::File.dirn
 
 module RGeo
   module Tests  # :nodoc:
-    module Geos  # :nodoc:
+    module GeosCAPI  # :nodoc:
       
       class TestGeometryCollection < ::Test::Unit::TestCase  # :nodoc:
         
@@ -59,4 +59,4 @@ module RGeo
       
     end
   end
-end if ::RGeo::Geos.supported?
+end if ::RGeo::Geos.capi_supported?

data/test/{geos → geos_capi}/tc_line_string.rb

@@ -42,7 +42,7 @@ require ::File.expand_path('../common/line_string_tests.rb', ::File.dirname(__FI
 
 module RGeo
   module Tests  # :nodoc:
-    module Geos  # :nodoc:
+    module GeosCAPI  # :nodoc:
       
       class TestLineString < ::Test::Unit::TestCase  # :nodoc:
         
@@ -59,4 +59,4 @@ module RGeo
       
     end
   end
-end if ::RGeo::Geos.supported?
+end if ::RGeo::Geos.capi_supported?

data/test/{geos → geos_capi}/tc_misc.rb

@@ -40,7 +40,7 @@ require 'rgeo'
 
 module RGeo
   module Tests  # :nodoc:
-    module Geos  # :nodoc:
+    module GeosCAPI  # :nodoc:
       
       class TestMisc < ::Test::Unit::TestCase  # :nodoc:
         
@@ -69,4 +69,8 @@ module RGeo
       
     end
   end
-end if ::RGeo::Geos.supported?
+end if ::RGeo::Geos.capi_supported?
+
+unless ::RGeo::Geos.capi_supported?
+  puts "WARNING: GEOS CAPI support not available. Related tests skipped."
+end

data/test/{geos → geos_capi}/tc_multi_line_string.rb

@@ -42,7 +42,7 @@ require ::File.expand_path('../common/multi_line_string_tests.rb', ::File.dirnam
 
 module RGeo
   module Tests  # :nodoc:
-    module Geos  # :nodoc:
+    module GeosCAPI  # :nodoc:
       
       class TestMultiLineString < ::Test::Unit::TestCase  # :nodoc:
         
@@ -59,4 +59,4 @@ module RGeo
       
     end
   end
-end if ::RGeo::Geos.supported?
+end if ::RGeo::Geos.capi_supported?

data/test/{geos → geos_capi}/tc_multi_point.rb

@@ -42,7 +42,7 @@ require ::File.expand_path('../common/multi_point_tests.rb', ::File.dirname(__FI
 
 module RGeo
   module Tests  # :nodoc:
-    module Geos  # :nodoc:
+    module GeosCAPI  # :nodoc:
       
       class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
         
@@ -59,4 +59,4 @@ module RGeo
       
     end
   end
-end if ::RGeo::Geos.supported?
+end if ::RGeo::Geos.capi_supported?

data/test/{geos → geos_capi}/tc_multi_polygon.rb

@@ -42,7 +42,7 @@ require ::File.expand_path('../common/multi_polygon_tests.rb', ::File.dirname(__
 
 module RGeo
   module Tests  # :nodoc:
-    module Geos  # :nodoc:
+    module GeosCAPI  # :nodoc:
       
       class TestMultiPolygon < ::Test::Unit::TestCase  # :nodoc:
         
@@ -60,4 +60,4 @@ module RGeo
       
     end
   end
-end if ::RGeo::Geos.supported?
+end if ::RGeo::Geos.capi_supported?

data/test/{geos → geos_capi}/tc_parsing_unparsing.rb

@@ -40,7 +40,7 @@ require 'rgeo'
 
 module RGeo
   module Tests  # :nodoc:
-    module Geos  # :nodoc:
+    module GeosCAPI  # :nodoc:
       
       class TestParsingUnparsing < ::Test::Unit::TestCase  # :nodoc:
         
@@ -77,4 +77,4 @@ module RGeo
       
     end
   end
-end if ::RGeo::Geos.supported?
+end if ::RGeo::Geos.capi_supported?

data/test/{geos → geos_capi}/tc_point.rb

@@ -42,7 +42,7 @@ require ::File.expand_path('../common/point_tests.rb', ::File.dirname(__FILE__))
 
 module RGeo
   module Tests  # :nodoc:
-    module Geos  # :nodoc:
+    module GeosCAPI  # :nodoc:
       
       class TestPoint < ::Test::Unit::TestCase  # :nodoc:
         
@@ -83,4 +83,4 @@ module RGeo
       
     end
   end
-end if ::RGeo::Geos.supported?
+end if ::RGeo::Geos.capi_supported?

data/test/{geos → geos_capi}/tc_polygon.rb

@@ -42,7 +42,7 @@ require ::File.expand_path('../common/polygon_tests.rb', ::File.dirname(__FILE__
 
 module RGeo
   module Tests  # :nodoc:
-    module Geos  # :nodoc:
+    module GeosCAPI  # :nodoc:
       
       class TestPolygon < ::Test::Unit::TestCase  # :nodoc:
         
@@ -83,4 +83,4 @@ module RGeo
       
     end
   end
-end if ::RGeo::Geos.supported?
+end if ::RGeo::Geos.capi_supported?

data/test/{geos → geos_capi}/tc_zmfactory.rb

@@ -40,7 +40,7 @@ require 'rgeo'
 
 module RGeo
   module Tests  # :nodoc:
-    module Geos  # :nodoc:
+    module GeosCAPI  # :nodoc:
       
       class TestZMFactory < ::Test::Unit::TestCase  # :nodoc:
         
@@ -82,4 +82,4 @@ module RGeo
       
     end
   end
-end if ::RGeo::Geos.supported?
+end if ::RGeo::Geos.capi_supported?

data/test/geos_ffi/tc_factory.rb

@@ -0,0 +1,91 @@
+# -----------------------------------------------------------------------------
+# 
+# Tests for the GEOS factory
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2010 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,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * 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
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
+require 'test/unit'
+require 'rgeo'
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module GeosFFI  # :nodoc:
+      
+      class TestFactory < ::Test::Unit::TestCase  # :nodoc:
+        
+        
+        def setup
+          @factory = ::RGeo::Geos.factory(:srid => 4326, :native_interface => :ffi)
+        end
+        
+        
+        def test_srid_preserved_through_factory
+          geom_ = @factory.point(-10, 20)
+          assert_equal(4326, geom_.srid)
+          factory_ = geom_.factory
+          assert_equal(4326, factory_.srid)
+          geom2_ = factory_.point(-20, 25)
+          assert_equal(4326, geom2_.srid)
+        end
+        
+        
+        def test_srid_preserved_through_geom_operations
+          geom1_ = @factory.point(-10, 20)
+          geom2_ = @factory.point(-20, 25)
+          geom3_ = geom1_.union(geom2_)
+          assert_equal(4326, geom3_.srid)
+          assert_equal(4326, geom3_.geometry_n(0).srid)
+          assert_equal(4326, geom3_.geometry_n(1).srid)
+        end
+        
+        
+        def test_srid_preserved_through_geom_functions
+          geom1_ = @factory.point(-10, 20)
+          geom2_ = geom1_.boundary
+          assert_equal(4326, geom2_.srid)
+        end
+        
+        
+        def test_srid_preserved_through_dup
+          geom1_ = @factory.point(-10, 20)
+          geom2_ = geom1_.clone
+          assert_equal(4326, geom2_.srid)
+        end
+        
+        
+      end
+      
+    end
+  end
+end if ::RGeo::Geos.ffi_supported?