spatial_features 3.6.3 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90e1672d25b0ffc7f11092c8518322c41597c2ebc826c5db42ab4e20bb5e3ff8
-  data.tar.gz: 61e0e85d335afd245d87e7d6aef3ad892398c704235b450ab45f949fd7d04a74
+  metadata.gz: 54f447bf36298072b9480e0f33faa93145d8f4dbdecd5d1422001f0202a25354
+  data.tar.gz: 2546213005b5fde86ed5732c9d408a9b1ee7f30d9c53afeaa75a19a4b0f299f7
 SHA512:
-  metadata.gz: 4af5bcc317b7468ed0eae22689a7d233b129d23179ef03910d6afadd1283c3b7e5f9de7af7468b40ccccce2f445f9988cc43597bfc7d15c207c1dc3ce81b8c47
-  data.tar.gz: 3641ff55ebaa1399101cf08637da7fd5b94c3e4f132634266883f8815845acdc682ea693431f191e770ca117cc8e7c5ddb7ffedb60cd1fbadc13681b4c46ff43
+  metadata.gz: f9295415b8375b8d5c9741b15371b2aebf0eb02dc75220a6d0f3ac16259d26f1dd60aefdc0f3bf96f8e5c959a4b34d81717efaa87309555f1bbfe28261797aa6
+  data.tar.gz: 26fedef5b3779e49f656410a5fbfc7cbf8997d2a7ac627015681372a5e61dc1392116ed95a46662143f1fdd1ea628a8b5aaaf6b0e7f45b08a42189f27a5e7cca

data/app/models/abstract_feature.rb

@@ -59,7 +59,41 @@ class AbstractFeature < ActiveRecord::Base
       else "ST_Transform(ST_SetSRID(ST_Point(:lng, :lat), 4326), #{detect_srid(geom)})"
       end
 
-    where("ST_DWithin(features.#{geom}, #{point_sql}, :distance)", :lat => lat, :lng => lng, :distance => distance_in_meters)
+    binds = { :lng => lng.to_d, :lat => lat.to_d }
+
+    within_distance_of_sql(point_sql, distance_in_meters, geom, **binds)
+  end
+
+  def self.within_distance_of_line(points, distance_in_meters, geom = 'geom_lowres')
+    point_sql =
+      case geom.to_s
+      when 'geog' then ':points'
+      else "ST_Transform(ST_SetSRID(:points::geometry, 4326), #{detect_srid(geom)})"
+      end
+
+    binds = { :points => "LINESTRING(#{points.map {|coords| coords.join(' ') }.join(', ')})" }
+
+    within_distance_of_sql(point_sql, distance_in_meters, geom, **binds)
+  end
+
+  def self.within_distance_of_polygon(points, distance_in_meters, geom = 'geom_lowres')
+    point_sql =
+      case geom.to_s
+      when 'geog' then "ST_Polygon(:points::geometry)"
+      else "ST_Transform(ST_Polygon(:points::geometry, 4326), #{detect_srid(geom)})"
+      end
+
+    binds = { :points => "LINESTRING(#{points.map {|coords| coords.join(' ') }.join(', ')})" }
+
+    within_distance_of_sql(point_sql, distance_in_meters, geom, **binds)
+  end
+
+  def self.within_distance_of_sql(geometry_sql, distance_in_meters, features_column = 'geom_lowres', **binds)
+    if distance_in_meters.to_f > 0
+      where("ST_DWithin(features.#{features_column}, #{geometry_sql}, :distance)", **binds, :distance => distance_in_meters)
+    else
+      where("ST_Intersects(features.#{features_column}, #{geometry_sql})", **binds)
+    end
   end
 
   def self.area_in_square_meters(geom = 'geom_lowres')

data/lib/spatial_features/controller_helpers/spatial_extensions.rb

@@ -8,6 +8,12 @@ module SpatialExtensions
     end
   end
 
+  def abstract_clear_feature_update_errors(models)
+    Array.wrap(models).each do |model|
+      model.clear_feature_update_error_status
+    end
+  end
+
   def abstract_proximity_action(scope, target, distance, &block)
     @nearby_records = scope_for_search(scope).within_buffer(target, distance, :distance => true, :intersection_area => true).order('distance_in_meters ASC, intersection_area_in_square_meters DESC, id ASC')
     @target = target

data/lib/spatial_features/has_spatial_features/queued_spatial_processing.rb

@@ -6,12 +6,18 @@ module SpatialFeatures
     def self.update_cached_status(record, method_name, state)
       return unless record.has_attribute?(:spatial_processing_status_cache)
 
-      cache = record.spatial_processing_status_cache || {}
+      cache = record.spatial_processing_status_cache
       cache[method_name] = state
       record.spatial_processing_status_cache = cache
       record.update_column(:spatial_processing_status_cache, cache) if record.will_save_change_to_spatial_processing_status_cache?
     end
 
+    def spatial_processing_status_cache
+      value = super
+      return {} unless value.is_a?(Hash)
+      return value
+    end
+
     def queue_update_spatial_cache(*args, priority: priority_offset + 1, **kwargs)
       queue_spatial_task('update_spatial_cache', *args, priority:, **kwargs)
     end
@@ -29,6 +35,12 @@ module SpatialFeatures
       end
     end
 
+    def clear_feature_update_error_status
+      with_lock do
+        SpatialFeatures::QueuedSpatialProcessing.update_cached_status(self, :update_features!, nil) if updating_features_failed?
+      end
+    end
+
     def updating_features_failed?
       spatial_processing_status(:update_features!) == :failure
     end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "3.6.3"
+  VERSION = "3.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 3.6.3
+  version: 3.8.0
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 2024-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails