spatial_features 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10fa0bff76bebbb1e6bbf5d8ac7bf122e6391991
-  data.tar.gz: 4e6659a9e0d6b97027cd5b2b8ee3d13ac86273c5
+  metadata.gz: 2502710a77234436e9df31b696307aec48406c4c
+  data.tar.gz: 256709db267694b3313f8b848f4b8273e0d1ae40
 SHA512:
-  metadata.gz: 961114c59850e022b0401d3a9e8d276e75882eac8c4d0e5db11d0003e625cabeefa7a549bce9099bf21c48bf28db48c8df6358e96696ffe07d4cecd956c37ca9
-  data.tar.gz: 8c95c131992d11849aa2ae5b4af9b300eff5b735de0a015b64b6cc9b3dfd025db3f919f2bed64561e8185ff059b1610eb2df79d461c89c4fbee6ee35a2b97c71
+  metadata.gz: def0c22906ea9400a2b5985e53af034bb83b23f1d554cedc1400e0ca3e39265ea7900c8f10366d44bf1a2f29a26fe879f5230a3b06638ef1157faf61cc8f745d
+  data.tar.gz: cdf4ca117eee31b4885fda6a1267b1284ebaed3efbc29202ceeacaef2e679c49e079c203df09af6af1446c201f9e9d7d86cc23ce84a439dd3489046d83645298

data/lib/spatial_features/controller_helpers/spatial_extensions.rb

@@ -14,7 +14,7 @@ module SpatialExtensions
   end
 
   def abstract_venn_polygons_action(scope, target, &block)
-    @venn_polygons = SpatialFeatures.venn_polygons(scope_for_search(scope).intersecting(target), target.class.where(:id => target), :simplified => false)
+    @venn_polygons = SpatialFeatures.venn_polygons(scope_for_search(scope).intersecting(target), target.class.where(:id => target), :target => target)
     @klass = klass_for_search(scope)
     @target = target
 
@@ -32,4 +32,4 @@ module SpatialExtensions
   def scope_for_search(scope)
     params.key?(:ids) ? scope.where(:id => params[:ids]) : scope
   end
-end
+end

data/lib/spatial_features/venn_polygons.rb

@@ -3,13 +3,12 @@ module SpatialFeatures
   # with kml for the overlapping area and a list of the record ids whose kml overlapped within that area
   def self.venn_polygons(*scopes)
     options = scopes.extract_options!
-    column = options[:simplified] ? 'geog_lowres' : 'geog'
     scope = scopes.collect do |scope|
-      scope.klass.from(scope, scope.klass.table_name).joins(:features).where('features.feature_type = ?', 'polygon').select("features.#{column}::geometry AS the_geom").to_sql
+      scope.klass.from(scope, scope.klass.table_name).joins(:features).where('features.feature_type = ?', 'polygon').select("features.geom AS the_geom").to_sql
     end.join(' UNION ')
 
     sql = "
-      SELECT scope.id, scope.type, ST_AsKML(geom) AS kml FROM ST_Dump((
+      SELECT scope.id, scope.type, ST_AsKML(venn_polygons.geom) AS kml FROM ST_Dump((
         SELECT ST_Polygonize(the_geom) AS the_geom FROM (
 
           SELECT ST_Union(the_geom) AS the_geom FROM (
@@ -26,13 +25,20 @@ module SpatialFeatures
       )) AS venn_polygons
     "
 
+    # If we have a target model, throw away all venn_polygons not bounded by the target
+    if options[:target]
+      sql <<
+        "INNER JOIN features
+          ON features.spatial_model_type = '#{options[:target].class}' AND features.spatial_model_id = #{options[:target].id} AND ST_Intersects(features.geom, venn_polygons.geom)"
+    end
+
     # 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.#{column}").to_sql
+      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
     end.join(' UNION ')
     sql <<
       "INNER JOIN (#{scope}) AS scope
-        ON ST_Covers(scope.#{column}, ST_PointOnSurface(venn_polygons.geom)) -- Shrink the venn polygons so they don't share edges with the original polygons which could cause varying results due to tiny inaccuracy"
+        ON ST_Covers(scope.geom, ST_PointOnSurface(venn_polygons.geom)) -- Shrink the venn polygons so they don't share edges with the original polygons which could cause varying results due to tiny inaccuracy"
 
     # Eager load the records for each venn polygon
     eager_load_hash = Hash.new {|hash, key| hash[key] = []}
@@ -53,4 +59,4 @@ module SpatialFeatures
       OpenStruct.new(:kml => kml, :records => records)
     end
   end
-end
+end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2015-01-15 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.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Adds spatial methods to a model.