Merge remote-tracking branch 'upstream/pull/5353'

[rails.git] / app / models / trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 35fee0bf4f800d7fd22f906d1b9cc3040ea5727f..20723b98d01ddc7e0efe3d732879c12c8345d77b 100644 (file)
--- 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 :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
 
   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
             :content_type => content_type(attachable.path),
             :identify => false)
     else

-      super(attachable)
+      super

     end
   end
 
     end
   end
 


@@ -202,14 +203,14 @@ class Trace < ApplicationRecord
     logger.info("GPX Import importing #{name} (#{id}) from #{user.email}")
 
     file.open do |file|
     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
       first = true
 
       # If there are any existing points for this trace then delete them
 
       f_lat = 0
       f_lon = 0
       first = true
 
       # If there are any existing points for this trace then delete them

-      Tracepoint.where(:gpx_id => id).delete_all
+      Tracepoint.where(:trace => id).delete_all

 
       gpx.points.each_slice(1_000) do |points|
         # Gather the trace points together for a bulk import
 
       gpx.points.each_slice(1_000) do |points|
         # Gather the trace points together for a bulk import


@@ -242,10 +243,10 @@ class Trace < ApplicationRecord
       end
 
       if gpx.actual_points.positive?
       end
 
       if gpx.actual_points.positive?

-        max_lat = Tracepoint.where(:gpx_id => id).maximum(:latitude)
-        min_lat = Tracepoint.where(:gpx_id => id).minimum(:latitude)
-        max_lon = Tracepoint.where(:gpx_id => id).maximum(:longitude)
-        min_lon = Tracepoint.where(:gpx_id => id).minimum(:longitude)
+        max_lat = Tracepoint.where(:trace => id).maximum(:latitude)
+        min_lat = Tracepoint.where(:trace => id).minimum(:latitude)
+        max_lon = Tracepoint.where(:trace => id).maximum(:longitude)
+        min_lon = Tracepoint.where(:trace => id).minimum(:longitude)

 
         max_lat = max_lat.to_f / 10000000
         min_lat = min_lat.to_f / 10000000
 
         max_lat = max_lat.to_f / 10000000
         min_lat = min_lat.to_f / 10000000


@@ -267,6 +268,14 @@ class Trace < ApplicationRecord
     end
   end
 
     end
   end
 

+  def schedule_import
+    TraceImporterJob.new(self).enqueue(:priority => user.traces.where(:inserted => false).count)
+  end
+
+  def schedule_destruction
+    TraceDestroyerJob.perform_later(self)
+  end
+

   private
 
   def content_type(file)
   private
 
   def content_type(file)