X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8a2db368f194686bd6a0bcfe1b7e13c58c0588fa..6b7374727128c95168d4fa6f6503a0e7d1bae729:/app/controllers/node_controller.rb

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index b104688d3..416d1794f 100644
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -5,12 +5,18 @@ class NodeController < ApplicationController
 
   def create
     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
         else
           render :nothing => true, :status => 500
@@ -28,7 +34,7 @@ class NodeController < ApplicationController
 
   def rest
     unless Node.exists?(params[:id])
-      render :nothing => true, :status => 400
+      render :nothing => true, :status => 404
       return
     end
 
@@ -37,6 +43,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 +84,33 @@ class NodeController < ApplicationController
     end
 
   end
+
+  def history
+    node = Node.find(params[:id])
+
+    unless node
+      render :nothing => true, :staus => 404
+      return
+    end
+
+    doc = XML::Document.new
+    doc.encoding = 'UTF-8' 
+    root = XML::Node.new 'osm'
+    root['version'] = '0.4'
+    root['generator'] = 'OpenStreetMap server'
+    doc.root = root
+
+    node.old_nodes.each do |old_node|
+      el1 = XML::Node.new 'node'
+      el1['id'] = old_node.id.to_s
+      el1['lat'] = old_node.latitude.to_s
+      el1['lon'] = old_node.longitude.to_s
+      Node.split_tags(el1, old_node.tags)
+      el1['visible'] = old_node.visible.to_s
+      el1['timestamp'] = old_node.timestamp.xmlschema
+      root << el1
+    end
+
+    render :text => doc.to_s
+  end
 end