activerecord-postgis-adapter 0.2.1 → 0.2.2

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 0.2.2 / 2010-12-27
+
+* Support for basic spatial equality queries. e.g. constructs such as:
+    MyClass.where(:geom_column => factory.point(1, 2))
+    MyClass.where(:geom_column => 'POINT(1 2)')
+* Fixed an exception when adding spatial columns where the column name is specified as a symbol.
+
 === 0.2.1 / 2010-12-15
 
 * Provides meta-information to RGeo 0.2.2 or later to support access to PostGIS's spatial reference system table.

data/README.rdoc

@@ -74,6 +74,19 @@ Now you can interact with the data using the RGeo types:
                                  # value will be cast from geographic to GEOS.
  RGeo::Geos.is_geos?(rec.shape)  # => true
 
+You can create simple queries based on spatial equality in the same way
+you would on a scalar column:
+
+ rec = SpatialTable.where(:latlon => RGeo::Geos.factory.point(-122, 47)).first
+
+You can also use WKT:
+
+ rec = SpatialTable.where(:latlon => 'POINT(-122 47)').first
+
+Other types of queries currently must be written in SQL. However, we are
+investigating writing a set of Arel extensions for constructing arbitrary
+spatial queries.
+
 === Installation
 
 This adapter has the following requirements:
@@ -81,8 +94,8 @@ This adapter has the following requirements:
 * Ruby 1.8.7 or later. Ruby 1.9.2 or later preferred.
 * PostGIS 1.5 or later.
 * \ActiveRecord 3.0.3 or later. Earlier versions will not work.
-* rgeo gem 0.2.0 or later.
-* rgeo-activerecord gem 0.2.0 or later.
+* rgeo gem 0.2.3 or later.
+* rgeo-activerecord gem 0.2.1 or later.
 * pg gem 0.10 or later.
 
 Install this adapter as a gem:

data/Version

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -42,7 +42,23 @@ require 'active_record/connection_adapters/postgresql_adapter'
 
 module Arel
   module Visitors
-    VISITORS['postgis'] = ::Arel::Visitors::PostgreSQL
+    
+    class PostGIS < PostgreSQL
+      
+      FUNC_MAP = {
+        'ST_WKTToSQL' => 'GeomFromEWKT',
+      }
+      
+      include ::RGeo::ActiveRecord::SpatialToSql
+      
+      def st_func(standard_name_)
+        FUNC_MAP[standard_name_] || standard_name_
+      end
+      
+    end
+    
+    VISITORS['postgis'] = ::Arel::Visitors::PostGIS
+    
   end
 end
 
@@ -161,7 +177,7 @@ module ActiveRecord
           dimensions_ = 2
           dimensions_ += 1 if has_z_
           dimensions_ += 1 if has_m_
-          execute("SELECT AddGeometryColumn('#{quote_string(table_name_)}', '#{quote_string(col_.name)}', #{col_.srid}, '#{quote_string(type_)}', #{dimensions_})")
+          execute("SELECT AddGeometryColumn('#{quote_string(table_name_)}', '#{quote_string(col_.name.to_s)}', #{col_.srid}, '#{quote_string(type_)}', #{dimensions_})")
         end
       end
       

data/test/tc_basic.rb

@@ -261,6 +261,55 @@ module RGeo
             end
             
             
+            def test_readme_example
+              klass_ = create_ar_class
+              klass_.connection.create_table(:spatial_test) do |t_|
+                t_.column(:latlon, :point)
+                t_.line_string(:path)
+                t_.geometry(:shape)
+              end
+              klass_.connection.change_table(:spatial_test) do |t_|
+                t_.index(:latlon, :spatial => true)
+              end
+              klass_.class_eval do
+                self.rgeo_factory_generator = ::RGeo::Geos.method(:factory)
+                set_rgeo_factory_for_column(:latlon, ::RGeo::Geographic.spherical_factory)
+              end
+              rec_ = klass_.new
+              rec_.latlon = 'POINT(-122 47)'
+              loc_ = rec_.latlon
+              assert_equal(47, loc_.latitude)
+              rec_.shape = loc_
+              assert_equal(true, ::RGeo::Geos.is_geos?(rec_.shape))
+            end
+            
+            
+            def test_query_point
+              klass_ = populate_ar_class(:latlon_point)
+              obj_ = klass_.new
+              obj_.latlon = @factory.point(1, 2)
+              obj_.save!
+              id_ = obj_.id
+              obj2_ = klass_.where(:latlon => @factory.multi_point([@factory.point(1, 2)])).first
+              assert_equal(id_, obj2_.id)
+              obj3_ = klass_.where(:latlon => @factory.point(2, 2)).first
+              assert_nil(obj3_)
+            end
+            
+            
+            def test_query_point_wkt
+              klass_ = populate_ar_class(:latlon_point)
+              obj_ = klass_.new
+              obj_.latlon = @factory.point(1, 2)
+              obj_.save!
+              id_ = obj_.id
+              obj2_ = klass_.where(:latlon => 'SRID=4326;POINT(1 2)').first
+              assert_equal(id_, obj2_.id)
+              obj3_ = klass_.where(:latlon => 'SRID=4326;POINT(2 2)').first
+              assert_nil(obj3_)
+            end
+            
+            
           end
           
         end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Daniel Azuma
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 -08:00
+date: 2010-12-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 0
-        version: 0.2.0
+        - 1
+        version: 0.2.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency