X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c38e4bf4a0f76550300386bbabf4bdda943e56c1..152cb13a02dfcb2966b8a9b29382f84a99a23a69:/app/controllers/way_controller.rb diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb index a2d215760..5b0a632f7 100644 --- a/app/controllers/way_controller.rb +++ b/app/controllers/way_controller.rb @@ -1,96 +1,145 @@ class WayController < ApplicationController require 'xml/libxml' - before_filter :authorize + session :off + before_filter :authorize, :only => [:create, :update, :delete] + before_filter :check_write_availability, :only => [:create, :update, :delete] + before_filter :check_read_availability, :except => [:create, :update, :delete] after_filter :compress_output def create - if request.put? - way = Way.from_xml(request.raw_post, true) + begin + if request.put? + way = Way.from_xml(request.raw_post, true) - if way - way.user_id = @user.id - if way.save_with_history - render :text => way.id + if way + way.create_with_history @user + render :text => way.id.to_s, :content_type => "text/plain" else - render :nothing => true, :status => 500 + render :nothing => true, :status => :bad_request end - return else - render :nothing => true, :status => 400 # if we got here the doc didnt parse - return + render :nothing => true, :status => :method_not_allowed end + rescue OSM::APIError => ex + render ex.render_opts end - - render :nothing => true, :status => 500 # something went very wrong end - def rest - unless Way.exists?(params[:id]) - render :nothing => true, :status => 404 - return + def read + begin + way = Way.find(params[:id]) + + response.headers['Last-Modified'] = way.timestamp.rfc822 + + if way.visible + render :text => way.to_xml.to_s, :content_type => "text/xml" + else + render :text => "", :status => :gone + end + rescue OSM::APIError => ex + render ex.render_opts + rescue ActiveRecord::RecordNotFound + render :nothing => true, :status => :not_found end + end + + def update + begin + way = Way.find(params[:id]) + new_way = Way.from_xml(request.raw_post) - way = Way.find(params[:id]) - case request.method - - when :get - unless way.visible - render :nothing => true, :status => 410 - return + if new_way and new_way.id == way.id + way.update_from(new_way, @user) + render :text => way.version.to_s, :content_type => "text/plain" + else + render :nothing => true, :status => :bad_request end - render :text => way.to_xml.to_s + rescue OSM::APIError => ex + render ex.render_opts + rescue ActiveRecord::RecordNotFound + render :nothing => true, :status => :not_found + end + end + + # This is the API call to delete a way + def delete + begin + way = Way.find(params[:id]) + new_way = Way.from_xml(request.raw_post) - when :delete - unless way.visible - render :nothing => true, :status => 410 - return + if new_way and new_way.id == way.id + way.delete_with_history!(new_way, @user) + render :text => way.version.to_s, :content_type => "text/plain" + else + render :nothing => true, :status => :bad_request end + rescue OSM::APIError => ex + render ex.render_opts + rescue ActiveRecord::RecordNotFound + render :nothing => true, :status => :not_found + end + end - way.visible = false - way.save_with_history - render :nothing => true - return - when :put - way = Way.from_xml(request.raw_post) - - if way - way_in_db = Way.find(way.id) - if way_in_db - way_in_db.user_id = @user.id - way_in_db.tags = way.tags - way_in_db.segs = way.segs - way_in_db.timestamp = way.timestamp - way_in_db.visible = true - if way_in_db.save_with_history - render :text => way.id - else - render :nothing => true, :status => 500 - end - return - else - render :nothing => true, :status => 404 # way doesn't exist yet + def full + begin + way = Way.find(params[:id]) + + if way.visible + nd_ids = way.nds + [-1] + nodes = Node.find(:all, :conditions => ["visible = ? AND id IN (#{nd_ids.join(',')})", true]) + + # Render + doc = OSM::API.new.get_xml_doc + nodes.each do |node| + doc.root << node.to_xml_node() end + doc.root << way.to_xml_node() + + render :text => doc.to_s, :content_type => "text/xml" else - render :nothing => true, :status => 400 # if we got here the doc didnt parse - return + render :text => "", :status => :gone end + rescue ActiveRecord::RecordNotFound + render :nothing => true, :status => :not_found end end def ways - response.headers["Content-Type"] = 'application/xml' - ids = params['ways'].split(',').collect {|w| w.to_i } + begin + ids = params['ways'].split(',').collect { |w| w.to_i } + rescue + ids = [] + end + if ids.length > 0 - waylist = Way.find(ids) - doc = get_xml_doc - waylist.each do |way| + doc = OSM::API.new.get_xml_doc + + Way.find(ids).each do |way| doc.root << way.to_xml_node - end - render :text => doc.to_s + end + + render :text => doc.to_s, :content_type => "text/xml" else - render :nothing => true, :status => 400 + render :nothing => true, :status => :bad_request end end + ## + # returns all the ways which are currently using the node given in the + # :id parameter. note that this used to return deleted ways as well, but + # this seemed not to be the expected behaviour, so it was removed. + def ways_for_node + wayids = WayNode.find(:all, + :conditions => ['node_id = ?', params[:id]] + ).collect { |ws| ws.id[0] }.uniq + + doc = OSM::API.new.get_xml_doc + + Way.find(wayids).each do |way| + doc.root << way.to_xml_node if way.visible + end + + render :text => doc.to_s, :content_type => "text/xml" + end end