Raise exception if there is an error, and import tracepoints in batches

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

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 892d41a2a217b5872cacc8a5724f63a36da5690c..3d23d02c8d7da728c47f9234beb0a08873b6ea3f 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -289,6 +289,8 @@ class Trace < ActiveRecord::Base
     # If there are any existing points for this trace then delete them
     Tracepoint.where(:gpx_id => id).delete_all
 
+    # Gather the trace points together for a bulk import
+    tracepoints = []
     gpx.points do |point|
       if first
         f_lat = point.latitude
@@ -303,9 +305,16 @@ class Trace < ActiveRecord::Base
       tp.timestamp = point.timestamp
       tp.gpx_id = id
       tp.trackid = point.segment
-      tp.save!
+      tracepoints << tp
     end
 
+    # Run the before_save and before_create callbacks, and then import them in bulk with activerecord-import
+    tracepoints.each do |tp|
+      tp.run_callbacks(:save) { false }
+      tp.run_callbacks(:create) { false }
+    end
+    Tracepoint.import!(tracepoints, :batch_size => 1_000)
+
     if gpx.actual_points.positive?
       max_lat = Tracepoint.where(:gpx_id => id).maximum(:latitude)
       min_lat = Tracepoint.where(:gpx_id => id).minimum(:latitude)