spatial_features 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4825ec1877a47df3ef4c5ccb0d83ee648e093322
-  data.tar.gz: a9aa87b0eed16d9e1a12a629ece02ec164365b2c
+  metadata.gz: 99790dcf4cfb676fe6c09d44c7e244485a2043bc
+  data.tar.gz: a566293dbcd0bf269819193e83793f7f409805e0
 SHA512:
-  metadata.gz: c5b3b9952c83e2010e6138be8784b87047c11a8694a7ecf4178617415d253bbf39978ebd985b079e9dacc3bacedcb312e70467314f31bd12af27f18606c9bf0a
-  data.tar.gz: 88244ebe9df2c9d123de36aac02f9fe23cbebe946918fea36ac74c51f90bb74b7f044511ff5034aefb29851b158aa6392ffb765b41536ca66c3d1807efe61fb3
+  metadata.gz: d76515d5e9ae92f24658aa1cb40f1db5b2e99160d0da699a42257587bf5df096fed536c6797387cd4ee293a8a4c489787226c53af2dd91fe3ee7608ffa279ec9
+  data.tar.gz: 653517f9b24614809b50e19f6d9d2c7c8f0e192f13ece4109db321c5ff6dbb47f77b41a7ebb82c4949c517c6dd0d356ff381ebe68ca397e3d912931020a3db03

data/lib/spatial_features/has_spatial_features.rb

@@ -28,13 +28,10 @@ module SpatialFeatures
     end
 
     def within_buffer(other, buffer_in_meters = 0, options = {})
-      if options[:cache] != false # CACHED
+      if options[:cache] != false && other.is_a?(ActiveRecord::Base) # CACHED
         return all.extending(UncachedRelation) unless class_for(other).spatial_cache_for?(self, buffer_in_meters) # Don't use the cache if it doesn't exist
 
-        scope = cached_spatial_join(other)
-          .select("#{table_name}.*, spatial_proximities.distance_in_meters, spatial_proximities.intersection_area_in_square_meters")
-          .group("#{table_name}.#{primary_key}")
-
+        scope = cached_spatial_join(other).select("#{table_name}.*, spatial_proximities.distance_in_meters, spatial_proximities.intersection_area_in_square_meters")
         scope = scope.where("spatial_proximities.distance_in_meters <= ?", buffer_in_meters) if buffer_in_meters
       else # NON-CACHED
         scope = joins_features_for(other)
@@ -80,6 +77,9 @@ module SpatialFeatures
       end
     end
 
+    def intersection_area_in_square_meters(other)
+      features.intersection_area_in_square_meters(other.features)
+    end
 
     def features
       Feature.where(:spatial_model_type => self, :spatial_model_id => all)

data/lib/spatial_features/models/feature.rb

@@ -35,6 +35,13 @@ class Feature < ActiveRecord::Base
     where('ST_IsValid(geog::geometry)')
   end
 
+  def self.intersection_area_in_square_meters(other_features)
+    self_geom = all.select('ST_Union(geog_lowres::geometry)').to_sql
+    other_geom = Feature.unscoped.where(:id => other_features).select('ST_Union(geog_lowres::geometry)').to_sql
+
+    connection.select_value "SELECT ST_Area(ST_Intersection((#{self_geom}), (#{other_geom})))"
+  end
+
   def envelope(buffer_in_meters = 0)
     envelope_json = JSON.parse(self.class.select("ST_AsGeoJSON(ST_Envelope(ST_Buffer(features.geog, #{buffer_in_meters})::geometry)) AS result").where(:id => id).first.result)
     envelope_json = envelope_json["coordinates"].first

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "1.4.0"
+  VERSION = "1.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,6 +59,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-nc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adds spatial methods to a model.
 email:
 - contact@culturecode.ca