X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8a2db368f194686bd6a0bcfe1b7e13c58c0588fa..8edf08405db64afcd1207a9f1d33039ea1e23cfb:/app/controllers/node_controller.rb?ds=sidebyside

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index b104688d3..bd81c9aa2 100644
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -2,16 +2,24 @@ class NodeController < ApplicationController
   require 'xml/libxml'
 
   before_filter :authorize
+  after_filter :compress_output
 
-  def create
+  def create
+    response.headers["Content-Type"] = 'application/xml'
     if request.put?
-      node = Node.from_xml(request.raw_post, true)
+      node = nil
+      begin
+        node = Node.from_xml(request.raw_post, true)
+      rescue
+        render :text => "XML didn't parse", :status => 400 # if we got here the doc didnt parse
+        return
+      end
 
       if node
         node.user_id = @user.id
+        node.visible = 1
         if node.save_with_history
-
-          render :text => node.id
+          render :text => node.id.to_s
         else
           render :nothing => true, :status => 500
         end
@@ -27,8 +35,9 @@ class NodeController < ApplicationController
   end
 
   def rest
+    response.headers["Content-Type"] = 'application/xml'
     unless Node.exists?(params[:id])
-      render :nothing => true, :status => 400
+      render :nothing => true, :status => 404
       return
     end
 
@@ -37,6 +46,16 @@ class NodeController < ApplicationController
     case request.method
 
     when :get
+      unless node
+        render :nothing => true, :status => 500
+        return
+      end
+
+      unless node.visible
+        render :nothing => true, :status => 410
+        return
+      end
+
       render :text => node.to_xml.to_s
       return
 
@@ -68,4 +87,19 @@ class NodeController < ApplicationController
     end
 
   end
+
+  def nodes
+    response.headers["Content-Type"] = 'application/xml'
+    ids = params['nodes'].split(',').collect {|n| n.to_i }
+    if ids.length > 0
+      nodelist = Node.find(ids)
+      doc = get_xml_doc
+      nodelist.each do |node|
+        doc.root << node.to_xml_node
+      end 
+      render :text => doc.to_s
+    else
+      render :nothing => true, :status => 400
+    end
+  end
 end