spatial_features 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 719c3ecae256a4ccc467f6ae09f2db52f7a087b4
-  data.tar.gz: 06d8012355564e46386fbfe327e915f3b9fa832d
+  metadata.gz: 417844aeba55e727bdb873b0492a6de02c9597af
+  data.tar.gz: '096586ef1f32f9091c55c9e2142c2736cd3db0ad'
 SHA512:
-  metadata.gz: e6e2990a278cf521a7857e6d1614c2d5be861c534e1f18dfeb1f2f81999808a54f51b2bc348745ffed684857dd62dbc36913ef9b92d7ba10c1cd4c78579cefc5
-  data.tar.gz: a236dcca05df37c76befe0be99b318aea0118e120822e0783d6415444ebdde7ca08c1315a1a9258c5eff3b1d05e51c182bad04d4599750ac374bf45e5fd91f9a
+  metadata.gz: 4fbaab3c02159dea567e0456fc5996f0d5979f26607d7c8e20ff264d27758af6417ae36837b60514ea71531babddb6d0d681772f4c9ffda9fd2589c188ceea2b
+  data.tar.gz: 0d823427501023ceec92a8f6f6e581653d299dfa9534f7d96cd79606476f22be61c484b82c16656b6f8f0129433a7da183aed4993d2e42a9fa038d7cc2ec8566

data/app/models/feature.rb

@@ -37,11 +37,12 @@ class Feature < ActiveRecord::Base
     unscoped { connection.select_value(select('ST_Area(ST_Union(geom))').from(current_scope, :features)).to_f }
   end
 
-  def self.total_intersection_area_in_square_meters(other_features)
-    unscoped
-      .from("(#{select("ST_Union(geom) AS geom").to_sql}) features, (#{other_features.to_sql}) other_features")
-      .pluck('ST_Area(ST_UNION(ST_Intersection(features.geom, other_features.geom)))')
-      .first.to_f
+  def self.total_intersection_area_in_square_meters(other_features, geom = 'geom_lowres')
+    scope = unscope(:select).select("ST_Union(#{geom}) AS geom")
+    other_scope = other_features.unscope(:select).select("ST_Union(#{geom}) AS geom")
+    query = unscoped.select('ST_Area(ST_Intersection(features.geom, other_features.geom))').from("(#{scope.to_sql}) features, (#{other_scope.to_sql}) other_features")
+
+    return connection.select_value(query).to_f
   end
 
   def self.intersecting(other)

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Ryan Wallace