spatial_features 2.10.8 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e304bd5be296e4094c384df03f72117452bce5bafc5364dd3277c9826c374f28
-  data.tar.gz: d0bddea53fc9210bbc192160c490b7ba8b85dcafc8ee6dc238f8f8f8d4ea6a43
+  metadata.gz: 589cebda0f09ed3f2568a2ddcd91908b556e1690062004d7158b2db98ba5fc96
+  data.tar.gz: d69b66a8242de5feffd71a33390cedf671eaa7e8652a26e2f6a8a23d586b3e75
 SHA512:
-  metadata.gz: bef25168be8628a563a5aff4026c3dd3de26ba5cbcd82ed6b3de155bfed59d6e8ac72af4f05b8a12f3755125772732fe14238f5ea9daccc6d62bfb8fc9739311
-  data.tar.gz: 9f0969a84cd00fca613384cbf8dfdd5989421de2b63c56db600729f94dc5c65a6333ba96dd99377b9339823bca8657fd7eaa51e1aff91abb8bfcd34bb3db9cb0
+  metadata.gz: 8732f12f99fab1fcad7c58ccab5d0956937f36cedb2f6fd16b02d004016ca36207a4bc601fb8c3804fabec28fa8b444ae3f0e74a93333f099eacaf74129b4034
+  data.tar.gz: bae08792bc07a63c25f1eeb0d0037d55ec55d438e376f61551203773e2e24ccfc89351a58f6f559bcc954ad41076653cf500fe7204298ed61c7cdf6f9942b3c3

data/app/models/abstract_feature.rb

@@ -40,6 +40,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 }
@@ -143,6 +148,10 @@ class AbstractFeature < ActiveRecord::Base
     @make_valid
   end
 
+  def wkt
+    ActiveRecord::Base.connection.select_value("SELECT ST_ASEWKT('#{geom}')")
+  end
+
   private
 
   def make_valid

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?
@@ -183,7 +188,7 @@ module SpatialFeatures
     end
 
     def intersects?(other)
-      self.class.intersecting(other).exists?(self)
+      self.class.unscoped { self.class.intersecting(other).exists?(id) }
     end
 
     def total_intersection_area_percentage(klass)

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.8"
+  VERSION = "2.12.1"
 end

metadata

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