rgeo 0.1.18 → 0.1.19

data/lib/rgeo/impl_helpers/basic_geometry_collection_methods.rb

@@ -135,6 +135,28 @@ module RGeo
       end
       
       
+      def _add_boundary(hash_, point_)  # :nodoc:
+        hval_ = [point_.x, point_.y].hash
+        (hash_[hval_] ||= [point_, 0])[1] += 1
+      end
+      
+      
+      def boundary
+        hash_ = {}
+        @elements.each do |line_|
+          if !line_.is_empty? && !line_.is_closed?
+            _add_boundary(hash_, line_.start_point)
+            _add_boundary(hash_, line_.end_point)
+          end
+        end
+        array_ = []
+        hash_.each do |hval_, data_|
+          array_ << data_[0] if data_[1] % 2 == 1
+        end
+        factory.multi_point([array_])
+      end
+      
+      
     end
     
     
@@ -159,6 +181,11 @@ module RGeo
       end
       
       
+      def boundary
+        factory.collection([])
+      end
+      
+      
     end
     
     
@@ -188,6 +215,18 @@ module RGeo
       end
       
       
+      def boundary
+        array_ = []
+        @elements.each do |poly_|
+          unless poly_.is_empty?
+            array_ << poly_.exterior_ring
+          end
+          array_.concat(poly_.interior_rings)
+        end
+        factory.multi_line_string(array_)
+      end
+      
+      
     end
     
     

data/lib/rgeo/impl_helpers/basic_geometry_methods.rb

@@ -67,11 +67,6 @@ module RGeo
       end
       
       
-      def cast(type_)
-        type_ == geometry_type ? self : nil
-      end
-      
-      
       def as_text
         WKRep::WKTGenerator.new.generate(self)
       end

data/lib/rgeo/impl_helpers/basic_line_string_methods.rb

@@ -101,6 +101,15 @@ module RGeo
       end
       
       
+      def boundary
+        array_ = []
+        if !is_empty? && !is_closed?
+          array_ << @points.first << @points.last
+        end
+        factory.multi_point([array_])
+      end
+      
+      
       def start_point
         @points.first
       end
@@ -112,7 +121,7 @@ module RGeo
       
       
       def is_closed?
-        if @is_closed.nil?
+        unless defined?(@is_closed)
           @is_closed = @points.size > 2 && @points.first == @points.last
         end
         @is_closed

data/lib/rgeo/impl_helpers/basic_point_methods.rb

@@ -119,13 +119,7 @@ module RGeo
         return false unless rhs_.is_a?(self.class) && rhs_.factory == self.factory
         case rhs_
         when Features::Point
-          if @y == 90
-            rhs_.y == 90
-          elsif @y == -90
-            rhs_.y == -90
-          else
-            rhs_.x == @x && rhs_.y == @y
-          end
+          rhs_.x == @x && rhs_.y == @y
         when Features::LineString
           rhs_.num_points > 0 && rhs_.points.all?{ |elem_| equals?(elem_) }
         when Features::GeometryCollection
@@ -136,12 +130,6 @@ module RGeo
       end
       
       
-      alias_method :longitude, :x
-      alias_method :lon, :x
-      alias_method :latitude, :y
-      alias_method :lat, :y
-      
-      
     end
     
     

data/lib/rgeo/impl_helpers/basic_polygon_methods.rb

@@ -103,6 +103,16 @@ module RGeo
       end
       
       
+      def boundary
+        array_ = []
+        unless @exterior_ring.is_empty?
+          array_ << @exterior_ring
+        end
+        array_.concat(@interior_rings)
+        factory.multi_line_string(array_)
+      end
+      
+      
     end
     
     

data/tests/common/geometry_collection_tests.rb

@@ -215,6 +215,22 @@ module RGeo
         end
         
         
+        def test_empty_collection_envelope
+          empty_ = @factory.collection([])
+          envelope_ = empty_.envelope
+          assert_equal(Features::GeometryCollection, envelope_.geometry_type)
+          assert_equal(0, envelope_.num_geometries)
+        end
+        
+        
+        def test_empty_collection_boundary
+          empty_ = @factory.collection([])
+          boundary_ = empty_.boundary
+          assert_equal(Features::GeometryCollection, boundary_.geometry_type)
+          assert_equal(0, boundary_.num_geometries)
+        end
+        
+        
       end
       
     end

data/tests/common/point_tests.rb

@@ -272,7 +272,7 @@ module RGeo
         end
         
         
-        def test_3d_creation
+        def test_3dz_creation
           point_ = @zfactory.point(11, 12, 13)
           assert_equal(11, point_.x)
           assert_equal(12, point_.y)
@@ -284,6 +284,32 @@ module RGeo
         end
         
         
+        def test_3dm_creation
+          point_ = @mfactory.point(11, 12, 13)
+          assert_equal(11, point_.x)
+          assert_equal(12, point_.y)
+          assert_equal(13, point_.m)
+          point2_ = @mfactory.point(21, 22)
+          assert_equal(21, point2_.x)
+          assert_equal(22, point2_.y)
+          assert_equal(0, point2_.m)
+        end
+        
+        
+        def test_4d_creation
+          point_ = @zmfactory.point(11, 12, 13, 14)
+          assert_equal(11, point_.x)
+          assert_equal(12, point_.y)
+          assert_equal(13, point_.z)
+          assert_equal(14, point_.m)
+          point2_ = @zmfactory.point(21, 22)
+          assert_equal(21, point2_.x)
+          assert_equal(22, point2_.y)
+          assert_equal(0, point2_.z)
+          assert_equal(0, point2_.m)
+        end
+        
+        
         def test_wkt_creation_3d
           point2_ = @zfactory.parse_wkt('POINT(11 12 13)')
           assert_equal(11, point2_.x)

data/tests/geos/tc_point.rb

@@ -50,6 +50,8 @@ module RGeo
         def setup
           @factory = ::RGeo::Geos.factory
           @zfactory = ::RGeo::Geos.factory(:support_z_coordinate => true)
+          @mfactory = ::RGeo::Geos.factory(:support_m_coordinate => true)
+          @zmfactory = ::RGeo::Geos.factory(:support_z_coordinate => true, :support_m_coordinate => true)
         end
         
         

data/tests/geos/tc_zmfactory.rb

@@ -0,0 +1,85 @@
+# -----------------------------------------------------------------------------
+# 
+# Tests for the GEOS point implementation
+# 
+# -----------------------------------------------------------------------------
+# 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 Geos
+      
+      class TestZMFactory < ::Test::Unit::TestCase  # :nodoc:
+        
+        
+        def setup
+          @factory = ::RGeo::Geos.factory(:support_z_coordinate => true, :support_m_coordinate => true, :srid => 1000, :buffer_resolution => 2)
+        end
+        
+        
+        def test_factory_parts
+          assert_equal(1000, @factory.srid)
+          assert_equal(1000, @factory.z_factory.srid)
+          assert_equal(1000, @factory.m_factory.srid)
+          assert_equal(2, @factory.buffer_resolution)
+          assert_equal(2, @factory.z_factory.buffer_resolution)
+          assert_equal(2, @factory.m_factory.buffer_resolution)
+          assert(@factory.has_capability?(:z_coordinate))
+          assert(@factory.has_capability?(:m_coordinate))
+          assert(@factory.z_factory.has_capability?(:z_coordinate))
+          assert(!@factory.z_factory.has_capability?(:m_coordinate))
+          assert(!@factory.m_factory.has_capability?(:z_coordinate))
+          assert(@factory.m_factory.has_capability?(:m_coordinate))
+        end
+        
+        
+        def test_4d_point
+          point_ = @factory.point(1, 2, 3, 4)
+          assert_equal(Features::Point, point_.geometry_type)
+          assert_equal(3, point_.z)
+          assert_equal(4, point_.m)
+          assert_equal(3, point_.z_geometry.z)
+          assert_nil(point_.z_geometry.m)
+          assert_nil(point_.m_geometry.z)
+          assert_equal(4, point_.m_geometry.m)
+        end
+        
+        
+      end
+      
+    end
+  end
+end

data/tests/simple_cartesian/tc_geometry_collection.rb

@@ -59,6 +59,7 @@ module RGeo
         undef_method :test_geometrically_equal
         undef_method :test_empty_equal
         undef_method :test_not_equal
+        undef_method :test_empty_collection_boundary
         
         
       end

data/tests/simple_cartesian/tc_point.rb

@@ -50,6 +50,8 @@ module RGeo
         def setup
           @factory = ::RGeo::Cartesian.simple_factory(:srid => 1)
           @zfactory = ::RGeo::Cartesian.simple_factory(:srid => 1, :support_z_coordinate => true)
+          @mfactory = ::RGeo::Cartesian.simple_factory(:srid => 1, :support_m_coordinate => true)
+          @zmfactory = ::RGeo::Cartesian.simple_factory(:srid => 1, :support_z_coordinate => true, :support_m_coordinate => true)
         end
         
         
@@ -76,7 +78,6 @@ module RGeo
         undef_method :test_within
         undef_method :test_contains
         undef_method :test_overlaps
-        undef_method :test_convex_hull
         undef_method :test_intersection
         undef_method :test_union
         undef_method :test_difference

data/tests/simple_mercator/tc_point.rb

@@ -50,6 +50,8 @@ module RGeo
         def setup
           @factory = ::RGeo::Geography.simple_mercator
           @zfactory = ::RGeo::Geography.simple_mercator(:support_z_coordinate => true)
+          @mfactory = ::RGeo::Geography.simple_mercator(:support_m_coordinate => true)
+          @zmfactory = ::RGeo::Geography.simple_mercator(:support_z_coordinate => true, :support_m_coordinate => true)
         end
         
         

data/tests/simple_spherical/tc_geometry_collection.rb

@@ -59,6 +59,8 @@ module RGeo
         undef_method :test_geometrically_equal
         undef_method :test_empty_equal
         undef_method :test_not_equal
+        undef_method :test_empty_collection_envelope
+        undef_method :test_empty_collection_boundary
         
         
       end

data/tests/simple_spherical/tc_point.rb

@@ -50,6 +50,8 @@ module RGeo
         def setup
           @factory = ::RGeo::Geography.simple_spherical
           @zfactory = ::RGeo::Geography.simple_spherical(:support_z_coordinate => true)
+          @mfactory = ::RGeo::Geography.simple_spherical(:support_m_coordinate => true)
+          @zmfactory = ::RGeo::Geography.simple_spherical(:support_z_coordinate => true, :support_m_coordinate => true)
         end
         
         
@@ -85,7 +87,6 @@ module RGeo
         undef_method :test_within
         undef_method :test_contains
         undef_method :test_overlaps
-        undef_method :test_convex_hull
         undef_method :test_intersection
         undef_method :test_union
         undef_method :test_difference

data/tests/tc_oneoff.rb

@@ -54,7 +54,6 @@ module RGeo
       
       
       def test_dummy
-        RGeo::Shapefile
       end
       
       

data/tests/wkrep/tc_wkb_generator.rb

@@ -46,10 +46,10 @@ module RGeo
         
         
         def setup
-          @factory = ::RGeo::Cartesian.simple_factory(:srid => 1000)
-          @factoryz = ::RGeo::Cartesian.simple_factory(:srid => 1000, :support_z_coordinate => true)
-          @factorym = ::RGeo::Cartesian.simple_factory(:srid => 1000, :support_m_coordinate => true)
-          @factoryzm = ::RGeo::Cartesian.simple_factory(:srid => 1000, :support_z_coordinate => true, :support_m_coordinate => true)
+          @factory = ::RGeo::Cartesian.preferred_factory(:srid => 1000)
+          @factoryz = ::RGeo::Cartesian.preferred_factory(:srid => 1000, :support_z_coordinate => true)
+          @factorym = ::RGeo::Cartesian.preferred_factory(:srid => 1000, :support_m_coordinate => true)
+          @factoryzm = ::RGeo::Cartesian.preferred_factory(:srid => 1000, :support_z_coordinate => true, :support_m_coordinate => true)
         end
         
         

data/tests/wkrep/tc_wkb_parser.rb

@@ -84,7 +84,7 @@ module RGeo
         
         
         def test_point_with_ewkb_zm
-          factory_ = ::RGeo::Cartesian.simple_factory(:support_z_coordinate => true, :support_m_coordinate => true)
+          factory_ = ::RGeo::Cartesian.preferred_factory(:support_z_coordinate => true, :support_m_coordinate => true)
           parser_ = ::RGeo::WKRep::WKBParser.new(:default_factory => factory_, :support_ewkb => true)
           obj_ = parser_.parse_hex('00c00000013ff0000000000000400000000000000040080000000000004010000000000000')
           assert_equal(::RGeo::Features::Point, obj_.geometry_type)
@@ -114,7 +114,7 @@ module RGeo
         
         
         def test_point_with_wkb12_zm
-          factory_ = ::RGeo::Cartesian.simple_factory(:support_z_coordinate => true, :support_m_coordinate => true)
+          factory_ = ::RGeo::Cartesian.preferred_factory(:support_z_coordinate => true, :support_m_coordinate => true)
           parser_ = ::RGeo::WKRep::WKBParser.new(:default_factory => factory_, :support_wkb12 => true)
           obj_ = parser_.parse_hex('0000000bb93ff0000000000000400000000000000040080000000000004010000000000000')
           assert_equal(::RGeo::Features::Point, obj_.geometry_type)

data/tests/wkrep/tc_wkt_generator.rb

@@ -46,10 +46,10 @@ module RGeo
         
         
         def setup
-          @factory = ::RGeo::Cartesian.simple_factory(:srid => 1000)
-          @factoryz = ::RGeo::Cartesian.simple_factory(:srid => 1000, :support_z_coordinate => true)
-          @factorym = ::RGeo::Cartesian.simple_factory(:srid => 1000, :support_m_coordinate => true)
-          @factoryzm = ::RGeo::Cartesian.simple_factory(:srid => 1000, :support_z_coordinate => true, :support_m_coordinate => true)
+          @factory = ::RGeo::Cartesian.preferred_factory(:srid => 1000)
+          @factoryz = ::RGeo::Cartesian.preferred_factory(:srid => 1000, :support_z_coordinate => true)
+          @factorym = ::RGeo::Cartesian.preferred_factory(:srid => 1000, :support_m_coordinate => true)
+          @factoryzm = ::RGeo::Cartesian.preferred_factory(:srid => 1000, :support_z_coordinate => true, :support_m_coordinate => true)
         end
         
         

data/tests/wkrep/tc_wkt_parser.rb

@@ -159,7 +159,7 @@ module RGeo
         
         
         def test_point_wkt12_m_with_factory_zm
-          factory_ = ::RGeo::Cartesian.simple_factory(:support_z_coordinate => true, :support_m_coordinate => true)
+          factory_ = ::RGeo::Cartesian.preferred_factory(:support_z_coordinate => true, :support_m_coordinate => true)
           parser_ = ::RGeo::WKRep::WKTParser.new(:default_factory => factory_, :support_wkt12 => true)
           obj_ = parser_.parse('POINT M(1 2 3)')
           assert_equal(::RGeo::Features::Point, obj_.geometry_type)
@@ -178,7 +178,7 @@ module RGeo
         
         
         def test_point_wkt12_zm
-          factory_ = ::RGeo::Cartesian.simple_factory(:support_z_coordinate => true, :support_m_coordinate => true)
+          factory_ = ::RGeo::Cartesian.preferred_factory(:support_z_coordinate => true, :support_m_coordinate => true)
           parser_ = ::RGeo::WKRep::WKTParser.new(:default_factory => factory_, :support_wkt12 => true)
           obj_ = parser_.parse('POINT ZM(1 2 3 4)')
           assert_equal(::RGeo::Features::Point, obj_.geometry_type)
@@ -188,7 +188,7 @@ module RGeo
         
         
         def test_point_wkt12_zm_not_enough_coords
-          factory_ = ::RGeo::Cartesian.simple_factory(:support_z_coordinate => true, :support_m_coordinate => true)
+          factory_ = ::RGeo::Cartesian.preferred_factory(:support_z_coordinate => true, :support_m_coordinate => true)
           parser_ = ::RGeo::WKRep::WKTParser.new(:default_factory => factory_, :support_wkt12 => true)
           assert_raise(::RGeo::Errors::ParseError) do
             obj_ = parser_.parse('POINT ZM(1 2 3)')
@@ -290,7 +290,7 @@ module RGeo
         
         
         def test_linestring_wkt12_m
-          factory_ = ::RGeo::Cartesian.simple_factory(:support_z_coordinate => true, :support_m_coordinate => true)
+          factory_ = ::RGeo::Cartesian.preferred_factory(:support_z_coordinate => true, :support_m_coordinate => true)
           parser_ = ::RGeo::WKRep::WKTParser.new(:default_factory => factory_, :support_wkt12 => true)
           obj_ = parser_.parse('LINESTRING M(1 2 3,5 6 7)')
           assert_equal(::RGeo::Features::LineString, obj_.geometry_type)
@@ -464,7 +464,7 @@ module RGeo
         
         
         def test_collection_wkt12_type_mismatch
-          factory_ = ::RGeo::Cartesian.simple_factory(:support_z_coordinate => true, :support_m_coordinate => true)
+          factory_ = ::RGeo::Cartesian.preferred_factory(:support_z_coordinate => true, :support_m_coordinate => true)
           parser_ = ::RGeo::WKRep::WKTParser.new(:default_factory => factory_, :support_wkt12 => true)
           assert_raise(::RGeo::Errors::ParseError) do
             obj_ = parser_.parse('GEOMETRYCOLLECTION Z(POINT Z(-1 -2 0),LINESTRING M(1 2 0, 3 4 0, 5 6 0))')