X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f75401ae29689d8081c2f047980a68be534ae436..8bd09c082897d808c4641f94836f5cfa4cbbf95c:/app/controllers/way_controller.rb

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index fcff0fc45..acc8a5d0c 100644
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,9 +1,9 @@
-class WayController < ApplicationController
+class WayController < ApplicationController
   require 'xml/libxml'
 
   before_filter :authorize
   after_filter :compress_output
-
+
   def create
     if request.put?
       way = Way.from_xml(request.raw_post, true)
@@ -16,7 +16,7 @@ class WayController < ApplicationController
         end
 
         if way.save_with_history
-          render :text => way.id
+          render :text => way.id.to_s
           return
         else
           render :nothing => true, :status => 500
@@ -32,7 +32,42 @@ class WayController < ApplicationController
     render :nothing => true, :status => 500 # something went very wrong
   end
 
-  def rest
+  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
     unless Way.exists?(params[:id])
       render :nothing => true, :status => 404
       return
@@ -41,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
@@ -86,11 +121,11 @@ class WayController < ApplicationController
   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 = get_xml_doc
+      doc = OSM::API.new.get_xml_doc
       waylist.each do |way|
         doc.root << way.to_xml_node
       end