X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/85f197b6df81cef19fe6a2a1cfc0429ea50051c7..1cf9e2ed19b5190e8c4bd2b0c07be4b56097a935:/app/controllers/node_controller.rb

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 97d551776..cc29c09e5 100644
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -2,19 +2,26 @@ class NodeController < ApplicationController
   require 'xml/libxml'
 
   before_filter :authorize
+  after_filter :compress_output
 
-  def create
+  def create
+    response.headers["Content-Type"] = 'text/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 :text => 'truesrgtsrtfgsar', :status => 500
-#          render :nothing => true, :status => 500
+          render :nothing => true, :status => 500
         end
         return
 
@@ -24,13 +31,13 @@ class NodeController < ApplicationController
       end
     end
 
-          render :text => 'FFFFFFFFFF ', :status => 500
-#    render :nothing => true, :status => 500 # something went very wrong
+    render :nothing => true, :status => 500 # something went very wrong
   end
 
   def rest
+    response.headers["Content-Type"] = 'text/xml'
     unless Node.exists?(params[:id])
-      render :nothing => true, :status => 400
+      render :nothing => true, :status => 404
       return
     end
 
@@ -39,30 +46,40 @@ 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
 
     when :delete
-
       if node.visible
         node.visible = 0
-
         node.save_with_history
-
         render :nothing => true
       else
         render :nothing => true, :status => 410
       end
 
     when :put
-
       new_node = Node.from_xml(request.raw_post)
 
-      new_node.timestamp = Time.now
-      new_node.user_id = @user.id
+      node.timestamp = Time.now
+      node.user_id = @user.id
 
-      if node.id == new_node.id and new_node.save_with_history
-        render :text => node.id
+      node.latitude = new_node.latitude 
+      node.longitude = new_node.longitude
+      node.tags = new_node.tags
+
+      if node.id == new_node.id and node.save_with_history
+        render :nothing => true, :status => 200
       else
         render :nothing => true, :status => 500
       end
@@ -71,5 +88,18 @@ class NodeController < ApplicationController
 
   end
 
-
+  def nodes
+    response.headers["Content-Type"] = 'text/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