Update to iD v1.1.2

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 19eb771638a53963b73531903326fd8c45faf936..1e34bc10d507c5cec1874137dd7c13fe5431a718 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -3,6 +3,7 @@
 class NodeController < ApplicationController
   require 'xml/libxml'
 
 class NodeController < ApplicationController
   require 'xml/libxml'
 

+  skip_before_filter :verify_authenticity_token

   before_filter :authorize, :only => [:create, :update, :delete]
   before_filter :require_allow_write_api, :only => [:create, :update, :delete]
   before_filter :require_public_data, :only => [:create, :update, :delete]
   before_filter :authorize, :only => [:create, :update, :delete]
   before_filter :require_allow_write_api, :only => [:create, :update, :delete]
   before_filter :require_public_data, :only => [:create, :update, :delete]


@@ -25,8 +26,10 @@ class NodeController < ApplicationController
   # Dump the details on a node given in params[:id]
   def read
     node = Node.find(params[:id])
   # Dump the details on a node given in params[:id]
   def read
     node = Node.find(params[:id])

-    if node.visible?
-      response.last_modified = node.timestamp
+
+    response.last_modified = node.timestamp
+
+    if node.visible

       render :text => node.to_xml.to_s, :content_type => "text/xml"
     else
       render :text => "", :status => :gone
       render :text => node.to_xml.to_s, :content_type => "text/xml"
     else
       render :text => "", :status => :gone


@@ -61,6 +64,10 @@ class NodeController < ApplicationController
 
   # Dump the details on many nodes whose ids are given in the "nodes" parameter.
   def nodes
 
   # Dump the details on many nodes whose ids are given in the "nodes" parameter.
   def nodes

+    if not params['nodes']
+      raise OSM::APIBadUserInput.new("The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]")
+    end
+

     ids = params['nodes'].split(',').collect { |n| n.to_i }
 
     if ids.length == 0
     ids = params['nodes'].split(',').collect { |n| n.to_i }
 
     if ids.length == 0