spatial_features 3.10.0 → 3.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5ada735515d4ec029917c5d00994254804e9b270c65093f32672d851fb1a452
-  data.tar.gz: 1828f79799ab6e91bfcd0503aba6091b9e0120d33aa28a05158f729dc1738e0f
+  metadata.gz: fdeeed7e535906a617d6fcfdf50ddf8b05acc0a588e14cade7f9ca62700b593c
+  data.tar.gz: 20886debc5f838c5cc9cc1d096867d10b1c32ad8884a836021d53ee5bc161c64
 SHA512:
-  metadata.gz: ff7491b8acd5875ad23909d2ce988ea793d00707be4ece7d9cb7b700c4a1e064db949778ccc029f948f3ea389d91b7e8c54dceac55fb3206bd928bd97319e760
-  data.tar.gz: f1256bec3bb256e2789e3e7e0462f8f710f23fc1a493814b8a9126c3cd5495680394f588ca5121908875847d5ae3748a10a0e65d5b0f84d7ee65a5304a238c4b
+  metadata.gz: 447c879b49a4e46931f2c2ce64f3acb3c1642f35909bf95e2c6d683eadd6205b0e393acd90cb77b90fd602b5b56e02cf2a87f511f5f8026c7cb46367a0dcfe7d
+  data.tar.gz: d5dd31db08df30837aaf1edea842e309e8d1008067cfb255c3134fdc5c1193d6d97943e8c11cb25cb9658e81de28836fbfe53ac5bd33c1e1e494d945fe4cf2ee

data/lib/spatial_features/has_spatial_features/feature_import.rb

@@ -41,8 +41,15 @@ module SpatialFeatures
             update_spatial_cache(options.slice(:spatial_cache))
           end
 
+          # Attribute each warning to the file it came from (e.g. `archive.zip/layer.kml`)
+          # so a multi-file or multi-source import makes clear which file was affected.
+          import_warnings = imports.flat_map do |import|
+            import.warnings.map {|warning| [import.source_identifier.presence, warning].compact.join(': ') }
+          end
+          store_feature_update_warnings(import_warnings)
+
           if imports.present? && features.compact_blank.empty? && !allow_blank
-            raise EmptyImportError, "No spatial features were found when updating"
+            raise EmptyImportError, ["No spatial features were found when updating.", *import_warnings].join(' ')
           end
         end
       end

data/lib/spatial_features/has_spatial_features/queued_spatial_processing.rb

@@ -45,6 +45,30 @@ module SpatialFeatures
       spatial_processing_status(:update_features!) == :failure
     end
 
+    # Non-fatal messages from the most recent successful feature import (e.g. parts of
+    # the source that were skipped). Stored alongside the status cache so they survive
+    # job completion, since successful Delayed::Jobs are deleted and can't be read back.
+    WARNINGS_CACHE_KEY = 'feature_update_warnings'.freeze
+
+    def feature_update_warnings
+      return [] unless has_attribute?(:spatial_processing_status_cache)
+      Array(spatial_processing_status_cache[WARNINGS_CACHE_KEY])
+    end
+
+    def store_feature_update_warnings(warnings)
+      return unless has_attribute?(:spatial_processing_status_cache)
+
+      cache = spatial_processing_status_cache
+      warnings = Array(warnings).reject(&:blank?)
+      if warnings.present?
+        cache[WARNINGS_CACHE_KEY] = warnings
+      else
+        cache.delete(WARNINGS_CACHE_KEY)
+      end
+      self.spatial_processing_status_cache = cache
+      update_column(:spatial_processing_status_cache, cache) if persisted? && will_save_change_to_spatial_processing_status_cache?
+    end
+
     def spatial_processing_status(method_name, use_cache: true)
       if has_attribute?(:spatial_processing_status_cache)
         update_spatial_processing_status(method_name) unless use_cache

data/lib/spatial_features/importers/base.rb

@@ -4,12 +4,19 @@ module SpatialFeatures
   module Importers
     class Base
       attr_reader :errors
+
+      # Non-fatal messages about parts of the source that could not be imported but
+      # did not prevent the remaining features from importing (e.g. unsupported
+      # elements). Unlike `errors`, warnings never abort the import.
+      attr_reader :warnings
+
       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, feature_name: ->(record) { record.name })
         @make_valid = make_valid
         @data = data
         @errors = []
+        @warnings = []
         @tmpdir = tmpdir
         @source_identifier = source_identifier
         @feature_name = feature_name

data/lib/spatial_features/importers/kml.rb

@@ -46,34 +46,50 @@ module SpatialFeatures
           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?
+          discard_network_links(doc)
           doc
         end
       end
 
+      # NetworkLinks reference geometry hosted elsewhere (e.g. a remote KMZ) rather
+      # than embedding it, so there is nothing for us to import from them. Rather than
+      # failing the whole file, we drop them and record a warning so any embedded
+      # geometry still imports and the user is told which layers were skipped. If the
+      # file contained nothing but NetworkLinks the import ends up empty and the
+      # EmptyImportError surfaces the warning as the reason.
+      def discard_network_links(doc)
+        network_links = doc.search('NetworkLink')
+        return if network_links.empty?
+
+        names = network_links.map {|link| link.at_css('name')&.text.presence }.compact.uniq
+        described = names.any? ? ": #{names.to_sentence}" : ''
+        @warnings << "Skipped #{network_links.size} network-linked #{'layer'.pluralize(network_links.size)} that reference remote data and cannot be imported#{described}."
+
+        network_links.remove
+      end
+
       def blank_feature?(feature)
         feature.css('coordinates').text.blank?
       end
 
       def geom_from_kml(kml)
-        geom = nil
-        conn = nil
-
         strip_altitude(kml)
 
-        # Do query in a new thread so we use a new connection (if the query fails it will poison the transaction of the current connection)
-        #
-        # We manually checkout a new connection since Rails re-uses DB connections across threads.
-        Thread.new do
-          conn = ActiveRecord::Base.connection_pool.checkout
-          geom = conn.select_value("SELECT ST_GeomFromKML(#{conn.quote(kml.to_s)})")
-        rescue ActiveRecord::StatementInvalid => e # Discard Invalid KML features
-          geom = nil
-        ensure
-          ActiveRecord::Base.connection_pool.checkin(conn) if conn
-        end.join
-
-        return geom
+        # Run the parse inside a SAVEPOINT so a `ST_GeomFromKML` failure on a single
+        # invalid feature rolls back only that savepoint, not the surrounding
+        # transaction. The previous implementation spawned a thread and checked out
+        # a fresh connection for the same isolation reason, but on Rails 8 that
+        # pattern deadlocks under `use_transactional_fixtures` — the test pins its
+        # connection, the spawned thread blocks indefinitely waiting on
+        # `ActiveRecord::Base.connection_pool.checkout`. A nested transaction
+        # (`requires_new: true`) gives identical fault containment without crossing
+        # thread boundaries.
+        ActiveRecord::Base.transaction(requires_new: true) do
+          conn = ActiveRecord::Base.connection
+          conn.select_value("SELECT ST_GeomFromKML(#{conn.quote(kml.to_s)})")
+        end
+      rescue ActiveRecord::StatementInvalid # Discard invalid KML features
+        nil
       end
 
       def images_from_metadata(metadata)

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "3.10.0"
+  VERSION = "3.10.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.10.2
 platform: ruby
 authors:
 - Ryan Wallace
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.5
 specification_version: 4
 summary: Adds spatial methods to a model.
 test_files: []