Be a bit more intelligent when trying to update the arguments on a link.

[rails.git] / app / controllers / way_controller.rb

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index acc8a5d0cdb3ea38d3b9aee550b915ea6f50fa45..5594382074a22727fad6381cc5990d165cb8f179 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,10 +1,11 @@
-class WayController < ApplicationController\r
+class WayController < ApplicationController
   require 'xml/libxml'
 
   before_filter :authorize
   after_filter :compress_output
-\r
+
   def create
+    response.headers["Content-Type"] = 'text/xml'
     if request.put?
       way = Way.from_xml(request.raw_post, true)
 
@@ -32,7 +33,7 @@ class WayController < ApplicationController
     render :nothing => true, :status => 500 # something went very wrong
   end
 
-  def full\r
+  def full
     unless Way.exists?(params[:id])
       render :nothing => true, :status => 404
       return
@@ -41,42 +42,44 @@ 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\r
+  def rest
+    response.headers["Content-Type"] = 'text/xml'
     unless Way.exists?(params[:id])
       render :nothing => true, :status => 404
       return
     end
 
     way = Way.find(params[:id])
+
     case request.method
 
-    when :get\r
+    when :get
       unless way.visible
         render :nothing => true, :status => 410
         return
@@ -128,7 +131,7 @@ class WayController < ApplicationController
       doc = OSM::API.new.get_xml_doc
       waylist.each do |way|
         doc.root << way.to_xml_node
-      end 
+      end
       render :text => doc.to_s
     else
       render :nothing => true, :status => 400