X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/457d66eb5b5b390257e318dd8258228db4de5b92..a7d41f09eb65c2a84fb612b476395826d198d0d9:/app/models/trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index d44d71027..4f21c8b25 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -9,6 +9,11 @@ class Trace < ActiveRecord::Base
   has_many :tags, :class_name => 'Tracetag', :foreign_key => 'gpx_id', :dependent => :delete_all
   has_many :points, :class_name => 'Tracepoint', :foreign_key => 'gpx_id', :dependent => :delete_all
 
+  def destroy
+    super
+    FileUtils.rm_f(trace_name, icon_picture_name, large_picture_name)
+  end
+
   def tagstring=(s)
     self.tags = s.split().collect {|tag|
       tt = Tracetag.new
@@ -135,21 +140,11 @@ class Trace < ActiveRecord::Base
         self.size = gpx.actual_points
         self.inserted = true
         self.save
-
-        Notifier::deliver_gpx_success(self, gpx.possible_points)
-      else
-        FileUtils.rm_f("/home/osm/gpx/#{id}.gpx")
-        self.destroy
-        Notifier::deliver_gpx_failure(self, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?')
       end
 
       logger.info "done trace #{id}"
-    rescue Exception => ex
-      logger.info ex
-      ex.backtrace.each {|l| logger.info l }
-      FileUtils.rm_f("/home/osm/gpx/#{id}.gpx")
-      self.destroy
-      Notifier::deliver_gpx_failure(self, ex.to_s + ex.backtrace.join("\n") )
+
+      return gpx
     ensure
       FileUtils.rm_f(tempfile) if tempfile
     end