X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e15916ad5b081f94c433f1e0bb708be242dbe5ab..6c3b5aa9d46577818723e669d6fc64f1bb30cc01:/app/controllers/way_controller.rb?ds=sidebyside diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb index 935ff3a72..f2cda21bc 100644 --- a/app/controllers/way_controller.rb +++ b/app/controllers/way_controller.rb @@ -1,126 +1,82 @@ class WayController < ApplicationController require 'xml/libxml' - session :off before_filter :authorize, :only => [:create, :update, :delete] - before_filter :check_availability, :only => [: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 - if request.put? - way = Way.from_xml(request.raw_post, true) + assert_method :put - if way - if !way.preconditions_ok? - render :nothing => true, :status => :precondition_failed - else - way.user_id = @user.id - way.save_with_history! - - render :text => way.id.to_s, :content_type => "text/plain" - end - else - render :nothing => true, :status => :bad_request - end + 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 => :method_not_allowed + render :nothing => true, :status => :bad_request end end def read - begin - way = Way.find(params[:id]) - - if way.visible - render :text => way.to_xml.to_s, :content_type => "text/xml" - else - render :nothing => true, :status => :gone - end - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + 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 end def update - begin - way = Way.find(params[:id]) - - if way.visible - new_way = Way.from_xml(request.raw_post) - - if new_way and new_way.id == way.id - if !new_way.preconditions_ok? - render :nothing => true, :status => :precondition_failed - else - way.user_id = @user.id - way.tags = new_way.tags - way.segs = new_way.segs - way.visible = true - way.save_with_history! - - render :nothing => true - end - else - render :nothing => true, :status => :bad_request - end - else - render :nothing => true, :status => :gone - end - 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 :nothing => true, :status => :bad_request end end + # This is the API call to delete a way def delete - begin - way = Way.find(params[:id]) - - if way.visible - way.user_id = @user.id - way.tags = [] - way.segs = [] - way.visible = false - way.save_with_history! - - render :nothing => true - else - render :nothing => true, :status => :gone - end - 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 :nothing => true, :status => :bad_request end end def full - begin - way = Way.find(params[:id]) - - if way.visible - # In future, we might want to do all the data fetch in one step - seg_ids = way.segs + [-1] - segments = Segment.find_by_sql "select * from current_segments where visible = 1 and id IN (#{seg_ids.join(',')})" - - node_ids = segments.collect {|segment| segment.node_a } - node_ids += segments.collect {|segment| segment.node_b } - node_ids += [-1] - nodes = Node.find(:all, :conditions => "visible = 1 AND id IN (#{node_ids.join(',')})") - - # Render - doc = OSM::API.new.get_xml_doc - nodes.each do |node| - doc.root << node.to_xml_node() - end - segments.each do |segment| - doc.root << segment.to_xml_node() - end - doc.root << way.to_xml_node() + way = Way.find(params[:id], :include => {:nodes => :node_tags}) + + if way.visible + changeset_cache = {} + user_display_name_cache = {} - render :text => doc.to_s, :content_type => "text/xml" - else - render :nothing => true, :status => :gone + 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) + end end - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + doc.root << way.to_xml_node(nil, changeset_cache, user_display_name_cache) + + render :text => doc.to_s, :content_type => "text/xml" + else + render :text => "", :status => :gone end end @@ -144,19 +100,21 @@ class WayController < ApplicationController end end - def ways_for_segment - wayids = WaySegment.find(:all, :conditions => ['segment_id = ?', params[:id]]).collect { |ws| ws.id }.uniq + ## + # 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 - if wayids.length > 0 - doc = OSM::API.new.get_xml_doc - - Way.find(wayids).each do |way| - doc.root << way.to_xml_node - end + doc = OSM::API.new.get_xml_doc - render :text => doc.to_s, :content_type => "text/xml" - else - render :nothing => true, :status => :bad_request + 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