postgis_adapter 0.2.1 → 0.2.3

data/README.rdoc

@@ -11,32 +11,42 @@ Postgis Manual - http://postgis.refractions.net/documentation/manual-svn
 *PostGIS and Rails 2+ only*.
 
 
-=== Install
+== Install
 
 If you are using Spatial Adapter, *remove it first*.
 
 
-==== Dependencies
+=== Dependencies
 
 - georuby
 - postgres 8.3+
 - postgis  1.3+
 
 
-==== As gem:
+=== As gem:
+
+    sudo gem install postgis-adapter
+
+Rails:
+
+    config.gem "postgis_adapter"
+
+Github version:
+
+
+    sudo gem install nofxx-postgis_adapter --source http://gems.github.com
+
+Rails:
 
-    sudo gem sources --add http://gems.github.com
-    sudo gem install nofxx-postgis_adapter
-  
     config.gem "nofxx-postgis_adapter", :lib => "postgis_adapter", :source => "http://gems.github.com"
-    
-  
-==== As plugin:
+
+
+=== As plugin:
 
     script/plugin install git://github.com/nofxx/postgis_adapter.git
 
 
-=== How to Use
+== How to Use
 
 Geometric columns in your ActiveRecord models now appear just like
 any other column of other basic data types. They can also be dumped
@@ -55,11 +65,11 @@ The plugin will get this information by itself.
 Here is an example of PostGIS row creation and access, using the
 model and the table defined above :
 
-  	pt = TablePoint.new(:data => "Hello!",:geom => Point.from_x_y(1,2))
-  	pt.save
-  	pt = TablePoint.first
-  	puts pt.geom.x
-  	=> 1
+        pt = TablePoint.new(:data => "Hello!",:geom => Point.from_x_y(1,2))
+        pt.save
+        pt = TablePoint.first
+        puts pt.geom.x
+        => 1
 
 
 == PostGIS Functions
@@ -78,7 +88,7 @@ Here are this fork additions. To use it:
     @street =   Street.new( :line  => **LineString**   )
 
 
-=== Play!
+== Play!
 
     @place.inside?(@park)
     => true
@@ -91,9 +101,9 @@ Here are this fork additions. To use it:
     @street.crosses?(@park)
 
     @area.contains?(@place)
-    
 
-Polygons:
+
+=== Polygons:
 
     @park.area
     => 1345
@@ -103,9 +113,14 @@ Polygons:
 
     @park.overlaps?(@other_park)
     => false
-    
 
-Line Strings:
+Supports transform (useful to transform SRID to UTM for area in Km^2)
+
+    @park.area(SRID)
+    => Area with new SRID
+
+
+=== Line Strings:
 
     @street_east.intersects?(@street_west)
     => false
@@ -120,7 +135,7 @@ Line Strings:
     => 4.40853636
 
 
-=== And for classes:
+=== Class Methods
 
     City.close_to(@point)
     => [Array of cities in order by distance...
@@ -158,7 +173,7 @@ Line Strings:
     same_as?
 
 
-Or use a (almost) postgis like notation:
+Or use a (almost) PostGIS like notation:
 
     @area.bbox "<<", @point
 
@@ -200,15 +215,15 @@ the find_by_*geom_column*: Either by passing a geometric object directly,
 or passing an array with the 2 opposite corners of a bounding box
 (with 2 or 3 coordinates depending of the dimension of the data).
 
-  	Park.find_by_geom(LineString.from_coordinates([[1.4,5.6],[2.7,8.9],[1.6,5.6]]))
+        Park.find_by_geom(LineString.from_coordinates([[1.4,5.6],[2.7,8.9],[1.6,5.6]]))
 
   or
 
-  	Park.find_by_geom([[3,5.6],[19.98,5.9]])
+        Park.find_by_geom([[3,5.6],[19.98,5.9]])
 
 In PostGIS, since you can only use operations with geometries with the same SRID, you can add a third element representing the SRID of the bounding box to the array. It is by default set to -1:
 
-  	Park.find_by_geom([[3,5.6],[19.98,5.9],123])
+        Park.find_by_geom([[3,5.6],[19.98,5.9],123])
 
 
 
@@ -221,13 +236,13 @@ geometric column in PostGIS, along with the addition of a spatial
 index on the column :
 
     ActiveRecord::Schema.define do
-  	  create_table :places do |t|
+          create_table :places do |t|
         t.string :name
-      	t.point  :geom, :srid => 123, :with_z => true, :null => false
-    	 
+        t.point  :geom, :srid => 123, :with_z => true, :null => false
+
         t.timestamps
       end
-  	  add_index :table_points, :geom, :spatial=>true
+          add_index :table_points, :geom, :spatial=>true
     end
 
 
@@ -242,9 +257,9 @@ is different for each database). You would use it like this, if
 the geometric column is a point:
 
     fixture:
-  	  id: 1
-  	  data: HELLO
-  	  geom: <%= Point.from_x_y(123.5,321.9).to_yaml %>
+          id: 1
+          data: HELLO
+          geom: <%= Point.from_x_y(123.5,321.9).to_yaml %>
 
 
 === Annotate
@@ -295,7 +310,7 @@ Postgis Adapter is released under the MIT license.
 
 == Support
 
-Tested using rails 2.2.2 / postgresql 8.3.5 / postgis 1.3.3 / linux / osx
+Tested using rails 2.2.2/2.3.0 / postgresql 8.3.5 / postgis 1.3.3 / linux / osx
 
 Any questions, enhancement proposals, bug notifications or corrections:
 

data/lib/postgis_adapter.rb

@@ -4,7 +4,8 @@
 # Spatial Adapter PostGIS Adapter for ActiveRecord
 #
 #
-#require 'active_record'
+require 'activerecord'
+require 'active_record/connection_adapters/postgresql_adapter'
 require 'geo_ruby'
 require 'postgis_adapter/common_spatial_adapter'
 require 'postgis_functions'
@@ -17,7 +18,7 @@ include GeoRuby::SimpleFeatures
 include SpatialAdapter
 
 module PostgisAdapter
-  VERSION = '0.2.1'
+  VERSION = '0.2.3'
 end
 
 #tables to ignore in migration : relative to PostGIS management of geometric columns
@@ -250,7 +251,8 @@ SELECT * FROM geometry_columns WHERE f_table_name = '#{table_name}'
     end
 
     raw_geom_infos
-
+    rescue => e
+      nil
   end
 
 end

data/lib/postgis_functions/bbox.rb

@@ -10,7 +10,7 @@ module PostgisFunctions
   # These operators utilize indexes. They compare geometries by bounding boxes.
   #
   # You can use the literal forms or call directly using the 'bbox' method. eg.:
-  #  
+  #
   #   @point.bbox(">>", @area)
   #   @point.bbox("|&>", @area)
   #
@@ -125,4 +125,4 @@ module PostgisFunctions
   def same_as? other
     bbox("=", other)
   end
-end
+end

data/lib/postgis_functions/common.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # #
 #
 # COMMON GEOMETRICAL FUNCTIONS
@@ -19,7 +20,7 @@ module PostgisFunctions
   # (it must be noted ST_OrderingEquals is a little more stringent than
   # simply verifying order of points are the same).
   #
-  # This function will return false if either geometry is invalid even 
+  # This function will return false if either geometry is invalid even
   # if they are binary equal.
   #
   # Returns Boolean ST_Equals(geometry A, geometry B);
@@ -74,9 +75,9 @@ module PostgisFunctions
   def centroid
     postgis_calculate(:centroid, self)
   end
-  
+
   #
-  # Returns the closure of the combinatorial boundary of this Geometry. 
+  # Returns the closure of the combinatorial boundary of this Geometry.
   # The combinatorial boundary is defined as described in section 3.12.3.2 of the
   # OGC SPEC. Because the result of this function is a closure, and hence topologically
   # closed, the resulting boundary can be represented using representational
@@ -100,7 +101,7 @@ module PostgisFunctions
   def distance_to(other)
     postgis_calculate(:distance, [self, other]).to_f
   end
-  
+
   #
   # True if geometry A is completely inside geometry B.
   #
@@ -136,11 +137,11 @@ module PostgisFunctions
     postgis_calculate(:dwithin, [self, other], margin)
   end
   alias_method "in_bounds?", "d_within?"
-  
+
   #
-  # True if geometry B is completely inside geometry A. 
+  # True if geometry B is completely inside geometry A.
   #
-  # For this function to make sense, the source geometries must both be of the same 
+  # For this function to make sense, the source geometries must both be of the same
   # coordinate projection, having the same SRID. 'contains?' is the inverse of 'within?'.
   #
   # So a.contains?(b) is like b.within?(a) except in the case of invalid
@@ -156,7 +157,7 @@ module PostgisFunctions
   def contains? other
     postgis_calculate(:contains, [self, other])
   end
-  
+
   #
   # True if no point in Geometry A is outside Geometry B
   #
@@ -177,7 +178,7 @@ module PostgisFunctions
     postgis_calculate(:coveredby, [self, other])
   end
   alias_method "inside?", "covered_by?"
-  
+
   #
   # Eye-candy. See 'covered_by?'.
   #
@@ -230,8 +231,8 @@ module PostgisFunctions
   def simplify(tolerance=0.1)
     postgis_calculate(:simplify, self, tolerance)
   end
-  
-  
+
+
   def simplify!(tolerance=0.1)
     #FIXME: not good..
     self.update_attribute(get_column_name, simplify)
@@ -255,7 +256,7 @@ module PostgisFunctions
   #
   # True if Geometries "spatially intersect", share any portion of space.
   # False if they don't (they are Disjoint).
-  # 
+  #
   # 'overlaps?', 'touches?', 'within?' all imply spatial intersection.
   # If any of the aforementioned returns true, then the geometries also
   # spatially intersect. 'disjoint?' implies false for spatial intersection.
@@ -344,11 +345,11 @@ module PostgisFunctions
   def convex_hull
     postgis_calculate(:convexhull, self)
   end
-  
+
   #
   # Creates an areal geometry formed by the constituent linework of given geometry.
-  # The return type can be a Polygon or MultiPolygon, depending on input. 
-  # If the input lineworks do not form polygons NULL is returned. The inputs can 
+  # The return type can be a Polygon or MultiPolygon, depending on input.
+  # If the input lineworks do not form polygons NULL is returned. The inputs can
   # be LINESTRINGS, MULTILINESTRINGS, POLYGONS, MULTIPOLYGONS, and GeometryCollections.
   #
   # Returns Boolean ST_BuildArea(geometry A);
@@ -356,7 +357,7 @@ module PostgisFunctions
   def build_area
     postgis_calculate(:buildarea, self)
   end
-  
+
   #
   # Returns true if this Geometry has no anomalous geometric points, such as
   # self intersection or self tangency.
@@ -369,10 +370,10 @@ module PostgisFunctions
   alias_method "simple?", "is_simple?"
 
   #
-  # Aggregate. Creates a GeometryCollection containing possible polygons formed 
+  # Aggregate. Creates a GeometryCollection containing possible polygons formed
   # from the constituent linework of a set of geometries.
   #
-  # Geometry Collections are often difficult to deal with with third party tools, 
+  # Geometry Collections are often difficult to deal with with third party tools,
   # so use ST_Polygonize in conjunction with ST_Dump to dump the polygons out into
   #  individual polygons.
   #
@@ -381,75 +382,84 @@ module PostgisFunctions
   def polygonize#(geom)
     postgis_calculate(:polygonize, self)
   end
-  
+
   #
-  # Returns true if this Geometry is spatially related to anotherGeometry, 
-  # by testing for intersections between the Interior, Boundary and Exterior 
-  # of the two geometries as specified by the values in the 
-  # intersectionPatternMatrix. If no intersectionPatternMatrix is passed in, 
+  # Returns true if this Geometry is spatially related to anotherGeometry,
+  # by testing for intersections between the Interior, Boundary and Exterior
+  # of the two geometries as specified by the values in the
+  # intersectionPatternMatrix. If no intersectionPatternMatrix is passed in,
   # then returns the maximum intersectionPatternMatrix that relates the 2 geometries.
-  # 
-  # 
-  # Version 1: Takes geomA, geomB, intersectionMatrix and Returns 1 (TRUE) if 
-  # this Geometry is spatially related to anotherGeometry, by testing for 
-  # intersections between the Interior, Boundary and Exterior of the two 
+  #
+  #
+  # Version 1: Takes geomA, geomB, intersectionMatrix and Returns 1 (TRUE) if
+  # this Geometry is spatially related to anotherGeometry, by testing for
+  # intersections between the Interior, Boundary and Exterior of the two
   # geometries as specified by the values in the intersectionPatternMatrix.
-  # 
-  # This is especially useful for testing compound checks of intersection, 
+  #
+  # This is especially useful for testing compound checks of intersection,
   # crosses, etc in one step.
-  # 
+  #
   # Do not call with a GeometryCollection as an argument
-  # 
-  # This is the "allowable" version that returns a boolean, not an integer. 
+  #
+  # This is the "allowable" version that returns a boolean, not an integer.
   # This is defined in OGC spec.
-  # This DOES NOT automagically include an index call. The reason for that 
-  # is some relationships are anti e.g. Disjoint. If you are using a relationship 
+  # This DOES NOT automagically include an index call. The reason for that
+  # is some relationships are anti e.g. Disjoint. If you are using a relationship
   # pattern that requires intersection, then include the && index call.
-  # 
-  # Version 2: Takes geomA and geomB and returns the DE-9IM 
+  #
+  # Version 2: Takes geomA and geomB and returns the DE-9IM
   # (dimensionally extended nine-intersection matrix)
-  # 
+  #
   # Do not call with a GeometryCollection as an argument
   # Not in OGC spec, but implied. see s2.1.13.2
-  # 
+  #
   #  Both Performed by the GEOS module
-  # 
+  #
   #  Returns:
   #
-  #  text ST_Relate(geometry geomA, geometry geomB);
-  #  boolean ST_Relate(geometry geomA, geometry geomB, text intersectionPatternMatrix);
+  #  String ST_Relate(geometry geomA, geometry geomB);
+  #  Boolean ST_Relate(geometry geomA, geometry geomB, text intersectionPatternMatrix);
   #
   def relate?(other, m = nil)
     # Relate is case sentitive.......
     m = "'#{m}'" if m
     postgis_calculate("Relate", [self, other], m)
-  end  
+  end
 
-  # 
-  # Transform the geometry into a different spatial reference system.
   #
-  # Return geometry ST_Transform(geometry g1, integer srid);
-  # Returns a new geometry with its coordinates transformed to spatial reference system referenced by the SRID integer parameter. The destination SRID must exist in the SPATIAL_REF_SYS table.
-  # ST_Transform is often confused with ST_SetSRID(). ST_Transform actually changes the coordinates of a geometry from one spatial reference system to another, while ST_SetSRID() simply changes the SRID identifier of the geometry
-  # Requires PostGIS be compiled with Proj support. Use PostGIS_Full_Version to confirm you have proj support compiled in.
-  #	
-  # If using more than one transformation, it is useful to have a functional index on the commonly used transformations to take advantage of index usage.
+  # Transform the geometry into a different spatial reference system.
+  # The destination SRID must exist in the SPATIAL_REF_SYS table.
   #
-  # Prior to 1.3.4, this function crashes if used with geometries that contain CURVES. This is fixed in 1.3.4+
   # This method implements the OpenGIS Simple Features Implementation Specification for SQL.
-  # This method supports Circular Strings and Curves
+  # This method supports Circular Strings and Curves (PostGIS 1.3.4+)
+  #
+  # Requires PostGIS be compiled with Proj support.
+  #
+  # Return Geometry ST_Transform(geometry g1, integer srid);
   #
   def transform(new_srid)
     postgis_calculate("Transform", self, new_srid)
   end
-  
+
+  #
+  # Returns a modified geometry having no segment longer than the given distance.
+  # Distance computation is performed in 2d only.
+  #
+  # This will only increase segments. It will not lengthen segments shorter than max length
+  #
+  # Return Geometry ST_Segmentize(geometry geomA, float max_length);
+  #
+  def segmentize(max_length=1.0)
+    postgis_calculate("segmentize", self, max_length)
+  end
+
   #
   # LINESTRING
   #
   #
   #
   module LineStringFunctions
-    
+
     #
     # Returns the 2D length of the geometry if it is a linestring, multilinestring,
     # ST_Curve, ST_MultiCurve. 0 is returned for areal geometries. For areal geometries
@@ -548,12 +558,12 @@ module PostgisFunctions
     def locate_point point
       postgis_calculate(:line_locate_point, [self, point]).to_f
     end
-    
+
     #
-    # Return a derived geometry collection value with elements that match the 
+    # Return a derived geometry collection value with elements that match the
     # specified measure. Polygonal elements are not supported.
     #
-    # Semantic is specified by: ISO/IEC CD 13249-3:200x(E) - Text for 
+    # Semantic is specified by: ISO/IEC CD 13249-3:200x(E) - Text for
     # Continuation CD Editing Meeting
     #
     # Returns geometry ST_Locate_Along_Measure(geometry ageom_with_measure, float a_measure);
@@ -561,9 +571,9 @@ module PostgisFunctions
     def locate_along_measure(measure)
       postgis_calculate(:locate_along_measure, self, measure)
     end
-    
+
     #
-    # Return a derived geometry collection value with elements that match the 
+    # Return a derived geometry collection value with elements that match the
     # specified range of measures inclusively. Polygonal elements are not supported.
     #
     # Semantic is specified by: ISO/IEC CD 13249-3:200x(E) - Text for Continuation CD Editing Meeting
@@ -573,7 +583,7 @@ module PostgisFunctions
     def locate_between_measures(a, b)
       postgis_calculate(:locate_between_measures, self, [a,b])
     end
-    
+
     #
     # Returns a point interpolated along a line. First argument must be a LINESTRING.
     # Second argument is a float8 between 0 and 1 representing fraction of total
@@ -603,7 +613,7 @@ module PostgisFunctions
       postgis_calculate(:line_substring, self, [s, e])
     end
 
-    ###  
+    ###
     #Not implemented in postgis yet
     # ST_max_distance Returns the largest distance between two line strings.
     #def max_distance other
@@ -699,7 +709,7 @@ module PostgisFunctions
     end
 
   end
-  
+
   ###
   ##
   #
@@ -713,10 +723,12 @@ module PostgisFunctions
     # Return the area measurement of an ST_Surface or ST_MultiSurface value.
     # Area is in the units of the spatial reference system.
     #
+    # Accepts optional parameter, the srid to transform to.
+    #
     # Returns Float ST_Area(geometry g1);
     #
-    def area
-      postgis_calculate(:area, self).to_f
+    def area transform=nil
+      postgis_calculate(:area, self, { :transform => transform }).to_f
     end
 
     #
@@ -725,10 +737,12 @@ module PostgisFunctions
     # use 'length'. Measurements are in the units of the spatial reference system of
     # the geometry.
     #
+    # Accepts optional parameter, the srid to transform to.
+    #
     # Returns Float ST_Perimeter(geometry g1);
     #
-    def perimeter
-      postgis_calculate(:perimeter, self).to_f
+    def perimeter transform=nil
+      postgis_calculate(:perimeter, self, { :transform => transform }).to_f
     end
 
     #
@@ -775,7 +789,7 @@ module PostgisFunctions
     end
 
   end
-  
+
 end
 
 # NEW

data/lib/postgis_functions.rb

@@ -1,9 +1,8 @@
-# #
+# -*- coding: utf-8 -*-
 #
 # PostGIS Adapter - http://github.com/nofxx/postgis_adapter
 #
-# Hope you enjoy this plugin. 
-# 
+# Hope you enjoy this plugin.
 #
 #
 # Post any bugs/suggestions to the lighthouse tracker:
@@ -16,12 +15,11 @@
 # Earth Spheroid - http://en.wikipedia.org/wiki/Figure_of_the_Earth
 #
 #
-#
 module PostgisFunctions
   EARTH_SPHEROID = "'SPHEROID[\"GRS-80\",6378137,298.257222101]'" # SRID => 4326
-  #EARTH_SPHEROID = "'SPHEROID[\"IERS_2003\",6378136.6,298.25642]'" # SRID => 
+  #EARTH_SPHEROID = "'SPHEROID[\"IERS_2003\",6378136.6,298.25642]'" # SRID =>
 
-  def postgis_calculate(operation, subjects, options = nil)
+  def postgis_calculate(operation, subjects, options = {})
     subjects = [subjects] unless subjects.respond_to?(:map)
     return execute_geometrical_calculation(operation, subjects, options)
     rescue Exception => e
@@ -33,14 +31,14 @@ module PostgisFunctions
   def get_column_name
     @geo_column ||= postgis_geoms[:columns].first
   end
- 
+
+  #
   # Construct the postgis sql query
   #
   # Area return in square feet
   # Distance/DWithin/Length/Perimeter —  in projected units.
   # DistanceSphere/Spheroid —  in meters.
   #
-  #
   def construct_geometric_sql(type,geoms,options)
 
     tables = geoms.map do |t| {
@@ -48,16 +46,24 @@ module PostgisFunctions
       :uid =>  unique_identifier,
       :id => t[:id] }
     end
-
-    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
     
+    # Implement a better way for options?
+    if options.instance_of? Hash
+      transform = options.delete(:transform)
+      options = nil
+    end
+
+    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
+
     #
-    # Data =>  SELECT Func(A,B)
-    # BBox =>  SELECT (A <=> B)
-    # 
-    unless type == :bbox
+    # Data  =>  SELECT Func(A,B)
+    # BBox  =>  SELECT (A <=> B)
+    # Func  =>  SELECT Func(Func(A))
+    #
+    if type != :bbox
       opcode = type.to_s
       opcode = "ST_#{opcode}" unless opcode =~ /th3d|pesinter/
       fields << options if options
@@ -85,7 +91,7 @@ module PostgisFunctions
     value = connection.select_value(construct_geometric_sql(operation, subject, options))
     return nil unless value
     if value =~ /t|f/
-      {"f" => false, "t" => true}[value] 
+      {"f" => false, "t" => true}[value]
     else
       GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb(value) rescue value
     end
@@ -143,7 +149,7 @@ end
 #ST_AsGML
 #ST_AsKML
 #ST_AsSVG
-# 
+#
 #  def distance_convert(value, unit, from = nil)
 #    factor = case unit
 #    when :km, :kilo     then  1

data/postgis_adapter.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{postgis_adapter}
-  s.version = "0.2.1"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2009-01-10}
+  s.date = %q{2009-02-16}
   s.description = %q{Postgis Adapter for Activer Record}
   s.email = ["x@nofxx.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]

data/spec/postgis_functions/bbox_spec.rb

@@ -1,51 +1,45 @@
 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]]],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
-
-     it "should check stricly left" do
-       @p1.bbox("<<", @c1).should be_true
-     end
-
-     it "should check stricly right" 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.binary_equal?(@c1).should be_false
-     end
-
-     it do
-       @p1.same_as?(@c1).should be_false
-     end
-
-   end
-
- end
+  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 => "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
+
+    it "should check stricly left" do
+      @p1.bbox("<<", @c1).should be_true
+    end
+
+    it "should check stricly right" do
+      @p1.bbox(">>", @c1).should be_false
+    end
+
+    it { @p1.should be_strictly_left_of(@c1) }
+    it { @p1.should_not be_strictly_right_of(@c1) }
+    it { @p1.should_not be_overlaps_or_right_of(@c1) }
+    it { @p1.should be_overlaps_or_left_of(@c1) }
+    it { @p1.should_not be_completely_contained_by(@c1) }
+    it { @c2.completely_contains?(@p1).should be_false }
+    it { @p1.should be_overlaps_or_above(@c1) }
+    it { @p1.should be_overlaps_or_below(@c1) }
+    it { @p1.should_not be_strictly_above(@c1) }
+    it { @p1.should_not be_strictly_below(@c1) }
+    it { @p1.interacts_with?(@c1).should be_false }
+
+    it { @p1.binary_equal?(@c1).should be_false }
+    it { @p1.same_as?(@c1).should be_false }
+
+  end
+
+end

data/spec/postgis_functions/common_spec.rb

@@ -39,28 +39,28 @@ describe "Common Functions" do
     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 { @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 { @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 = @p1.transform(29101)
       @p1.geom.srid.should eql(29101)
     end
 
@@ -68,6 +68,10 @@ describe "Common Functions" do
       @p1.where_on_line(@s1).should eql(0.0)
     end
 
+    it "should see in what fraction of the ls it is" do
+      @p2.where_on_line(@s2).should be_close(0.3333, 0.1)
+    end
+
   end
 
   describe "Polygon" do
@@ -83,14 +87,18 @@ describe "Common Functions" do
     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 { @c2.dimension.should eql(2) }
+
     it { @c3.area.should be_close(1093.270089, 0.1) }
     it { @c2.area.should be_close(1159.5, 0.1) }
+    it { @c2.area(32640).should be_close(5852791139841.2, 0.01) }
 
-    it { @c2.dimension.should eql(2) }
     it { @c2.perimeter.should be_close(219.770013855493, 0.1) }
+    it { @c2.perimeter(32640).should be_close(23061464.4268903, 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 }
 
@@ -143,9 +151,14 @@ describe "Common Functions" do
     it { @c2.disjoint?(@p2).should be_true }
     it { @c3.polygonize.should have(2).geometries }
 
+    it "should acts as jack" do
+      @c2.segmentize(0.1).should be_instance_of(Polygon)
+    end
+
+
     # weird...
     # it  do
-    #   @c1.disjoint?(@s2).should be_true
+    #   @c1.disjoint?(@p2).should be_true
     # end
 
   end
@@ -241,7 +254,7 @@ describe "Common Functions" do
 
     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
@@ -258,7 +271,7 @@ describe "Common Functions" do
     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)
@@ -275,7 +288,10 @@ describe "Common Functions" do
       @s2.build_area.should be_nil
     end
 
+    it "should acts as jack" do
+      @s2.segmentize(0.1).should be_instance_of(LineString)
+    end
+
   end
 
 end
-

data/spec/postgis_functions_spec.rb

@@ -2,22 +2,32 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe "PostgisFunctions" do
   before(:all) do
-    #load_schema 
-    @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))
+    #load_schema
+    @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))  
+    @p1 ||= Position.create!(:data => "Point1", :geom => Point.from_x_y(-43,-22,4326))
   end
 
   describe "Common Mix" do
-    
+
     it "should calculate distance point to line" do
       @p1.distance_to(@s1).should be_close(0.248069469178417, 0.00000001)
     end
-    
+
     it "should calculate inside a city" do
       @p1.should_not be_inside(@c1)
     end
-    
+
+    it { @c1.area(32640).should be_close(9165235788987.37, 0.01) }
+
+    it { @c1.area.should be_close(720.0, 0.1) }
+
+    it { @p1.should be_strictly_left_of(@c1) }
+
+    it { @s1.length.should be_close(8.06225774829855, 0.001) }
+
+    it { @s1.length_spheroid.should be_close(891883.597963462,0.0001) }
+
   end
 
   #TODO is sorted rspec helper

data/spec/spec.opts

@@ -2,4 +2,4 @@
 --format RspecSpinner::Spinner
 --timeout
 20
---diff
+--diff

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: postgis_adapter
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-10 00:00:00 -02:00
+date: 2009-02-16 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency