postgis_adapter 0.3.0 → 0.3.4

data/Manifest.txt

@@ -7,7 +7,6 @@ init.rb
 install.rb
 lib/postgis_adapter.rb
 lib/postgis_adapter/acts_as_geom.rb
-lib/postgis_adapter/acts_as_geom_flymake.rb
 lib/postgis_adapter/common_spatial_adapter.rb
 lib/postgis_functions.rb
 lib/postgis_functions/bbox.rb

data/README.rdoc

@@ -5,6 +5,7 @@ in a transparent way (that is like the other base data type columns).
 It also provides a way to manage these columns in migrations.
 
 This fork adds handy methods to make geometrical calculations on postgis.
+Based on http://georuby.rubyforge.org Spatial Adapter
 
 Postgis Manual - http://postgis.refractions.net/documentation/manual-svn
 
@@ -322,5 +323,5 @@ Project Tracker http://nofxx.lighthouseapp.com/projects/20712-postgis_adapter
 
 === SpatialAdapter
 
-
+http://georuby.rubyforge.org
 guilhem.vellut+georuby@gmail.com.

data/lib/postgis_adapter/common_spatial_adapter.rb

@@ -1,9 +1,12 @@
-# #
+#
 # PostGIS Adapter
 #
 # Common Spatial Adapter for ActiveRecord
 #
+# Code from
+# http://georuby.rubyforge.org Spatial Adapter
 #
+
 #Addition of a flag indicating if the index is spatial
 ActiveRecord::ConnectionAdapters::IndexDefinition.class_eval do
   attr_accessor :spatial

data/lib/postgis_adapter.rb

@@ -1,8 +1,9 @@
-# #
+#
 # PostGIS Adapter
 #
-# Spatial Adapter PostGIS Adapter for ActiveRecord
 #
+# Code from
+# http://georuby.rubyforge.org Spatial Adapter
 #
 require 'activerecord'
 require 'active_record/connection_adapters/postgresql_adapter'
@@ -18,7 +19,7 @@ include GeoRuby::SimpleFeatures
 include SpatialAdapter
 
 module PostgisAdapter
-  VERSION = '0.3.0'
+  VERSION = '0.3.4'
 end
 
 #tables to ignore in migration : relative to PostGIS management of geometric columns

data/lib/postgis_functions/class.rb

@@ -1,31 +1,30 @@
 module PostgisFunctions
-  
-  
-    ###
-    ##
+
     #
     # Class Methods
     #
-    # Falling back to AR here.
-    #
     module ClassMethods
 
       #
-      # Returns the closest record 
-      #
-      def closest_to(p, srid=4326)
-        find(:first, :order => "ST_Distance(geom, GeomFromText('POINT(#{p.x} #{p.y})', #{srid}))" )
+      # Returns the closest record
+      def closest_to(p, opts = {})
+        srid = opts.delete(:srid) || 4326
+        opts.merge!(:order => "ST_Distance(geom, GeomFromText('POINT(#{p.x} #{p.y})', #{srid}))")
+        find(:first, opts)
       end
 
-      def close_to(p, srid=4326)
-        find(:all, :order => "ST_Distance(geom, GeomFromText('POINT(#{p.x} #{p.y})', #{srid}))" )
+      #
+      # Order by distance
+      def close_to(p, opts = {})
+        srid = opts.delete(:srid) || 4326
+        opts.merge!(:order => "ST_Distance(geom, GeomFromText('POINT(#{p.x} #{p.y})', #{srid}))")
+        find(:all, opts)
       end
 
-      #
-      #
-      #
-      def by_length sort='asc'
-        find(:all, :order => "ST_length(geom) #{sort}" )
+      def by_length opts = {}
+        sort = opts.delete(:sort) || 'asc'
+        opts.merge!(:order => "ST_length(geom) #{sort}")
+        find(:all, opts)
       end
 
       def longest
@@ -58,7 +57,7 @@ module PostgisFunctions
       end
 
     end
-  
-  
-  
-end
+
+
+
+end

data/lib/postgis_functions/common.rb

@@ -379,7 +379,7 @@ module PostgisFunctions
   #
   # Returns Geometry ST_Polygonize(geometry set geomfield);
   #
-  def polygonize#(geom)
+  def polygonize
     postgis_calculate(:polygonize, self)
   end
 
@@ -437,8 +437,12 @@ module PostgisFunctions
   #
   # Return Geometry ST_Transform(geometry g1, integer srid);
   #
+  def transform!(new_srid)
+    self[get_column_name] = postgis_calculate("Transform", self, new_srid)
+  end
+
   def transform(new_srid)
-    postgis_calculate("Transform", self, new_srid)
+    dup.transform!(new_srid)
   end
 
   #
@@ -453,6 +457,52 @@ module PostgisFunctions
     postgis_calculate("segmentize", self, max_length)
   end
 
+  #
+  # Returns the instance`s geom srid
+  #
+  def srid
+    self[get_column_name].srid
+  end
+
+  #
+  # Return UTM Zone for a geom
+  #
+  # Return Integer
+  def utm_zone
+    if srid == 4326
+      geom = centroid
+    else
+      geomdup = transform(4326)
+      mezzo = geomdup.length / 2
+      geom = case geomdup
+             when Point      then  geomdup
+             when LineString then  geomdup[mezzo]
+             else
+               geomgeog[mezzo][geomgeo[mezzo]/2]
+             end
+
+    end
+
+    pref = geom.y > 0 ? 32700 : 32600
+    zone = ((geom.x + 180) / 6 + 1).to_i
+    zone + pref
+  end
+
+  #
+  # Returns the Geometry in its UTM Zone
+  #
+  # Return Geometry
+  def to_utm!(utm=nil)
+    utm ||= utm_zone
+    self[get_column_name] = transform(utm)
+  end
+
+  def to_utm
+    dup.to_utm!
+  end
+
+  #
+  #
   #
   # LINESTRING
   #
@@ -623,15 +673,24 @@ module PostgisFunctions
   end
 
 
-  ####
-  ###
-  ##
+  #
+  #
+  #
   #
   # POINT
   #
   #
+  #
+  #
   module PointFunctions
 
+    #
+    #  Some nice getters
+    #
+    def x;     @x ||= self[get_column_name].x;    end
+    def y;     @y ||= self[get_column_name].y;    end
+    def z;     @z ||= self[get_column_name].z;    end
+
     #
     # Returns a float between 0 and 1 representing the location of the closest point
     # on LineString to the given Point, as a fraction of total 2d line length.
@@ -710,12 +769,15 @@ module PostgisFunctions
 
   end
 
-  ###
-  ##
+  #
+  #
+  #
   #
   # Polygon
   #
   #
+  #
+  #
   module PolygonFunctions
 
     #

data/lib/postgis_functions.rb

@@ -11,13 +11,13 @@
 #
 # Some links:
 #
-# PostGis Manual -  http://postgis.refractions.net/documentation/manual-svn/ch07.html
+# PostGis Manual - http://postgis.refractions.net/documentation/manual-svn/ch07.html
 # Earth Spheroid - http://en.wikipedia.org/wiki/Figure_of_the_Earth
 #
-#
+
 module PostgisFunctions
+  # WGS84 Spheroid
   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 = {})
     subjects = [subjects] unless subjects.respond_to?(:map)
@@ -29,24 +29,24 @@ module PostgisFunctions
   private
 
   def get_column_name
-    @geo_column ||= postgis_geoms[:columns].first
+    @geo_column ||= postgis_geoms[:columns]
   end
 
   #
-  # Construct the postgis sql query
+  # Construct the PostGIS SQL query
   #
-  # Area return in square feet
-  # Distance/DWithin/Length/Perimeter —  in projected units.
-  # DistanceSphere/Spheroid —  in meters.
+  # Returns:
+  # Area/Distance/DWithin/Length/Perimeter  =>  projected units
+  # DistanceSphere/Spheroid  =>  meters
   #
   def construct_geometric_sql(type,geoms,options)
 
     tables = geoms.map do |t| {
-      :class => t.class.to_s.downcase.pluralize,
+      :name => t.class.table_name,
       :uid =>  unique_identifier,
       :id => t[:id] }
     end
-    
+
     # Implement a better way for options?
     if options.instance_of? Hash
       transform = options.delete(:transform)
@@ -56,7 +56,7 @@ module PostgisFunctions
     fields      = tables.map { |f| "#{f[:uid]}.#{get_column_name}" }     # W1.geom
     fields.map! { |f| "ST_Transform(#{f}, #{transform})" } if transform  # ST_Transform(W1.geom,x)
     conditions  = tables.map { |f| "#{f[:uid]}.id = #{f[:id]}" }         # W1.id = 5
-    tables.map! { |f| "#{f[:class]} #{f[:uid]}" }                        # streets W1
+    tables.map! { |f| "#{f[:name]} #{f[:uid]}" }                         # streets W1
 
     #
     # Data  =>  SELECT Func(A,B)
@@ -149,7 +149,7 @@ end
 #ST_AsGML
 #ST_AsKML
 #ST_AsSVG
-#
+#  #EARTH_SPHEROID = "'SPHEROID[\"IERS_2003\",6378136.6,298.25642]'" # SRID =>
 #  def distance_convert(value, unit, from = nil)
 #    factor = case unit
 #    when :km, :kilo     then  1

data/postgis_adapter.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{postgis_adapter}
-  s.version = "0.3.0"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2009-03-09}
+  s.date = %q{2009-04-13}
   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/acts_as_geom_flymake.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.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 = %q{http://github.com/nofxx/postgis_adapter}
   s.rdoc_options = ["--main", "README.rdoc"]
@@ -25,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.2.3"])
+      s.add_development_dependency(%q<newgem>, [">= 1.3.0"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<activerecord>, [">= 2.0.2"])
-      s.add_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_dependency(%q<newgem>, [">= 1.3.0"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 2.0.2"])
-    s.add_dependency(%q<newgem>, [">= 1.2.3"])
+    s.add_dependency(%q<newgem>, [">= 1.3.0"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
 end

data/spec/db/schema_postgis.rb

@@ -80,4 +80,10 @@ ActiveRecord::Schema.define() do
     t.line_string  :geom,:null=>false,:srid=>4326
   end
 
+  create_table :common_geos do |t|
+    t.string :data, :limit => 100
+    t.integer :value
+    t.point  :geom,:null=>false,:srid=>4326
+  end
+
 end

data/spec/postgis_functions/class_spec.rb

@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe "Class 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))
+    @s1 ||= Street.create!(:data => "Street1", :geom => LineString.from_coordinates([[1,1],[88,88]],4326))
+    @p1 ||= Position.create!(:data => "Point1", :geom => Point.from_x_y(1,1,4326))
+  end
+
+  it "should find the closest other point" do
+    Position.close_to(@p1.geom, :srid => 4326)[0].data.should == @p1.data
+  end
+
+  it "should find the closest other point and limit" do
+    Position.close_to(@p1.geom, :limit => 10).should have(10).positions
+  end
+
+  it "should find the closest other point" do
+    Position.closest_to(@p1.geom).data.should == @p1.data
+  end
+
+  it "should sort by linestring length" do
+    Street.by_length.should be_instance_of(Array)
+  end
+
+  it "should sort by linestring length" do
+    Street.by_length(:limit => 10).should have(10).streets
+  end
+
+  it "should find the longest" do
+    Street.longest.should be_instance_of(Street)
+  end
+
+  it "should find all dwithin one" do
+    Position.all_within(@s1.geom).should be_instance_of(Array)
+  end
+
+  it "should find all dwithin one" do
+    City.by_perimeter.should be_instance_of(Array)
+  end
+
+  it "should sort by polygon area" do
+    City.by_area.should be_instance_of(Array)
+  end
+
+  it "should sort by all within" do
+    City.all_within(@s1.geom).should be_instance_of(Array)
+  end
+
+  it "should sort by all within" do
+    City.by_boundaries.should be_instance_of(Array)
+  end
+
+end

data/spec/postgis_functions/common_spec.rb

@@ -20,11 +20,11 @@ describe "Common Functions" do
   describe "Point" do
 
     it "should find the closest other point" do
-      Position.close_to(@p1.geom,4326)[0].data.should == @p1.data
+      Position.close_to(@p1.geom)[0].data.should == @p1.data
     end
 
     it "should find the closest other point" do
-      Position.closest_to(@p1.geom,4326).data.should == @p1.data
+      Position.closest_to(@p1.geom).data.should == @p1.data
     end
 
     it { @p1.distance_to(@s2).should be_close(4.24264068711928, 0.0001) }
@@ -72,6 +72,22 @@ describe "Common Functions" do
       @p2.where_on_line(@s2).should be_close(0.3333, 0.1)
     end
 
+    it "should have a srid getter" do
+      @p1.srid.should eql(29101)
+    end
+
+    it "should calculate the UTM srid" do
+      @p2.utm_zone.should eql(32731)
+    end
+
+    it "should convert to utm zone" do
+      lambda { @p2.to_utm! }.should change(@p2, :srid)
+    end
+
+    it { @p3.x.should be_close(8.0, 0.1) }
+    it { @p3.y.should be_close(8.0, 0.1) }
+    it { @p3.z.should be_close(0.0, 0.1) }
+
   end
 
   describe "Polygon" do
@@ -161,6 +177,10 @@ describe "Common Functions" do
     #   @c1.disjoint?(@p2).should be_true
     # end
 
+    it "should find the UTM zone" do
+      @c2.utm_zone.should eql(32737)
+    end
+
   end
 
   describe "LineString" do
@@ -292,6 +312,15 @@ describe "Common Functions" do
       @s2.segmentize(0.1).should be_instance_of(LineString)
     end
 
+    it "should find the UTM zone" do
+      @s2.utm_zone.should eql(32731)
+    end
+
+    it "should find the UTM zone" do
+      @s2.transform!(29101)
+      @s2.utm_zone.should eql(32732)
+    end
+
   end
 
 end

data/spec/postgis_functions_spec.rb

@@ -6,6 +6,7 @@ describe "PostgisFunctions" do
     @c1 ||= City.create!(:data => "City1", :geom => Polygon.from_coordinates([[[12,45],[45,42],[4,1],[12,45]],[[2,5],[5,1],[14,1],[2,5]]],4326))
     @s1 ||= Street.create!(:data => "Street1", :geom => LineString.from_coordinates([[-43,-20],[-42,-28]],4326))
     @p1 ||= Position.create!(:data => "Point1", :geom => Point.from_x_y(-43,-22,4326))
+    @cg ||= CommonGeo.create!(:data => "Point1", :geom => Point.from_x_y(-43,-22,4326))
   end
 
   describe "Common Mix" do
@@ -14,6 +15,14 @@ describe "PostgisFunctions" do
       @p1.distance_to(@s1).should be_close(0.248069469178417, 0.00000001)
     end
 
+    it "should calculate distance point to line" do
+      @cg.distance_to(@s1).should be_close(0.248069469178417, 0.00000001)
+    end
+
+     it "should calculate distance point to line" do
+      @p1.geom.as_kml.should eql("<Point>\n<coordinates>-43,-22</coordinates>\n</Point>\n")
+    end
+
     it "should calculate inside a city" do
       @p1.should_not be_inside(@c1)
     end
@@ -30,29 +39,4 @@ describe "PostgisFunctions" do
 
   end
 
-  #TODO is sorted rspec helper
-  describe "Class methods" do
-
-    it "should find all dwithin one" do
-      Position.all_within(@s1.geom).should be_instance_of(Array)
-    end
-
-    it "should find all dwithin one" do
-      City.by_perimeter.should be_instance_of(Array)
-    end
-
-    it "should sort by polygon area" do
-      City.by_area.should be_instance_of(Array)
-    end
-
-    it "should sort by all within" do
-      City.all_within(@s1.geom).should be_instance_of(Array)
-    end
-
-    it "should sort by all within" do
-      City.by_boundaries.should be_instance_of(Array)
-    end
-
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: postgis_adapter
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.4
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-09 00:00:00 -03:00
+date: 2009-04-13 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -63,7 +63,6 @@ files:
 - install.rb
 - lib/postgis_adapter.rb
 - lib/postgis_adapter/acts_as_geom.rb
-- lib/postgis_adapter/acts_as_geom_flymake.rb
 - lib/postgis_adapter/common_spatial_adapter.rb
 - lib/postgis_functions.rb
 - lib/postgis_functions/bbox.rb

data/lib/postgis_adapter/acts_as_geom_flymake.rb

@@ -1,69 +0,0 @@
-# #
-# PostGIS Adapter
-#
-#
-# http://github.com/nofxx/postgis_adapter
-#
-module PostgisFunctions
-  def self.included(base)
-    base.send :extend, ClassMethods
-  end
-
-  module ClassMethods
-    #
-    # class City
-    #   has_geom :point, :bounds
-    # end
-    #
-    # @city.bounds.area            #=>  12.456
-    # @city.point.distance_to(@p)  #=>  "1000"
-    # @product.tax_currency     #=>  "USD"
-    #
-    # Opts:
-    # :cents => "pennys"        #=>  @product.pennys
-    # :currency => "currency"   #=>  @product.currency
-    # :allow_nil => true
-    # :with_currency => true
-    #
-    def has_geom(*attributes)
-      config = {:with_currency => true, :converter => lambda { |m| m.to_money },
-                :allow_nil => false }.update(attributes.extract_options!)
-
-      attributes.each do |attr|
-        mapping = [[config[:cents] || "#{attr}_cents", 'cents']]
-        mapping << [config[:currency] || "#{attr}_currency", 'currency'] if config[:with_currency]
-
-        composed_of attr, :class_name => 'Money',:allow_nil => config[:allow_nil],
-           :mapping => mapping, :converter => config[:converter]
-      end
-
-    end
-    
-    # acts_as_geom :geom
-    def acts_as_geom(*columns)
-      cattr_accessor :postgis_geoms
-      geoms = columns.map do |g|
-        geom_type = get_geom_type(g)
-        case geom_type
-        when :point
-          send :include, PointFunctions
-        when :polygon
-          send :include, PolygonFunctions
-        when :line_string
-          send :include, LineStringFunctions
-        end
-        g
-      end
-      self.postgis_geoms = {:columns => geoms}#, :opts => options}
-    end
-
-    def get_geom_type(column)
-      self.columns.select { |c| c.name == column.to_s}.first.geometry_type
-    rescue ActiveRecord::StatementInvalid => e
-      nil
-    end
-  end
-end
-
-ActiveRecord::Base.send :include, PostgisFunctions
-