spatial_features 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca9589fa4acf1bb8c8d5c4a915891628c298b80c
-  data.tar.gz: b450b7c37ffa34bfd87731493916f3a20210b414
+  metadata.gz: 86ef03aa25c8f1b883c2dfc313ca200eb26f22b0
+  data.tar.gz: 25b5c3887d7b9cf1cb560d7b0baf38cc4fdd6f73
 SHA512:
-  metadata.gz: cbdd1f67b29366a08858491b4d8c3c0deaeab2e8feebfd335b07c7d90ca38908b5d750834c9dc46336c038bb77cb2ef60a47405029ad412ddf4c7b87387c583e
-  data.tar.gz: 7c03e44c03b576eec2bd88c5524f3925b7e78579b9d927fa6aa79ead01c7e92425c012a8c63e3f3bd8cacfc1727b69bf9c66908ac3f3c0b9cdb219a5aa6bccbf
+  metadata.gz: c437c6f85a9bf15ecd88637d09a348a92498a9e450a4885731e4daedff1c04fbcd626a9ffd4e6ac1430da612b794fc4b8f5ecff62a7c1039c295bab8f39ddbf7
+  data.tar.gz: 503b88e79c31b67c0069b5cb1346b26879f782227234e82e4bdcfc0b080ea920418767a333b6a1f5b9d30f43375bf3e5a666e0c2915505d8fbf38097e486839e

data/app/models/feature.rb

@@ -7,10 +7,9 @@ class Feature < ActiveRecord::Base
 
   before_validation :sanitize_feature_type
   validates_presence_of :geog
-  validate :geometry_is_valid
+  validate :validate_geometry
   validates_inclusion_of :feature_type, :in => FEATURE_TYPES
   before_save :sanitize
-  before_save :make_valid, if: :make_valid?
   after_save :cache_derivatives
 
   def self.with_metadata(k, v)
@@ -111,7 +110,7 @@ class Feature < ActiveRecord::Base
   private
 
   def make_valid
-    self.geog = ActiveRecord::Base.connection.select_value("SELECT ST_CollectionExtract(ST_MakeValid('#{sanitize}'),3)")
+    self.geog = ActiveRecord::Base.connection.select_value("SELECT ST_Buffer('#{sanitize}', 0)")
   end
 
   # Use ST_Force2D to discard z-coordinates that cause failures later in the process
@@ -127,13 +126,24 @@ class Feature < ActiveRecord::Base
     joins('INNER JOIN features AS other_features ON true').where(:other_features => {:id => other})
   end
 
-  def geometry_is_valid
-    if geog?
-      instance = self.class.unscoped.invalid.from("(SELECT '#{sanitize_input_for_sql(self.geog)}'::geometry AS geog) #{self.class.table_name}").to_a.first
-      errors.add :geog, instance.invalid_geometry_message if instance
+  def validate_geometry
+    return unless geog?
+
+    error = geometry_validation_message
+    if error && make_valid?
+      make_valid
+      self.make_valid = false
+      validate_geometry
+    elsif error
+      errors.add :geog, error
     end
   end
 
+  def geometry_validation_message
+    error = self.class.connection.select_one(self.class.unscoped.invalid.from("(SELECT '#{sanitize_input_for_sql(self.geog)}'::geometry AS geog) #{self.class.table_name}"))
+    return error.fetch('invalid_geometry_message') if error
+  end
+
   def sanitize_feature_type
     self.feature_type = FEATURE_TYPES.find {|type| self.feature_type.to_s.strip.downcase.include?(type) }
   end

data/lib/spatial_features/has_spatial_features.rb

@@ -7,7 +7,7 @@ module SpatialFeatures
         include DelayedFeatureImport
 
         class_attribute :spatial_features_options
-        self.spatial_features_options = {}
+        self.spatial_features_options = {:make_valid => true}
 
         has_many :features, lambda { extending FeaturesAssociationExtensions }, :as => :spatial_model, :dependent => :delete_all
 

data/lib/spatial_features/has_spatial_features/feature_import.rb

@@ -19,8 +19,7 @@ module SpatialFeatures
         return if features_cache_key_matches?(cache_key)
 
         run_callbacks :update_features do
-          import_features(imports)
-          validate_features!(imports, skip_invalid)
+          import_features(imports, skip_invalid)
           set_features_cache_key(cache_key)
         end
 
@@ -37,25 +36,23 @@ module SpatialFeatures
       end.compact
     end
 
-    def import_features(imports)
-      self.features.destroy_all
-      self.features = imports.flat_map(&:features)
-    end
-
-    def validate_features!(imports, skip_invalid = false)
-      invalid = features.select {|feature| feature.errors.present? }
-      features.destroy(invalid)
-
-      return if skip_invalid
-
-      errors = imports.flat_map(&:errors)
-      invalid.each do |feature|
-        errors << "Feature #{feature.name}: #{feature.errors.full_messages.to_sentence}"
+    def import_features(imports, skip_invalid)
+      self.features.delete_all
+      valid, invalid = imports.flat_map(&:features).partition do |feature|
+        feature.spatial_model = self
+        feature.save
       end
 
-      if errors.present?
+      if !skip_invalid && invalid.present?
+        errors = imports.flat_map(&:errors)
+        invalid.each do |feature|
+          errors << "Feature #{feature.name}: #{feature.errors.full_messages.to_sentence}"
+        end
+
         raise ImportError, "Error updating #{self.class} #{self.id}. #{errors.to_sentence}"
       end
+
+      self.features = valid
     end
 
     def features_cache_key_matches?(cache_key)

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.1.6"
+  VERSION = "2.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Ryan Wallace