spatial_features 2.15.1 → 2.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32a3f5efdd999a1b4e229e6f9e270ef62711345939d94b1cb2c86e1740f5ec26
-  data.tar.gz: 90cf9b26c0d1816e1a65b7fc499827fdbb83d26f83f9a80ce13d48818832170c
+  metadata.gz: 86e67798202370af90674a888afbf1ac4f7847fa24385e1457ebe14e3ff6d4bc
+  data.tar.gz: 75e5c07bb3dc7c3f969f36919d7a468046fec0fcb3683e28f2c862dce9bcee11
 SHA512:
-  metadata.gz: 00ba9b1b12ca3858f5f9ff44c5a4cbb5b1275248df062b2a608f24cf83ff0495ac811074bfa1b4e88d3fdacf0b83c09462c72c003f78a25ab30d212f7fef5ec4
-  data.tar.gz: 26c67a7e211df58ff05e20cb3b33dbf2c98dc938e0263a000ab2b744a4c71581bef751fd4871d44bc3068f575a301b487074469cbdae32c457bb122341c21358
+  metadata.gz: fc4d1aeb966cc2623bd8d324e6ef1bf1fc8e3b4f4bdffddaf123f30e76d827461b0b2277b141ae57a501fd26dc47105aa289771c70f302d1119f5d7270d9ff96
+  data.tar.gz: 41a82aebeef10ff3445348a0859e2db72f42e4b5041fd27b8b72d1368b12d4294e8ec9b270bcf570280f28b23819ed3ad80b066803c0997eca9777f361a778e2

data/app/models/abstract_feature.rb

@@ -19,17 +19,16 @@ class AbstractFeature < ActiveRecord::Base
   before_save :sanitize, if: :will_save_change_to_geog?
   after_save :cache_derivatives, :if => [:automatically_cache_derivatives?, :saved_change_to_geog?]
 
-  def self.cache_key
-    result = connection.select_one(all.select('max(id) AS max, count(*) AS count').to_sql)
-    "#{result['max']}-#{result['count']}"
-  end
-
   # for Rails >= 5 ActiveRecord collections we override the collection_cache_key
   # to prevent Rails doing its default query on `updated_at`
   def self.collection_cache_key(_collection, _timestamp_column)
     self.cache_key
   end
 
+  def self.cache_key
+    "#{maximum(:id)}-#{count}"
+  end
+
   def self.with_metadata(k, v)
     if k.present? && v.present?
       where('metadata->? = ?', k, v)
@@ -123,8 +122,15 @@ class AbstractFeature < ActiveRecord::Base
     SQL
   end
 
-  def self.geojson(lowres: false, precision: 6, properties: true, srid: 4326) # default srid is 4326 so output is Google Maps compatible
-    column = lowres ? "ST_Transform(geom_lowres, #{srid})" : 'geog'
+  def self.geojson(lowres: false, precision: 6, properties: true, srid: 4326, centroids: false) # default srid is 4326 so output is Google Maps compatible
+    if centroids
+      column = 'centroid'
+    elsif lowres
+      column = "ST_Transform(geom_lowres, #{srid})"
+    else
+      column = 'geog'
+    end
+
     properties_sql = <<~SQL if properties
       , 'properties', hstore_to_json(metadata)
     SQL
@@ -145,7 +151,7 @@ class AbstractFeature < ActiveRecord::Base
   end
 
   def feature_bounds
-    {n: north, e: east, s: south, w: west}
+    slice(:north, :east, :south, :west)
   end
 
   def cache_derivatives(*args)

data/lib/spatial_features/has_spatial_features.rb

@@ -201,6 +201,15 @@ module SpatialFeatures
       self.class.unscoped { self.class.intersecting(other).exists?(id) }
     end
 
+    def bounds
+      if association(:aggregate_feature).loaded?
+        aggregate_feature&.feature_bounds
+      else
+        result = aggregate_features.pluck(:north, :east, :south, :west).first
+        [:north, :east, :south, :west].zip(result.map {|bound| BigDecimal(bound) }).to_h.with_indifferent_access if result
+      end
+    end
+
     def total_intersection_area_percentage(klass)
       return 0.0 unless features_area_in_square_meters > 0
 
@@ -208,7 +217,11 @@ module SpatialFeatures
     end
 
     def features_area_in_square_meters
-      aggregate_feature&.area
+      if association(:aggregate_feature).loaded?
+        aggregate_feature&.area
+      else
+        aggregate_features.pluck(:area).first
+      end
     end
 
     def total_intersection_area_in_square_meters(other)
@@ -228,6 +241,11 @@ module SpatialFeatures
         return false
       end
     end
+
+    # Scope to perform SQL-only calculations on a record's aggregate feature. This avoids loading the large data payload if all that is needed is metadata
+    def aggregate_features
+      self.class.where(id: id).aggregate_features
+    end
   end
 
   module FeaturesAssociationExtensions

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.15.1"
+  VERSION = "2.17.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.15.1
+  version: 2.17.2
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-14 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails