spatial_features 2.15.0 → 2.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79fb559903943c11893b5d338f5c8030971f23051cf3611a326d0e013720f5e5
-  data.tar.gz: 1311241026ec5dc76a90e04f8fcc9e93c92965875f0967e1b27a0e1f64694ab3
+  metadata.gz: b61f238cf2d0fa0dd936d9258c617708ea7e4e4ec4be41257b0a3869cde54d4d
+  data.tar.gz: 5ea8025d332dd1fedeab4a90c878568567710d139eba76547cf695e0bbedfd66
 SHA512:
-  metadata.gz: 8080e32e08c262fb3c44c6a228b0c599a1030ec52f9daea7862a06a98aa72b46dad77fb73127d5d40e6e999549ea44ebde0b77e826b1776e92eefe6b4a14898c
-  data.tar.gz: 3d591754fdc5a1ddb92146d805074aa5dc4bc65f5261eb0c169546f886b5dee784de7f24f56829a359641ae778960ffd54923c6b2535261d2e1194e0c9db0859
+  metadata.gz: 8089ccc6e35bf54547f72d11332d3112388ba86ba2dd4828080f7be12a075ab3f33c3d181d79dd7c4403bfd7d9c2e8d6ff7842d57dcfc6ad2a775361d1ce5844
+  data.tar.gz: 6ae887ec028239d8d0431ecdbf2006f0f5b7a8ecf04e3c1b45adadd5a080a44b2b447787e178614610f1627a5cfe244cfee2fabd9670fa617deb516a87813512

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,10 +122,17 @@ class AbstractFeature < ActiveRecord::Base
     SQL
   end
 
-  def self.geojson(lowres: false, precision: 6, properties: {}, srid: 4326) # default srid is 4326 so output is Google Maps compatible
-    column = lowres ? "ST_Transform(geom_lowres, #{srid})" : 'geog'
-    properties_sql = <<~SQL if properties.present?
-      , 'properties', json_build_object(#{properties.map {|k,v| "'#{k}',#{v}" }.join(',') })
+  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
 
     sql = <<~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
 
@@ -228,6 +237,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.0"
+  VERSION = "2.17.1"
 end

metadata

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