spatial_features 3.5.1 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58ed4738a69dce88104f9ad09ad32dc9f6ebe8819e6bd4bd87c30ea7bde58c70
-  data.tar.gz: b70f376893db22e801ce2b1535c26390f02a754a6884938713ad292cac7432da
+  metadata.gz: b7cdd5c7e10977ad9a78fb31f28eb86dd05b1e62e0249f09b126f4ed4df90a19
+  data.tar.gz: 893d5e2d61574a7fcdedde78e5fde1e2a6ccf9d2a251bfd69cbcbcf8dcda89e9
 SHA512:
-  metadata.gz: 9e0aa77934a5e00d891bb22adc72e3779267193035deaad0e236ced895c0565c06a6d4b81218e2d2708a493f9913fefdec10cac6e64b40d105cb0e0518f57ec4
-  data.tar.gz: 9456cac927abb58f4710cbbc6366e5f906c93460e68013be9bd48cef90340d2ccf3d43d29e8ac8dff1752fc1c3950030aa494fbaffb3ca91e8ffc3ee179d8876
+  metadata.gz: 7ba7abf4e57f5bb8f76500e6b501b287e6b5b3ff09c5338b088900de2e9b993d4aa0365f305c52ba7febb6ff6ecf0606396026e4cae169767948a34b46bbd768
+  data.tar.gz: 976241133335d867dd74f05e5426b8f9281d88c126f30177e4c4f56a5e4509104dfe80f1ae4dc27bc1eaba265a079c8e2b2eaee4d0e7096a6ac136ed15c69daf

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"

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

data/lib/spatial_features/importers/kml_file_arcgis.rb

@@ -12,16 +12,6 @@ module SpatialFeatures
       rescue OpenURI::HTTPError
         raise ImportError, "ArcGIS Map Service not found. Ensure ArcGIS Server is running and accessible at #{path_or_url}."
       end
-
-      private
-
-      # ArcGIS includes metadata as an html table in the description
-      def each_record(&block)
-        super do |record|
-          record.metadata = Hash[Nokogiri::XML(record.metadata[:description]).css('td').collect(&:text).each_slice(2).to_a]
-          yield record
-        end
-      end
     end
   end
 end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "3.5.1"
+  VERSION = "3.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.1
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails