postgis_adapter 0.1.8 → 0.2.1

data/lib/postgis_functions.rb

@@ -18,9 +18,8 @@
 #
 #
 module PostgisFunctions
-  # EARTH_SPHEROID = "'SPHEROID[\"GRS-80\",6378137,298.257222101]'"
-
-  EARTH_SPHEROID = "'SPHEROID[\"IERS_2003\",6378136.6,298.25642]'"
+  EARTH_SPHEROID = "'SPHEROID[\"GRS-80\",6378137,298.257222101]'" # SRID => 4326
+  #EARTH_SPHEROID = "'SPHEROID[\"IERS_2003\",6378136.6,298.25642]'" # SRID => 
 
   def postgis_calculate(operation, subjects, options = nil)
     subjects = [subjects] unless subjects.respond_to?(:map)
@@ -29,12 +28,13 @@ module PostgisFunctions
     raise StandardError, "#{e}"
   end
 
-
   private
 
-
+  def get_column_name
+    @geo_column ||= postgis_geoms[:columns].first
+  end
+ 
   # Construct the postgis sql query
-  # TODO: ST_Transform() ?? # Convert between distances. Implement this?
   #
   # Area return in square feet
   # Distance/DWithin/Length/Perimeter —  in projected units.
@@ -49,7 +49,7 @@ module PostgisFunctions
       :id => t[:id] }
     end
 
-    fields      = tables.map { |f| "#{f[:uid]}.geom" }            # W1.geom
+    fields      = tables.map { |f| "#{f[:uid]}.#{get_column_name}" }            # W1.geom
     conditions  = tables.map { |f| "#{f[:uid]}.id = #{f[:id]}" }  # W1.id = 5
     tables.map! { |f| "#{f[:class]} #{f[:uid]}" }    # streets W1
     
@@ -57,17 +57,16 @@ module PostgisFunctions
     # Data =>  SELECT Func(A,B)
     # BBox =>  SELECT (A <=> B)
     # 
-    if type == :bbox
-      opcode = nil
-      s_join = " #{options} "
-    else
+    unless type == :bbox
       opcode = type.to_s
       opcode = "ST_#{opcode}" unless opcode =~ /th3d|pesinter/
-      s_join = ","
       fields << options if options
+      fields = fields.join(",")
+    else
+      fields = fields.join(" #{options} ")
     end
 
-    sql =   "SELECT #{opcode}(#{fields.join(s_join)}) "
+    sql =   "SELECT #{opcode}(#{fields}) "
     sql <<  "FROM #{tables.join(",")} "           if tables
     sql <<  "WHERE #{conditions.join(" AND ")}"   if conditions
     #p sql; sql
@@ -94,7 +93,7 @@ module PostgisFunctions
 
   # Get a unique ID for tables
   def unique_identifier
-    @u_id ||= "W1"
+    @u_id ||= "T1"
     @u_id = @u_id.succ
   end
 

data/postgis_adapter.gemspec

@@ -1,21 +1,23 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
-  s.name = "postgis_adapter"
-  s.version = "0.1.8"
+  s.name = %q{postgis_adapter}
+  s.version = "0.2.1"
+
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = "2008-12-16"
-  s.description = "Postgis Adapter for Activer Record"
+  s.date = %q{2009-01-10}
+  s.description = %q{Postgis Adapter for Activer Record}
   s.email = ["x@nofxx.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
-  s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "init.rb", "install.rb", "lib/postgis_adapter.rb", "lib/postgis_adapter/acts_as_geom.rb", "lib/postgis_adapter/common_spatial_adapter.rb", "lib/postgis_functions.rb", "lib/postgis_functions/bbox.rb", "lib/postgis_functions/class.rb", "lib/postgis_functions/common.rb", "lib/postgis_functions/linestring.rb", "lib/postgis_functions/point.rb", "lib/postgis_functions/polygon.rb", "postgis_adapter.gemspec", "rails/init.rb", "script/console", "script/destroy", "script/generate", "uninstall.rb"]
-  s.test_files = ["spec/acts_as_geom_spec.rb", "spec/common_spatial_adapter_spec.rb", "spec/db/database_postgis.yml", "spec/db/models_postgis.rb", "spec/db/schema_postgis.rb", "spec/postgis_adapter_spec.rb", "spec/postgis_functions/bbox_spec.rb", "spec/postgis_functions/linestring_spec.rb", "spec/postgis_functions/point_spec.rb", "spec/postgis_functions/polygon_spec.rb", "spec/postgis_functions_spec.rb", "spec/spec.opts", "spec/spec_helper.rb"]
+  s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "init.rb", "install.rb", "lib/postgis_adapter.rb", "lib/postgis_adapter/acts_as_geom.rb", "lib/postgis_adapter/common_spatial_adapter.rb", "lib/postgis_functions.rb", "lib/postgis_functions/bbox.rb", "lib/postgis_functions/class.rb", "lib/postgis_functions/common.rb", "postgis_adapter.gemspec", "rails/init.rb", "script/console", "script/destroy", "script/generate", "spec/db/database_postgis.yml", "spec/db/models_postgis.rb", "spec/db/schema_postgis.rb", "spec/postgis_adapter/acts_as_geom_spec.rb", "spec/postgis_adapter/common_spatial_adapter_spec.rb", "spec/postgis_adapter_spec.rb", "spec/postgis_functions/bbox_spec.rb", "spec/postgis_functions/class_spec.rb", "spec/postgis_functions/common_spec.rb", "spec/postgis_functions_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "uninstall.rb"]
   s.has_rdoc = true
-  s.homepage = "http://github.com/nofxx/postgis_adapter"
+  s.homepage = %q{http://github.com/nofxx/postgis_adapter}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{postgis_adapter}
   s.rubygems_version = %q{1.3.1}
-  s.summary = "Postgis Adapter for Activer Record"
+  s.summary = %q{Postgis Adapter for Activer Record}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -23,16 +25,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 2.0.2"])
-      s.add_development_dependency(%q<newgem>, [">= 1.1.0"])
+      s.add_development_dependency(%q<newgem>, [">= 1.2.3"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<activerecord>, [">= 2.0.2"])
-      s.add_dependency(%q<newgem>, [">= 1.1.0"])
+      s.add_dependency(%q<newgem>, [">= 1.2.3"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 2.0.2"])
-    s.add_dependency(%q<newgem>, [">= 1.1.0"])
+    s.add_dependency(%q<newgem>, [">= 1.2.3"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
 end

data/spec/db/database_postgis.yml

@@ -1,4 +1,4 @@
 adapter: postgresql
-database: postgis_plugin_test
+database: postgis_plugin
 username: postgres
 password:

data/spec/db/models_postgis.rb

@@ -53,4 +53,5 @@ class Street < ActiveRecord::Base
 end
 
 class CommonGeo < ActiveRecord::Base
+  acts_as_geom :geom
 end

data/spec/db/schema_postgis.rb

@@ -54,33 +54,30 @@ ActiveRecord::Schema.define() do
     t.point "geom", :null => false, :with_m => true, :with_z => true
   end
 
-   create_table "table_srid_line_strings", :force => true do |t|
-    t.line_string "geom", :null => false , :srid => 123
+  create_table "table_srid_line_strings", :force => true do |t|
+    t.line_string "geom", :null => false , :srid => 4326
   end
 
   create_table "table_srid4d_polygons", :force => true do |t|
-    t.polygon "geom", :with_m => true, :with_z => true, :srid => 123
+    t.polygon "geom", :with_m => true, :with_z => true, :srid => 4326
   end
 
-        create_table :cities do |t|
-          t.string :data, :limit => 100
-          t.integer :value
-          t.polygon  :geom,:null=>false,:srid=>123
-        end
-
-        create_table :positions do |t|
-          t.string :data, :limit => 100
-          t.integer :value
-          t.point  :geom,:null=>false,:srid=>123
-        end
-
-        create_table :streets do |t|
-          t.string :data, :limit => 100
-          t.integer :value
-          t.line_string  :geom,:null=>false,:srid=>123
-        end
-
+  create_table :cities do |t|
+    t.string :data, :limit => 100
+    t.integer :value
+    t.polygon  :geom,:null=>false,:srid=>4326
+  end
 
+  create_table :positions do |t|
+    t.string :data, :limit => 100
+    t.integer :value
+    t.point  :geom,:null=>false,:srid=>4326
+  end
 
+  create_table :streets do |t|
+    t.string :data, :limit => 100
+    t.integer :value
+    t.line_string  :geom,:null=>false,:srid=>4326
+  end
 
 end

data/spec/postgis_adapter/acts_as_geom_spec.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe "ActsAsGeom" do
+
+  before(:each) do
+    class DiffColumn < ActiveRecord::Base
+      acts_as_geom :ponto
+    end
+    
+    class NotInDb < ActiveRecord::Base
+      acts_as_geom :geom
+    end
+  end
+
+  it "should get the geom type" do
+    City.get_geom_type(:geom).should eql(:polygon)
+  end
+
+  it "should not interfere with migrations" do
+    NotInDb.get_geom_type(:geom).should be_nil
+  end
+
+  it "should query a diff column name" do
+   # DiffColumn
+  end
+
+end

data/spec/{common_spatial_adapter_spec.rb → postgis_adapter/common_spatial_adapter_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 describe "CommonSpatialAdapter" do
 

data/spec/postgis_adapter_spec.rb

@@ -48,9 +48,9 @@ describe "PostgisAdapter" do
     end
 
     it "should test multipoint" do
-      mp = TableMultiPoint.create!(:geom => MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]]))
+      mp = TableMultiPoint.create!(:geom => MultiPoint.from_coordinates([[12.4,-4326.3],[-65.1,4326.4],[4326.55555555,4326]]))
       find = TableMultiPoint.find(:first)
-      find.geom.should == MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]])
+      find.geom.should == MultiPoint.from_coordinates([[12.4,-4326.3],[-65.1,4326.4],[4326.55555555,4326]])
     end
 
   end
@@ -68,18 +68,18 @@ describe "PostgisAdapter" do
    end
 
    it "should test_srid_line_string" do
-    ls = TableSridLineString.create!(:geom => LineString.from_coordinates([[1.4,2.5],[1.5,6.7]],123))
+    ls = TableSridLineString.create!(:geom => LineString.from_coordinates([[1.4,2.5],[1.5,6.7]],4326))
     ls = TableSridLineString.find(:first)
-    ls_e = LineString.from_coordinates([[1.4,2.5],[1.5,6.7]],123)
+    ls_e = LineString.from_coordinates([[1.4,2.5],[1.5,6.7]],4326)
     ls.geom.should be_instance_of(LineString)
-    ls.geom.srid.should eql(123)
+    ls.geom.srid.should eql(4326)
     end
 
 
     it "hsould test_multi_line_string" do
-      ml = TableMultiLineString.create!(:geom => MultiLineString.from_line_strings([LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]]),LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012],[45.123,123.3]])]))
+      ml = TableMultiLineString.create!(:geom => MultiLineString.from_line_strings([LineString.from_coordinates([[1.5,45.2],[-54.432612,-0.012]]),LineString.from_coordinates([[1.5,45.2],[-54.432612,-0.012],[45.4326,4326.3]])]))
       find = TableMultiLineString.find(:first)
-      find.geom.should == MultiLineString.from_line_strings([LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]]),LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012],[45.123,123.3]])])
+      find.geom.should == MultiLineString.from_line_strings([LineString.from_coordinates([[1.5,45.2],[-54.432612,-0.012]]),LineString.from_coordinates([[1.5,45.2],[-54.432612,-0.012],[45.4326,4326.3]])])
     end
   end
 
@@ -103,11 +103,11 @@ describe "PostgisAdapter" do
     end
 
     it "should test_srid_4d_polygon" do
-      pg = TableSrid4dPolygon.create(:geom => Polygon.from_coordinates([[[0,0,2,-45.1],[4,0,2,5],[4,4,2,4.67],[0,4,2,1.34],[0,0,2,-45.1]],[[1,1,2,12.3],[3,1,2,123],[3,3,2,12.2],[1,3,2,12],[1,1,2,12.3]]],123,true,true))
+      pg = TableSrid4dPolygon.create(:geom => Polygon.from_coordinates([[[0,0,2,-45.1],[4,0,2,5],[4,4,2,4.67],[0,4,2,1.34],[0,0,2,-45.1]],[[1,1,2,12.3],[3,1,2,4326],[3,3,2,12.2],[1,3,2,12],[1,1,2,12.3]]],4326,true,true))
       find = TableSrid4dPolygon.find(:first)
-      pg_e = Polygon.from_coordinates([[[0,0,2,-45.1],[4,0,2,5],[4,4,2,4.67],[0,4,2,1.34],[0,0,2,-45.1]],[[1,1,2,12.3],[3,1,2,123],[3,3,2,12.2],[1,3,2,12],[1,1,2,12.3]]],123,true,true)
+      pg_e = Polygon.from_coordinates([[[0,0,2,-45.1],[4,0,2,5],[4,4,2,4.67],[0,4,2,1.34],[0,0,2,-45.1]],[[1,1,2,12.3],[3,1,2,4326],[3,3,2,12.2],[1,3,2,12],[1,1,2,12.3]]],4326,true,true)
       pg.geom.should == pg_e
-      pg.geom.srid.should eql(123)
+      pg.geom.srid.should eql(4326)
     end
   end
 
@@ -134,7 +134,7 @@ describe "PostgisAdapter" do
         create_table "parks", :force => true do |t|
           t.column "data" , :string, :limit => 100
           t.column "value", :integer
-          t.column "geom", :point,:null=>false,:srid=>123
+          t.column "geom", :point,:null=>false,:srid=>4326
         end
         add_index "parks","geom",:spatial=>true,:name => "example_spatial_index"
       end
@@ -143,13 +143,13 @@ describe "PostgisAdapter" do
     end
 
     it "should create some points" do
-      Park.create!(:data => "Point1", :geom => Point.from_x_y(1.2,0.75,123))
-      Park.create!(:data => "Point2",:geom => Point.from_x_y(0.6,1.3,123))
-      Park.create!(:data => "Point3", :geom => Point.from_x_y(2.5,2,123))
+      Park.create!(:data => "Point1", :geom => Point.from_x_y(1.2,0.75,4326))
+      Park.create!(:data => "Point2",:geom => Point.from_x_y(0.6,1.3,4326))
+      Park.create!(:data => "Point3", :geom => Point.from_x_y(2.5,2,4326))
     end
 
     it "should find by geom" do
-      pts = Park.find_all_by_geom(LineString.from_coordinates([[0,0],[2,2]],123))
+      pts = Park.find_all_by_geom(LineString.from_coordinates([[0,0],[2,2]],4326))
       pts.should be_instance_of(Array)
       pts.length.should eql(2)
       pts[0].data.should match /Point/
@@ -157,12 +157,12 @@ describe "PostgisAdapter" do
     end
 
     it "should find by geom again" do
-      pts = Park.find_all_by_geom(LineString.from_coordinates([[2.49,1.99],[2.51,2.01]],123))
+      pts = Park.find_all_by_geom(LineString.from_coordinates([[2.49,1.99],[2.51,2.01]],4326))
       pts[0].data.should eql("Point3")
     end
 
     it "should find by geom column bbox condition" do
-      pts = Park.find_all_by_geom([[0,0],[2,2],123])
+      pts = Park.find_all_by_geom([[0,0],[2,2],4326])
       pts.should be_instance_of(Array)
       pts.length.should eql(2)
       pts[0].data.should match /Point/

data/spec/postgis_functions/bbox_spec.rb

@@ -4,18 +4,17 @@ require File.dirname(__FILE__) + '/../spec_helper.rb'
 describe "Point" do
 
    before(:all) do
-     @c1 ||= City.create!(:data => "City1", :geom => Polygon.from_coordinates([[[12,45],[45,41],[4,1],[12,45]],[[2,5],[5,1],[14,1],[2,5]]],123))
-     @c2 ||= City.create!(:data => "City1", :geom => Polygon.from_coordinates([[[22,66],[65,65],[20,10],[22,66]],[[10,15],[15,11],[34,14],[10,15]]],123))
-     @c3 ||= City.create!(:data => "City3", :geom => Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]],123))
-     @s1 ||= Street.create!(:data => "Street1", :geom => LineString.from_coordinates([[1,1],[2,2]],123))
-     @s2 ||= Street.create!(:data => "Street2", :geom => LineString.from_coordinates([[4,4],[7,7]],123))
-     @s3 ||= Street.create!(:data => "Street3", :geom => LineString.from_coordinates([[8,8],[18,18],[20,20],[25,25],[30,30],[38,38]],123))
-     @s4 ||= Street.create!(:data => "Street3", :geom => LineString.from_coordinates([[10,8],[15,18]],123))
-     @p1 ||= Position.create!(:data => "Point1", :geom => Point.from_x_y(1,1,123))
-     @p2 ||= Position.create!(:data => "Point2", :geom => Point.from_x_y(5,5,123))
-     @p3 ||= Position.create!(:data => "Point3", :geom => Point.from_x_y(8,8,123))
+     @c1 ||= City.create!(:data => "City1", :geom => Polygon.from_coordinates([[[12,45],[45,41],[4,1],[12,45]],[[2,5],[5,1],[14,1],[2,5]]],4326))
+     @c2 ||= City.create!(:data => "City1", :geom => Polygon.from_coordinates([[[22,66],[65,65],[20,10],[22,66]],[[10,15],[15,11],[34,14],[10,15]]],4326))
+     @c3 ||= City.create!(:data => "City3", :geom => Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]],4326))
+     @s1 ||= Street.create!(:data => "Street1", :geom => LineString.from_coordinates([[1,1],[2,2]],4326))
+     @s2 ||= Street.create!(:data => "Street2", :geom => LineString.from_coordinates([[4,4],[7,7]],4326))
+     @s3 ||= Street.create!(:data => "Street3", :geom => LineString.from_coordinates([[8,8],[18,18],[20,20],[25,25],[30,30],[38,38]],4326))
+     @s4 ||= Street.create!(:data => "Street3", :geom => LineString.from_coordinates([[10,8],[15,18]],4326))
+     @p1 ||= Position.create!(:data => "Point1", :geom => Point.from_x_y(1,1,4326))
+     @p2 ||= Position.create!(:data => "Point2", :geom => Point.from_x_y(5,5,4326))
+     @p3 ||= Position.create!(:data => "Point3", :geom => Point.from_x_y(8,8,4326))
    end
-   
 
    describe "BBox operations" do
 
@@ -27,49 +26,17 @@ describe "Point" do
        @p1.bbox(">>", @c1).should be_false
      end
 
-     it  do
-       @p1.should be_strictly_left_of(@c1)
-     end
-
-     it  do
-       @p1.should_not be_strictly_right_of(@c1)
-     end
-
-     it do
-       @p1.should_not be_overlaps_or_right_of(@c1)
-     end
-
-     it do
-       @p1.should be_overlaps_or_left_of(@c1)
-     end
-
-     it do
-       @p1.should_not be_completely_contained_by(@c1)
-     end
-
-     it  do
-       @c2.completely_contains?(@p1).should be_false
-     end
-
-     it  do
-       @p1.should be_overlaps_or_above(@c1)
-     end
-
-     it  do
-       @p1.should be_overlaps_or_below(@c1)
-     end
-
-     it do
-       @p1.should_not be_strictly_above(@c1)
-     end
-
-     it do
-       @p1.should_not be_strictly_below(@c1)
-     end
-
-     it do
-       @p1.interacts_with?(@c1).should be_false
-     end
+     it do @p1.should be_strictly_left_of(@c1) end
+     it do @p1.should_not be_strictly_right_of(@c1) end
+     it do @p1.should_not be_overlaps_or_right_of(@c1) end
+     it do @p1.should be_overlaps_or_left_of(@c1) end
+     it do @p1.should_not be_completely_contained_by(@c1) end
+     it do @c2.completely_contains?(@p1).should be_false end
+     it do @p1.should be_overlaps_or_above(@c1) end
+     it do @p1.should be_overlaps_or_below(@c1) end
+     it do @p1.should_not be_strictly_above(@c1) end
+     it do @p1.should_not be_strictly_below(@c1) end
+     it do @p1.interacts_with?(@c1).should be_false end
 
      it do
        @p1.binary_equal?(@c1).should be_false
@@ -79,6 +46,6 @@ describe "Point" do
        @p1.same_as?(@c1).should be_false
      end
 
-
    end
- end
+
+ end

data/spec/postgis_functions/common_spec.rb

@@ -0,0 +1,281 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe "Common Functions" do
+
+  before(:all) do
+    @c1 ||= City.create!(:data => "City1", :geom => Polygon.from_coordinates([[[12,45],[45,41],[4,1],[12,45]],[[2,5],[5,1],[14,1],[2,5]]],4326))
+    @c2 ||= City.create!(:data => "City1", :geom => Polygon.from_coordinates([[[22,66],[65,65],[20,10],[22,66]],[[10,15],[15,11],[34,14],[10,15]]],4326))
+    @c3 ||= City.create!(:data => "City3", :geom => Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]],4326))
+    @s1 ||= Street.create!(:data => "Street1", :geom => LineString.from_coordinates([[1,1],[2,2]],4326))
+    @s2 ||= Street.create!(:data => "Street2", :geom => LineString.from_coordinates([[4,4],[7,7]],4326))
+    @s3 ||= Street.create!(:data => "Street3", :geom => LineString.from_coordinates([[8,8],[18,18],[20,20],[25,25],[30,30],[38,38]],4326))
+    @s4 ||= Street.create!(:data => "Street4", :geom => LineString.from_coordinates([[10,8],[15,18]],4326))
+    @p1 ||= Position.create!(:data => "Point1", :geom => Point.from_x_y(1,1,4326))
+    @p2 ||= Position.create!(:data => "Point2", :geom => Point.from_x_y(5,5,4326))
+    @p3 ||= Position.create!(:data => "Point3", :geom => Point.from_x_y(8,8,4326))
+    @p4 ||= Position.create!(:data => "Point4", :geom => Point.from_x_y(18.1,18,4326))
+    @p5 ||= Position.create!(:data => "Point5", :geom => Point.from_x_y(30,30,4326))
+  end
+
+  describe "Point" do
+
+    it "should find the closest other point" do
+      Position.close_to(@p1.geom,4326)[0].data.should == @p1.data
+    end
+
+    it "should find the closest other point" do
+      Position.closest_to(@p1.geom,4326).data.should == @p1.data
+    end
+
+    it { @p1.distance_to(@s2).should be_close(4.24264068711928, 0.0001) }
+    it { @p1.distance_to(@s3).should be_close(9.89949493661167, 0.0001) }
+    it { @p2.distance_to(@s3).should be_close(4.24264068711928, 0.0001) }
+    it { @p1.distance_to(@p2).should be_close(5.65685424949238, 0.0001) }
+    it { @p1.distance_to(@c1).should be_close(3.0, 0.0001) }
+    it { @p1.distance_to(@c2).should be_close(21.0237960416286, 0.000001) }
+    it { @p1.distance_to(@s2).should be_close(4.24264068711928, 0.000001) }
+    it { @p1.distance_sphere_to(@p2).should be_close(628516.874554178, 0.0001) }
+    it { @p1.distance_sphere_to(@p3).should be_close(1098726.61466584, 0.00001) }
+    it { @p1.distance_spheroid_to(@p2).should be_close(627129.50,0.01) }
+    it { @p1.distance_spheroid_to(@p2).should be_close(627129.502639041, 0.000001) }
+    it { @p1.distance_spheroid_to(@p3).should be_close(1096324.48117672, 0.000001) }
+    
+    it { @p1.should_not be_inside(@c1) }
+    it { @p1.should be_outside(@c1) }
+    it { @p1.should be_inside_circle(2.0,2.0,20.0) }
+    it { @p1.should_not be_inside_circle(50,50,2) }
+    it { @p1.should be_in_bounds(@s1) }
+    it { @p3.should_not be_in_bounds(@s1, 1) }
+    it { @p4.in_bounds?(@s3, 0.01).should be_false } 
+    
+    it { @p1.azimuth(@p2).should be_close(0.785398163397448,0.000001) }
+    it { @p1.azimuth(@s2).should raise_error }
+    it { @p1.disjoint?(@s2).should be_true }
+    it { @p3.polygonize.geometries.should be_empty }
+    it { @p4.where_on_line(@s3).should be_close(0.335, 0.0001) }   
+    it { @s3.locate_point(@p4).should be_close(0.335, 0.1)}
+    it { @s3.interpolate_point(0.335).x.should be_close(18.05, 0.01) }
+    
+    it { @p1.relate?(@s3, "T*T***FF*").should be_false }
+    it { @p1.relate?(@s3).should eql("FF0FFF102") }
+
+    it "should transform srid" do
+      @p1.geom = @p1.transform(29101) 
+      @p1.geom.srid.should eql(29101)
+    end
+
+    it "should see in what fraction of the ls it is" do
+      @p1.where_on_line(@s1).should eql(0.0)
+    end
+
+  end
+
+  describe "Polygon" do
+
+    it "sort by area size" do
+      City.by_area.first.data.should == "City1" #[@c1, @c2, @c3]
+    end
+
+    it "find all cities that contains a point" do
+      City.contains(@p1.geom, 4326).should eql([])
+    end
+
+    it "should find one city (first) that contains a point" do
+      City.contain(@p4.geom, 4326).data.should eql("City1")
+    end
+    
+    it { @c2.should be_closed }
+    it { @c3.area.should be_close(1093.270089, 0.1) }
+    it { @c2.area.should be_close(1159.5, 0.1) }
+
+    it { @c2.dimension.should eql(2) }
+    it { @c2.perimeter.should be_close(219.770013855493, 0.1) }
+    it { @c2.perimeter3d.should be_close(219.770013855493, 0.1) }
+    it { @c1.contains?(@p1).should be_false }
+    it { @c1.contains?(@p4).should be_true }
+
+    it { @c1.should_not be_spatially_equal(@c2) }
+
+    it { @c1.covers?(@p1).should be_false }
+    it { @c1.covers?(@p4).should be_true }
+    it { @c1.should_not be_within(@c2) }
+
+    it "city overlaps point?" do
+      lambda { @c3.overlaps?(@c2) }.should raise_error # WHY??
+    end
+
+    it "should get a polygon for envelope" do
+      @c2.envelope.should be_instance_of(Polygon)
+    end
+
+    it "should get a polygon for envelope" do
+      @c2.envelope.rings[0].points[0].should be_instance_of(Point)
+    end
+
+    it "should get the center" do
+      @c2.centroid.x.should be_close(36.2945235015093,0.00001)
+      @c2.centroid.y.should be_close(48.3211154233146,0.00001)
+    end
+
+    it "should get the center with the correct srid" do
+      @c1.centroid.srid.should eql(4326)
+    end
+
+    it "distance from another" do
+      @c1.distance_to(@c3).should eql(0.0)
+    end
+
+    it "distance to a linestring" do
+      @c1.distance_to(@s1).should be_close(1.8,0.001)
+    end
+
+    it "should simplify me" do
+      @c3.simplify.should be_instance_of(Polygon)
+    end
+
+    it "should simplify me number of points" do
+      @c3.simplify[0].length.should eql(4)
+    end
+
+    #Strange again.... s2 s3 ... error
+    it { @c3.touches?(@s1).should be_false }
+    it { @c2.should be_simple }
+    it { @c2.disjoint?(@p2).should be_true }
+    it { @c3.polygonize.should have(2).geometries }
+
+    # weird...
+    # it  do
+    #   @c1.disjoint?(@s2).should be_true
+    # end
+
+  end
+
+  describe "LineString" do
+
+    it "should sort by size" do
+      Street.by_length.first.data.should == "Street1"
+      Street.by_length.last.data.should == "Street3"
+    end
+
+    it "largest" do
+      Street.longest.data.should == "Street3"
+    end
+
+    describe "Length" do
+      it { @s1.length.should be_close(1.4142135623731, 0.000001) }
+      it { @s2.length.should be_close(4.2, 0.1) }
+      it { @s3.length.should be_close(42.4264068, 0.001) }
+      it { @s1.length_spheroid.should be_close(156876.1494,0.0001) }
+      it { @s1.length_3d.should be_close(1.4142135623731,0.0001) }
+    end
+
+    it { @s1.crosses?(@s2).should be_false }
+    it { @s4.crosses?(@s3).should be_true }
+    it { @s1.touches?(@s2).should be_false }
+    it { @s4.touches?(@s3).should be_false }
+
+    it "should intersect with linestring" do
+      @s4.intersects?(@s3).should be_true
+    end
+
+    it "should not intersect with this linestring" do
+      @s4.intersects?(@s1).should be_false
+    end
+
+    it "intersection with a point" do
+      @s1.intersection(@p2).should be_instance_of(GeometryCollection)
+    end
+
+    describe "Self" do
+
+      it do
+        @s1.envelope.should be_instance_of(Polygon)
+      end
+
+      it "should get a polygon for envelope" do
+        @s1.envelope.rings[0].points[0].should be_instance_of(Point)
+      end
+
+      it "should get the center" do
+        @s1.centroid.x.should be_close(1.5,0.01)
+        @s1.centroid.y.should be_close(1.5,0.01)
+      end
+
+      it "should get the center with the correct srid" do
+        @s1.centroid.srid.should eql(4326)
+      end
+
+      it "number of points" do
+        @s3.num_points.should eql(6)
+      end
+
+      it "startpoint" do
+        @s3.start_point.should be_instance_of(Point)
+        @s3.start_point.x.should be_close(8.0, 0.1)
+      end
+
+      it "endpoint" do
+        @s2.end_point.should be_instance_of(Point)
+        @s2.end_point.x.should be_close(7.0, 0.1)
+      end
+
+      it { @s1.should_not be_envelopes_intersect(@s2) }
+      it { @s1.boundary.should be_instance_of(MultiPoint) }
+
+    end
+
+    describe "Distance" do
+
+      it { @s1.distance_to(@p3).should be_close(8.48528137423857,0.0001) }
+      it { @s1.distance_to(@p3).should be_close(8.48,0.01) }
+
+      it do
+        lambda { @p1.distance_spheroid_to(@c3) }.should raise_error
+      end
+
+      it do
+        lambda { @p3.distance_spheroid_to(@s1) }.should raise_error
+      end
+
+    end
+
+    it do @s1.locate_point(@p1).should eql(0.0) end
+    it do @s1.locate_point(@p2).should eql(1.0) end
+    
+    it "should simplify a line" do
+      @s3.simplify.points.length.should eql(2)
+    end
+
+    it "should simplify the first correcty" do
+      @s3.simplify.points[0].y.should be_close(8.0, 0.1)
+    end
+
+    it "should simplify the last correcty" do
+      @s3.simplify.points[1].y.should be_close(38.0, 0.1)
+    end
+
+    it { @s1.overlaps?(@c2).should be_false }
+    it { @s1.overlaps?(@s2).should be_false }
+    it { @s1.convex_hull.should be_instance_of(LineString) }
+    it { @s1.line_substring(0.2,0.5).should be_instance_of(LineString) }
+    
+    it do
+      @s1.interpolate_point(0.7).should be_instance_of(Point)
+      @s1.interpolate_point(0.7).x.should be_close(1.7,0.1)
+    end
+
+    it { @s1.should be_simple }
+    it { @s1.disjoint?(@s2).should be_true }
+    it { @s1.polygonize.should be_instance_of(GeometryCollection) }
+    it { @s3.polygonize.geometries.should be_empty }
+    it { @s2.locate_along_measure(1.6).should be_nil }
+    it { @s2.locate_between_measures(0.1,0.3).should be_nil }
+
+    it "should build area" do
+      @s2.build_area.should be_nil
+    end
+
+  end
+
+end
+