map { |memb| [memb[0], ids[memb[0]][memb[1].to_i] || memb[1], memb[2]] }
return r
end
+
+ def read
+ begin
+ changeset = Changeset.find(params[:id])
+ render :text => changeset.to_xml.to_s, :content_type => "text/xml"
+ rescue ActiveRecord::RecordNotFound
+ render :nothing => true, :status => :not_found
+ end
+ end
+
+ def close
+ begin
+ if not request.put?
+ render :nothing => true, :status => :method_not_allowed
+ return
+ end
+ changeset = Changeset.find(params[:id])
+ changeset.open = false
+ changeset.save
+ render :nothing => true
+ rescue ActiveRecord::RecordNotFound
+ render :nothing => true, :status => :not_found
+ end
+ end
def upload
if not request.put?
return
end
- # FIXME: this should really be done without loading the whole XML file
- # into memory.
- p = XML::Parser.new
- p.string = request.raw_post
- doc = p.parse
+ 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.transaction do
- doc.find('//osm/create/node').each do |nd|
- create_prim node_ids, Node.from_xml_node(nd, true), nd
- end
- doc.find('//osm/create/way').each do |nd|
- way = Way.from_xml_node(nd, true)
- fix_way(way, node_ids)
- raise OSM::APIPreconditionFailedError.new if !way.preconditions_ok?
- create_prim way_ids, way, nd
- end
- doc.find('//osm/create/relation').each do |nd|
- relation = Relation.from_xml_node(nd, true)
- fix_rel(relation, ids)
- raise OSM::APIPreconditionFailedError.new if !relation.preconditions_ok?
- create_prim rel_ids, relation, nd
- end
+ while p.read == 1
+ break if p.node_type == 15 # end element
+ next unless p.node_type == 1 # element
- doc.find('//osm/modify/node').each do |nd|
- unless NodeController.new.update_internal nil, Node.from_xml_node(nd)
- raise OSM::APIPreconditionFailedError.new
- end
- end
- doc.find('//osm/modify/way').each do |nd|
- unless WayController.update_internal nil, fix_way(Way.from_xml_node(nd), node_ids)
- raise OSM::APIPreconditionFailedError.new
- end
- end
- doc.find('//osm/modify/relation').each do |nd|
- unless RelationController.update_internal nil, fix_rel(Relation.from_xml_node(nd), ids)
- raise OSM::APIPreconditionFailedError.new
- end
- end
+ case p.name
+ when 'create':
+ while p.read == 1
+ break if p.node_type == 15 # end element
+ next unless p.node_type == 1 # element
- doc.find('//osm/delete/node').each do |nd|
- unless NodeController.delete_internal nil, Node.from_xml_node(n)
- raise OSM::APIPreconditionFailedError.new
- end
- end
- doc.find('//osm/delete/way').each do |nd|
- Way.from_xml_node(nd).delete_with_relations_and_history(@user)
- end
- doc.find('//osm/delete/relation').each do |nd|
- unless RelationController.delete_internal nil, fix_rel(Relation.from_xml_node(nd), ids)
- raise OSM::APIPreconditionFailedError.new
+ 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
end
- render :text => "Ok, Fine. Upload worked without errors.\n", :status => 200
+ render :text => res.to_s, :content_type => "text/xml"
+
+ rescue OSM::APIError => ex
+ render ex.render_opts
end
end
projects / rails.git / blobdiff