X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/857f0f460b3cee78454519f9764a4091204bc1a6..23f568cf3a0f4a5f102952ebe68d6d2636e82b1b:/app/controllers/amf_controller.rb diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index 210d3c8a4..fb50b6aad 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -376,8 +376,9 @@ class AmfController < ApplicationController timestamp = DateTime.strptime(timestamp.to_s, "%d %b %Y, %H:%M:%S") old_way = OldWay.where("way_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first unless old_way.nil? - points = old_way.get_nodes_revert(timestamp) - unless old_way.visible + if old_way.visible + points = old_way.get_nodes_revert(timestamp) + else return [-1, "Sorry, the way was deleted at that time - please revert to a previous version.", id] end end @@ -610,7 +611,8 @@ class AmfController < ApplicationController # 3. new way id, # 4. hash of renumbered nodes (old id=>new id), # 5. way version, - # 6. hash of node versions (node=>version) + # 6. hash of changed node versions (node=>version) + # 7. hash of deleted node versions (node=>version) def putway(renumberednodes, usertoken, changeset_id, wayversion, originalway, pointlist, attributes, nodes, deletednodes) #:doc: amf_handle_error("'putway' #{originalway}", "way", originalway) do