X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a90be5e69a478e2b49ae676b649a78589f85a50e..a4e5e8437f8c1836c6389f7aa49cc3884f3a7cf7:/app/controllers/changeset_controller.rb diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index 181c827b3..fad797cdc 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -2,7 +2,6 @@ class ChangesetController < ApplicationController require 'xml/libxml' - require 'diff_reader' before_filter :authorize, :only => [:create, :update, :delete, :upload, :include, :close] before_filter :check_write_availability, :only => [:create, :update, :delete, :upload, :include] @@ -56,7 +55,7 @@ class ChangesetController < ApplicationController # to close the changeset, we'll just set its closed_at time to # now. this might not be enough if there are concurrency issues, # but we'll have to wait and see. - changeset.closed_at = DateTime.now + changeset.set_closed_time_now changeset.save! render :nothing => true @@ -71,7 +70,7 @@ class ChangesetController < ApplicationController # increase the size of the bounding box. this is a hint that clients can # set either before uploading a large number of changes, or changes that # the client (but not the server) knows will affect areas further away. - def include + def expand_bbox # only allow POST requests, because although this method is # idempotent, there is no "document" to PUT really... if request.post? @@ -295,6 +294,7 @@ class ChangesetController < ApplicationController render ex.render_opts end +private #------------------------------------------------------------ # utility functions below. #------------------------------------------------------------