X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/33d292e9810faeb0a038d6a3df3881411183e28c..6094a97ce6297d390e5bbf733f5c2b4cc6b2076c:/app/models/trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index be5d0a631..20723b98d 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -38,6 +38,7 @@ class Trace < ApplicationRecord
   scope :visible_to, ->(u) { visible.where(:visibility => %w[public identifiable]).or(visible.where(:user => u)) }
   scope :visible_to_all, -> { where(:visibility => %w[public identifiable]) }
   scope :tagged, ->(t) { joins(:tags).where(:gpx_file_tags => { :tag => t }) }
+  scope :imported, -> { where(:inserted => true) }
 
   has_one_attached :file, :service => Settings.trace_file_storage
   has_one_attached :image, :service => Settings.trace_image_storage
@@ -80,7 +81,7 @@ class Trace < ApplicationRecord
             :content_type => content_type(attachable.path),
             :identify => false)
     else
-      super(attachable)
+      super
     end
   end
 
@@ -202,7 +203,7 @@ class Trace < ApplicationRecord
     logger.info("GPX Import importing #{name} (#{id}) from #{user.email}")
 
     file.open do |file|
-      gpx = GPX::File.new(file.path)
+      gpx = GPX::File.new(file.path, :maximum_points => Settings.max_trace_size)
 
       f_lat = 0
       f_lon = 0
@@ -268,7 +269,7 @@ class Trace < ApplicationRecord
   end
 
   def schedule_import
-    TraceImporterJob.perform_later(self)
+    TraceImporterJob.new(self).enqueue(:priority => user.traces.where(:inserted => false).count)
   end
 
   def schedule_destruction