spatial_features 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 436fef303733276633ff5c6055541d20d1139d0e
-  data.tar.gz: cfddf894cb3a79e5beb9662069e7210a6c43035d
+  metadata.gz: 1a7122350d682567036a4ced4d0f02fa1e24f6fe
+  data.tar.gz: 3a30f1f18b42f0aa5d76dcd695a985ed38ab7eb8
 SHA512:
-  metadata.gz: a36136f66dc0c2a7c9c419ed3d7cab05f21c8abeacb6e58995e3bef4410ca6664b2886a7ab1849ec308a1b2d4b69740d143ad360bf0905a3b5e78620bb1c114f
-  data.tar.gz: 0fe23f41fb24a53e30859653c807fca288173d8172245d0cd58c1be493a9999b4adc1fee79a6d595dc5a7ca3f47c914f4d78a3a2b16b69dacf501edde0b7f162
+  metadata.gz: fdc7be6e44faccb577d56ba0a15b3bb85061b6166e2108f95e98815ed7b0cda516c973ececc0894bb533a92f6458ca584c4692777e0df873a22af33b351c4054
+  data.tar.gz: 82076004699c948c14209121a93fd4b5131da27438e9369fa40e02b7dfebfa5783304365bc87f6cfde9f53298fd9ea0803560c27a8619bc2d4b49c1a14141df6

data/lib/spatial_features/venn_polygons.rb

@@ -4,7 +4,7 @@ module SpatialFeatures
   def self.venn_polygons(*scopes)
     options = scopes.extract_options!
     scope = scopes.collect do |scope|
-      scope.klass.from(scope, scope.klass.table_name).joins(:features).where('features.feature_type = ?', 'polygon').select("features.geom AS the_geom").to_sql
+      scope.joins(:features).where('features.feature_type = ?', 'polygon').except(:select).select("features.geom AS the_geom").to_sql
     end.join(' UNION ')
 
     sql = "
@@ -34,7 +34,7 @@ module SpatialFeatures
 
     # Join with the original polygons so we can determine which original polygons each venn polygon came from
     scope = scopes.collect do |scope|
-      scope.klass.from(scope, scope.klass.table_name).joins(:features).where('features.feature_type = ?', 'polygon').select("#{scope.klass.table_name}.id, features.spatial_model_type AS type, features.geom").to_sql
+      scope.joins(:features).where('features.feature_type = ?', 'polygon').except(:select).select("#{scope.klass.table_name}.id, features.spatial_model_type AS type, features.geom").to_sql
     end.join(' UNION ')
     sql <<
       "INNER JOIN (#{scope}) AS scope

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "1.3.7"
+  VERSION = "1.3.8"
 end

metadata

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