Merge branch 'master' into tag-colour-preview-rebase

[rails.git] / app / controllers / api / map_controller.rb

diff --git a/app/controllers/api/map_controller.rb b/app/controllers/api/map_controller.rb
index 4790e2f60992bb08a9b3261c8c8ef66a0abbf7ff..b0998f7ebaa9aa6ae49f8aa125f0583f5353049e 100644 (file)
--- a/app/controllers/api/map_controller.rb
+++ b/app/controllers/api/map_controller.rb
@@ -22,8 +22,8 @@ module Api
         @bounds = BoundingBox.from_bbox_params(params)
         @bounds.check_boundaries
         @bounds.check_size
-      rescue StandardError => err
-        report_error(err.message)
+      rescue StandardError => e
+        report_error(e.message)
         return
       end
 
@@ -90,9 +90,7 @@ module Api
 
       response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""
       # Render the result
-      respond_to do |format|
-        format.xml
-      end
+      render :formats => [:xml]
     end
   end
 end