Drop redundant support for legacy trace files

openstreetmap · Mar 28, 2024 · 6059ed0 · 6059ed0
1 parent 91143a5
commit 6059ed0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/app/controllers/traces/icons_controller.rb b/app/controllers/traces/icons_controller.rb
@@ -9,12 +9,7 @@ def show
       trace = Trace.visible.imported.find(params[:trace_id])
 
       if trace.public? || (current_user && current_user == trace.user)
-        if trace.icon.attached?
-          redirect_to rails_blob_path(trace.icon, :disposition => "inline")
-        else
-          expires_in 7.days, :private => !trace.public?, :public => trace.public?
-          send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => "image/gif", :disposition => "inline")
-        end
+        redirect_to rails_blob_path(trace.icon, :disposition => "inline")
       else
         head :forbidden
       end

diff --git a/app/controllers/traces/pictures_controller.rb b/app/controllers/traces/pictures_controller.rb
@@ -9,12 +9,7 @@ def show
       trace = Trace.visible.imported.find(params[:trace_id])
 
       if trace.public? || (current_user && current_user == trace.user)
-        if trace.icon.attached?
-          redirect_to rails_blob_path(trace.image, :disposition => "inline")
-        else
-          expires_in 7.days, :private => !trace.public?, :public => trace.public?
-          send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => "image/gif", :disposition => "inline")
-        end
+        redirect_to rails_blob_path(trace.image, :disposition => "inline")
       else
         head :forbidden
       end