spatial_features 3.4.8 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9407d9a0f72fe25d714ee781b2902f387c77837c8deb3b1c1df8cdaa7be97b35
-  data.tar.gz: af6a1f4386fcb85adb7b0c17925f13ff11f0730fd4fe407cdbf1c8efdcfbbdee
+  metadata.gz: c477982103b4f48e410ff562a0bf0e16ec24e4cd3b42584aa5015cde9d380264
+  data.tar.gz: 9982438597418015427e05f060ac060f2a3ab803930c06d8a5e9a7578153129f
 SHA512:
-  metadata.gz: 22acdcc935004caaf2783679b0e0126ddfe679cd7f51c29f0eb6f358746c9cfb01c67dd5f67db4bfa26f975aec7da783d6e3ad45312e292081677ff194761552
-  data.tar.gz: 84fd0dcfd2a158bd7612df2da14b6124bc9b5a4b668779057037cf1c17a4be03eda6641ee9204d3eef696766e446c3764fcb6976ea3387ad660e8fef63285c13
+  metadata.gz: 4aa2e8cdb7a59b4bf113489055c0d3018b3fb01ce5e18d6a03ec77d865e177b84231715abab3c410d5aba837db2fc0f0ebf2dd6ab70d5892567aaeda7b6e4e0a
+  data.tar.gz: 9a823d0703242fff4b790428b531a52d6017aa28e5922d87052066ff72e8056fa841825566e4feb0d48f10b238ca0be5570393ffe126108cf8c057efac3dbfba

data/README.md

@@ -106,7 +106,8 @@ Person.new(:features => [Feature.new(:geog => 'some binary PostGIS Geography str
 ### Import
 
 You can specify multiple import sources for geometry. Each key is a method that returns the data for the Importer, and
-each value is the Importer to use to parse the data. See each Importer for more details.
+each value is the Importer to use to parse the data. Options can be passed in place of the Importer name, but must still
+include a `name` key with the name of the importer. See each Importer for more details.
 ```ruby
 def ImageImporter
   def self.call(feature, image_paths)
@@ -117,8 +118,11 @@ def ImageImporter
 end
 
 class Location < ActiveRecord::Base
-  has_spatial_features :import => { :remote_kml_url => 'KMLFile', :file => 'File', :geojson => 'ESRIGeoJSON' },
-                       :image_handlers => ['ImageImporter']
+  has_spatial_features :image_handlers => ['ImageImporter'],
+                       :import => {
+                         :remote_kml_url => { :name => 'KMLFile', :feature_name => lambda {|source_feature| source_feature.metadata['shapeID'] },
+                         :file => 'File', :geojson => 'ESRIGeoJSON' }
+                       }
 
   def remote_kml_url
     "www.test.com/kml/#{id}.kml"
@@ -200,6 +204,23 @@ add_index :features, :source_identifier
 MyModel.update_features!(:force => true) # Force an `update_features!` will populate the source_identifier column.
 ```
 
+## Upgrading From 3.4 to 3.5
+The gem now relies on virtual columns to set a number of derived column values.
+```ruby
+  change_table :features do |t|
+    t.remove :tilegeom, :feature_type, :centroid, :area, :north, :east, :south, :west
+
+    t.virtual :tilegeom, :type => 'geometry(Geometry,3857)', as: "ST_Transform(geom, 3857)", stored: true, :index => { :using => :gist }
+    t.virtual :feature_type, :type => :string, as: "CASE GeometryType(geog) WHEN 'POLYGON' THEN 'polygon' WHEN 'MULTIPOLYGON' THEN 'polygon' WHEN 'GEOMETRYCOLLECTION' THEN 'polygon' WHEN 'LINESTRING' THEN 'line' WHEN 'MULTILINESTRING' THEN 'line' WHEN 'POINT' THEN 'point' WHEN 'MULTIPOINT' THEN 'point' END", stored: true, :index => true
+    t.virtual :centroid, :type => :geography, as: "ST_PointOnSurface(geog::geometry)", stored: true
+    t.virtual :area, :type => :decimal, as: "ST_Area(geog)", stored: true
+    t.virtual :north, :type => :decimal, as: "ST_YMax(geog::geometry)", stored: true
+    t.virtual :east, :type => :decimal, as: "ST_XMax(geog::geometry)", stored: true
+    t.virtual :south, :type => :decimal, as: "ST_YMin(geog::geometry)", stored: true
+    t.virtual :west, :type => :decimal, as: "ST_XMin(geog::geometry)", stored: true
+  end
+```
+
 ## Testing
 
 Create a postgres database:

data/app/models/abstract_feature.rb

@@ -13,7 +13,6 @@ class AbstractFeature < ActiveRecord::Base
 
   FEATURE_TYPES = %w(polygon point line)
 
-  before_validation :sanitize_feature_type
   validates_presence_of :geog
   validate :validate_geometry, if: :will_save_change_to_geog?
   before_save :sanitize, if: :will_save_change_to_geog?
@@ -113,13 +112,7 @@ class AbstractFeature < ActiveRecord::Base
 
   def self.cache_derivatives(options = {})
     update_all <<-SQL.squish
-      geom         = ST_Transform(geog::geometry, #{detect_srid('geom')}),
-      north        = ST_YMax(geog::geometry),
-      east         = ST_XMax(geog::geometry),
-      south        = ST_YMin(geog::geometry),
-      west         = ST_XMin(geog::geometry),
-      area         = ST_Area(geog),
-      centroid     = ST_PointOnSurface(geog::geometry)
+      geom         = ST_Transform(geog::geometry, #{detect_srid('geom')})
     SQL
 
     invalid('geom').update_all <<-SQL.squish
@@ -127,8 +120,7 @@ class AbstractFeature < ActiveRecord::Base
     SQL
 
     update_all <<-SQL.squish
-      geom_lowres  = ST_SimplifyPreserveTopology(geom, #{options.fetch(:lowres_simplification, lowres_simplification)}),
-      tilegeom     = ST_Transform(geom, 3857)
+      geom_lowres  = ST_SimplifyPreserveTopology(geom, #{options.fetch(:lowres_simplification, lowres_simplification)})
     SQL
 
     invalid('geom_lowres').update_all <<-SQL.squish
@@ -286,10 +278,6 @@ class AbstractFeature < ActiveRecord::Base
     return error.fetch('invalid_geometry_message') if error
   end
 
-  def sanitize_feature_type
-    self.feature_type = FEATURE_TYPES.find {|type| self.feature_type.to_s.strip.downcase.include?(type) }
-  end
-
   def sanitize_input_for_sql(input)
     self.class.send(:sanitize_sql_for_conditions, input)
   end

data/app/models/feature.rb

@@ -11,8 +11,6 @@ class Feature < AbstractFeature
 
   scope :source_identifier, lambda {|source_identifier| where(:source_identifier => source_identifier) if source_identifier.present? }
 
-  validates_inclusion_of :feature_type, :in => FEATURE_TYPES
-
   before_save :truncate_name
 
   after_save :refresh_aggregate, if: :automatically_refresh_aggregate?

data/lib/spatial_features/has_spatial_features/feature_import.rb

@@ -88,10 +88,20 @@ module SpatialFeatures
     private
 
     def spatial_feature_imports(import_options, make_valid, tmpdir)
-      import_options.flat_map do |data_method, importer_name|
+      import_options.flat_map do |data_method, configuration|
+        case configuration
+        when Hash
+          importer_name = configuration.fetch(:name)
+          options = configuration.except(:name)
+        else
+          importer_name = configuration
+          options = {}
+        end
+
         Array.wrap(send(data_method)).flat_map do |data|
           next unless data.present?
-          spatial_importer_from_name(importer_name).create_all(data, :make_valid => make_valid, :tmpdir => tmpdir)
+
+          spatial_importer_from_name(importer_name).create_all(data, **options, :make_valid => make_valid, :tmpdir => tmpdir)
         end
       end.compact
     end

data/lib/spatial_features/has_spatial_features/queued_spatial_processing.rb

@@ -1,6 +1,7 @@
 module SpatialFeatures
   module QueuedSpatialProcessing
     extend ActiveSupport::Concern
+    mattr_accessor :priority_offset, default: 0 # Offsets the queued priority of spatial tasks. Lower numbers run with higher priority
 
     def self.update_cached_status(record, method_name, state)
       return unless record.has_attribute?(:spatial_processing_status_cache)
@@ -11,12 +12,12 @@ module SpatialFeatures
       record.update_column(:spatial_processing_status_cache, cache) if record.will_save_change_to_spatial_processing_status_cache?
     end
 
-    def queue_update_spatial_cache(*args, **kwargs)
-      queue_spatial_task('update_spatial_cache', *args, **kwargs)
+    def queue_update_spatial_cache(*args, priority: priority_offset + 1, **kwargs)
+      queue_spatial_task('update_spatial_cache', *args, priority:, **kwargs)
     end
 
-    def delay_update_features!(*args, **kwargs)
-      queue_spatial_task('update_features!', *args, **kwargs)
+    def delay_update_features!(*args, priority: priority_offset + 0, **kwargs)
+      queue_spatial_task('update_features!', *args, priority:, **kwargs)
     end
 
     def updating_features?(**options)
@@ -77,7 +78,7 @@ module SpatialFeatures
 
     def queue_spatial_task(method_name, *args, priority: 1, **kwargs)
       # NOTE: We pass kwargs as an arg because Delayed::Job does not support separation of positional and keyword arguments in Ruby 3.0. Instead we perform manual extraction in `perform`.
-      Delayed::Job.enqueue SpatialProcessingJob.new(self, method_name, *args, kwargs), :queue => spatial_processing_queue_name + method_name, :priority => priority
+      Delayed::Job.enqueue SpatialProcessingJob.new(self, method_name, *args, kwargs), :queue => spatial_processing_queue_name + method_name, priority:
     end
 
     def spatial_processing_queue_name

data/lib/spatial_features/importers/base.rb

@@ -6,12 +6,13 @@ module SpatialFeatures
       attr_reader :errors
       attr_accessor :source_identifier # An identifier for the source of the features. Used to differentiate groups of features on the spatial model.
 
-      def initialize(data, make_valid: false, tmpdir: nil, source_identifier: nil)
+      def initialize(data, make_valid: false, tmpdir: nil, source_identifier: nil, feature_name: ->(record) { record.name })
         @make_valid = make_valid
         @data = data
         @errors = []
         @tmpdir = tmpdir
         @source_identifier = source_identifier
+        @feature_name = feature_name
       end
 
       def features
@@ -51,13 +52,12 @@ module SpatialFeatures
       def build_feature(record)
         importable_image_paths = record.importable_image_paths if record.respond_to?(:importable_image_paths)
         Feature.new do |feature|
-          feature.name = record.name
           feature.metadata = record.metadata
-          feature.feature_type = record.feature_type
           feature.geog = record.geog
           feature.importable_image_paths = importable_image_paths
           feature.make_valid = @make_valid
           feature.source_identifier = source_identifier
+          feature.name = @feature_name.is_a?(Proc) ? @feature_name.call(record) : @feature_name
         end
       end
     end

data/lib/spatial_features/importers/kml.rb

@@ -22,9 +22,9 @@ module SpatialFeatures
       def each_record(&block)
         {'Polygon' => 'POLYGON', 'LineString' => 'LINE', 'Point' => 'POINT'}.each do |kml_type, sql_type|
           kml_document.css(kml_type).each do |feature|
-            if placemark = feature.ancestors('Placemark').first
-              name = placemark.css('name').text
+            if (placemark = feature.ancestors('Placemark').first)
               metadata = extract_metadata(placemark)
+              name = placemark.css('name').text
             else
               metadata = {}
             end
@@ -36,7 +36,7 @@ module SpatialFeatures
 
             importable_image_paths = images_from_metadata(metadata)
 
-            yield OpenStruct.new(:feature_type => sql_type, :geog => geog, :name => name, :metadata => metadata, :importable_image_paths => importable_image_paths)
+            yield OpenStruct.new(:geog => geog, :name => name, :metadata => metadata, :importable_image_paths => importable_image_paths)
           end
         end
       end

data/lib/spatial_features/importers/shapefile.rb

@@ -6,7 +6,6 @@ module SpatialFeatures
     class Shapefile < Base
       class_attribute :default_proj4_projection
 
-      FEATURE_TYPE_FOR_DIMENSION = { 0 => 'point', 1 => 'line', 2 => 'polygon' }.freeze
       PROJ4_4326 = '+proj=longlat +datum=WGS84 +no_defs'.freeze
 
       def initialize(data, proj4: nil, **options)
@@ -46,7 +45,7 @@ module SpatialFeatures
       def data_from_record(record, proj4 = nil)
         geometry = record.geometry
         wkt = geometry.as_text
-        data = { :metadata => record.attributes, feature_type: FEATURE_TYPE_FOR_DIMENSION.fetch(geometry.dimension) }
+        data = { :metadata => record.attributes }
 
         if proj4 == PROJ4_4326
           data[:geog] = wkt

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "3.4.8"
+  VERSION = "3.6.0"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 3.4.8
+  version: 3.6.0
 platform: ruby
 authors:
 - Ryan Wallace
 - Nicholas Jakobsen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-03 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +101,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +208,7 @@ homepage: https://github.com/culturecode/spatial_features
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -203,8 +223,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.23
-signing_key: 
+rubygems_version: 3.5.1
+signing_key:
 specification_version: 4
 summary: Adds spatial methods to a model.
 test_files: []