spatial_features 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e27151385100d922d8a64f10fedcc3e807e28482
-  data.tar.gz: 44261407916d79df9256a84609e6c033ae3eace0
+  metadata.gz: d3efc2d6c406b0428852a67e4773ef4991b6ebe7
+  data.tar.gz: c8c95001752f7b34467e9fd54637d89b627b2373
 SHA512:
-  metadata.gz: c4c810a96a8bbc0a54ea54321ac3f2ef29f5d0453729054c102a4e32daa99b180b70679409ed883cc3142eb1321c03f5efe2ec45a5bcad90ed4b817f3433584d
-  data.tar.gz: 580a73af6c334c7ab9c1e7560e0b7997efd35100c61fd6751455d92a1d4236e9e1375adbe5bedcfe182d9ef5f0fc608b2628ed6810c519ad1620b4d6bfcfa784
+  metadata.gz: 0dda0b1e79fffd25931b7b3cc0ae9a32de9524debadfd26b3cd8bdcd2252ecb8655e6de5c3f4d458c589cad7589e7a062a1b556df112e6017013739a15504270
+  data.tar.gz: 992838a271527d54765386d31ec536d1baa1355812808260cd69190d637258b68a5c2000de99aec931925b55a635ce76c976f7a356cc5542cb6f58b3dc794305

data/lib/spatial_features/has_spatial_features.rb

@@ -187,20 +187,12 @@ module SpatialFeatures
       self.class.intersecting(other).exists?(self)
     end
 
-    def total_intersection_area_in_hectares(klass)
-      Formatters::HECTARES.call(total_intersection_area_in_square_meters(klass))
-    end
-
     def total_intersection_area_percentage(klass)
       return 0.0 unless features_area_in_square_meters > 0
 
       ((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.area
     end
@@ -217,13 +209,17 @@ module SpatialFeatures
     end
 
     def update_features_area
-      update_column :features_area, features.area
+      update_column :features_area, features.area(:cache => false)
     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
+      if options[:cache] == false
+        connection.select_value(all.select('ST_Area(ST_UNION(geom))')).try(:to_f)
+      else
+        proxy_association.owner.features_area
+      end
     end
   end
 end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "1.4.6"
+  VERSION = "1.4.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-20 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.