nofxx-postgis_adapter 0.2.1 → 0.2.2

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.2'
 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/common.rb

@@ -19,7 +19,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 +74,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 +100,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 +136,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 +156,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 +177,7 @@ module PostgisFunctions
     postgis_calculate(:coveredby, [self, other])
   end
   alias_method "inside?", "covered_by?"
-  
+
   #
   # Eye-candy. See 'covered_by?'.
   #
@@ -230,8 +230,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 +255,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 +344,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 +356,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 +369,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 +381,86 @@ 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
-  
+
+  # Return a modified geometry having no segment longer than the given distance. Distance computation is performed in 2d only.
+#  Synopsis
+
+#geometry ST_Segmentize(geometry geomA, float max_length);
+#Description
+
+#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
+
+  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 +559,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 +572,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 +584,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 +614,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 +710,7 @@ module PostgisFunctions
     end
 
   end
-  
+
   ###
   ##
   #
@@ -775,7 +786,7 @@ module PostgisFunctions
     end
 
   end
-  
+
 end
 
 # NEW

data/lib/postgis_functions.rb

@@ -40,7 +40,6 @@ module PostgisFunctions
   # Distance/DWithin/Length/Perimeter —  in projected units.
   # DistanceSphere/Spheroid —  in meters.
   #
-  #
   def construct_geometric_sql(type,geoms,options)
 
     tables = geoms.map do |t| {

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.2"
 
   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-01-12}
   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/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,7 +87,7 @@ 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 { @c3.area.should be_close(1093.270089, 0.1) }
     it { @c2.area.should be_close(1159.5, 0.1) }
@@ -143,9 +147,13 @@ 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 +249,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 +266,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 +283,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
-

metadata

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