From 6d8353821bd431b4f6221449cd33759078622931 Mon Sep 17 00:00:00 2001 From: Steve Coast Date: Mon, 7 May 2007 15:00:33 +0000 Subject: [PATCH] cleanup --- app/controllers/way_controller.rb | 46 +++++++++++++++---------------- config/environment.rb | 1 - 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb index acc8a5d0c..d297f0acc 100644 --- a/app/controllers/way_controller.rb +++ b/app/controllers/way_controller.rb @@ -3,7 +3,7 @@ class WayController < ApplicationController before_filter :authorize after_filter :compress_output - + def create if request.put? way = Way.from_xml(request.raw_post, true) @@ -41,33 +41,33 @@ class WayController < ApplicationController way = Way.find(params[:id]) unless way.visible - render :nothing => true, :status => 410 - return + render :nothing => true, :status => 410 + return end - # 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() + # 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() render :text => doc.to_s end - def rest + def rest unless Way.exists?(params[:id]) render :nothing => true, :status => 404 return @@ -76,7 +76,7 @@ class WayController < ApplicationController way = Way.find(params[:id]) case request.method - when :get + when :get unless way.visible render :nothing => true, :status => 410 return diff --git a/config/environment.rb b/config/environment.rb index 711d2ff8d..6375a5086 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -75,4 +75,3 @@ HTTP_PRECONDITION_FAILED = 412 HTTP_EXPECTATION_FAILED = 417 - -- 2.43.2