api06: simplify exception handling and add exception handling to the diff

[rails.git] / app / controllers / changeset_controller.rb

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 9994a6b1e6c989be5968b0157fe263a0ca500921..322ce79f7552f024a382061df1e22554650911e0 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -167,7 +167,7 @@ class ChangesetController < ApplicationController
       doc.find('//osm/delete/way').each do |nd|
        elem = XML::Node.new 'way'
        way = Way.find(nd['id'])
-       way.delete_with_relations_and_history(@user)
+       way.delete_with_history(@user)
        elem['old_id'] = elem['new_id'] = way.id.to_s
        elem['new_version'] = way.version.to_s
        root << elem
@@ -184,5 +184,8 @@ class ChangesetController < ApplicationController
     end
 
     render :text => res.to_s, :content_type => "text/xml"
+
+  rescue OSM::APIError => ex
+    render ex.render_opts
   end
 end