spatial_features 1.5.10 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0307a9516187c3bbfed164e679d85d8aafd88d52
-  data.tar.gz: 877f85316e78c8fb6f8737069287bde6c83d0c94
+  metadata.gz: b1f2c3d038baab7cfb9b0e8da43f9df18516425a
+  data.tar.gz: 6f659cee10eb6583fc25d91aa412b0e9fbd94785
 SHA512:
-  metadata.gz: 2e1fdb2c6f5bd8a813fd21587bc526fc40bd620c2331fc1ad80ee0d3e75688b26bbdd64c1404223899efee68834b76a577400b5f86120ede72aa38603024c906
-  data.tar.gz: bb5616750ff468513c2acf1334217892c48d19624f6b2d6015467526d2910d69a0706aab491eac28901e9ba2c8d036f48d47b874bc21c98375fc561faa2f0c63
+  metadata.gz: 0001489c898f5f27c508c9c46bda80a685914ad34f3d63c7da9e2c98e12fe40dc00eac46b2eab9e942cd48587bc5eff696298cea1f74efc7a6dfad81010d1377
+  data.tar.gz: 78d28037a3c5e3f1edffc8589b72afb0dd356e7e9cc96a0cd38289a8141cb48045eaf1449d5957c336dbc8f14f6bb935593fd36f8c4fcea11162840fd47f8179

data/app/models/feature.rb

@@ -61,15 +61,15 @@ class Feature < ActiveRecord::Base
     options.reverse_merge! :lowres_simplification => 0.00001, :lowres_precision => 5
 
     update_all("area        = ST_Area(geog),
-                geom        = ST_Transform(geog::geometry, 26910),
+                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(ST_Transform (geom, 4326)),
-                east        = ST_XMax(ST_Transform (geom, 4326)),
-                south       = ST_YMin(ST_Transform (geom, 4326)),
-                west        = ST_XMin(ST_Transform (geom, 4326))"
+                north       = ST_YMax(geog::geometry),
+                east        = ST_XMax(geog::geometry),
+                south       = ST_YMin(geog::geometry),
+                west        = ST_XMin(geog::geometry)"
                 .squish)
   end
 
@@ -87,6 +87,10 @@ class Feature < ActiveRecord::Base
 
   private
 
+  def self.detect_srid(column_name)
+    connection.select_value("SELECT Find_SRID('public', '#{table_name}', '#{column_name}')")
+  end
+
   def self.join_other_features(other)
     joins('INNER JOIN features AS other_features ON true').where(:other_features => {:id => other})
   end

data/lib/spatial_features/has_spatial_features.rb

@@ -66,10 +66,10 @@ module SpatialFeatures
     end
 
     def features
-      if all == unscoped.all
+      if all == unscoped
         Feature.where(:spatial_model_type => self)
       else
-        Feature.where(:spatial_model_type => self, :spatial_model_id => all)
+        Feature.where(:spatial_model_type => self, :spatial_model_id => all.unscope(:select))
       end
     end
 
@@ -206,7 +206,8 @@ module SpatialFeatures
     end
 
     def total_intersection_area_in_square_meters(other)
-      features.total_intersection_area_in_square_meters(other.features)
+      other = other.intersecting(self) unless other.is_a?(ActiveRecord::Base)
+      return features.total_intersection_area_in_square_meters(other.features)
     end
 
     def spatial_cache_for?(klass, buffer_in_meters)

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "1.5.10"
+  VERSION = "1.5.11"
 end

metadata

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