rgeo 0.1.20 → 0.1.21

data/test/active_record/tc_spatialite.rb

@@ -0,0 +1,198 @@
+# -----------------------------------------------------------------------------
+# 
+# Tests for the SpatiaLite ActiveRecord adapter
+# 
+# -----------------------------------------------------------------------------
+# 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 'fileutils'
+require 'test/unit'
+require ::File.expand_path('common_setup_methods.rb', ::File.dirname(__FILE__))
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module ActiveRecord  # :nodoc:
+      
+      if TESTS_AVAILABLE
+        
+        
+        if ALL_DATABASES_CONFIG.include?('spatialite')
+          
+          class TestSpatiaLite < ::Test::Unit::TestCase  # :nodoc:
+            
+            
+            ADAPTER_NAME = 'spatialite'
+            
+            def self.before_open_database(params_)
+              database_ = params_[:config][:database]
+              dir_ = ::File.dirname(database_)
+              ::FileUtils.mkdir_p(dir_) unless dir_ == '.'
+              ::FileUtils.rm_f(database_)
+            end
+            
+            def self.initialize_database(params_)
+              params_[:connection].execute('SELECT InitSpatialMetaData()')
+            end
+            
+            include CommonSetupMethods
+            
+            
+            def populate_ar_class(content_)
+              klass_ = create_ar_class
+              case content_
+              when :latlon_point
+                klass_.connection.create_table(:spatial_test) do |t_|
+                  t_.column 'latlon', :point, :srid => 4326
+                end
+              end
+              klass_
+            end
+            
+            
+            def test_meta_data_present
+              result_ = DEFAULT_AR_CLASS.connection.select_value("SELECT COUNT(*) FROM spatial_ref_sys").to_i
+              assert_not_equal(0, result_)
+            end
+            
+            
+            def test_create_simple_geometry
+              klass_ = create_ar_class
+              klass_.connection.create_table(:spatial_test) do |t_|
+                t_.column 'latlon', :geometry
+              end
+              assert_equal(1, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
+              assert_equal(::RGeo::Feature::Geometry, klass_.columns.last.geometric_type)
+              assert(klass_.cached_attributes.include?('latlon'))
+              klass_.connection.drop_table(:spatial_test)
+              assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
+            end
+            
+            
+            def test_create_point_geometry
+              klass_ = create_ar_class
+              klass_.connection.create_table(:spatial_test) do |t_|
+                t_.column 'latlon', :point
+              end
+              assert_equal(::RGeo::Feature::Point, klass_.columns.last.geometric_type)
+              assert(klass_.cached_attributes.include?('latlon'))
+            end
+            
+            
+            def test_create_geometry_with_index
+              klass_ = create_ar_class
+              klass_.connection.create_table(:spatial_test) do |t_|
+                t_.column 'latlon', :geometry
+              end
+              klass_.connection.change_table(:spatial_test) do |t_|
+                t_.index([:latlon], :spatial => true)
+              end
+              assert(klass_.connection.spatial_indexes(:spatial_test).last.spatial)
+            end
+            
+            
+            def test_set_and_get_point
+              klass_ = populate_ar_class(:latlon_point)
+              obj_ = klass_.new
+              assert_nil(obj_.latlon)
+              obj_.latlon = @factory.point(1, 2)
+              assert_equal(@factory.point(1, 2), obj_.latlon)
+              assert_equal(4326, obj_.latlon.srid)
+            end
+            
+            
+            def test_set_and_get_point_from_wkt
+              klass_ = populate_ar_class(:latlon_point)
+              obj_ = klass_.new
+              assert_nil(obj_.latlon)
+              obj_.latlon = 'POINT(1 2)'
+              assert_equal(@factory.point(1, 2), obj_.latlon)
+              assert_equal(4326, obj_.latlon.srid)
+            end
+            
+            
+            def test_save_and_load_point
+              klass_ = populate_ar_class(:latlon_point)
+              obj_ = klass_.new
+              obj_.latlon = @factory.point(1, 2)
+              obj_.save!
+              id_ = obj_.id
+              obj2_ = klass_.find(id_)
+              assert_equal(@factory.point(1, 2), obj2_.latlon)
+              assert_equal(4326, obj2_.latlon.srid)
+            end
+            
+            
+            def test_save_and_load_point_from_wkt
+              klass_ = populate_ar_class(:latlon_point)
+              obj_ = klass_.new
+              obj_.latlon = 'POINT(1 2)'
+              obj_.save!
+              id_ = obj_.id
+              obj2_ = klass_.find(id_)
+              assert_equal(@factory.point(1, 2), obj2_.latlon)
+              assert_equal(4326, obj2_.latlon.srid)
+            end
+            
+            
+            def test_add_column
+              klass_ = create_ar_class
+              klass_.connection.create_table(:spatial_test) do |t_|
+                t_.column('latlon', :geometry)
+              end
+              klass_.connection.change_table(:spatial_test) do |t_|
+                t_.column('geom2', :point, :srid => 4326)
+                t_.column('name', :string)
+              end
+              assert_equal(2, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
+              cols_ = klass_.columns
+              assert_equal(::RGeo::Feature::Geometry, cols_[-3].geometric_type)
+              assert_equal(-1, cols_[-3].srid)
+              assert_equal(::RGeo::Feature::Point, cols_[-2].geometric_type)
+              assert_equal(4326, cols_[-2].srid)
+              assert_nil(cols_[-1].geometric_type)
+            end
+            
+            
+          end
+          
+        else
+          puts "WARNING: Couldn't find spatialite in database.yml. Skipping those tests."
+          puts "         See tests/active_record/readme.txt for more info."
+        end
+        
+        
+      end
+      
+    end
+    
+  end
+end

data/test/coord_sys/tc_proj4.rb

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 # 
-# A container file for one-off tests
+# Tests for proj4 wrapper
 # 
 # -----------------------------------------------------------------------------
 # Copyright 2010 Daniel Azuma
@@ -94,16 +94,23 @@ module RGeo
         def test_simple_mercator_transform
           geography_ = RGeo::CoordSys::Proj4.create('+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs')
           projection_ = RGeo::CoordSys::Proj4.create('+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')
-          assert_equal(_project_merc(0, 0), RGeo::CoordSys::Proj4.transform_coords(geography_, projection_, 0, 0, nil, :radians => true))
-          assert_equal(_project_merc(0.01, 0.01), RGeo::CoordSys::Proj4.transform_coords(geography_, projection_, 0.01, 0.01, nil, :radians => true))
-          assert_equal(_project_merc(1, 1), RGeo::CoordSys::Proj4.transform_coords(geography_, projection_, 1, 1, nil, :radians => true))
-          assert_equal(_project_merc(-1, -1), RGeo::CoordSys::Proj4.transform_coords(geography_, projection_, -1, -1, nil, :radians => true))
+          _assert_xy_close(_project_merc(0, 0), RGeo::CoordSys::Proj4.transform_coords(geography_, projection_, 0, 0, nil, :radians => true))
+          _assert_xy_close(_project_merc(0.01, 0.01), RGeo::CoordSys::Proj4.transform_coords(geography_, projection_, 0.01, 0.01, nil, :radians => true))
+          _assert_xy_close(_project_merc(1, 1), RGeo::CoordSys::Proj4.transform_coords(geography_, projection_, 1, 1, nil, :radians => true))
+          _assert_xy_close(_project_merc(-1, -1), RGeo::CoordSys::Proj4.transform_coords(geography_, projection_, -1, -1, nil, :radians => true))
           _assert_xy_close(_unproject_merc(0, 0), RGeo::CoordSys::Proj4.transform_coords(projection_, geography_, 0, 0, nil, :radians => true))
           _assert_xy_close(_unproject_merc(10000, 10000), RGeo::CoordSys::Proj4.transform_coords(projection_, geography_, 10000, 10000, nil, :radians => true))
           _assert_xy_close(_unproject_merc(-20000000, -20000000), RGeo::CoordSys::Proj4.transform_coords(projection_, geography_, -20000000, -20000000, nil, :radians => true))
         end
         
         
+        def test_equivalence
+          proj1_ = RGeo::CoordSys::Proj4.create('+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs')
+          proj2_ = RGeo::CoordSys::Proj4.create('+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs')
+          assert_equal(proj1_, proj2_)
+        end
+        
+        
       end
       
     end

data/test/projected_geography/tc_geometry_collection.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def create_factory
-          ::RGeo::Geography.projected(: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)
+          ::RGeo::Geography.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)
         end
         
         

data/test/projected_geography/tc_line_string.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def setup
-          @factory = ::RGeo::Geography.projected(: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)
+          @factory = ::RGeo::Geography.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)
         end
         
         

data/test/projected_geography/tc_multi_line_string.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def create_factory
-          ::RGeo::Geography.projected(: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)
+          ::RGeo::Geography.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)
         end
         
         

data/test/projected_geography/tc_multi_point.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def create_factory
-          ::RGeo::Geography.projected(: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)
+          ::RGeo::Geography.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)
         end
         
         

data/test/projected_geography/tc_multi_polygon.rb

@@ -48,8 +48,8 @@ module RGeo
         
         
         def create_factories
-          @factory = ::RGeo::Geography.projected(: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)
-          @lenient_factory = ::RGeo::Geography.projected(: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, :lenient_multi_polygon_assertions => true)
+          @factory = ::RGeo::Geography.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)
+          @lenient_factory = ::RGeo::Geography.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, :lenient_multi_polygon_assertions => true)
         end
         
         

data/test/projected_geography/tc_point.rb

@@ -48,10 +48,10 @@ module RGeo
         
         
         def setup
-          @factory = ::RGeo::Geography.projected(: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)
-          @zfactory = ::RGeo::Geography.projected(:support_z_coordinate => true, :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)
-          @mfactory = ::RGeo::Geography.projected(:support_m_coordinate => true, :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)
-          @zmfactory = ::RGeo::Geography.projected(:support_z_coordinate => true, :support_m_coordinate => true, :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)
+          @factory = ::RGeo::Geography.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)
+          @zfactory = ::RGeo::Geography.projected_factory(:support_z_coordinate => true, :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)
+          @mfactory = ::RGeo::Geography.projected_factory(:support_m_coordinate => true, :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)
+          @zmfactory = ::RGeo::Geography.projected_factory(:support_z_coordinate => true, :support_m_coordinate => true, :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/projected_geography/tc_polygon.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def setup
-          @factory = ::RGeo::Geography.projected(: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)
+          @factory = ::RGeo::Geography.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)
         end
         
         

data/test/simple_mercator/tc_geometry_collection.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def create_factory
-          ::RGeo::Geography.simple_mercator
+          ::RGeo::Geography.simple_mercator_factory
         end
         
         

data/test/simple_mercator/tc_line_string.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def setup
-          @factory = ::RGeo::Geography.simple_mercator
+          @factory = ::RGeo::Geography.simple_mercator_factory
         end
         
         

data/test/simple_mercator/tc_multi_line_string.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def create_factory
-          ::RGeo::Geography.simple_mercator
+          ::RGeo::Geography.simple_mercator_factory
         end
         
         

data/test/simple_mercator/tc_multi_point.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def create_factory
-          ::RGeo::Geography.simple_mercator
+          ::RGeo::Geography.simple_mercator_factory
         end
         
         

data/test/simple_mercator/tc_multi_polygon.rb

@@ -48,8 +48,8 @@ module RGeo
         
         
         def create_factories
-          @factory = ::RGeo::Geography.simple_mercator
-          @lenient_factory = ::RGeo::Geography.simple_mercator(:lenient_multi_polygon_assertions => true)
+          @factory = ::RGeo::Geography.simple_mercator_factory
+          @lenient_factory = ::RGeo::Geography.simple_mercator_factory(:lenient_multi_polygon_assertions => true)
         end
         
         

data/test/simple_mercator/tc_point.rb

@@ -48,10 +48,10 @@ 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)
+          @factory = ::RGeo::Geography.simple_mercator_factory
+          @zfactory = ::RGeo::Geography.simple_mercator_factory(:support_z_coordinate => true)
+          @mfactory = ::RGeo::Geography.simple_mercator_factory(:support_m_coordinate => true)
+          @zmfactory = ::RGeo::Geography.simple_mercator_factory(:support_z_coordinate => true, :support_m_coordinate => true)
         end
         
         

data/test/simple_mercator/tc_polygon.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def setup
-          @factory = ::RGeo::Geography.simple_mercator
+          @factory = ::RGeo::Geography.simple_mercator_factory
         end
         
         

data/test/simple_mercator/tc_window.rb

@@ -46,7 +46,7 @@ module RGeo
         
         
         def setup
-          @factory = ::RGeo::Geography.simple_mercator
+          @factory = ::RGeo::Geography.simple_mercator_factory
         end
         
         

data/test/spherical_geography/tc_geometry_collection.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def create_factory
-          @factory = ::RGeo::Geography.spherical
+          @factory = ::RGeo::Geography.spherical_factory
         end
         
         

data/test/spherical_geography/tc_line_string.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def setup
-          @factory = ::RGeo::Geography.spherical
+          @factory = ::RGeo::Geography.spherical_factory
         end
         
         

data/test/spherical_geography/tc_multi_line_string.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def create_factory
-          @factory = ::RGeo::Geography.spherical
+          @factory = ::RGeo::Geography.spherical_factory
         end
         
         

data/test/spherical_geography/tc_multi_point.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def create_factory
-          @factory = ::RGeo::Geography.spherical
+          @factory = ::RGeo::Geography.spherical_factory
         end
         
         

data/test/spherical_geography/tc_multi_polygon.rb

@@ -48,8 +48,8 @@ module RGeo
         
         
         def create_factories
-          @factory = ::RGeo::Geography.spherical
-          @lenient_factory = ::RGeo::Geography.spherical(:lenient_multi_polygon_assertions => true)
+          @factory = ::RGeo::Geography.spherical_factory
+          @lenient_factory = ::RGeo::Geography.spherical_factory(:lenient_multi_polygon_assertions => true)
         end