no longer deletes nodes used in other segments ('H' test case)

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 8daac7cc2c543487a4015bbdd7c478d9ec3fee8e..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
   require 'xml/libxml'
 
   before_filter :authorize
   after_filter :compress_output

-\r
+

   def create
   def create

+    response.headers["Content-Type"] = 'text/xml'

     if request.put?
       way = Way.from_xml(request.raw_post, true)
 
     if request.put?
       way = Way.from_xml(request.raw_post, true)
 


@@ -32,16 +33,53 @@ class WayController < ApplicationController
     render :nothing => true, :status => 500 # something went very wrong
   end
 
     render :nothing => true, :status => 500 # something went very wrong
   end
 

-  def rest\r
+  def full
+    unless Way.exists?(params[:id])
+      render :nothing => true, :status => 404
+      return
+    end
+
+    way = Way.find(params[:id])
+
+    unless way.visible
+      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()
+
+    render :text => doc.to_s
+  end
+
+  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])
     unless Way.exists?(params[:id])
       render :nothing => true, :status => 404
       return
     end
 
     way = Way.find(params[:id])

+

     case request.method
 
     case request.method
 

-    when :get\r
+    when :get

       unless way.visible
         render :nothing => true, :status => 410
         return
       unless way.visible
         render :nothing => true, :status => 410
         return


@@ -86,14 +124,14 @@ class WayController < ApplicationController
   end
 
   def ways
   end
 
   def ways

-    response.headers["Content-Type"] = 'application/xml'
+    response.headers["Content-Type"] = 'text/xml'

     ids = params['ways'].split(',').collect {|w| w.to_i }
     if ids.length > 0
       waylist = Way.find(ids)
       doc = OSM::API.new.get_xml_doc
       waylist.each do |way|
         doc.root << way.to_xml_node
     ids = params['ways'].split(',').collect {|w| w.to_i }
     if ids.length > 0
       waylist = Way.find(ids)
       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
       render :text => doc.to_s
     else
       render :nothing => true, :status => 400