X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/35fc840b41d1257fe3560af777c291a2852ac749..699e73a22ad85124cef4a69f6a1848729cf87b32:/app/controllers/api/ways_controller.rb diff --git a/app/controllers/api/ways_controller.rb b/app/controllers/api/ways_controller.rb index 285ed4604..2fd86b997 100644 --- a/app/controllers/api/ways_controller.rb +++ b/app/controllers/api/ways_controller.rb @@ -26,12 +26,21 @@ module Api end def show - @way = Way.find(params[:id]) + @way = Way + @way = @way.includes(:nodes => :node_tags) if params[:full] + @way = @way.find(params[:id]) - response.last_modified = @way.timestamp + response.last_modified = @way.timestamp unless params[:full] if @way.visible - # Render the result + if params[:full] + @nodes = [] + + @way.nodes.uniq.each do |node| + @nodes << node if node.visible + end + end + respond_to do |format| format.xml format.json @@ -71,41 +80,5 @@ module Api head :bad_request end end - - def full - @way = Way.includes(:nodes => :node_tags).find(params[:id]) - - if @way.visible - @nodes = [] - - @way.nodes.uniq.each do |node| - @nodes << node if node.visible - end - - # Render the result - respond_to do |format| - format.xml - format.json - end - else - head :gone - 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.where(:node_id => params[:id]).collect { |ws| ws.id[0] }.uniq - - @ways = Way.where(:id => wayids, :visible => true) - - # Render the result - respond_to do |format| - format.xml - format.json - end - end end end