spatial_features 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69d8ba9f76d0b6597c4719211a776191af5a6051
-  data.tar.gz: 048baef877073d0068e9a1b06c1e4b5fbf438c9d
+  metadata.gz: 436fef303733276633ff5c6055541d20d1139d0e
+  data.tar.gz: cfddf894cb3a79e5beb9662069e7210a6c43035d
 SHA512:
-  metadata.gz: 5b9dd28da45913bc3637d4c3df5ea6e5e9ebc5eec1e1f4e353c2f8334cddc495912c369d09ab1a60cfb585c3c389505e50ff180cecabc1eb3643dcc716705680
-  data.tar.gz: f029dd9bb557d9237e19376dbe40db379b31d967cd2520714f4d5ce998e5afdf76678d5912a257511700fed8bfc75ca9cb44fc64efdc702956bef9a57e302f28
+  metadata.gz: a36136f66dc0c2a7c9c419ed3d7cab05f21c8abeacb6e58995e3bef4410ca6664b2886a7ab1849ec308a1b2d4b69740d143ad360bf0905a3b5e78620bb1c114f
+  data.tar.gz: 0fe23f41fb24a53e30859653c807fca288173d8172245d0cd58c1be493a9999b4adc1fee79a6d595dc5a7ca3f47c914f4d78a3a2b16b69dacf501edde0b7f162

data/README.md

@@ -12,11 +12,32 @@ execute("
       name character varying(255),
       feature_type character varying(255),
       geog geography,
+      kml text,
       geog_lowres geography(Geometry,4326),
       geom geometry(Geometry,26910),
-      kml text,
+      metadata hstore,
       kml_lowres text,
-      metadata hstore
+      area double precision
   );
+
+  CREATE TABLE spatial_caches (
+      id integer NOT NULL,
+      intersection_model_type character varying(255),
+      spatial_model_type character varying(255),
+      spatial_model_id integer,
+      created_at timestamp without time zone,
+      updated_at timestamp without time zone,
+      intersection_cache_distance double precision
+  );
+
+  CREATE TABLE spatial_proximities (
+      id integer NOT NULL,
+      model_a_type character varying(255),
+      model_a_id integer,
+      model_b_type character varying(255),
+      model_b_id integer,
+      distance_in_meters double precision,
+      intersection_area_in_square_meters double precision
+  );    
 ")
 ```

data/lib/spatial_features/caching.rb

@@ -61,6 +61,6 @@ module SpatialFeatures
     SpatialCache.create!(
       :spatial_model => model,
       :intersection_model_type => klass.name,
-      :cache_distance => default_cache_buffer_in_meters)
+      :intersection_cache_distance => default_cache_buffer_in_meters)
   end
-end
+end

data/lib/spatial_features/has_spatial_features.rb

@@ -139,7 +139,7 @@ module SpatialFeatures
 		end
 
 		def features_area_in_square_meters
-		  @features_area_in_square_meters ||= features.sum('ST_Area(features.geog_lowres)')
+		  @features_area_in_square_meters ||= features.sum('features.area')
 		end
 
 		def features_area_in_hectares
@@ -152,10 +152,10 @@ module SpatialFeatures
 
 		def spatial_cache_for?(klass, buffer_in_meters)
 		  if cache = spatial_cache_for(klass)
-		    return cache.cache_distance.nil? if buffer_in_meters.nil? # cache must be total if no buffer_in_meters
-		    return true if cache.cache_distance.nil? # always good if cache is total
+		    return cache.intersection_cache_distance.nil? if buffer_in_meters.nil? # cache must be total if no buffer_in_meters
+		    return true if cache.intersection_cache_distance.nil? # always good if cache is total
 
-		    return buffer_in_meters <= cache.cache_distance
+		    return buffer_in_meters <= cache.intersection_cache_distance
 		  else
 		    return false
 		  end

data/lib/spatial_features/models/feature.rb

@@ -31,6 +31,10 @@ class Feature < ActiveRecord::Base
     select('features.*, ST_IsValidReason(geog::geometry) AS invalid_geometry_message').where.not('ST_IsValid(geog::geometry)')
   end
 
+  def self.valid
+    where('ST_IsValid(geog::geometry)')
+  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
@@ -43,7 +47,8 @@ class Feature < ActiveRecord::Base
   def self.cache_derivatives(options = {})
     options.reverse_merge! :lowres_simplification => 0.0001, :lowres_precision => 5
 
-    update_all("geom        = ST_Transform(geog::geometry, 26910),
+    update_all("area        = ST_Area(geog),
+                geom        = ST_Transform(geog::geometry, 26910),
                 geog_lowres = ST_SimplifyPreserveTopology(geog::geometry, #{options[:lowres_simplification]})"
                 .squish)
     update_all("kml         = ST_AsKML(features.geog, 6),

data/lib/spatial_features/version.rb

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

metadata

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