X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/568c05c548773a222e6204e091342db6e76b62b3..fd6f00b069af5a7b87227ea4c3401dc461d7311a:/app/controllers/amf_controller.rb diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index b4cbaeaf0..b0b3f13cf 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -41,7 +41,7 @@ class AmfController < ApplicationController include MapBoundary session :off - before_filter :check_write_availability + before_filter :check_api_writable # Main AMF handlers: process the raw AMF string (using AMF library) and # calls each action (private method) accordingly. @@ -55,7 +55,7 @@ class AmfController < ApplicationController # Parse request - headers=AMF.getint(req) # Read number of headers + headers=AMF.getint(req) # Read number of headers headers.times do # Read each header name=AMF.getstring(req) # | @@ -157,7 +157,7 @@ class AmfController < ApplicationController cs.tags = cstags cs.user_id = user.id # smsm1 doesn't like the next two lines and thinks they need to be abstracted to the model more/better - cs.created_at = Time.now + cs.created_at = Time.now.getutc cs.closed_at = cs.created_at + Changeset::IDLE_TIMEOUT cs.save_with_tags! return [0,cs.id] @@ -276,7 +276,7 @@ class AmfController < ApplicationController [wayid, points, tags, version] end - + # Get an old version of a way, and all constituent nodes. # # For undelete (version<0), always uses the most recent version of each node, @@ -490,8 +490,8 @@ class AmfController < ApplicationController new_relation.changeset_id = changeset_id new_relation.version = version - - if id <= 0 + # NOTE: id or relid here? id doesn't seem to be set above + if relid <= 0 # We're creating the node new_relation.create_with_history(user) elsif visible