postgis_adapter 0.7.5 → 0.7.7

data/VERSION

@@ -1 +1 @@
-0.7.5
+0.7.7

data/lib/postgis_functions.rb

@@ -38,7 +38,8 @@ module PostgisFunctions
   # DistanceSphere/Spheroid  =>  meters
   #
   def construct_geometric_sql(type,geoms,options)
-    not_db, on_db = geoms.partition { |g| g.is_a? Geometry }
+    not_db, on_db = geoms.partition { |g| g.is_a?(Geometry) || g.new_record? }
+    not_db.map! {|o| o.respond_to?(:new_record?) ? o.geom : o }
 
     tables = on_db.map do |t| {
       :name => t.class.table_name,
@@ -58,10 +59,7 @@ module PostgisFunctions
     fields << not_db.map { |g| "'#{g.as_hex_ewkb}'::geometry"} unless not_db.empty?
     fields.map! { |f| "ST_Transform(#{f}, #{transform})" } if transform  # ST_Transform(W1.geom,x)
     fields.map! { |f| "ST_Union(#{f})" } if stcollect  # ST_Transform(W1.geom,x)
-    conditions  = tables.map do |f|
-      raise unless f[:uid]
-      "#{f[:uid]}.id = #{f[:id]}"
-    end         # W1.id = 5
+    conditions  = tables.map {|f| "#{f[:uid]}.id = #{f[:id]}" }   # W1.id = 5
     tables.map! { |f| "#{f[:name]} #{f[:uid]}" }                         # streets W1
 
     #
@@ -106,7 +104,7 @@ module PostgisFunctions
       GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb(value) rescue value
     end
     rescue Exception => e
-    raise StandardError, "#{e}"
+    raise StandardError, e.to_s #+ e.backtrace.inspect
   end
 
   # Get a unique ID for tables

data/postgis_adapter.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{postgis_adapter}
-  s.version = "0.7.5"
+  s.version = "0.7.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]

data/spec/postgis_functions/common_spec.rb

@@ -400,6 +400,10 @@ describe "Common Functions" do
         @m1.geom.geometries[0].length.should eql(2)
       end
 
+      it "should calculate multi line string length" do
+        @m1.length_spheroid.should be_close(470464.54, 0.01)
+      end
+
       it "should line merge!" do
         merged = @m1.line_merge
         merged.should be_instance_of(LineString)
@@ -407,6 +411,7 @@ describe "Common Functions" do
       end
 
       it "should line merge collect" do
+        pending
         co = @m2.line_merge
         co.should be_instance_of(LineString)
       end

data/spec/postgis_functions_spec.rb

@@ -31,11 +31,18 @@ describe "PostgisFunctions" do
        @p1.distance_to(Point.from_x_y(5,5,4326)).should be_close(55.0726792520575, 0.001)
     end
 
+    it "should work with unsaved objects" do
+      ss = Street.new(:data => "Street1", :geom => LineString.from_coordinates([[-44,-21],[-43,-29]],4326))
+      ss.length_spheroid.should be_close(891908.39, 0.01)
+    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 "should be strictly left of city" do
+      @p1.should be_strictly_left_of(@c1)
+    end
 
     it { @s1.length.should be_close(8.06225774829855, 0.001) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: postgis_adapter
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.7.7
 platform: ruby
 authors: 
 - Marcos Piccinini