spatial_features 1.5.12 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73e929f19dbe88a8a660db9905520f65298ae749
-  data.tar.gz: ea15f17e06a0c28e3737acde7d102a8111e9624f
+  metadata.gz: 22436d934425f3bf26fa67267809556fee323e29
+  data.tar.gz: 61ffeaba1a567cde42cd084c3ef058389dc10595
 SHA512:
-  metadata.gz: 0bfdb3c23c67fd37602798cd56702d87ffb74bb56f1f56066620cec18d40be2e350f761e9442b4007faa3c79df4f09836857f4fa446ef27ed0ce9c0232a9de17
-  data.tar.gz: 8531be35e8009f784944d55d979c7450304141736d6f0805dbb21c844452da039b883177a9bd539aac47ff9ca814b6eb2f7ccc32fd263270798e286f448768f1
+  metadata.gz: 7f4569629dbefd9a0d2f338135229ab285471d16a2ecbe52a1db52b2f0eacb3e23d29f24547bcd9066617d8071f05a2606254faa371ebe0878b8f37e56203a50
+  data.tar.gz: d46d59474311d6171ebcea73a6576ae4419cb6600a6a34cdbf294210880d8812fc30afe8d77021d5645ef8df0a9455f6d4af5fceee1c0779e59ccf1792d4b83f

data/README.md

@@ -12,12 +12,16 @@ execute("
       name character varying(255),
       feature_type character varying(255),
       geog geography,
+      geom geometry(Geometry,3005),
+      geom_lowres geometry(Geometry,3005),
       kml text,
-      geog_lowres geography(Geometry,4326),
-      geom geometry(Geometry,26910),
-      metadata hstore,
       kml_lowres text,
-      area double precision
+      metadata hstore,
+      area double precision,
+      north numeric(9,6),
+      east numeric(9,6),
+      south numeric(9,6),
+      west numeric(9,6)
   );
 
   CREATE TABLE spatial_caches (

data/app/models/feature.rb

@@ -32,17 +32,15 @@ class Feature < ActiveRecord::Base
     unscoped { connection.select_value(select('ST_Area(ST_Union(geom))').from(current_scope, :features)).to_f }
   end
 
-  def self.total_intersection_area_in_square_meters(other)
-    other_features = unscoped.flattened_features.where(:id => intersecting(other).select('other_features.id'))
-
+  def self.total_intersection_area_in_square_meters(other_features)
     unscoped
-      .from("(#{flattened_features.to_sql}) features, (#{other_features.to_sql}) other_features")
-      .pluck('ST_Area(ST_Intersection(features.geom, other_features.geom))')
+      .from("(#{select("ST_Union(geom) AS geom").to_sql}) features, (#{other_features.to_sql}) other_features")
+      .pluck('ST_Area(ST_UNION(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
+    join_other_features(other).where('ST_Intersects(features.geom_lowres, other_features.geom_lowres)').uniq
   end
 
   def self.invalid
@@ -63,19 +61,25 @@ class Feature < ActiveRecord::Base
   end
 
   def self.cache_derivatives(options = {})
-    options.reverse_merge! :lowres_simplification => 0.00001, :lowres_precision => 5
+    options.reverse_merge! :lowres_simplification => 2, :lowres_precision => 5
+
+    update_all <<-SQL.squish
+      geom        = ST_Transform(geog::geometry, #{detect_srid('geom')}),
+      north       = ST_YMax(geog::geometry),
+      east        = ST_XMax(geog::geometry),
+      south       = ST_YMin(geog::geometry),
+      west        = ST_XMin(geog::geometry),
+      area        = ST_Area(geog)
+    SQL
+
+    update_all <<-SQL.squish
+      geom_lowres = ST_SimplifyPreserveTopology(geom, #{options[:lowres_simplification]})
+    SQL
 
-    update_all("area        = ST_Area(geog),
-                geom        = ST_Transform(geog::geometry, #{detect_srid('geom')}),
-                geog_lowres = ST_SimplifyPreserveTopology(geog::geometry, #{options[:lowres_simplification]})"
-                .squish)
-    update_all("kml         = ST_AsKML(features.geog, 6),
-                kml_lowres  = ST_AsKML(geog_lowres::geometry, #{options[:lowres_precision]}),
-                north       = ST_YMax(geog::geometry),
-                east        = ST_XMax(geog::geometry),
-                south       = ST_YMin(geog::geometry),
-                west        = ST_XMin(geog::geometry)"
-                .squish)
+    update_all <<-SQL.squish
+      kml         = ST_AsKML(geog, 6),
+      kml_lowres  = ST_AsKML(geom_lowres, #{options[:lowres_precision]})
+    SQL
   end
 
   def feature_bounds
@@ -92,10 +96,6 @@ 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/caching.rb

@@ -2,6 +2,14 @@ module SpatialFeatures
   mattr_accessor :default_cache_buffer_in_meters
   self.default_cache_buffer_in_meters = 100
 
+  def self.update_spatial_cache(scope)
+    scope.with_stale_spatial_cache.includes(:spatial_cache).find_each do |record|
+      record.spatial_cache.each do |spatial_cache|
+        cache_record_proximity(record, spatial_cache.intersection_model_type) if spatial_cache.stale?
+      end
+    end
+  end
+
   # Create or update the spatial cache of a spatial class in relation to another
   # NOTE: Arguments are order independent, so their names do not reflect the _a _b
   # naming scheme used in other cache methods
@@ -41,13 +49,14 @@ module SpatialFeatures
   end
 
   def self.clear_record_cache(record, klass)
-    record.spatial_cache.where(:intersection_model_type => klass.name).delete_all
-    SpatialProximity.where(:model_a_type => record.class.name, :model_a_id => record.id, :model_b_type => klass.name).delete_all
-    SpatialProximity.where(:model_b_type => record.class.name, :model_b_id => record.id, :model_a_type => klass.name).delete_all
+    record.spatial_cache.where(:intersection_model_type => klass).delete_all
+    SpatialProximity.where(:model_a_type => record.class, :model_a_id => record.id, :model_b_type => klass).delete_all
+    SpatialProximity.where(:model_b_type => record.class, :model_b_id => record.id, :model_a_type => klass).delete_all
   end
 
   def self.create_spatial_proximities(record, klass)
-    record_is_a = record.class.name < klass.name
+    klass = klass.to_s.constantize
+    record_is_a = record.class.to_s < klass.to_s
 
     scope = klass.within_buffer(record, default_cache_buffer_in_meters, :intersection_area => true, :distance => true, :cache => false)
     scope.find_each do |klass_record|
@@ -63,7 +72,7 @@ module SpatialFeatures
   def self.create_spatial_cache(model, klass)
     SpatialCache.create! do |cache|
       cache.spatial_model               = model
-      cache.intersection_model_type     = klass.name
+      cache.intersection_model_type     = klass
       cache.intersection_cache_distance = default_cache_buffer_in_meters
       cache.features_hash               = model.features_hash if model.has_spatial_features_hash?
     end

data/lib/spatial_features/has_spatial_features.rb

@@ -234,7 +234,7 @@ module SpatialFeatures
   module FeaturesAssociationExtensions
     def area(options = {})
       if options[:cache] == false || !proxy_association.owner.class.has_features_area?
-        connection.select_value(all.select('ST_Area(ST_UNION(geom))')).try(:to_f)
+        pluck('ST_Area(ST_UNION(geom))').first.to_f
       else
         proxy_association.owner.features_area
       end

data/lib/spatial_features/version.rb

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

metadata

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