rgeo 0.3.5 → 0.3.6

data/lib/rgeo/geos/ffi_factory.rb

@@ -56,8 +56,8 @@ module RGeo
         # Main flags
         @uses_lenient_multi_polygon_assertions = opts_[:lenient_multi_polygon_assertions] ||
           opts_[:uses_lenient_multi_polygon_assertions]
-        @has_z = opts_[:has_z_coordinate]
-        @has_m = opts_[:has_m_coordinate]
+        @has_z = opts_[:has_z_coordinate] ? true : false
+        @has_m = opts_[:has_m_coordinate] ? true : false
         if @has_z && @has_m
           raise Error::UnsupportedOperation, "GEOS cannot support both Z and M coordinates at the same time."
         end
@@ -132,7 +132,7 @@ module RGeo
         wkb_parser_ = opts_[:wkb_parser]
         case wkb_parser_
         when :geos
-          @wkb_reader = ::Geos::WktReader.new
+          @wkb_reader = ::Geos::WkbReader.new
           @wkb_parser = nil
         when ::Hash
           @wkb_parser = WKRep::WKBParser.new(self, wkb_parser_)
@@ -159,6 +159,107 @@ module RGeo
       alias_method :==, :eql?
 
 
+      # Marshal support
+
+      def marshal_dump  # :nodoc:
+        hash_ = {
+          'hasz' => @has_z,
+          'hasm' => @has_m,
+          'srid' => @srid,
+          'bufr' => @buffer_resolution,
+          'wktg' => @wkt_generator._properties,
+          'wkbg' => @wkb_generator._properties,
+          'wktp' => @wkt_parser._properties,
+          'wkbp' => @wkb_parser._properties,
+          'lmpa' => @uses_lenient_multi_polygon_assertions,
+          'apre' => @_auto_prepare,
+        }
+        hash_['proj4'] = @proj4.marshal_dump if @proj4
+        hash_['cs'] = @coord_sys.to_wkt if @coord_sys
+        hash_
+      end
+
+      def marshal_load(data_)  # :nodoc:
+        if CoordSys::Proj4.supported? && (proj4_data_ = data_['proj4'])
+          proj4_ = CoordSys::Proj4.allocate
+          proj4_.marshal_load(proj4_data_)
+        else
+          proj4_ = nil
+        end
+        if (coord_sys_data_ = data_['cs'])
+          coord_sys_ = CoordSys::CS.create_from_wkt(coord_sys_data_)
+        else
+          coord_sys_ = nil
+        end
+        initialize(
+          :has_z_coordinate => data_['hasz'],
+          :has_m_coordinate => data_['hasm'],
+          :srid => data_['srid'],
+          :buffer_resolution => data_['bufr'],
+          :wkt_generator => ImplHelper::Utils.symbolize_hash(data_['wktg']),
+          :wkb_generator => ImplHelper::Utils.symbolize_hash(data_['wkbg']),
+          :wkt_parser => ImplHelper::Utils.symbolize_hash(data_['wktp']),
+          :wkb_parser => ImplHelper::Utils.symbolize_hash(data_['wkbp']),
+          :uses_lenient_multi_polygon_assertions => data_['lmpa'],
+          :auto_prepare => (data_['apre'] ? :simple : :disabled),
+          :proj4 => proj4_,
+          :coord_sys => coord_sys_
+        )
+      end
+
+
+      # Psych support
+
+      def encode_with(coder_)  # :nodoc:
+        coder_['has_z_coordinate'] = @has_z
+        coder_['has_m_coordinate'] = @has_m
+        coder_['srid'] = @srid
+        coder_['buffer_resolution'] = @buffer_resolution
+        coder_['lenient_multi_polygon_assertions'] = @uses_lenient_multi_polygon_assertions
+        coder_['wkt_generator'] = @wkt_generator._properties
+        coder_['wkb_generator'] = @wkb_generator._properties
+        coder_['wkt_parser'] = @wkt_parser._properties
+        coder_['wkb_parser'] = @wkb_parser._properties
+        coder_['auto_prepare'] = @_auto_prepare ? 'simple' : 'disabled'
+        if @proj4
+          str_ = @proj4.original_str || @proj4.canonical_str
+          coder_['proj4'] = @proj4.radians? ? {'proj4' => str_, 'radians' => true} : str_
+        end
+        coder_['coord_sys'] = @coord_sys.to_wkt if @coord_sys
+      end
+
+      def init_with(coder_)  # :nodoc:
+        if (proj4_data_ = coder_['proj4'])
+          if proj4_data_.is_a?(::Hash)
+            proj4_ = CoordSys::Proj4.create(proj4_data_['proj4'], :radians => proj4_data_['radians'])
+          else
+            proj4_ = CoordSys::Proj4.create(proj4_data_.to_s)
+          end
+        else
+          proj4_ = nil
+        end
+        if (coord_sys_data_ = coder_['cs'])
+          coord_sys_ = CoordSys::CS.create_from_wkt(coord_sys_data_.to_s)
+        else
+          coord_sys_ = nil
+        end
+        initialize(
+          :has_z_coordinate => coder_['has_z_coordinate'],
+          :has_m_coordinate => coder_['has_m_coordinate'],
+          :srid => coder_['srid'],
+          :buffer_resolution => coder_['buffer_resolution'],
+          :wkt_generator => ImplHelper::Utils.symbolize_hash(coder_['wkt_generator']),
+          :wkb_generator => ImplHelper::Utils.symbolize_hash(coder_['wkb_generator']),
+          :wkt_parser => ImplHelper::Utils.symbolize_hash(coder_['wkt_parser']),
+          :wkb_parser => ImplHelper::Utils.symbolize_hash(coder_['wkb_parser']),
+          :auto_prepare => coder_['auto_prepare'] == 'disabled' ? :disabled : :simple,
+          :uses_lenient_multi_polygon_assertions => coder_['lenient_multi_polygon_assertions'],
+          :proj4 => proj4_,
+          :coord_sys => coord_sys_
+        )
+      end
+
+
       # Returns the SRID of geometries created by this factory.
 
       def srid
@@ -207,7 +308,7 @@ module RGeo
 
       def parse_wkt(str_)
         if @wkt_reader
-          @wkt_reader.read(str_)
+          wrap_fg_geom(@wkt_reader.read(str_))
         else
           @wkt_parser.parse(str_)
         end
@@ -218,7 +319,7 @@ module RGeo
 
       def parse_wkb(str_)
         if @wkb_reader
-          @wkb_reader.read(str_)
+          wrap_fg_geom(@wkb_reader.read(str_))
         else
           @wkb_parser.parse(str_)
         end

data/lib/rgeo/geos/interface.rb

@@ -195,8 +195,6 @@ module RGeo
       #   operation that would benefit from it is called. The latter
       #   never automatically generates a prepared geometry (unless you
       #   generate one explicitly using the <tt>prepare!</tt> method).
-      #   Currently, prepared geometries are supported under CAPI but
-      #   not FFI.
 
       def factory(opts_={})
         if supported?

data/lib/rgeo/geos/zm_factory.rb

@@ -74,8 +74,9 @@ module RGeo
         end
         srid_ ||= coord_sys_.authority_code if coord_sys_
         config_ = {
-          :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions],
-          :buffer_resolution => opts_[:buffer_resolution],
+          :uses_lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions] ||
+            opts_[:uses_lenient_multi_polygon_assertions],
+          :buffer_resolution => opts_[:buffer_resolution], :auto_prepare => opts_[:auto_prepare],
           :wkt_generator => opts_[:wkt_generator], :wkt_parser => opts_[:wkt_parser],
           :wkb_generator => opts_[:wkb_generator], :wkb_parser => opts_[:wkb_parser],
           :srid => srid_.to_i, :proj4 => proj4_, :coord_sys => coord_sys_,
@@ -120,6 +121,109 @@ module RGeo
       end
 
 
+      # Marshal support
+
+      def marshal_dump  # :nodoc:
+        hash_ = {
+          'srid' => @zfactory.srid,
+          'bufr' => @zfactory.buffer_resolution,
+          'wktg' => @wkt_generator._properties,
+          'wkbg' => @wkb_generator._properties,
+          'wktp' => @wkt_parser._properties,
+          'wkbp' => @wkb_parser._properties,
+          'lmpa' => @zfactory.lenient_multi_polygon_assertions?,
+          'apre' => @zfactory.property(:auto_prepare) == :simple,
+          'nffi' => @zfactory.is_a?(FFIFactory),
+        }
+        proj4_ = @zfactory.proj4
+        coord_sys_ = @zfactory.coord_sys
+        hash_['proj4'] = proj4_.marshal_dump if proj4_
+        hash_['cs'] = coord_sys_.to_wkt if coord_sys_
+        hash_
+      end
+
+      def marshal_load(data_)  # :nodoc:
+        if CoordSys::Proj4.supported? && (proj4_data_ = data_['proj4'])
+          proj4_ = CoordSys::Proj4.allocate
+          proj4_.marshal_load(proj4_data_)
+        else
+          proj4_ = nil
+        end
+        if (coord_sys_data_ = data_['cs'])
+          coord_sys_ = CoordSys::CS.create_from_wkt(coord_sys_data_)
+        else
+          coord_sys_ = nil
+        end
+        initialize(
+          :native_interface => (data_['nffi'] ? :ffi : :capi),
+          :has_z_coordinate => data_['hasz'],
+          :has_m_coordinate => data_['hasm'],
+          :srid => data_['srid'],
+          :buffer_resolution => data_['bufr'],
+          :wkt_generator => ImplHelper::Utils.symbolize_hash(data_['wktg']),
+          :wkb_generator => ImplHelper::Utils.symbolize_hash(data_['wkbg']),
+          :wkt_parser => ImplHelper::Utils.symbolize_hash(data_['wktp']),
+          :wkb_parser => ImplHelper::Utils.symbolize_hash(data_['wkbp']),
+          :uses_lenient_multi_polygon_assertions => data_['lmpa'],
+          :auto_prepare => (data_['apre'] ? :simple : :disabled),
+          :proj4 => proj4_,
+          :coord_sys => coord_sys_
+        )
+      end
+
+
+      # Psych support
+
+      def encode_with(coder_)  # :nodoc:
+        coder_['srid'] = @zfactory.srid
+        coder_['buffer_resolution'] = @zfactory.buffer_resolution
+        coder_['lenient_multi_polygon_assertions'] = @zfactory.lenient_multi_polygon_assertions?
+        coder_['wkt_generator'] = @wkt_generator._properties
+        coder_['wkb_generator'] = @wkb_generator._properties
+        coder_['wkt_parser'] = @wkt_parser._properties
+        coder_['wkb_parser'] = @wkb_parser._properties
+        coder_['auto_prepare'] = @zfactory.property(:auto_prepare).to_s
+        coder_['native_interface'] = @zfactory.is_a?(FFIFactory) ? 'ffi' : 'capi'
+        if @proj4
+          str_ = @proj4.original_str || @proj4.canonical_str
+          coder_['proj4'] = @proj4.radians? ? {'proj4' => str_, 'radians' => true} : str_
+        end
+        coder_['coord_sys'] = @coord_sys.to_wkt if @coord_sys
+      end
+
+      def init_with(coder_)  # :nodoc:
+        if (proj4_data_ = coder_['proj4'])
+          if proj4_data_.is_a?(::Hash)
+            proj4_ = CoordSys::Proj4.create(proj4_data_['proj4'], :radians => proj4_data_['radians'])
+          else
+            proj4_ = CoordSys::Proj4.create(proj4_data_.to_s)
+          end
+        else
+          proj4_ = nil
+        end
+        if (coord_sys_data_ = coder_['cs'])
+          coord_sys_ = CoordSys::CS.create_from_wkt(coord_sys_data_.to_s)
+        else
+          coord_sys_ = nil
+        end
+        initialize(
+          :native_interface => coder_['native_interface'] == 'ffi' ? :ffi : :capi,
+          :has_z_coordinate => coder_['has_z_coordinate'],
+          :has_m_coordinate => coder_['has_m_coordinate'],
+          :srid => coder_['srid'],
+          :buffer_resolution => coder_['buffer_resolution'],
+          :wkt_generator => ImplHelper::Utils.symbolize_hash(coder_['wkt_generator']),
+          :wkb_generator => ImplHelper::Utils.symbolize_hash(coder_['wkb_generator']),
+          :wkt_parser => ImplHelper::Utils.symbolize_hash(coder_['wkt_parser']),
+          :wkb_parser => ImplHelper::Utils.symbolize_hash(coder_['wkb_parser']),
+          :auto_prepare => coder_['auto_prepare'] == 'disabled' ? :disabled : :simple,
+          :uses_lenient_multi_polygon_assertions => coder_['lenient_multi_polygon_assertions'],
+          :proj4 => proj4_,
+          :coord_sys => coord_sys_
+        )
+      end
+
+
       # Returns the SRID of geometries created by this factory.
 
       def srid

data/lib/rgeo/geos/zm_impl.rb

@@ -160,9 +160,10 @@ module RGeo
       end
 
 
-      def relate(rhs_, pattern_)
-        @zgeometry.relate(rhs_, pattern_)
+      def relate?(rhs_, pattern_)
+        @zgeometry.relate?(rhs_, pattern_)
       end
+      alias_method :relate, :relate?  # DEPRECATED
 
 
       def distance(rhs_)

data/lib/rgeo/impl_helper.rb

@@ -45,6 +45,7 @@ end
 
 
 # Implementation files
+require 'rgeo/impl_helper/utils'
 require 'rgeo/impl_helper/math'
 require 'rgeo/impl_helper/basic_geometry_methods'
 require 'rgeo/impl_helper/basic_geometry_collection_methods'

data/lib/rgeo/impl_helper/basic_line_string_methods.rb

@@ -177,7 +177,7 @@ module RGeo
         super
         if @points.size > 0
           @points << @points.first if @points.first != @points.last
-          if !is_ring?
+          if !@factory.property(:uses_lenient_assertions) && !is_ring?
             raise Error::InvalidGeometry, 'LinearRing failed ring test'
           end
         end

data/lib/rgeo/impl_helper/utils.rb

@@ -0,0 +1,67 @@
+# -----------------------------------------------------------------------------
+#
+# Math constants and tools
+#
+# -----------------------------------------------------------------------------
+# 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,
+#   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.
+# -----------------------------------------------------------------------------
+;
+
+
+module RGeo
+
+  module ImplHelper  # :nodoc:
+
+    module Utils  # :nodoc:
+
+      class << self
+
+        def stringize_hash(hash_)
+          nhash_ = {}
+          hash_.each do |k_, v_|
+            nhash_[k_.is_a?(::Symbol) ? k_.to_s : k_] = v_.is_a?(::Symbol) ? v_.to_s : v_
+          end
+          nhash_
+        end
+
+        def symbolize_hash(hash_)
+          nhash_ = {}
+          hash_.each do |k_, v_|
+            nhash_[k_.is_a?(::String) ? k_.to_sym : k_] = v_.is_a?(::String) ? v_.to_sym : v_
+          end
+          nhash_
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/rgeo/wkrep/wkb_generator.rb

@@ -125,10 +125,10 @@ module RGeo
 
       def _properties  # :nodoc:
         {
-          :type_format => @type_format,
-          :emit_ewkb_srid => @emit_ewkb_srid,
-          :hex_format => @hex_format,
-          :little_endian => @little_endian,
+          'type_format' => @type_format.to_s,
+          'emit_ewkb_srid' => @emit_ewkb_srid,
+          'hex_format' => @hex_format,
+          'little_endian' => @little_endian,
         }
       end
 

data/lib/rgeo/wkrep/wkb_parser.rb

@@ -130,10 +130,10 @@ module RGeo
 
       def _properties  # :nodoc:
         {
-          :support_ewkb => @support_ewkb,
-          :support_wkb12 => @support_wkb12,
-          :ignore_extra_bytes => @ignore_extra_bytes,
-          :default_srid => @default_srid,
+          'support_ewkb' => @support_ewkb,
+          'support_wkb12' => @support_wkb12,
+          'ignore_extra_bytes' => @ignore_extra_bytes,
+          'default_srid' => @default_srid,
         }
       end
 

data/lib/rgeo/wkrep/wkt_generator.rb

@@ -116,10 +116,10 @@ module RGeo
 
       def _properties  # :nodoc:
         {
-          :tag_format => @tag_format,
-          :emit_ewkt_srid => @emit_ewkt_srid,
-          :square_brackets => @square_brackets,
-          :convert_case => @convert_case,
+          'tag_format' => @tag_format.to_s,
+          'emit_ewkt_srid' => @emit_ewkt_srid,
+          'square_brackets' => @square_brackets,
+          'convert_case' => @convert_case ? @convert_case.to_s : nil,
         }
       end
 

data/lib/rgeo/wkrep/wkt_parser.rb

@@ -144,11 +144,11 @@ module RGeo
 
       def _properties  # :nodoc:
         {
-          :support_ewkt => @support_ewkt,
-          :support_wkt12 => @support_wkt12,
-          :strict_wkt11 => @strict_wkt11,
-          :ignore_extra_tokens => @ignore_extra_tokens,
-          :default_srid => @default_srid,
+          'support_ewkt' => @support_ewkt,
+          'support_wkt12' => @support_wkt12,
+          'strict_wkt11' => @strict_wkt11,
+          'ignore_extra_tokens' => @ignore_extra_tokens,
+          'default_srid' => @default_srid,
         }
       end
 

data/test/common/factory_tests.rb

@@ -0,0 +1,117 @@
+# -----------------------------------------------------------------------------
+#
+# Common tests for geometry collection implementations
+#
+# -----------------------------------------------------------------------------
+# 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,
+#   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 'rgeo'
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module Common  # :nodoc:
+
+      module FactoryTests  # :nodoc:
+
+
+        def _srid
+          defined?(@srid) ? @srid : 0
+        end
+
+
+        def test_srid_preserved_through_factory
+          geom_ = @factory.point(-10, 20)
+          assert_equal(_srid, geom_.srid)
+          factory_ = geom_.factory
+          assert_equal(_srid, factory_.srid)
+          geom2_ = factory_.point(-20, 25)
+          assert_equal(_srid, 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(_srid, geom3_.srid)
+          assert_equal(_srid, geom3_.geometry_n(0).srid)
+          assert_equal(_srid, geom3_.geometry_n(1).srid)
+        end
+
+
+        def test_srid_preserved_through_geom_functions
+          geom1_ = @factory.point(-10, 20)
+          geom2_ = geom1_.boundary
+          assert_equal(_srid, geom2_.srid)
+        end
+
+
+        def test_srid_preserved_through_dup
+          geom1_ = @factory.point(-10, 20)
+          geom2_ = geom1_.clone
+          assert_equal(_srid, geom2_.srid)
+        end
+
+
+        def test_dup_factory
+          dup_factory_ = @factory.dup
+          assert_equal(@factory, dup_factory_)
+          assert_equal(_srid, dup_factory_.srid)
+        end
+
+
+        def test_marshal_dump_load_factory
+          data_ = ::Marshal.dump(@factory)
+          factory2_ = ::Marshal.load(data_)
+          assert_equal(@factory, factory2_)
+          assert_equal(_srid, factory2_.srid)
+        end
+
+
+        if ::RGeo.yaml_supported?
+
+          def test_psych_dump_load_factory
+            data_ = ::Psych.dump(@factory)
+            factory2_ = ::Psych.load(data_)
+            assert_equal(@factory, factory2_)
+            assert_equal(_srid, factory2_.srid)
+          end
+
+        end
+
+
+      end
+
+    end
+  end
+end