spatial_features 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4613b63bcb5c5ac6eff245ae9c2cda4ef38b948
-  data.tar.gz: 7f6d3a777c72868e754a3d452dc1f086bea2d194
+  metadata.gz: 10ff909874fdd64f019a564dda17df6d63d6b405
+  data.tar.gz: bfcdee15505529b1142110722312c793821f3f16
 SHA512:
-  metadata.gz: caea9449c010f38ed4648254d3a67383be6cbcf79171c34e50e0a61af422da01561261a22e96c54ca3d4fa928f10b9aa92aefba28061337fe231168e5cb861d0
-  data.tar.gz: aed8dea2e9ed4344aec3fb8aa4886143734cedc95a33677b9b642e62c377220ec482269626cb540dc9507a5def1863c48e1fd9da58923a9f1acf8fb50ed84e1d
+  metadata.gz: 59d516201f42433921e1def7cec21a42b17ba8340232dfef479b840b45c6e89334eced10212d47c3742b2c15f87a9d2ac50a17cca525847d861462f9b48a7d2a
+  data.tar.gz: 027192a3d69ebb10e98719fd1154e691d82ea2211faa925d785391a2f2325fd43caca1249476d8d590db9ad5ac49e66154dcd687fa8b27b4da61bd4631f6bf81

data/README.md

@@ -21,7 +21,9 @@ execute("
       north numeric(9,6),
       east numeric(9,6),
       south numeric(9,6),
-      west numeric(9,6)
+      west numeric(9,6),
+      centroid geography,
+      kml_centroid text
   );
 
   CREATE TABLE spatial_caches (

data/app/models/feature.rb

@@ -64,21 +64,23 @@ class Feature < ActiveRecord::Base
     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)
+      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),
+      centroid     = ST_PointOnSurface(geog::geometry)
     SQL
 
     update_all <<-SQL.squish
-      geom_lowres = ST_SimplifyPreserveTopology(geom, #{options[:lowres_simplification]})
+      geom_lowres  = ST_SimplifyPreserveTopology(geom, #{options[:lowres_simplification]})
     SQL
 
     update_all <<-SQL.squish
-      kml         = ST_AsKML(geog, 6),
-      kml_lowres  = ST_AsKML(geom_lowres, #{options[:lowres_precision]})
+      kml          = ST_AsKML(geog, 6),
+      kml_lowres   = ST_AsKML(geom_lowres, #{options[:lowres_precision]}),
+      kml_centroid = ST_AsKML(centroid)
     SQL
   end
 
@@ -91,7 +93,9 @@ class Feature < ActiveRecord::Base
   end
 
   def kml(options = {})
-    options[:lowres] ? kml_lowres : super()
+    geometry = options[:lowres] ? kml_lowres : super()
+    geometry = "<MultiGeometry>#{geometry}#{kml_centroid}</MultiGeometry>" if options[:centroid]
+    return geometry
   end
 
   private

data/lib/spatial_features/has_spatial_features.rb

@@ -10,7 +10,7 @@ module SpatialFeatures
       scope :without_features, lambda { joins("LEFT OUTER JOIN features ON features.spatial_model_type = '#{name}' AND features.spatial_model_id = #{table_name}.id").where("features.id IS NULL") }
 
       scope :with_spatial_cache, lambda {|klass| joins(:spatial_cache).where(:spatial_caches => { :intersection_model_type =>  klass }).uniq }
-      scope :without_spatial_cache, lambda {|klass| where.not(:id => with_spatial_cache(klass)) }
+      scope :without_spatial_cache, lambda {|klass| joins("LEFT OUTER JOIN #{SpatialCache.table_name} ON spatial_model_id = #{table_name}.id AND spatial_model_type = '#{name}' and intersection_model_type = '#{klass}'").where('spatial_model_id IS NULL') }
       scope :with_stale_spatial_cache, lambda { joins(:spatial_cache).where("#{table_name}.features_hash != spatial_caches.features_hash").uniq } if has_spatial_features_hash?
 
       has_many :spatial_cache, :as => :spatial_model, :dependent => :delete_all
@@ -127,7 +127,7 @@ module SpatialFeatures
       end
 
       scope = scope.select("MIN(ST_Distance(features.geom, features_for_other.geom)) AS distance_in_meters") if options[:distance]
-      scope = scope.select("ST_Area(ST_Intersection(ST_UNION(features.geom), ST_UNION(features_for_other.geom))) AS intersection_area_in_square_meters") if options[:intersection_area]
+      scope = scope.select("ST_Area(ST_UNION(ST_Intersection(features.geom, features_for_other.geom))) AS intersection_area_in_square_meters") if options[:intersection_area]
       return scope
     end
 

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "1.6.1"
+  VERSION = "1.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails