rgeo 0.3.11 → 0.3.12

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.3.12 / 2012-04-24
+
+* Geos::FFIFactory collection constructors sometimes modified arguments in place, which caused problems for the ZMFactory among other things. Fixed.
+
 === 0.3.11 / 2012-04-14
 
 * Geometry#buffer crashed in the geos capi factory. Fixed.

data/Version

@@ -1 +1 @@
-0.3.11
+0.3.12

data/lib/rgeo/geos/ffi_factory.rb

@@ -431,7 +431,7 @@ module RGeo
         inner_rings_ = inner_rings_.to_a unless inner_rings_.kind_of?(::Array)
         return nil unless ::RGeo::Feature::LineString.check_type(outer_ring_)
         outer_ring_ = _create_fg_linear_ring(outer_ring_.points)
-        inner_rings_.map! do |r_|
+        inner_rings_ = inner_rings_.map do |r_|
           return nil unless ::RGeo::Feature::LineString.check_type(r_)
           _create_fg_linear_ring(r_.points)
         end
@@ -465,7 +465,7 @@ module RGeo
 
       def multi_point(elems_)
         elems_ = elems_.to_a unless elems_.kind_of?(::Array)
-        elems_.map! do |elem_|
+        elems_ = elems_.map do |elem_|
           elem_ = ::RGeo::Feature.cast(elem_, self, ::RGeo::Feature::Point,
             :force_new, :keep_subtype)
           return nil unless elem_
@@ -483,7 +483,7 @@ module RGeo
       def multi_line_string(elems_)
         elems_ = elems_.to_a unless elems_.kind_of?(::Array)
         klasses_ = []
-        elems_.map! do |elem_|
+        elems_ = elems_.map do |elem_|
           elem_ = ::RGeo::Feature.cast(elem_, self, ::RGeo::Feature::LineString,
             :force_new, :keep_subtype)
           return nil unless elem_
@@ -500,7 +500,7 @@ module RGeo
 
       def multi_polygon(elems_)
         elems_ = elems_.to_a unless elems_.kind_of?(::Array)
-        elems_.map! do |elem_|
+        elems_ = elems_.map do |elem_|
           elem_ = ::RGeo::Feature.cast(elem_, self, ::RGeo::Feature::Polygon,
             :force_new, :keep_subtype)
           return nil unless elem_

data/test/common/multi_point_tests.rb

@@ -227,6 +227,14 @@ module RGeo
         end
 
 
+        def test_zm
+          factory_ = create_factory(:has_z_coordinate => true, :has_m_coordinate => true)
+          p1_ = factory_.point(1, 2, 3, 4)
+          mp_ = factory_.multi_point([p1_])
+          assert_equal(p1_, mp_[0])
+        end
+
+
       end
 
     end

data/test/geos_capi/tc_multi_point.rb

@@ -47,8 +47,8 @@ module RGeo
       class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
 
 
-        def create_factory
-          ::RGeo::Geos.factory
+        def create_factory(opts_={})
+          ::RGeo::Geos.factory(opts_)
         end
 
 

data/test/geos_ffi/tc_multi_point.rb

@@ -47,8 +47,8 @@ module RGeo
       class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
 
 
-        def create_factory
-          ::RGeo::Geos.factory(:native_interface => :ffi)
+        def create_factory(opts_={})
+          ::RGeo::Geos.factory(opts_.merge(:native_interface => :ffi))
         end
 
 

data/test/geos_ffi/tc_point.rb

@@ -59,6 +59,11 @@ module RGeo
         include ::RGeo::Tests::Common::PointTests
 
 
+        # TEMP until ffi-geos 0.0.5 is released
+        undef_method :test_buffer
+        # END_TEMP
+
+
         def test_has_no_projection
           point_ = @factory.point(21, -22)
           assert(!point_.respond_to?(:projection))

data/test/projected_geographic/tc_multi_point.rb

@@ -47,8 +47,9 @@ module RGeo
       class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
 
 
-        def create_factory
-          ::RGeo::Geographic.projected_factory(:projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857)
+        def create_factory(opts_={})
+          ::RGeo::Geographic.projected_factory(opts_.merge(
+            :projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857))
         end
 
 

data/test/simple_cartesian/tc_multi_point.rb

@@ -47,8 +47,8 @@ module RGeo
       class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
 
 
-        def create_factory
-          @factory = ::RGeo::Cartesian.simple_factory
+        def create_factory(opts_={})
+          @factory = ::RGeo::Cartesian.simple_factory(opts_)
         end
 
 

data/test/simple_mercator/tc_multi_point.rb

@@ -47,8 +47,8 @@ module RGeo
       class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
 
 
-        def create_factory
-          ::RGeo::Geographic.simple_mercator_factory
+        def create_factory(opts_={})
+          ::RGeo::Geographic.simple_mercator_factory(opts_)
         end
 
 

data/test/simple_mercator/tc_point.rb

@@ -58,6 +58,11 @@ module RGeo
         include ::RGeo::Tests::Common::PointTests
 
 
+        # TEMP until ffi-geos 0.0.5 is released
+        undef_method :test_buffer
+        # END_TEMP
+
+
         def test_has_projection
           point_ = @factory.point(21, -22)
           assert(point_.respond_to?(:projection))

data/test/spherical_geographic/tc_multi_point.rb

@@ -47,8 +47,8 @@ module RGeo
       class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
 
 
-        def create_factory
-          @factory = ::RGeo::Geographic.spherical_factory
+        def create_factory(opts_={})
+          @factory = ::RGeo::Geographic.spherical_factory(opts_)
         end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-14 00:00:00.000000000 Z
+date: 2012-04-24 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