spatial_features 2.10.5 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9bf780dcb26228b6b90cb184045b0321cbc4ba30d081317fa804663070f3d35
-  data.tar.gz: d481db709804be2eede27c8454b142693d052eb58a16431b2b0dfe5aec8594e6
+  metadata.gz: fb5268adbbf2c9b9019512e4d3617fc97c587497913202bf95c3dd35332497e8
+  data.tar.gz: 37928531494a21c1934425bb222759accdbfae763c7eb2e7f5570e8e17c69e42
 SHA512:
-  metadata.gz: 36ef374d045bf479fc82d03cba5591fa12697f6631be9007a0eb4834aedc6dfb23d5f49ea5ea64635cd16e3cd360d081e5c8ec72e8b9d801eaa4ebe5463e3b78
-  data.tar.gz: 8dc564d1d76a136d452cc21205fdd6b8119a37f6cd5c7d85ca192e805da27b18fede7987e617a827a4c2166b37ada0ed9116e0b2dc1df0ae3b52ffca86f3fe2e
+  metadata.gz: d995ebde69133a39e99885ce694551d5bd64fb08a67b8e658d86138f56673b78a27f101f65cb86027e864d3fa0a3e2c05f43d944a3c55b2fac1a3e53a304715b
+  data.tar.gz: 99be0f11815754302e8b3f1cf50fa31964993fa43d2a1cc5a68e688eacb03d0d2116cea1ff71c7c7c8c2c99a7c7ae76c2dc83c0f6bef34ec525434bb990be2e1

data/app/models/abstract_feature.rb

@@ -40,6 +40,11 @@ class AbstractFeature < ActiveRecord::Base
     where(:feature_type => 'point')
   end
 
+  def self.within_distance(lat, lng, distance_in_meters)
+    # where("ST_DWithin(features.geog, ST_SetSRID( ST_Point( -71.104, 42.315), 4326)::geography, :distance)", :lat => lat, :lng => lng, :distance => distance_in_meters)
+    where("ST_DWithin(features.geog, ST_Point(:lng, :lat), :distance)", :lat => lat, :lng => lng, :distance => distance_in_meters)
+  end
+
   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 }
@@ -143,6 +148,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/lib/spatial_features/has_spatial_features.rb

@@ -81,6 +81,15 @@ module SpatialFeatures
       end
     end
 
+    def aggregate_features
+      type = base_class.to_s # Rails stores polymorphic foreign keys as the base class
+      if all == unscoped
+        AggregateFeature.where(:spatial_model_type => type)
+      else
+        AggregateFeature.where(:spatial_model_type => type, :spatial_model_id => all.unscope(:select))
+      end
+    end
+
     # Returns true if the model stores a hash of the features so we don't need to process the features if they haven't changed
     def has_spatial_features_hash?
       column_names.include? 'features_hash'
@@ -131,7 +140,7 @@ module SpatialFeatures
       scope = scope.select(options[:columns])
 
       scope = scope.select("ST_Distance(features.geom, other_features.geom) AS distance_in_meters") if options[:distance]
-      scope = scope.select("ST_Area(ST_Intersection(features.geom, other_features.geom)) AS intersection_area_in_square_meters") if options[:intersection_area]
+      scope = scope.select("ST_Area(ST_Intersection(ST_CollectionExtract(features.geom, 3), ST_CollectionExtract(other_features.geom, 3))) AS intersection_area_in_square_meters") if options[:intersection_area] # Use ST_CollectionExtract to avoid a segfault we've been seeing when intersecting certain geometry
 
       return scope
     end
@@ -141,13 +150,12 @@ module SpatialFeatures
     def spatial_join(other, buffer = 0, table_alias = 'features', other_alias = 'other_features', geom = 'geom_lowres')
       scope = features_scope(self).select("#{geom} AS geom").select(:spatial_model_id)
 
-      other_scope = features_scope(other)
-      other_scope_select_sql = "ST_Union(#{geom})"
-      other_scope_select_sql = "ST_Buffer(#{other_scope_select_sql}, #{buffer})" if buffer&.positive?
-      other_scope = other_scope.select("ST_Union(#{geom}) AS geom").select("#{other_scope_select_sql} AS buffered_geom")
-
+      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_Intersects(#{table_alias}.geom, #{other_alias}.buffered_geom)))
+            .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)
@@ -184,7 +192,7 @@ module SpatialFeatures
     end
 
     def intersects?(other)
-      self.class.intersecting(other).exists?(self)
+      self.class.unscoped { self.class.intersecting(other).exists?(id) }
     end
 
     def total_intersection_area_percentage(klass)

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.10.5"
+  VERSION = "2.11.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.10.5
+  version: 2.11.0
 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-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails