spatial_features 3.7.0 → 3.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 301894cdb34ba62e4176add97fdd2462e4618cabdc7d86af8ff28113ea35fe13
-  data.tar.gz: 2d89a66243c80d8333f3825721c7fe0da008302d097a6f4033e97231b2052433
+  metadata.gz: 20b15f8be8e82ecb943e33fa81f3ccb2a98981fcc0a6143c282ba5e86dd1021f
+  data.tar.gz: d8ce7b591e57b0c7ada43af9f7db1ca415d7c88cf156d8394348ba67b717b216
 SHA512:
-  metadata.gz: 2d483dddd5d794a4a1cacee046abb80d1ac91301e48f4b108adb9cc7b8bdc7ba72cb0aee80a559fbdecb8896094ee51fc957d41ee8dfb069ffc51d101efffd8d
-  data.tar.gz: 3500d719c5c216a5667e70ba85460b72bfcfd62a3fc0a9351f67f7627baa94461c836bf315defeeb00f3de5ee5bc3ff1e4aea128cfb642905fc1400347a1b45d
+  metadata.gz: 71de22c18001e7b74ffc8f2caa98b5761cd92ea0c30dbf0bfdbb46f3d101b3806c44145bb897e69c4d9f2a929c07cde571490b3f2117549c6b010157c787e167
+  data.tar.gz: a4f3e57ac9e560dc641da35f499a3f39f73e61f1e39867a2762b51dfceb70b117ad4019ad304ae18b18338334a8297de8d65bf5bcc672bb0b6859fb90635329d

data/README.md

@@ -24,22 +24,33 @@ Adds spatial methods to a model.
 
     CREATE TABLE features (
         id integer NOT NULL,
-        type character varying(255),
         spatial_model_type character varying(255),
         spatial_model_id integer,
         name character varying(255),
-        feature_type character varying(255),
-        geog geography,
-        geom geometry(Geometry,4326),
-        geom_lowres geometry(Geometry,4326),
-        tilegeom geometry(Geometry,3857),
-        metadata hstore,
-        area double precision,
-        north numeric(9,6),
-        east numeric(9,6),
-        south numeric(9,6),
-        west numeric(9,6),
-        centroid geography,
+        geog public.geography,
+        metadata public.hstore DEFAULT ''::public.hstore NOT NULL,
+        geom public.geometry(Geometry,3005),
+        geom_lowres public.geometry(Geometry,3005),
+        type character varying,
+        source_identifier character varying,
+        tilegeom public.geometry(Geometry,3857) GENERATED ALWAYS AS (public.st_transform(geom, 3857)) STORED,
+        feature_type character varying GENERATED ALWAYS AS (
+    CASE public.geometrytype(geog)
+        WHEN 'POLYGON'::text THEN 'polygon'::text
+        WHEN 'MULTIPOLYGON'::text THEN 'polygon'::text
+        WHEN 'GEOMETRYCOLLECTION'::text THEN 'polygon'::text
+        WHEN 'LINESTRING'::text THEN 'line'::text
+        WHEN 'MULTILINESTRING'::text THEN 'line'::text
+        WHEN 'POINT'::text THEN 'point'::text
+        WHEN 'MULTIPOINT'::text THEN 'point'::text
+        ELSE NULL::text
+    END) STORED,
+        centroid public.geography GENERATED ALWAYS AS (public.st_pointonsurface((geog)::public.geometry)) STORED,
+        area numeric GENERATED ALWAYS AS (public.st_area(geog)) STORED,
+        north numeric GENERATED ALWAYS AS (public.st_ymax(((geog)::public.geometry)::public.box3d)) STORED,
+        east numeric GENERATED ALWAYS AS (public.st_xmax(((geog)::public.geometry)::public.box3d)) STORED,
+        south numeric GENERATED ALWAYS AS (public.st_ymin(((geog)::public.geometry)::public.box3d)) STORED,
+        west numeric GENERATED ALWAYS AS (public.st_xmin(((geog)::public.geometry)::public.box3d)) STORED
     );
 
     CREATE SEQUENCE features_id_seq START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1;

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/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

data/lib/spatial_features/importers/kml.rb

@@ -44,6 +44,7 @@ module SpatialFeatures
       def kml_document
         @kml_document ||= begin
           doc = Nokogiri::XML(@data)
+          doc.remove_namespaces! # We don't care about namespaces since the document is going to be filled with placemark geometry and we want it all without needing to deal with namespaces
           raise ImportError, "Invalid KML document (root node was '#{doc.root&.name}')" unless doc.root&.name.to_s.casecmp?('kml')
           raise ImportError, "NetworkLink elements are not supported" unless doc.search('NetworkLink').empty?
           doc

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "3.7.0"
+  VERSION = "3.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.8.1
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-16 00:00:00.000000000 Z
+date: 2025-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails