X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6339473cb77e4e0998b959a0835a8f42767f608d..6b0d4dcab2c72397dbbabd768e47323c0e2e42b2:/app/controllers/way_controller.rb diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb index 25d535d79..2ce49b7e8 100644 --- a/app/controllers/way_controller.rb +++ b/app/controllers/way_controller.rb @@ -1,128 +1,106 @@ class WayController < ApplicationController require 'xml/libxml' - session :off + skip_before_filter :verify_authenticity_token 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] + before_filter :require_allow_write_api, :only => [:create, :update, :delete] + before_filter :require_public_data, :only => [:create, :update, :delete] + before_filter :check_api_writable, :only => [:create, :update, :delete] + before_filter :check_api_readable, :except => [:create, :update, :delete] after_filter :compress_output + around_filter :api_call_handle_error, :api_call_timeout def create - begin - if request.put? - way = Way.from_xml(request.raw_post, true) - - if way - way.create_with_history @user - render :text => way.id.to_s, :content_type => "text/plain" - else - render :nothing => true, :status => :bad_request - end - else - render :nothing => true, :status => :method_not_allowed - end - rescue OSM::APIError => ex - render ex.render_opts + assert_method :put + + way = Way.from_xml(request.raw_post, true) + + if way + way.create_with_history @user + render :text => way.id.to_s, :content_type => "text/plain" + else + render :text => "", :status => :bad_request end end 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 + way = Way.find(params[:id]) + + response.last_modified = way.timestamp + + if way.visible + render :text => way.to_xml.to_s, :content_type => "text/xml" + else + render :text => "", :status => :gone end end def update - begin - way = Way.find(params[:id]) - new_way = Way.from_xml(request.raw_post) - - 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 - rescue OSM::APIError => ex - render ex.render_opts - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + way = Way.find(params[:id]) + new_way = Way.from_xml(request.raw_post) + + 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 :text => "", :status => :bad_request 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) - - 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 + way = Way.find(params[:id]) + new_way = Way.from_xml(request.raw_post) + + 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 :text => "", :status => :bad_request end end def full - begin - way = Way.find(params[:id]) - - if way.visible - nd_ids = way.nds + [-1] - nodes = Node.find(:all, :conditions => "visible = 1 AND id IN (#{nd_ids.join(',')})") + way = Way.includes(:nodes => :node_tags).find(params[:id]) + + if way.visible + visible_nodes = {} + changeset_cache = {} + user_display_name_cache = {} - # Render - doc = OSM::API.new.get_xml_doc - nodes.each do |node| - doc.root << node.to_xml_node() + doc = OSM::API.new.get_xml_doc + way.nodes.uniq.each do |node| + if node.visible + doc.root << node.to_xml_node(changeset_cache, user_display_name_cache) + visible_nodes[node.id] = node end - doc.root << way.to_xml_node() - - render :text => doc.to_s, :content_type => "text/xml" - else - render :text => "", :status => :gone end - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache) + + render :text => doc.to_s, :content_type => "text/xml" + else + render :text => "", :status => :gone end end def ways - begin - ids = params['ways'].split(',').collect { |w| w.to_i } - rescue - ids = [] + if not params['ways'] + raise OSM::APIBadUserInput.new("The parameter ways is required, and must be of the form ways=id[,id[,id...]]") end - if ids.length > 0 - doc = OSM::API.new.get_xml_doc + ids = params['ways'].split(',').collect { |w| w.to_i } - Way.find(ids).each do |way| - doc.root << way.to_xml_node - end + if ids.length == 0 + raise OSM::APIBadUserInput.new("No ways were given to search for") + end - render :text => doc.to_s, :content_type => "text/xml" - else - render :nothing => true, :status => :bad_request + 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, :content_type => "text/xml" end ## @@ -130,9 +108,7 @@ class WayController < ApplicationController # :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 + wayids = WayNode.where(:node_id => params[:id]).collect { |ws| ws.id[0] }.uniq doc = OSM::API.new.get_xml_doc