spatial_features 2.19.1 → 2.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36eed2c1325bed9be0605ee197dfe74770fd86e2a0e0c032e73937db73519ebc
-  data.tar.gz: dc7959b2ed3f6ca983c0dc22c50842bdbf78b73ab47ec8279a8101f0f850f99b
+  metadata.gz: 639dee46fedd2cf507642b41119ff99e93506b54d891ab42d21a1f24fcf5a679
+  data.tar.gz: 956175227c6a59acc867810a51796303218eac70c9bc49fe0d0f8222ea8558e6
 SHA512:
-  metadata.gz: cf5986e2b8473f571c7faef6044a34b14171779ad46724b3d38916570ca47dff17e57e0ea5ee6d8ae599032ae197ef7177b7113d77911495dc87413570ba630a
-  data.tar.gz: 95dbc3d2c8c8dc2535930304823f91746ef293091b70ff9c530fcebdeff65ca8dabca66db78ce6bf68919f4cb5d1afb0b3db8e3ee414130e600b956a285a6a1e
+  metadata.gz: 6a1ac7a0dca15400e0e03f0f1c2192e22a4c1e818edde2a832f925e6ee803a9284c5236684228e25dbeabf2d147aacef4f4c05170216b0857941c87ed9b9a395
+  data.tar.gz: da6fc8be7449202dfe46de18f0829e49664626ba17b90b6e3c1eae7a059f38a10d8310046e4f2bf44fb80bf78f2cdeea26624f429fc0d7b5873775b332086712

data/README.md

@@ -109,8 +109,17 @@ Person.new(:features => [Feature.new(:geog => 'some binary PostGIS Geography str
 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.
 ```ruby
+def ImageImporter
+  def self.call(feature, image_paths)
+    image_paths.each do |pathname|
+      # ...
+    end
+  end
+end
+
 class Location < ActiveRecord::Base
-  has_spatial_features :import => { :remote_kml_url => 'KMLFile', :file => 'File', :geojson => 'GeoJSON' }
+  has_spatial_features :import => { :remote_kml_url => 'KMLFile', :file => 'File', :geojson => 'GeoJSON' },
+                       :image_handlers => ['ImageImporter']
 
   def remote_kml_url
     "www.test.com/kml/#{id}.kml"

data/app/models/feature.rb

@@ -15,6 +15,8 @@ class Feature < AbstractFeature
 
   after_save :refresh_aggregate, if: :automatically_refresh_aggregate?
 
+  attr_accessor :importable_image_paths # :nodoc:
+
   # Features are used for display so we also cache their KML representation
   def self.cache_derivatives(options = {})
     super

data/lib/spatial_features/has_spatial_features/feature_import.rb

@@ -8,7 +8,7 @@ module SpatialFeatures
     included do
       extend ActiveModel::Callbacks
       define_model_callbacks :update_features
-      spatial_features_options.reverse_merge!(:import => {}, spatial_cache: [])
+      spatial_features_options.reverse_merge!(:import => {}, :spatial_cache => [], :image_handlers => [])
     end
 
     module ClassMethods
@@ -78,13 +78,30 @@ module SpatialFeatures
       "SpatialFeatures::Importers::#{importer_name}".constantize
     end
 
+    def handle_images(feature)
+      return if feature.importable_image_paths.nil? || feature.importable_image_paths.empty?
+
+      Array(spatial_features_options[:image_handlers]).each do |image_handler|
+        image_handler_from_name(image_handler).call(feature, feature.importable_image_paths)
+      end
+    end
+
+    def image_handler_from_name(handler_name)
+      handler_name.to_s.constantize
+    end
+
     def import_features(imports, skip_invalid)
       features.delete_all
       valid, invalid = Feature.defer_aggregate_refresh do
         Feature.without_caching_derivatives do
           imports.flat_map(&:features).partition do |feature|
             feature.spatial_model = self
-            feature.save
+            if feature.save
+              handle_images(feature)
+              true
+            else
+              false
+            end
           end
         end
       end

data/lib/spatial_features/importers/base.rb

@@ -46,7 +46,8 @@ module SpatialFeatures
       end
 
       def build_feature(record)
-        Feature.new(:name => record.name, :metadata => record.metadata, :feature_type => record.feature_type, :geog => record.geog, :make_valid => @make_valid)
+        importable_image_paths = record.importable_image_paths if record.respond_to?(:importable_image_paths)
+        Feature.new(:name => record.name, :metadata => record.metadata, :feature_type => record.feature_type, :geog => record.geog, :importable_image_paths => importable_image_paths, :make_valid => @make_valid)
       end
     end
   end

data/lib/spatial_features/importers/kml.rb

@@ -3,6 +3,14 @@ require 'ostruct'
 module SpatialFeatures
   module Importers
     class KML < Base
+      # <SimpleData name> keys that may contain <img> tags
+      IMAGE_METADATA_KEYS = %w[pdfmaps_photos].freeze
+
+      def initialize(data, base_dir: nil, **args)
+        @base_dir = base_dir
+        super data, **args
+      end
+
       private
 
       def each_record(&block)
@@ -18,10 +26,11 @@ module SpatialFeatures
             next if blank_feature?(feature)
 
             geog = geom_from_kml(feature)
-
             next if geog.blank?
 
-            yield OpenStruct.new(:feature_type => sql_type, :geog => geog, :name => name, :metadata => metadata)
+            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)
           end
         end
       end
@@ -32,17 +41,35 @@ module SpatialFeatures
 
       def geom_from_kml(kml)
         geom = nil
+        conn = nil
 
         # 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
-          geom = SpatialFeatures::Utils.select_db_value("SELECT ST_GeomFromKML(#{ActiveRecord::Base.connection.quote(kml.to_s)})")
+          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
       end
 
+      def images_from_metadata(metadata)
+        IMAGE_METADATA_KEYS.flat_map do |key|
+          images = metadata.delete(key)
+          next unless images
+
+          Nokogiri::HTML.fragment(images).css("img").map do |img|
+            next unless (src = img["src"])
+            @base_dir.join(src.downcase)
+          end
+        end.compact
+      end
+
       def extract_metadata(placemark)
         metadata = {}
         metadata.merge! extract_table(placemark)

data/lib/spatial_features/importers/kml_file.rb

@@ -1,13 +1,17 @@
 module SpatialFeatures
   module Importers
     class KMLFile < KML
-      def initialize(path_or_url, *args)
-        super Download.read(path_or_url, unzip: '.kml'), *args
-
+      def initialize(path_or_url, **options)
+        path = Download.open_each(path_or_url, unzip: [/\.kml$/], downcase: true).first
+        super ::File.read(path), base_dir: Pathname.new(path).dirname, **options
       rescue SocketError, Errno::ECONNREFUSED, OpenURI::HTTPError
         url = URI(path_or_url)
         raise ImportError, "KML server is not responding. Ensure server is running and accessible at #{[url.scheme, "//#{url.host}", url.port].select(&:present?).join(':')}."
       end
+
+      def cache_key
+        @cache_key ||= Digest::MD5.hexdigest(@data)
+      end
     end
   end
 end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.19.1"
+  VERSION = "2.20.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.19.1
+  version: 2.20.0
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-12 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -175,8 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Adds spatial methods to a model.