spatial_features 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 417844aeba55e727bdb873b0492a6de02c9597af
-  data.tar.gz: '096586ef1f32f9091c55c9e2142c2736cd3db0ad'
+  metadata.gz: 0d84b44917dac8280a1de81c1a440d4127485846
+  data.tar.gz: fa5a503cce899bcb8d75e7c1fc3087c414b2fabd
 SHA512:
-  metadata.gz: 4fbaab3c02159dea567e0456fc5996f0d5979f26607d7c8e20ff264d27758af6417ae36837b60514ea71531babddb6d0d681772f4c9ffda9fd2589c188ceea2b
-  data.tar.gz: 0d823427501023ceec92a8f6f6e581653d299dfa9534f7d96cd79606476f22be61c484b82c16656b6f8f0129433a7da183aed4993d2e42a9fa038d7cc2ec8566
+  metadata.gz: a7e260e34f722ab7b668bcd9b92830d4e8d720e8159f1ac488c61091a57f78842cef8579ae5cb47973f328f46276fdf29e59d131a1b66ffe74069e52f791ac92
+  data.tar.gz: bd354f3f27912b24c8aa2f4cd92ad1e3dd2d29815217e1aca1ab77b5977ea6be196470e36c2066abd67caf90322954cf7df1c232aa0ff02e567e42e8089ff30d

data/app/models/feature.rb

@@ -32,16 +32,18 @@ class Feature < ActiveRecord::Base
     where(:feature_type => 'point')
   end
 
-  def self.area_in_square_meters
-    current_scope = all
-    unscoped { connection.select_value(select('ST_Area(ST_Union(geom))').from(current_scope, :features)).to_f }
+  def self.area_in_square_meters(geom = 'geom_lowres')
+    current_scope = all.polygons
+    unscoped { connection.select_value(select("ST_Area(ST_Union(#{geom}))").from(current_scope, :features)).to_f }
   end
 
   def self.total_intersection_area_in_square_meters(other_features, geom = 'geom_lowres')
-    scope = unscope(:select).select("ST_Union(#{geom}) AS geom")
-    other_scope = other_features.unscope(:select).select("ST_Union(#{geom}) AS geom")
-    query = unscoped.select('ST_Area(ST_Intersection(features.geom, other_features.geom))').from("(#{scope.to_sql}) features, (#{other_scope.to_sql}) other_features")
+    scope = unscope(:select).select("ST_Union(#{geom}) AS geom").polygons
+    other_scope = other_features.polygons
 
+    query = unscoped.select('ST_Area(ST_Intersection(ST_Union(features.geom), ST_Union(other_features.geom)))')
+                    .from(scope, "features")
+                    .joins("INNER JOIN (#{other_scope.to_sql}) AS other_features ON ST_Intersects(features.geom, other_features.geom)")
     return connection.select_value(query).to_f
   end
 

data/lib/spatial_features/caching.rb

@@ -68,15 +68,22 @@ module SpatialFeatures
 
   def self.create_spatial_proximities(record, klass)
     klass = klass.to_s.constantize
-    record_is_a = record.class.to_s < klass.to_s
+    klass_record = klass.new
+    model_a, model_b = record.class.to_s < klass.to_s ? [record, klass_record] : [klass_record, record]
 
-    scope = klass.within_buffer(record, default_cache_buffer_in_meters, :intersection_area => true, :distance => true, :cache => false)
-    scope.find_each do |klass_record|
+    scope = klass.within_buffer(record, default_cache_buffer_in_meters, :columns => :id, :intersection_area => true, :distance => true, :cache => false)
+    results = klass.connection.select_rows(scope.to_sql)
+
+    results.each do |id, distance, area|
+      klass_record.id = id
       SpatialProximity.create! do |proximity|
-        proximity.model_a                            = record_is_a ? record : klass_record
-        proximity.model_b                            = record_is_a ? klass_record : record
-        proximity.distance_in_meters                 = klass_record.distance_in_meters
-        proximity.intersection_area_in_square_meters = klass_record.intersection_area_in_square_meters
+        # Set id and type instead of model to avoid autosaving the klass_record
+        proximity.model_a_id = model_a.id
+        proximity.model_a_type = model_a.class
+        proximity.model_b_id = model_b.id
+        proximity.model_b_type = model_b.class
+        proximity.distance_in_meters = distance
+        proximity.intersection_area_in_square_meters = area
       end
     end
   end

data/lib/spatial_features/has_spatial_features.rb

@@ -97,10 +97,13 @@ module SpatialFeatures
     private
 
     def cached_within_buffer_scope(other, buffer_in_meters, options)
+      options = options.reverse_merge(:columns => "#{table_name}.*")
+
       # Don't use the cache if it doesn't exist
       return all.extending(UncachedRelation) unless other.spatial_cache_for?(class_for(self), buffer_in_meters)
 
-      scope = cached_spatial_join(other).select("#{table_name}.*")
+      scope = cached_spatial_join(other)
+      scope = scope.select(options[:columns])
       scope = scope.where("spatial_proximities.distance_in_meters <= ?", buffer_in_meters) if buffer_in_meters
       scope = scope.select("spatial_proximities.distance_in_meters") if options[:distance]
       scope = scope.select("spatial_proximities.intersection_area_in_square_meters") if options[:intersection_area]
@@ -119,8 +122,10 @@ module SpatialFeatures
     end
 
     def uncached_within_buffer_scope(other, buffer_in_meters, options)
+      options = options.reverse_merge(:columns => "#{table_name}.*")
+
       scope = spatial_join(other, buffer_in_meters)
-      scope = scope.select("#{table_name}.*")
+      scope = scope.select(options[:columns])
 
       # Ensure records with multiple features don't appear multiple times
       if options[:distance] || options[:intersection_area]
@@ -130,7 +135,7 @@ module SpatialFeatures
       end
 
       scope = scope.select("MIN(ST_Distance(features.geom, other_features.geom)) AS distance_in_meters") if options[:distance]
-      scope = scope.select("ST_Area(ST_UNION(ST_Intersection(features.geom, other_features.geom))) AS intersection_area_in_square_meters") if options[:intersection_area]
+      scope = scope.select("ST_Area(ST_UNION(ST_Intersection(ST_CollectionExtract(features.geom, 3), ST_CollectionExtract(other_features.geom, 3)))) AS intersection_area_in_square_meters") if options[:intersection_area]
       return scope
     end
 
@@ -243,7 +248,7 @@ module SpatialFeatures
   module FeaturesAssociationExtensions
     def area(options = {})
       if options[:cache] == false || !proxy_association.owner.class.has_features_area?
-        pluck('ST_Area(ST_UNION(geom))').first.to_f
+        area_in_square_meters
       else
         proxy_association.owner.features_area.to_f
       end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.2.3"
+  VERSION = "2.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Ryan Wallace