X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/866c3ff78245994ce03cf1567afee20673dc8932..dc2a95903722644f6109244cec9a2d1e195fef0e:/app/controllers/changeset_controller.rb diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index ec5ef83b0..a24f61e28 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -2,6 +2,7 @@ class ChangesetController < ApplicationController require 'xml/libxml' + require 'diff_reader' before_filter :authorize, :only => [:create, :update, :delete, :upload] before_filter :check_write_availability, :only => [:create, :update, :delete, :upload] @@ -57,149 +58,50 @@ class ChangesetController < ApplicationController def close begin - if not request.put? + unless request.put? render :nothing => true, :status => :method_not_allowed return end changeset = Changeset.find(params[:id]) changeset.open = false - changeset.save + changeset.save! render :nothing => true rescue ActiveRecord::RecordNotFound render :nothing => true, :status => :not_found end end + ## + # Upload a diff in a single transaction. + # + # This means that each change within the diff must succeed, i.e: that + # each version number mentioned is still current. Otherwise the entire + # transaction *must* be rolled back. + # + # Furthermore, each element in the diff can only reference the current + # changeset. + # + # Returns: ??? the new document? updated diffs? def upload - if not request.put? + # only allow POST requests, as the upload method is most definitely + # not idempotent, as several uploads with placeholder IDs will have + # different side-effects. + # see http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.1.2 + unless request.post? render :nothing => true, :status => :method_not_allowed return end - p = XML::Reader.new request.raw_post - - node_ids, way_ids, rel_ids = {}, {}, {} - ids = {"node"=>node_ids, "way"=>way_ids, "relation"=>rel_ids} - - res = XML::Document.new - res.encoding = 'UTF-8' - root = XML::Node.new 'osm' - root['version'] = '0.6' - root['creator'] = 'OpenStreetMap.org' - res.root = root - - root << XML::Node.new_comment(" Warning: this is a 0.6 result document, " + - "not a normal OSM file. ") - + changeset = Changeset.find(params[:id]) + + diff_reader = DiffReader.new(request.raw_post, changeset) Changeset.transaction do - while p.read == 1 - break if p.node_type == 15 # end element - next unless p.node_type == 1 # element - - case p.name - when 'create': - while p.read == 1 - break if p.node_type == 15 # end element - next unless p.node_type == 1 # element - - case p.name - when 'node': - elem = XML::Node.new 'node' - node = Node.from_xml_node(p.expand, true) - elem['old_id'] = p.expand['id'] - create_prim node_ids, node, p.expand - elem['new_id'] = node.id.to_s - elem['new_version'] = node.version.to_s - root << elem - when 'way': - elem = XML::Node.new 'way' - way = Way.from_xml_node(p.expand, true) - elem['old_id'] = p.expand['id'] - fix_way(way, node_ids) - raise OSM::APIPreconditionFailedError.new if !way.preconditions_ok? - create_prim way_ids, way, p.expand - elem['new_id'] = way.id.to_s - elem['new_version'] = way.version.to_s - root << elem - when 'relation': - elem = XML::Node.new 'relation' - relation = Relation.from_xml_node(p.expand, true) - elem['old_id'] = p.expand['id'] - fix_rel(relation, ids) - raise OSM::APIPreconditionFailedError.new if !relation.preconditions_ok? - create_prim rel_ids, relation, p.expand - elem['new_id'] = relation.id.to_s - elem['new_version'] = relation.version.to_s - root << elem - end - end - when 'modify': - while p.read == 1 - break if p.node_type == 15 # end element - next unless p.node_type == 1 # element - - case p.name - when 'node': - elem = XML::Node.new 'node' - new_node = Node.from_xml_node(p.expand) - node = Node.find(new_node.id) - node.update_from new_node, @user - elem['old_id'] = elem['new_id'] = node.id.to_s - elem['new_version'] = node.version.to_s - root << elem - when 'way': - elem = XML::Node.new 'way' - new_way = Way.from_xml_node(p.expand) - way = Way.find(new_way.id) - way.update_from new_way, @user - elem['old_id'] = elem['new_id'] = way.id.to_s - elem['new_version'] = way.version.to_s - root << elem - when 'relation': - elem = XML::Node.new 'relation' - new_relation = Relation.from_xml_node(p.expand) - relation = Relation.find(new_relation.id) - relation.update_from new_relation, @user - elem['old_id'] = elem['new_id'] = relation.id.to_s - elem['new_version'] = relation.version.to_s - root << elem - end - end - when 'delete': - while p.read == 1 - break if p.node_type == 15 # end element - next unless p.node_type == 1 # element - - case p.name - when 'node': - elem = XML::Node.new 'node' - node = Node.find(p.expand['id']) - node.delete_with_history(@user) - elem['old_id'] = elem['new_id'] = node.id.to_s - elem['new_version'] = node.version.to_s - root << elem - when 'way': - elem = XML::Node.new 'way' - way = Way.find(p.expand['id']) - way.delete_with_history(@user) - elem['old_id'] = elem['new_id'] = way.id.to_s - elem['new_version'] = way.version.to_s - root << elem - when 'relation': - elem = XML::Node.new 'relation' - relation = Relation.find(p.expand['id']) - relation.delete_with_history(@user) - elem['old_id'] = elem['new_id'] = relation.id.to_s - elem['new_version'] = relation.version.to_s - root << elem - end - end - end - end + result = diff_reader.commit + render :text => result.to_s, :content_type => "text/xml" end - - render :text => res.to_s, :content_type => "text/xml" - + + rescue ActiveRecord::RecordNotFound + render :nothing => true, :status => :not_found rescue OSM::APIError => ex render ex.render_opts end