spatial_features 2.11.0 → 2.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb5268adbbf2c9b9019512e4d3617fc97c587497913202bf95c3dd35332497e8
-  data.tar.gz: 37928531494a21c1934425bb222759accdbfae763c7eb2e7f5570e8e17c69e42
+  metadata.gz: a7dc123319b7699b8cdd61e7957ad5be3b173e2c6e80701772293eda72eaa93a
+  data.tar.gz: 27d3ed1027be88610afaf8788fb4bc076658f5573bd6337387a0d73ea285a5b1
 SHA512:
-  metadata.gz: d995ebde69133a39e99885ce694551d5bd64fb08a67b8e658d86138f56673b78a27f101f65cb86027e864d3fa0a3e2c05f43d944a3c55b2fac1a3e53a304715b
-  data.tar.gz: 99be0f11815754302e8b3f1cf50fa31964993fa43d2a1cc5a68e688eacb03d0d2116cea1ff71c7c7c8c2c99a7c7ae76c2dc83c0f6bef34ec525434bb990be2e1
+  metadata.gz: 6b6d63f7b5a919afeae24b1075bd69a32420cd47b4963a5bcd319d79890c06a284c28b8162e61327ef76c5bbf6acc2f2f8c5c88b82746ebc51c264b24dbe5473
+  data.tar.gz: 3eb3585092c0437a1e02881bc52c6f6cffe9d9c7784404b6119db9eb70c4ee46d9d58b614dc3a6496677e1d4a7a203f346340a584b332e6855ad9088a1292a88

data/app/models/abstract_feature.rb

@@ -17,7 +17,8 @@ class AbstractFeature < ActiveRecord::Base
   after_save :cache_derivatives, :if => :saved_change_to_geog?
 
   def self.cache_key
-    "#{maximum(:id)}-#{count}"
+    result = connection.select_one(all.select('max(id) AS max, count(*) AS count').to_sql)
+    "#{result['max']}-#{result['count']}"
   end
 
   def self.with_metadata(k, v)

data/config/initializers/register_oids.rb

@@ -1,8 +1,8 @@
 module PostGISTypes
-  def initialize_type_map(mapping)
+  def initialize_type_map(m = type_map)
     super
-    register_class_with_limit mapping, 'geometry', ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::SpecializedString
-    register_class_with_limit mapping, 'geography', ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::SpecializedString
+    register_class_with_limit m, 'geometry', ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::SpecializedString
+    register_class_with_limit m, 'geography', ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::SpecializedString
   end
 end
 

data/lib/spatial_features/has_spatial_features.rb

@@ -36,12 +36,8 @@ module SpatialFeatures
       true
     end
 
-    # Add methods to generate cache keys for a record or all records of this class
-    # NOTE: features are never updated, only deleted and created, therefore we can
-    # tell if they have changed by finding the maximum id and count instead of needing timestamps
     def features_cache_key
-      # Do two separate queries because it is much faster for some reason
-      "#{name}/#{features.cache_key}"
+      "#{name}/#{aggregate_features.cache_key}"
     end
 
     def intersecting(other, options = {})
@@ -172,7 +168,7 @@ module SpatialFeatures
     end
 
     def features_cache_key
-      "#{self.class.name}/#{self.id}-#{features.cache_key}"
+      "#{self.class.name}/#{id}-#{has_spatial_features_hash? ? features_hash : aggregate_feature.cache_key}"
     end
 
     def polygons?
@@ -188,7 +184,11 @@ module SpatialFeatures
     end
 
     def features?
-      features.present?
+      if features.loaded?
+        features.present?
+      else
+        features.exists?
+      end
     end
 
     def intersects?(other)

data/lib/spatial_features/has_spatial_features/feature_import.rb

@@ -67,9 +67,10 @@ module SpatialFeatures
     private
 
     def spatial_feature_imports(import_options, make_valid)
-      import_options.collect do |data_method, importer_name|
-        data = send(data_method)
-        spatial_importer_from_name(importer_name).new(data, :make_valid => make_valid) if data.present?
+      import_options.flat_map do |data_method, importer_name|
+        Array.wrap(send(data_method)).map do |data|
+          spatial_importer_from_name(importer_name).new(data, :make_valid => make_valid) if data.present?
+        end
       end.compact
     end
 

data/lib/spatial_features/importers/kml.rb

@@ -6,22 +6,24 @@ module SpatialFeatures
       private
 
       def each_record(&block)
-        Nokogiri::XML(@data).css('Placemark').each do |placemark|
-          name = placemark.css('name').text
-          metadata = extract_metadata(placemark)
-
-          {'Polygon' => 'POLYGON', 'LineString' => 'LINE', 'Point' => 'POINT'}.each do |kml_type, sql_type|
-            placemark.css(kml_type).each do |placemark|
-              next if blank_placemark?(placemark)
-
-              yield OpenStruct.new(:feature_type => sql_type, :geog => geom_from_kml(placemark), :name => name, :metadata => metadata)
+        {'Polygon' => 'POLYGON', 'LineString' => 'LINE', 'Point' => 'POINT'}.each do |kml_type, sql_type|
+          Nokogiri::XML(@data).css(kml_type).each do |feature|
+            if placemark = feature.ancestors('Placemark').first
+              name = placemark.css('name').text
+              metadata = extract_metadata(placemark)
+            else
+              metadata = {}
             end
+    
+            next if blank_feature?(feature)
+
+            yield OpenStruct.new(:feature_type => sql_type, :geog => geom_from_kml(feature), :name => name, :metadata => metadata)
           end
         end
       end
 
-      def blank_placemark?(placemark)
-        placemark.css('coordinates').text.blank?
+      def blank_feature?(feature)
+        feature.css('coordinates').text.blank?
       end
 
       def geom_from_kml(kml)

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.11.0"
+  VERSION = "2.12.3"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.3
 platform: ruby
 authors:
 - Ryan Wallace
 - Nicholas Jakobsen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2020-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -20,7 +20,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
@@ -205,7 +205,7 @@ homepage: https://github.com/culturecode/spatial_features
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -220,9 +220,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Adds spatial methods to a model.
 test_files: []