spatial_features 2.10.6 → 2.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcb19db9366e628655a5197f84d4274271013822121071a820941237eeb86fa0
-  data.tar.gz: ac12926f535a66226a8297f13e65dd7a2e5ef72315ecf816d4fe17d177a13b28
+  metadata.gz: e62668e5118907b61af7d07274b1e136086f9aa920b8bcbc3a415fd7ce1d7846
+  data.tar.gz: '090b0a6b28286e52c57079b4e51250c10280b9a185c938b055696607f7ac61be'
 SHA512:
-  metadata.gz: a130a20a293bfa1f9fd79ba33bfb2f270b51bcdb612cefb054d2c48a390f66b55072a5e2a797d054b266800f2943b98cd93f6263b44fecc153e879c06b1e3d48
-  data.tar.gz: 02cd94b02d8ae93a39f238e9ec66cd259d663943815677673c2c446621af8ccc9a0121d887445e1b8cf625c1a9d19b04eb80bc31863d350bfed860cde49f11d9
+  metadata.gz: '0293f1342cf5dd4f23c311d4efe555b74e2e0805ce31c35f8e5f711613415a065a23a3105622204358201ef5dac8f60a98bd66de66aebc3da1ed29954f4cca9d'
+  data.tar.gz: 357e67c32a156fa8fd3ed6d67edfaddde398346babc4f384c3e7ec41b77a5b28cdb215b49021bebe948c27f57ea1f95ac9889caa9f0ba6bce5cf5556b62f4e6a

data/app/models/abstract_feature.rb

@@ -143,6 +143,10 @@ class AbstractFeature < ActiveRecord::Base
     @make_valid
   end
 
+  def wkt
+    ActiveRecord::Base.connection.select_value("SELECT ST_ASEWKT('#{geom}')")
+  end
+
   private
 
   def make_valid

data/app/models/aggregate_feature.rb

@@ -14,8 +14,10 @@ class AggregateFeature < AbstractFeature
     SQL
 
     # Remove empty features so ST_COLLECT doesn't choke. This seems to be a difference between PostGIS 2.x and 3.x
+    # NOTE: ST_CollectionHomogenize is used to normalize geometry representation in order to avoid a segmentation fault
+    #       we were seeing when intersecting complex geometry.
     self.geog = ActiveRecord::Base.connection.select_value <<~SQL
-      SELECT COALESCE(ST_Collect(unnest)::geography, ST_GeogFromText('MULTIPOLYGON EMPTY'))
+      SELECT COALESCE(ST_CollectionHomogenize(ST_Collect(unnest))::geography, ST_GeogFromText('MULTIPOLYGON EMPTY'))
       FROM (SELECT unnest(#{feature_array_sql})) AS features
       WHERE NOT ST_IsEmpty(unnest)
     SQL

data/lib/spatial_features/has_spatial_features.rb

@@ -142,9 +142,11 @@ module SpatialFeatures
       scope = features_scope(self).select("#{geom} AS geom").select(:spatial_model_id)
 
       other_scope = features_scope(other).select("ST_Union(#{geom}) AS geom")
-
       return joins(%Q(INNER JOIN (#{scope.to_sql}) AS #{table_alias} ON #{table_alias}.spatial_model_id = #{table_name}.id))
-            .joins(%Q(INNER JOIN (#{other_scope.to_sql}) AS #{other_alias} ON ST_DWithin(#{table_alias}.geom, #{other_alias}.geom, #{buffer})))
+            .joins(%Q(INNER JOIN (#{other_scope.to_sql}) AS #{other_alias}
+                       ON NOT ST_IsEmpty(#{table_alias}.geom) -- Can't ST_DWithin empty geometry
+                      AND NOT ST_IsEmpty(#{other_alias}.geom) -- Can't ST_DWithin empty geometry
+                      AND ST_DWithin(#{table_alias}.geom, #{other_alias}.geom, #{buffer})))
     end
 
     def features_scope(other)

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.10.6"
+  VERSION = "2.10.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.10.6
+  version: 2.10.7
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails