spatial_features 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fabdd3f0f73eb21327f8e3deb1b7dda5969d97bdb7c053c60199a63fe5cd04b1
-  data.tar.gz: 777c5dc188ba968ab4cba25e58fa2f361c9d3814781ecfb9e751cf0fc1b40b0e
+  metadata.gz: 7ba1ab9dfa18160f48292f26a63f75031187e44cc04aff73dba792832d482063
+  data.tar.gz: b25d8a6f4bd0412c3d2d9dd34a57c620a0593979304ddb9061c7f3b3e2d7f834
 SHA512:
-  metadata.gz: e3f28e99e814f1fcc2ba49edf8a59ff957b9f92c9e0d990f93409c61f00d4c496e7ac5f60eb3616660df720c615033f62dbe02d707c1584cc4cee7d9cb88067c
-  data.tar.gz: 18e776f2d1bc792e7a0313d5742345e93adca24f060472bb10a36611eb3e62cf7fe8fcf2d7d520db16cd9b1755e85b4e40e75cabcb4110e25c397e42087fd9e0
+  metadata.gz: 1be4b279b3341582262bdb8d802c0786b1eb3607cef070f2a03813b2bc987d21fb0aa92323d7b49dbec01aa8b2e128f0b9982ce356dc4836875ccd5ad89f7092
+  data.tar.gz: 8e70dfe6f6bad6545c29fc5dbf1406b308b9cb44ff48ebfc849469912af6cf30640c829c2baf363a6790e9207f78d3c039276c002a50ce6319ccf0d9450f9df7

data/app/models/abstract_feature.rb

@@ -49,8 +49,14 @@ class AbstractFeature < ActiveRecord::Base
     where(:feature_type => 'point')
   end
 
-  def self.within_distance_of_point(lat, lng, distance_in_meters)
-    where("ST_DWithin(features.geog, ST_Point(:lng, :lat), :distance)", :lat => lat, :lng => lng, :distance => distance_in_meters)
+  def self.within_distance_of_point(lat, lng, distance_in_meters, geom = 'geom_lowres')
+    point_sql =
+      case geom.to_s
+      when 'geog' then 'ST_Point(:lng, :lat)'
+      else "ST_Transform(ST_SetSRID(ST_Point(:lng, :lat), 4326), #{detect_srid(geom)})"
+      end
+
+    where("ST_DWithin(features.#{geom}, #{point_sql}, :distance)", :lat => lat, :lng => lng, :distance => distance_in_meters)
   end
 
   def self.area_in_square_meters(geom = 'geom_lowres')
@@ -248,7 +254,7 @@ class AbstractFeature < ActiveRecord::Base
     self.geog = SpatialFeatures::Utils.select_db_value("SELECT ST_Force2D('#{geog}')")
   end
 
-  SRID_CACHE = {}
+  SRID_CACHE = HashWithIndifferentAccess.new
   def self.detect_srid(column_name)
     SRID_CACHE[column_name] ||= SpatialFeatures::Utils.select_db_value("SELECT Find_SRID('public', '#{table_name}', '#{column_name}')")
   end

data/config/initializers/mime_types.rb

@@ -3,3 +3,7 @@ Mime::Type.register "application/vnd.bounds+json", :bounds
 Mime::Type.register "application/vnd.mapbox-vector-tile", :mvt
 Mime::Type.register "application/vnd.google-earth.kml+xml", :kml
 Mime::Type.register "application/vnd.google-earth.kmz", :kmz
+Mime::Type.register "application/zip", :zip
+Mime::Type.register "application/zip", :piz
+Mime::Type.register "application/zip", :zap
+Mime::Type.register "application/zip", :shpz

data/lib/spatial_features/has_spatial_features/feature_import.rb

@@ -13,14 +13,14 @@ module SpatialFeatures
     end
 
     module ClassMethods
-      def update_features!(skip_invalid: false, **options)
+      def update_features!(skip_invalid: false, allow_blank: false, **options)
         find_each do |record|
-          record.update_features!(skip_invalid: skip_invalid, **options)
+          record.update_features!(skip_invalid: skip_invalid, allow_blank: allow_blank, **options)
         end
       end
     end
 
-    def update_features!(skip_invalid: false, **options)
+    def update_features!(skip_invalid: false, allow_blank: false, **options)
       options = options.reverse_merge(spatial_features_options)
       tmpdir = options.fetch(:tmpdir) { Dir.mktmpdir("ruby_spatial_features") }
 
@@ -31,7 +31,7 @@ module SpatialFeatures
         return if features_cache_key_matches?(cache_key)
 
         run_callbacks :update_features do
-          import_features(imports, skip_invalid)
+          features = import_features(imports, skip_invalid)
           update_features_cache_key(cache_key)
           update_features_area
 
@@ -40,11 +40,17 @@ module SpatialFeatures
           else
             update_spatial_cache(options.slice(:spatial_cache))
           end
+
+          if imports.present? && features.compact_blank.empty? && !allow_blank
+            raise EmptyImportError, "No spatial features were found when updating"
+          end
         end
       end
 
       return true
     rescue StandardError => e
+      raise e if e.is_a?(EmptyImportError)
+
       if skip_invalid
         Rails.logger.warn "Error updating #{self.class} #{self.id}. #{e.message}"
         return nil
@@ -137,7 +143,7 @@ module SpatialFeatures
         raise ImportError, "Error updating #{self.class} #{self.id}. #{errors.to_sentence}"
       end
 
-      return features
+      valid
     end
 
     def features_cache_key_matches?(cache_key)

data/lib/spatial_features/has_spatial_features.rb

@@ -235,14 +235,10 @@ module SpatialFeatures
     end
 
     def features_area_in_square_meters
-      @features_area_in_square_meters ||=
-        if has_attribute?(:area)
-          area
-        elsif association(:aggregate_feature).loaded?
-          aggregate_feature&.area
-        else
-          aggregate_features.pluck(:area).first
-        end
+      @features_area_in_square_meters ||= area if has_attribute?(:area) # Calculated area column
+      @features_area_in_square_meters ||= features_area if has_attribute?(:features_area) # Cached area column
+      @features_area_in_square_meters ||= aggregate_feature&.area if association(:aggregate_feature).loaded?
+      @features_area_in_square_meters ||= aggregate_features.pluck(:area).first
     end
 
     def total_intersection_area_in_square_meters(other)

data/lib/spatial_features/importers/base.rb

@@ -56,4 +56,5 @@ module SpatialFeatures
   # EXCEPTIONS
 
   class ImportError < StandardError; end
+  class EmptyImportError < ImportError; end
 end

data/lib/spatial_features/importers/file.rb

@@ -3,16 +3,23 @@ require 'open-uri'
 module SpatialFeatures
   module Importers
     class File < SimpleDelegator
-      INVALID_ARCHIVE = "Archive did not contain a .kml, .shp, .json, or .geojson file.".freeze
+      SUPPORTED_SPATIAL_FORMATS = %w(application/zip application/x-shp+zip application/vnd.google-earth.kml+xml application/vnd.google-earth.kmz application/vnd.geo+json).freeze
+      SUPPORTED_SPATIAL_FILE_EXTENSIONS = %w(.zip .zap .piz .shpz .kml .kmz .json .geojson).freeze
       SUPPORTED_FORMATS = "Supported formats are KMZ, KML, zipped ArcGIS shapefiles, ESRI JSON, and GeoJSON.".freeze
 
+      def self.invalid_archive!(filename)
+        filename = ::File.basename(filename.to_s)
+        raise ImportError, "#{filename} did not contain a spatial file. #{SUPPORTED_FORMATS}"
+      end
+      delegate :invalid_archive!, :to => :class
+
       FILE_PATTERNS = [/\.kml$/, /\.shp$/, /\.json$/, /\.geojson$/]
       def self.create_all(data, **options)
         Download.open_each(data, unzip: FILE_PATTERNS, downcase: true, tmpdir: options[:tmpdir]).map do |file|
           new(data, **options, current_file: file)
         end
       rescue Unzip::PathNotFound
-        raise ImportError, INVALID_ARCHIVE + " " + SUPPORTED_FORMATS
+        invalid_archive!(data)
       end
 
       # The File importer may be initialized multiple times by `::create_all` if it
@@ -25,10 +32,12 @@ module SpatialFeatures
         begin
           current_file ||= Download.open_each(data, unzip: FILE_PATTERNS, downcase: true, tmpdir: options[:tmpdir]).first
         rescue Unzip::PathNotFound
-          raise ImportError, INVALID_ARCHIVE
+          invalid_archive!(data)
         end
 
-        case ::File.extname(current_file.path.downcase)
+        filename = current_file.path.downcase
+
+        case ::File.extname(filename)
         when '.kml'
           __setobj__(KMLFile.new(current_file, **options))
         when '.shp'
@@ -36,9 +45,15 @@ module SpatialFeatures
         when '.json', '.geojson'
           __setobj__(ESRIGeoJSON.new(current_file.path, **options))
         else
-          raise ImportError, "Could not import file. " + SUPPORTED_FORMATS
+          import_error!(filename)
         end
       end
+
+      private
+
+      def import_error!(filename)
+        raise ImportError, "Could not import #{filename}. " + SUPPORTED_FORMATS
+      end
     end
   end
 end

data/lib/spatial_features/importers/kml.rb

@@ -6,6 +6,12 @@ module SpatialFeatures
       # <SimpleData name> keys that may contain <img> tags
       IMAGE_METADATA_KEYS = %w[pdfmaps_photos].freeze
 
+      # matches a coordinate pair with an optional altitude, including invalid altitudes like NaN
+      #   -118.1,50.9,NaN
+      #   -118.1,50.9,0
+      #   -118.1,50.9
+      COORDINATES_WITH_ALTITUDE = /((-?\d+\.\d+,-?\d+\.\d+)(,-?[a-zA-Z\d\.]+))/.freeze
+
       def initialize(data, base_dir: nil, **options)
         @base_dir = base_dir
         super data, **options
@@ -52,6 +58,8 @@ module SpatialFeatures
         geom = nil
         conn = nil
 
+        strip_altitude(kml)
+
         # Do query in a new thread so we use a new connection (if the query fails it will poison the transaction of the current connection)
         #
         # We manually checkout a new connection since Rails re-uses DB connections across threads.
@@ -106,6 +114,13 @@ module SpatialFeatures
         end
         return metadata
       end
+
+      def strip_altitude(kml)
+        kml.css('coordinates').each do |coordinates|
+          next unless COORDINATES_WITH_ALTITUDE.match?(coordinates.content)
+          coordinates.content = coordinates.content.gsub(COORDINATES_WITH_ALTITUDE, '\2')
+        end
+      end
     end
   end
 end

data/lib/spatial_features/importers/shapefile.rb

@@ -20,7 +20,7 @@ module SpatialFeatures
           new(file, **options)
         end
       rescue Unzip::PathNotFound
-        raise ImportError, INVALID_ARCHIVE
+        invalid_archive!(data)
       end
 
       private

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "3.2.0"
+  VERSION = "3.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-12 00:00:00.000000000 Z
+date: 2023-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails