spatial_features 2.10.4 → 2.10.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 033d463978aa207a802ab2ecb1f295f33cd1c4f857905aba42c4266ada83383a
-  data.tar.gz: 6306307bbf18320d1767ad9c73ae855edafbc2549b089db4afb4a86948492532
+  metadata.gz: a716f42ee3c557baa01ea0a9e209f58e7bfb94163059057c7ff6fe303018de09
+  data.tar.gz: 17b0fa1251fb09c2aef8d45f82adb89e2e5e141110c3b1a659b8f2b30ab28f07
 SHA512:
-  metadata.gz: 104856341f7d7807012a9f2372682f78eebd867adea536fc98f9f97f62029b50d5176c09394e634d9837fd819923f2061e627d8f3ef0c60f91c2fe153d7a53f0
-  data.tar.gz: 64411a07521f62d1c83213bd2c76cf7636d6321aa524c17a00a510be3fc8b003f66be0b43da9b38ae8d87e838ef0ef2a654b24037993c57cb4b1bed27cce426f
+  metadata.gz: 3281304f2c534c57c98a2842cbf4cd77b14c59f3d54169c9ef0e39bd78b1f07e8ab775fe05cf575ee3f7443a3b13468638bebf3a7508e2931acfd0f4bacc96ea
+  data.tar.gz: aaf5163cd6403673d418943585b20bd4817e6bfd4885fe08f4e663d29d003adfaa80e480f69554fe4f31522e4cbd9e695ac38c19d9797bbfe1d1c0fba5ccef4e

data/app/models/abstract_feature.rb

@@ -143,6 +143,10 @@ class AbstractFeature < ActiveRecord::Base
     @make_valid
   end
 
+  def wkt
+    ActiveRecord::Base.connection.select_value("SELECT ST_ASEWKT('#{geom}')")
+  end
+
   private
 
   def make_valid

data/lib/spatial_features/has_spatial_features.rb

@@ -131,7 +131,7 @@ module SpatialFeatures
       scope = scope.select(options[:columns])
 
       scope = scope.select("ST_Distance(features.geom, other_features.geom) AS distance_in_meters") if options[:distance]
-      scope = scope.select("ST_Area(ST_Intersection(features.geom, other_features.geom)) AS intersection_area_in_square_meters") if options[:intersection_area]
+      scope = scope.select("ST_Area(ST_Intersection(ST_CollectionExtract(features.geom, 3), ST_CollectionExtract(other_features.geom, 3))) AS intersection_area_in_square_meters") if options[:intersection_area] # Use ST_CollectionExtract to avoid a segfault we've been seeing when intersecting certain geometry
 
       return scope
     end
@@ -141,13 +141,12 @@ module SpatialFeatures
     def spatial_join(other, buffer = 0, table_alias = 'features', other_alias = 'other_features', geom = 'geom_lowres')
       scope = features_scope(self).select("#{geom} AS geom").select(:spatial_model_id)
 
-      other_scope = features_scope(other)
-      other_scope_select_sql = "ST_Union(#{geom})"
-      other_scope_select_sql = "ST_Buffer(#{other_scope_select_sql}, #{buffer})" if buffer&.positive?
-      other_scope = other_scope.select("ST_Union(#{geom}) AS geom").select("#{other_scope_select_sql} AS buffered_geom")
-
+      other_scope = features_scope(other).select("ST_Union(#{geom}) AS geom")
       return joins(%Q(INNER JOIN (#{scope.to_sql}) AS #{table_alias} ON #{table_alias}.spatial_model_id = #{table_name}.id))
-            .joins(%Q(INNER JOIN (#{other_scope.to_sql}) AS #{other_alias} ON ST_Intersects(#{table_alias}.geom, #{other_alias}.buffered_geom)))
+            .joins(%Q(INNER JOIN (#{other_scope.to_sql}) AS #{other_alias}
+                       ON NOT ST_IsEmpty(#{table_alias}.geom) -- Can't ST_DWithin empty geometry
+                      AND NOT ST_IsEmpty(#{other_alias}.geom) -- Can't ST_DWithin empty geometry
+                      AND ST_DWithin(#{table_alias}.geom, #{other_alias}.geom, #{buffer})))
     end
 
     def features_scope(other)
@@ -184,7 +183,7 @@ module SpatialFeatures
     end
 
     def intersects?(other)
-      self.class.intersecting(other).exists?(self)
+      self.class.unscoped { self.class.intersecting(other).exists?(id) }
     end
 
     def total_intersection_area_percentage(klass)

data/lib/spatial_features/importers/file.rb

@@ -4,7 +4,11 @@ module SpatialFeatures
   module Importers
     class File < SimpleDelegator
       def initialize(data, *args)
-        file = Download.open(data, unzip: [/\.kml$/, /\.shp$/], downcase: true)
+        begin
+          file = Download.open(data, unzip: [/\.kml$/, /\.shp$/], downcase: true)
+        rescue Unzip::PathNotFound
+          raise ImportError, "Archive did not contain a .kml or .shp file. Supported formats are KMZ, KML, and zipped ArcGIS shapefiles."
+        end
 
         case ::File.extname(file.path.downcase)
         when '.kml'

data/lib/spatial_features/importers/shapefile.rb

@@ -26,7 +26,7 @@ module SpatialFeatures
       rescue Errno::ENOENT => e
         case e.message
         when /No such file or directory @ rb_sysopen - (.+)/
-          raise IncompleteShapefileArchive, "Shapefile archive was missing a required file: #{::File.basename($1)}"
+          raise IncompleteShapefileArchive, "Shapefile archive is missing a required file: #{::File.basename($1)}"
         else
           raise e
         end

data/lib/spatial_features/unzip.rb

@@ -7,7 +7,7 @@ module SpatialFeatures
 
       if find = Array.wrap(find).presence
         paths = paths.detect {|path| find.any? {|pattern| path.index(pattern) } }
-        raise(ImportError, "No file matched #{find}") unless paths.present?
+        raise(PathNotFound, "Archive did not contain a file matching #{find}") unless paths.present?
       end
 
       return paths
@@ -44,5 +44,9 @@ module SpatialFeatures
     rescue EOFError
       return false
     end
+
+    # EXCEPTIONS
+
+    class PathNotFound < StandardError; end
   end
 end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.10.4"
+  VERSION = "2.10.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.10.4
+  version: 2.10.9
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,9 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,9 +28,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement