spatial_features 1.4.9 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf3dda9ab1fdf8948a6bab915004ea89a4775b47
-  data.tar.gz: 05c63080928e3efad230b01cb4998c05b0b440ff
+  metadata.gz: 6cd096776f5bb77163b8212f69c6adb72e18eebe
+  data.tar.gz: 4e231bdbbdfb67a8eeb6834723813668d3680389
 SHA512:
-  metadata.gz: 50badb4ab9d03d94cf50180f67624823cb600a646fcdc0185805dee2e04f2ada1140138131683cc038605b5237751d91450f340698cfdf97c32b024e2f6bed02
-  data.tar.gz: 2171f215ae4801d28eb5ca1513aa82558706efa2537a4476555beeaabca921787ead65488671a3c30bf1847d9891dd1eff20c29a4fe0d3b695e65f18991d8408
+  metadata.gz: 691b52de13ba3bb0dcb984f5b8c13da76aa7f5c3f6022da16b5c2213c942dc5945c0f78ec3e274a7c20ba5ad2aa22effebbe640f69d084a58b9861071fa31ba3
+  data.tar.gz: fb09b3e7c0de8d60deeb2f5fe726b5628f8e052623c6d57a5ec9ad3a29fde465207e3a021218b7bd8ccb2bb593bd872223771ab6bb1213248523eee6fa10e4bb

data/lib/spatial_features/has_spatial_features.rb

@@ -39,7 +39,7 @@ module SpatialFeatures
       # This is because the cached intersection_area doesn't account for overlaps between the features in the scope.
       if options[:cache] != false && other.is_a?(ActiveRecord::Base)
         # Don't use the cache if it doesn't exist
-        return all.extending(UncachedRelation) unless class_for(other).spatial_cache_for?(self, buffer_in_meters)
+        return all.extending(UncachedRelation) unless other.spatial_cache_for?(class_for(self), buffer_in_meters)
 
         scope = cached_spatial_join(other).select("#{table_name}.*")
         scope = scope.where("spatial_proximities.distance_in_meters <= ?", buffer_in_meters) if buffer_in_meters
@@ -74,18 +74,6 @@ module SpatialFeatures
       features.points
     end
 
-    def spatial_cache_for?(other, buffer_in_meters)
-      if cache = spatial_cache_for(other)
-        return cache.intersection_cache_distance.nil? if buffer_in_meters.nil? # cache must be total if no buffer_in_meters
-        return false if cache.stale? # cache must be for current features
-        return true if cache.intersection_cache_distance.nil? # always good if cache is total
-
-        return buffer_in_meters <= cache.intersection_cache_distance
-      else
-        return false
-      end
-    end
-
     def features
       Feature.where(:spatial_model_type => self, :spatial_model_id => all)
     end
@@ -128,10 +116,6 @@ module SpatialFeatures
       joins("INNER JOIN spatial_proximities ON spatial_proximities.#{self_column}_type = '#{self}' AND spatial_proximities.#{self_column}_id = #{table_name}.id AND spatial_proximities.#{other_column}_type = '#{other_class}' AND spatial_proximities.#{other_column}_id IN (#{ids_sql_for(other)})")
     end
 
-    def spatial_cache_for(other)
-      SpatialCache.where(:spatial_model_type => self, :intersection_model_type => class_for(other)).first
-    end
-
     # Returns the class for the given, class, scope, or record
     def class_for(other)
       case other
@@ -208,6 +192,22 @@ module SpatialFeatures
         .try(:intersection_area_in_square_meters) || 0
     end
 
+    def spatial_cache_for?(klass, buffer_in_meters)
+      if cache = spatial_cache_for(klass)
+        return cache.intersection_cache_distance.nil? if buffer_in_meters.nil? # cache must be total if no buffer_in_meters
+        return false if cache.stale? # cache must be for current features
+        return true if cache.intersection_cache_distance.nil? # always good if cache is total
+
+        return buffer_in_meters <= cache.intersection_cache_distance
+      else
+        return false
+      end
+    end
+
+    def spatial_cache_for(klass)
+      spatial_cache.where(:intersection_model_type => klass).first
+    end
+
     def update_features_area
       update_column :features_area, features.area(:cache => false)
     end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "1.4.9"
+  VERSION = "1.5.0"
 end

metadata

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