rails API support for history of node/segment/way + various bugfixes and cleanups

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index ae0d00c75c5dc6901bb2bf57bce54779f07cc96b..5370306f3b4cd1bf7cf4118022e811a1cc421c72 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -4,13 +4,20 @@ class NodeController < ApplicationController
   before_filter :authorize
 
   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
         else
           render :nothing => true, :status => 500
@@ -27,8 +34,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
 
@@ -79,32 +87,4 @@ class NodeController < ApplicationController
 
   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