spatial_features 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17c8fdb48ee250613d98e9e0bd615a673c6ec4c19e470ca7ecf30d9697b9391a
-  data.tar.gz: feea9dc4293d2f5003f7d69a62b56cb180ccd79588ca03779430a6cc178e33d4
+  metadata.gz: a3e126c82bcff0ef6828308c9eb5ae062e1540a2fdd817a3be74b85db3b23d19
+  data.tar.gz: cecf17b38121de11392d25196bf788f9da8aa3771401f8d59c295ae7dbdd1140
 SHA512:
-  metadata.gz: 76cc314c548cfbb14f51d4979b574c4735aecb97f65e1e99387d83cb426917ae031286c8b2a5ac1193643ba2858e0c3cfcac27d079368ab4ddf617a389fbb721
-  data.tar.gz: 4bb9f272f48e30324df8e4f545a7ba0b953b24b76ecf5499d4f237971db73dc20a4ba5d0c8a0bcf6b33610ffe229f29839be5c9357e330292fc4b3ce6c63a613
+  metadata.gz: 686329bb9f5bb6c9e8e7fd8f8d3f64aa63d72f9a892144be8e00239ecf9fc2770b218e9f3c1e6baf7ccd740d6eb96a0798ef4dc4df4a833af503531d08e2df8d
+  data.tar.gz: 6bf976be9ccdb8ed02c6f5802ba93ab730dc6d38b24d98070c4730c1c67bae50c03fd39ac7f2ec2aa05372665adbf8edfc6f04cfc70ad87af25285ab495ab229

data/app/models/aggregate_feature.rb

@@ -5,12 +5,26 @@ class AggregateFeature < AbstractFeature
 
   # Aggregate the features for the spatial model into a single feature
   def refresh
-    self.geog = ActiveRecord::Base.connection.select_value <<~SQL
-      SELECT ST_Collect(ARRAY[
+    feature_array_sql = <<~SQL
+      ARRAY[
         (#{features.select('ST_UNION(ST_CollectionExtract(geog::geometry, 1))').to_sql}),
         (#{features.select('ST_UNION(ST_CollectionExtract(geog::geometry, 2))').to_sql}),
         (#{features.select('ST_UNION(ST_CollectionExtract(geog::geometry, 3))').to_sql})
-      ])::geography
+      ]
+    SQL
+
+    # Remove empty features so ST_COLLECT doesn't choke. This seems to be a difference between PostGIS 2.x and 3.x
+    compacted_feature_array_sql = <<~SQL
+      array_remove(
+        array_remove(
+          array_remove(#{feature_array_sql},
+          ST_GeomFromText('Point EMPTY')),
+        ST_GeomFromText('Linestring EMPTY')),
+      ST_GeomFromText('Polygon EMPTY'))
+    SQL
+
+    self.geog = ActiveRecord::Base.connection.select_value <<~SQL
+      SELECT ST_Collect(#{compacted_feature_array_sql})::geography
     SQL
     self.save!
   end

data/lib/spatial_features/caching.rb

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

data/lib/spatial_features/has_spatial_features.rb

@@ -117,10 +117,11 @@ module SpatialFeatures
       other_class = Utils.base_class_of(other)
       self_class = Utils.base_class_of(self)
 
-      other_column = other_class.name < self_class.name ? :model_a : :model_b
-      self_column = other_column == :model_a ? :model_b : :model_a
-
-      joins("INNER JOIN spatial_proximities ON spatial_proximities.#{self_column}_type = '#{self_class}' AND spatial_proximities.#{self_column}_id = #{table_name}.id AND spatial_proximities.#{other_column}_type = '#{other_class}' AND spatial_proximities.#{other_column}_id IN (#{Utils.id_sql(other)})")
+      joins <<~SQL
+        INNER JOIN spatial_proximities
+        ON (spatial_proximities.model_a_type = '#{self_class}' AND spatial_proximities.model_a_id = #{table_name}.id AND spatial_proximities.model_b_type = '#{other_class}' AND spatial_proximities.model_b_id IN (#{Utils.id_sql(other)}))
+        OR (spatial_proximities.model_b_type = '#{self_class}' AND spatial_proximities.model_b_id = #{table_name}.id AND spatial_proximities.model_a_type = '#{other_class}' AND spatial_proximities.model_a_id IN (#{Utils.id_sql(other)}))
+      SQL
     end
 
     def uncached_within_buffer_scope(other, buffer_in_meters, options)

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.9.0"
+  VERSION = "2.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-07 00:00:00.000000000 Z
+date: 2019-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails