spatial_features 2.10.3 → 2.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb9c8e3383260110361e8adee25be15e7811937c7422a26c1559854de9577470
-  data.tar.gz: 99306279256c88e034af0dfbe32035a1283d0604fc75634c4dbf6f78213295b6
+  metadata.gz: e304bd5be296e4094c384df03f72117452bce5bafc5364dd3277c9826c374f28
+  data.tar.gz: d0bddea53fc9210bbc192160c490b7ba8b85dcafc8ee6dc238f8f8f8d4ea6a43
 SHA512:
-  metadata.gz: d6ec6a878142aa3dacf50f9df6d579d91cfa723e9e2206776157551cf4c2a2eb7de9ada41b2c734d5e371aa18b4f4ac9ac61cd08ace25b3da5b88b3c9bd0dc96
-  data.tar.gz: bdbe282b14d9d57b35208d40c43bf987e29961febcf30d864beb1e43876cba178c96c74e5a4c895d48af7b6b9306e299f2e62ad9a2e6fcb2c495e07184fddb92
+  metadata.gz: bef25168be8628a563a5aff4026c3dd3de26ba5cbcd82ed6b3de155bfed59d6e8ac72af4f05b8a12f3755125772732fe14238f5ea9daccc6d62bfb8fc9739311
+  data.tar.gz: 9f0969a84cd00fca613384cbf8dfdd5989421de2b63c56db600729f94dc5c65a6333ba96dd99377b9339823bca8657fd7eaa51e1aff91abb8bfcd34bb3db9cb0

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)

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

@@ -23,10 +23,17 @@ module SpatialFeatures
             yield OpenStruct.new data_from_wkt(record.geometry.as_text, proj4_projection).merge(:metadata => record.attributes) if record.geometry.present?
           end
         end
+      rescue Errno::ENOENT => e
+        case e.message
+        when /No such file or directory @ rb_sysopen - (.+)/
+          raise IncompleteShapefileArchive, "Shapefile archive is missing a required file: #{::File.basename($1)}"
+        else
+          raise e
+        end
       end
 
       def proj4_projection
-        @proj4 ||= proj4_from_file || default_proj4_projection || raise(IndeterminateProjection, 'Could not determine shapefile projection. Check that `gdalsrsinfo` is installed.')
+        @proj4 ||= proj4_from_file || default_proj4_projection || raise(IndeterminateShapefileProjection, 'Could not determine shapefile projection. Check that `gdalsrsinfo` is installed.')
       end
 
       def proj4_from_file
@@ -45,11 +52,10 @@ module SpatialFeatures
       def file
         @file ||= Download.open(@data, unzip: /\.shp$/, downcase: true)
       end
-
-
-      # ERRORS
-
-      class IndeterminateProjection < StandardError; end
     end
+
+    # ERRORS
+    class IndeterminateShapefileProjection < SpatialFeatures::ImportError; end
+    class IncompleteShapefileArchive < SpatialFeatures::ImportError; end
   end
 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.3"
+  VERSION = "2.10.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.10.3
+  version: 2.10.8
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-05-28 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