rgeo 0.3.3 → 0.3.4

data/test/coord_sys/tc_proj4_srs_data.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Tests for OGC CS classes
-# 
+#
 # -----------------------------------------------------------------------------
-# 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,36 +41,36 @@ require 'rgeo'
 module RGeo
   module Tests  # :nodoc:
     module CoordSys  # :nodoc:
-      
+
       class TestProj4SRSData < ::Test::Unit::TestCase  # :nodoc:
-        
-        
+
+
         def test_epsg_4326
           db_ = ::RGeo::CoordSys::SRSDatabase::Proj4Data.new('epsg')
           entry_ = db_.get(4326)
           assert_equal('+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs', entry_.proj4.original_str)
           assert_equal('WGS 84', entry_.name)
         end
-        
-        
+
+
         def test_epsg_3785
           db_ = ::RGeo::CoordSys::SRSDatabase::Proj4Data.new('epsg')
           entry_ = db_.get(3785)
           assert_equal('+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', entry_.proj4.original_str)
           assert_equal('Popular Visualisation CRS / Mercator (deprecated)', entry_.name)
         end
-        
-        
+
+
         def test_nad83_4601
           db_ = ::RGeo::CoordSys::SRSDatabase::Proj4Data.new('nad83')
           entry_ = db_.get(4601)
           assert_equal('+proj=lcc  +datum=NAD83 +lon_0=-120d50 +lat_1=48d44 +lat_2=47d30 +lat_0=47 +x_0=500000 +y_0=0 +no_defs', entry_.proj4.original_str)
           assert_equal('4601: washington north: nad83', entry_.name)
         end
-        
-        
+
+
       end
-      
+
     end
   end
 end if ::RGeo::CoordSys::Proj4.supported?

data/test/coord_sys/tc_sr_org.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Tests for OGC CS classes
-# 
+#
 # -----------------------------------------------------------------------------
-# 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,10 +41,10 @@ require 'rgeo'
 module RGeo
   module Tests  # :nodoc:
     module CoordSys  # :nodoc:
-      
+
       class TestSrOrg < ::Test::Unit::TestCase  # :nodoc:
-        
-        
+
+
         def test_epsg_4326
           db_ = ::RGeo::CoordSys::SRSDatabase::SrOrg.new('epsg')
           entry_ = db_.get(4326)
@@ -52,8 +52,8 @@ module RGeo
           assert_kind_of(::RGeo::CoordSys::CS::GeographicCoordinateSystem, entry_.coord_sys)
           assert_equal('WGS 84', entry_.name)
         end
-        
-        
+
+
         def test_epsg_3785
           db_ = ::RGeo::CoordSys::SRSDatabase::SrOrg.new('epsg')
           entry_ = db_.get(3785)
@@ -61,10 +61,10 @@ module RGeo
           assert_kind_of(::RGeo::CoordSys::CS::ProjectedCoordinateSystem, entry_.coord_sys)
           assert_equal('Popular Visualisation CRS / Mercator', entry_.name)
         end
-        
-        
+
+
       end if false
-      
+
     end
   end
 end

data/test/coord_sys/tc_url_reader.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Tests for OGC CS classes
-# 
+#
 # -----------------------------------------------------------------------------
-# 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,42 +41,42 @@ require 'rgeo'
 module RGeo
   module Tests  # :nodoc:
     module CoordSys  # :nodoc:
-      
+
       class TestUrlReader < ::Test::Unit::TestCase  # :nodoc:
-        
-        
+
+
         def test_sr_org_epsg_4326_ogcwkt
           db_ = ::RGeo::CoordSys::SRSDatabase::UrlReader.new
           entry_ = db_.get('http://spatialreference.org/ref/epsg/4326/ogcwkt/')
           assert_kind_of(::RGeo::CoordSys::CS::GeographicCoordinateSystem, entry_.coord_sys)
           assert_equal('WGS 84', entry_.name)
         end
-        
-        
+
+
         def test_sr_org_epsg_4326_proj4
           db_ = ::RGeo::CoordSys::SRSDatabase::UrlReader.new
           entry_ = db_.get('http://spatialreference.org/ref/epsg/4326/proj4/')
           assert_equal('+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs', entry_.proj4.original_str)
         end
-        
-        
+
+
         def test_sr_org_epsg_3785_ogcwkt
           db_ = ::RGeo::CoordSys::SRSDatabase::UrlReader.new
           entry_ = db_.get('http://spatialreference.org/ref/epsg/3785/ogcwkt/')
           assert_kind_of(::RGeo::CoordSys::CS::ProjectedCoordinateSystem, entry_.coord_sys)
           assert_equal('Popular Visualisation CRS / Mercator', entry_.name)
         end
-        
-        
+
+
         def test_sr_org_epsg_3785_proj4
           db_ = ::RGeo::CoordSys::SRSDatabase::UrlReader.new
           entry_ = db_.get('http://spatialreference.org/ref/epsg/3785/proj4/')
           assert_equal('+proj=merc +lon_0=0 +k=1 +x_0=0 +y_0=0 +a=6378137 +b=6378137 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs', entry_.proj4.original_str)
         end
-        
-        
+
+
       end if false
-      
+
     end
   end
 end

data/test/geos_capi/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 GeosCAPI  # :nodoc:
-      
+
       class TestFactory < ::Test::Unit::TestCase  # :nodoc:
-        
-        
+
+
         def setup
           @factory = ::RGeo::Geos.factory(:srid => 4326)
         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.capi_supported?

data/test/geos_capi/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 GeosCAPI  # :nodoc:
-      
+
       class TestGeometryCollection < ::Test::Unit::TestCase  # :nodoc:
-        
-        
+
+
         def create_factory
           ::RGeo::Geos.factory
         end
-        
-        
+
+
         include ::RGeo::Tests::Common::GeometryCollectionTests
-        
-        
+
+
       end
-      
+
     end
   end
 end if ::RGeo::Geos.capi_supported?

data/test/geos_capi/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 GeosCAPI  # :nodoc:
-      
+
       class TestLineString < ::Test::Unit::TestCase  # :nodoc:
-        
-        
+
+
         def setup
           @factory = ::RGeo::Geos.factory
         end
-        
-        
+
+
         include ::RGeo::Tests::Common::LineStringTests
-        
-        
+
+
       end
-      
+
     end
   end
 end if ::RGeo::Geos.capi_supported?

data/test/geos_capi/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,30 +41,30 @@ require 'rgeo'
 module RGeo
   module Tests  # :nodoc:
     module GeosCAPI  # :nodoc:
-      
+
       class TestMisc < ::Test::Unit::TestCase  # :nodoc:
-        
-        
+
+
         def setup
           @factory = ::RGeo::Geos.factory(:srid => 4326)
         end
-        
-        
+
+
         def test_uninitialized
           geom_ = ::RGeo::Geos::GeometryImpl.new
           assert_equal(false, geom_.initialized?)
           assert_nil(geom_.geometry_type)
         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)
@@ -74,8 +74,8 @@ module RGeo
           polygon_.prepare!
           assert_equal(true, polygon_.prepared?)
         end
-        
-        
+
+
         def test_auto_prepare
           p1_ = @factory.point(1, 2)
           p2_ = @factory.point(3, 4)
@@ -86,7 +86,7 @@ module RGeo
           assert_equal(false, polygon_.prepared?)
           polygon_.intersects?(p2_)
           assert_equal(true, polygon_.prepared?)
-          
+
           factory_no_auto_prepare_ = ::RGeo::Geos.factory(:srid => 4326, :auto_prepare => :disabled)
           polygon2_ = factory_no_auto_prepare_.polygon(
             factory_no_auto_prepare_.linear_ring([p1_, p2_, p3_, p1_]))
@@ -96,10 +96,21 @@ module RGeo
           polygon2_.intersects?(p2_)
           assert_equal(false, polygon2_.prepared?)
         end
-        
-        
+
+
+        def test_gh_21
+          # Test for GH-21 (seg fault in rgeo_convert_to_geos_geometry)
+          # This seemed to fail under Ruby 1.8.7 only.
+          f_ = RGeo::Geographic.simple_mercator_factory
+          loc_ = f_.line_string([f_.point(-123, 37), f_.point(-122, 38)])
+          f2_ = f_.projection_factory
+          loc2_ = f2_.line_string([f2_.point(-123, 37), f2_.point(-122, 38)])
+          loc2_.intersection(loc_)
+        end
+
+
       end
-      
+
     end
   end
 end if ::RGeo::Geos.capi_supported?