spatial_features 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d233745523bccf1bc197738dea299c3e9176b3db
-  data.tar.gz: cbf5d686fa6041965c9484f4b76025bd98ef5e8c
+  metadata.gz: 0cd63a859a5b2dc1ea05a30d24bd61d6454f7591
+  data.tar.gz: e74e1827facb883756275fbbe0e2a549a7c474a0
 SHA512:
-  metadata.gz: d6cde3c67b95ba0fbc807c6cdd564d7e5f7c9ce280f0d2091e934016b28bf25902b28fc5e8730badc7ebe8ed63b71e8107ddef0c5658afbe08ced72cb8c2f856
-  data.tar.gz: 0c03056c50fa4edc07a2539258c4729f35ab16539c2283c457e75c32cd34b26a16d88c03ee34e1c60ed9c01ad4cca2c154eef022aa40fe4fda49411b6b462c65
+  metadata.gz: d485766d5075a0e7dd13cffc468738c4d8f11404ebcf398e248872d0fffe3024b9dd4540cec931636f3c9fdaa54dfaf2fdc194a610803fe417f7e1fee0cccc4b
+  data.tar.gz: c6d356fd5432119e148a76ef9e02b685da9d5e0a51bf255adf3c7c1a557fccbc688abf9b3093a3e57fed07a80aae89268295a6884e562b28761866ae3eaf1c2b

data/lib/spatial_features/has_spatial_features.rb

@@ -1,7 +1,11 @@
 module SpatialFeatures
   module ActMethod
     def has_spatial_features(options = {})
-      has_many :features, :as => :spatial_model, :dependent => :delete_all
+      extend ClassMethods
+      include InstanceMethods
+
+      has_many :features, lambda { extending FeaturesAssociationExtensions }, :as => :spatial_model, :dependent => :delete_all
+
       scope :with_features, lambda { where(:id => Feature.select(:spatial_model_id).where(:spatial_model_type => name)) }
       scope :without_features, lambda { where.not(:id => Feature.select(:spatial_model_id).where(:spatial_model_type => name)) }
 
@@ -9,8 +13,9 @@ module SpatialFeatures
       has_many :model_a_spatial_proximities, :as => :model_a, :class_name => 'SpatialProximity', :dependent => :delete_all
       has_many :model_b_spatial_proximities, :as => :model_b, :class_name => 'SpatialProximity', :dependent => :delete_all
 
-      extend SpatialFeatures::ClassMethods
-      include SpatialFeatures::InstanceMethods
+      after_save :update_features_area, :if => :features_hash_changed? if has_features_area? && has_spatial_features_hash?
+
+      delegate :has_spatial_features_hash?, :has_features_area?, :to => self
     end
   end
 
@@ -81,7 +86,6 @@ module SpatialFeatures
       end
     end
 
-
     def features
       Feature.where(:spatial_model_type => self, :spatial_model_id => all)
     end
@@ -101,6 +105,16 @@ module SpatialFeatures
                AND "#{table_alias}".spatial_model_id IN (#{spatial_model_id}))
     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'
+    end
+
+    # Returns true if the model stores a cache of the features area
+    def has_features_area?
+      column_names.include? 'features_area'
+    end
+
     private
 
     def cached_spatial_join(other)
@@ -165,11 +179,6 @@ module SpatialFeatures
       features.present?
     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?
-      respond_to?(:features_hash)
-    end
-
     def covers?(other)
       self.class.covering(other).exists?(self)
     end
@@ -178,17 +187,6 @@ module SpatialFeatures
       self.class.intersecting(other).exists?(self)
     end
 
-    def total_intersection_area_in_square_meters(klass, options = {})
-      self.class
-        .select(%Q(ST_Area(ST_Intersection(ST_Union(features_for.geog_lowres::geometry), ST_Union(features_for_other.geog_lowres::geometry))::geography) AS intersection_area_in_square_meters))
-        .joins_features_for(klass)
-        .where(:id => self.id)
-        .where('ST_DWithin(features_for.geog_lowres, features_for_other.geog_lowres, 0)')
-        .group("#{self.class.table_name}.id")
-        .first
-        .try(:intersection_area_in_square_meters) || 0
-    end
-
     def total_intersection_area_in_hectares(klass)
       Formatters::HECTARES.call(total_intersection_area_in_square_meters(klass))
     end
@@ -199,12 +197,33 @@ module SpatialFeatures
       ((total_intersection_area_in_square_meters(klass) / features_area_in_square_meters) * 100).round(1)
     end
 
+    def features_area_in_hectares
+      Formatters::HECTARES.call(features_area_in_square_meters)
+    end
+
     def features_area_in_square_meters
-      @features_area_in_square_meters ||= features.sum('features.area')
+      @features_area_in_square_meters ||= features.area
     end
 
-    def features_area_in_hectares
-      Formatters::HECTARES.call(features_area_in_square_meters)
+    def total_intersection_area_in_square_meters(klass, options = {})
+      self.class
+        .select(%Q(ST_Area(ST_Intersection(ST_Union(features_for.geog_lowres::geometry), ST_Union(features_for_other.geog_lowres::geometry))::geography) AS intersection_area_in_square_meters))
+        .joins_features_for(klass)
+        .where(:id => self.id)
+        .where('ST_DWithin(features_for.geog_lowres, features_for_other.geog_lowres, 0)')
+        .group("#{self.class.table_name}.id")
+        .first
+        .try(:intersection_area_in_square_meters) || 0
+    end
+
+    def update_features_area
+      update_column :features_area, features.area
+    end
+  end
+
+  module FeaturesAssociationExtensions
+    def area(options = {})
+      options[:cache] == false ? connection.select_value(all.select('ST_Area(ST_UNION(geom))')).to_f : proxy_association.owner.features_area
     end
   end
 end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "1.4.4"
+  VERSION = "1.4.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Adds spatial methods to a model.