rgeo 0.3.3 → 0.3.4

data/test/geos_ffi/tc_factory.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Tests for the GEOS factory
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# 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,
@@ -18,7 +18,7 @@
 # * 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
@@ -41,15 +41,15 @@ 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)
@@ -58,8 +58,8 @@ module RGeo
           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)
@@ -68,24 +68,24 @@ module RGeo
           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?

data/test/geos_ffi/tc_geometry_collection.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Tests for the GEOS geometry collection implementation
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# 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,
@@ -18,7 +18,7 @@
 # * 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
@@ -43,20 +43,20 @@ require ::File.expand_path('../common/geometry_collection_tests.rb', ::File.dirn
 module RGeo
   module Tests  # :nodoc:
     module GeosFFI  # :nodoc:
-      
+
       class TestGeometryCollection < ::Test::Unit::TestCase  # :nodoc:
-        
-        
+
+
         def create_factory
           ::RGeo::Geos.factory(:native_interface => :ffi)
         end
-        
-        
+
+
         include ::RGeo::Tests::Common::GeometryCollectionTests
-        
-        
+
+
       end
-      
+
     end
   end
 end if ::RGeo::Geos.ffi_supported?

data/test/geos_ffi/tc_line_string.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Tests for the GEOS line string implementation
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# 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,
@@ -18,7 +18,7 @@
 # * 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
@@ -43,20 +43,20 @@ require ::File.expand_path('../common/line_string_tests.rb', ::File.dirname(__FI
 module RGeo
   module Tests  # :nodoc:
     module GeosFFI  # :nodoc:
-      
+
       class TestLineString < ::Test::Unit::TestCase  # :nodoc:
-        
-        
+
+
         def setup
           @factory = ::RGeo::Geos.factory(:native_interface => :ffi)
         end
-        
-        
+
+
         include ::RGeo::Tests::Common::LineStringTests
-        
-        
+
+
       end
-      
+
     end
   end
 end if ::RGeo::Geos.ffi_supported?

data/test/geos_ffi/tc_misc.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Tests for miscellaneous GEOS stuff
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# 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,
@@ -18,7 +18,7 @@
 # * 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
@@ -41,25 +41,59 @@ require 'rgeo'
 module RGeo
   module Tests  # :nodoc:
     module GeosFFI  # :nodoc:
-      
+
       class TestMisc < ::Test::Unit::TestCase  # :nodoc:
-        
-        
+
+
         def setup
           @factory = ::RGeo::Geos.factory(:srid => 4326, :native_interface => :ffi)
         end
-        
-        
+
+
         def test_empty_geometries_equal
           geom1_ = @factory.collection([])
           geom2_ = @factory.line_string([])
           assert(!geom1_.eql?(geom2_))
           assert(geom1_.equals?(geom2_))
         end
-        
-        
+
+
+        def test_prepare
+          p1_ = @factory.point(1, 2)
+          p2_ = @factory.point(3, 4)
+          p3_ = @factory.point(5, 2)
+          polygon_ = @factory.polygon(@factory.linear_ring([p1_, p2_, p3_, p1_]))
+          assert_equal(false, polygon_.prepared?)
+          polygon_.prepare!
+          assert_equal(true, polygon_.prepared?)
+        end
+
+
+        def test_auto_prepare
+          p1_ = @factory.point(1, 2)
+          p2_ = @factory.point(3, 4)
+          p3_ = @factory.point(5, 2)
+          polygon_ = @factory.polygon(@factory.linear_ring([p1_, p2_, p3_, p1_]))
+          assert_equal(false, polygon_.prepared?)
+          polygon_.intersects?(p1_)
+          assert_equal(false, polygon_.prepared?)
+          polygon_.intersects?(p2_)
+          assert_equal(true, polygon_.prepared?)
+
+          factory_no_auto_prepare_ = ::RGeo::Geos.factory(:srid => 4326,
+            :native_interface => :ffi, :auto_prepare => :disabled)
+          polygon2_ = factory_no_auto_prepare_.polygon(
+            factory_no_auto_prepare_.linear_ring([p1_, p2_, p3_, p1_]))
+          assert_equal(false, polygon2_.prepared?)
+          polygon2_.intersects?(p1_)
+          assert_equal(false, polygon2_.prepared?)
+          polygon2_.intersects?(p2_)
+          assert_equal(false, polygon2_.prepared?)
+        end
+
+
       end
-      
+
     end
   end
 end if ::RGeo::Geos.ffi_supported?

data/test/geos_ffi/tc_multi_line_string.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Tests for the GEOS multi line string implementation
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# 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,
@@ -18,7 +18,7 @@
 # * 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
@@ -43,20 +43,20 @@ require ::File.expand_path('../common/multi_line_string_tests.rb', ::File.dirnam
 module RGeo
   module Tests  # :nodoc:
     module GeosFFI  # :nodoc:
-      
+
       class TestMultiLineString < ::Test::Unit::TestCase  # :nodoc:
-        
-        
+
+
         def create_factory
           ::RGeo::Geos.factory(:native_interface => :ffi)
         end
-        
-        
+
+
         include ::RGeo::Tests::Common::MultiLineStringTests
-        
-        
+
+
       end
-      
+
     end
   end
 end if ::RGeo::Geos.ffi_supported?

data/test/geos_ffi/tc_multi_point.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Tests for the GEOS multi point implementation
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# 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,
@@ -18,7 +18,7 @@
 # * 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
@@ -43,20 +43,20 @@ require ::File.expand_path('../common/multi_point_tests.rb', ::File.dirname(__FI
 module RGeo
   module Tests  # :nodoc:
     module GeosFFI  # :nodoc:
-      
+
       class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
-        
-        
+
+
         def create_factory
           ::RGeo::Geos.factory(:native_interface => :ffi)
         end
-        
-        
+
+
         include ::RGeo::Tests::Common::MultiPointTests
-        
-        
+
+
       end
-      
+
     end
   end
 end if ::RGeo::Geos.ffi_supported?

data/test/geos_ffi/tc_multi_polygon.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Tests for the GEOS multi polygon implementation
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# 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,
@@ -18,7 +18,7 @@
 # * 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
@@ -43,22 +43,22 @@ require ::File.expand_path('../common/multi_polygon_tests.rb', ::File.dirname(__
 module RGeo
   module Tests  # :nodoc:
     module GeosFFI  # :nodoc:
-      
+
       class TestMultiPolygon < ::Test::Unit::TestCase  # :nodoc:
-        
-        
+
+
         def create_factories
           @factory = ::RGeo::Geos.factory(:native_interface => :ffi)
           @lenient_factory = ::RGeo::Geos.factory(:lenient_multi_polygon_assertions => true,
             :native_interface => :ffi)
         end
-        
-        
+
+
         include ::RGeo::Tests::Common::MultiPolygonTests
-        
-        
+
+
       end
-      
+
     end
   end
 end if ::RGeo::Geos.ffi_supported?