spatial_features 2.10.9 → 2.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a716f42ee3c557baa01ea0a9e209f58e7bfb94163059057c7ff6fe303018de09
-  data.tar.gz: 17b0fa1251fb09c2aef8d45f82adb89e2e5e141110c3b1a659b8f2b30ab28f07
+  metadata.gz: 0051ead788fe05361e242dd7043efe1dee46c31260f4b3fdc782c06af5238e73
+  data.tar.gz: f9658375cee39987dd047839222781eb12b35eab73eb950e62c4349e47955dbf
 SHA512:
-  metadata.gz: 3281304f2c534c57c98a2842cbf4cd77b14c59f3d54169c9ef0e39bd78b1f07e8ab775fe05cf575ee3f7443a3b13468638bebf3a7508e2931acfd0f4bacc96ea
-  data.tar.gz: aaf5163cd6403673d418943585b20bd4817e6bfd4885fe08f4e663d29d003adfaa80e480f69554fe4f31522e4cbd9e695ac38c19d9797bbfe1d1c0fba5ccef4e
+  metadata.gz: 2738a619531511cf2d90052a6ffdab481b5edfc875271cae30df287759ccdc09dcb1df8291c63192e5e618291410befd2d5cfcd3a3155f852a5d59c44b5b6aff
+  data.tar.gz: 114543074b9bdfea813e979505829d6282ec49524fe9ad4093b1119e7099feec2205f8b5a33b447ca8cac05470ae74b12ee93b9a7a3c6f7e66d9497ce43fa2ca

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)
@@ -40,6 +41,11 @@ class AbstractFeature < ActiveRecord::Base
     where(:feature_type => 'point')
   end
 
+  def self.within_distance(lat, lng, distance_in_meters)
+    # where("ST_DWithin(features.geog, ST_SetSRID( ST_Point( -71.104, 42.315), 4326)::geography, :distance)", :lat => lat, :lng => lng, :distance => distance_in_meters)
+    where("ST_DWithin(features.geog, ST_Point(:lng, :lat), :distance)", :lat => lat, :lng => lng, :distance => distance_in_meters)
+  end
+
   def self.area_in_square_meters(geom = 'geom_lowres')
     current_scope = all.polygons
     unscoped { connection.select_value(select("ST_Area(ST_Union(#{geom}))").from(current_scope, :features)).to_f }

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 = {})
@@ -81,6 +77,15 @@ module SpatialFeatures
       end
     end
 
+    def aggregate_features
+      type = base_class.to_s # Rails stores polymorphic foreign keys as the base class
+      if all == unscoped
+        AggregateFeature.where(:spatial_model_type => type)
+      else
+        AggregateFeature.where(:spatial_model_type => type, :spatial_model_id => all.unscope(:select))
+      end
+    end
+
     # Returns true if the model stores a hash of the features so we don't need to process the features if they haven't changed
     def has_spatial_features_hash?
       column_names.include? 'features_hash'
@@ -163,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?

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.10.9"
+  VERSION = "2.12.2"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.10.9
+  version: 2.12.2
 platform: ruby
 authors:
 - Ryan Wallace
 - Nicholas Jakobsen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2020-08-23 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: []