spatial_features 1.5.11 → 1.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1f2c3d038baab7cfb9b0e8da43f9df18516425a
-  data.tar.gz: 6f659cee10eb6583fc25d91aa412b0e9fbd94785
+  metadata.gz: 73e929f19dbe88a8a660db9905520f65298ae749
+  data.tar.gz: ea15f17e06a0c28e3737acde7d102a8111e9624f
 SHA512:
-  metadata.gz: 0001489c898f5f27c508c9c46bda80a685914ad34f3d63c7da9e2c98e12fe40dc00eac46b2eab9e942cd48587bc5eff696298cea1f74efc7a6dfad81010d1377
-  data.tar.gz: 78d28037a3c5e3f1edffc8589b72afb0dd356e7e9cc96a0cd38289a8141cb48045eaf1449d5957c336dbc8f14f6bb935593fd36f8c4fcea11162840fd47f8179
+  metadata.gz: 0bfdb3c23c67fd37602798cd56702d87ffb74bb56f1f56066620cec18d40be2e350f761e9442b4007faa3c79df4f09836857f4fa446ef27ed0ce9c0232a9de17
+  data.tar.gz: 8531be35e8009f784944d55d979c7450304141736d6f0805dbb21c844452da039b883177a9bd539aac47ff9ca814b6eb2f7ccc32fd263270798e286f448768f1

data/app/models/feature.rb

@@ -33,11 +33,16 @@ class Feature < ActiveRecord::Base
   end
 
   def self.total_intersection_area_in_square_meters(other)
-    scope = join_other_features(other)
-      .where('ST_Intersects(features.geog_lowres, other_features.geog_lowres)')
-      .select('ST_Area(ST_Intersection(ST_Union(features.geog_lowres::geometry), ST_Union(other_features.geog_lowres::geometry))::geography) AS intersection_area_in_square_meters')
+    other_features = unscoped.flattened_features.where(:id => intersecting(other).select('other_features.id'))
 
-    connection.select_value(scope).to_f
+    unscoped
+      .from("(#{flattened_features.to_sql}) features, (#{other_features.to_sql}) other_features")
+      .pluck('ST_Area(ST_Intersection(features.geom, other_features.geom))')
+      .first.to_f
+  end
+
+  def self.intersecting(other)
+    join_other_features(other).where('ST_Intersects(features.geog_lowres, other_features.geog_lowres)').uniq
   end
 
   def self.invalid
@@ -87,6 +92,10 @@ class Feature < ActiveRecord::Base
 
   private
 
+  def self.flattened_features
+    select('ST_Union(features.geom) AS geom')
+  end
+
   def self.detect_srid(column_name)
     connection.select_value("SELECT Find_SRID('public', '#{table_name}', '#{column_name}')")
   end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "1.5.11"
+  VERSION = "1.5.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 1.5.11
+  version: 1.5.12
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails