Don't paginate redactions

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index f2cda21bca0da9e77938daca4a7e6f33d349c167..2ce49b7e84fd9693216646bd53c5228dc14551bb 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,6 +1,7 @@
 class WayController < 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]
@@ -18,14 +19,14 @@ class WayController < ApplicationController
       way.create_with_history @user
       render :text => way.id.to_s, :content_type => "text/plain"
     else
-      render :nothing => true, :status => :bad_request
+      render :text => "", :status => :bad_request
     end
   end
 
   def read
     way = Way.find(params[:id])
     
-    response.headers['Last-Modified'] = way.timestamp.rfc822
+    response.last_modified = way.timestamp
     
     if way.visible
       render :text => way.to_xml.to_s, :content_type => "text/xml"
@@ -42,7 +43,7 @@ class WayController < ApplicationController
       way.update_from(new_way, @user)
       render :text => way.version.to_s, :content_type => "text/plain"
     else
-      render :nothing => true, :status => :bad_request
+      render :text => "", :status => :bad_request
     end
   end
 
@@ -55,14 +56,15 @@ class WayController < ApplicationController
       way.delete_with_history!(new_way, @user)
       render :text => way.version.to_s, :content_type => "text/plain"
     else
-      render :nothing => true, :status => :bad_request
+      render :text => "", :status => :bad_request
     end
   end
 
   def full
-    way = Way.find(params[:id], :include => {:nodes => :node_tags})
+    way = Way.includes(:nodes => :node_tags).find(params[:id])
     
     if way.visible
+      visible_nodes = {}
       changeset_cache = {}
       user_display_name_cache = {}
 
@@ -70,9 +72,10 @@ class WayController < ApplicationController
       way.nodes.uniq.each do |node|
         if node.visible
           doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
+          visible_nodes[node.id] = node
         end
       end
-      doc.root << way.to_xml_node(nil, changeset_cache, user_display_name_cache)
+      doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
       
       render :text => doc.to_s, :content_type => "text/xml"
     else
@@ -81,23 +84,23 @@ class WayController < ApplicationController
   end
 
   def ways
-    begin
-      ids = params['ways'].split(',').collect { |w| w.to_i }
-    rescue
-      ids = []
+    if not params['ways']
+      raise OSM::APIBadUserInput.new("The parameter ways is required, and must be of the form ways=id[,id[,id...]]")
     end
 
-    if ids.length > 0
-      doc = OSM::API.new.get_xml_doc
+    ids = params['ways'].split(',').collect { |w| w.to_i }
 
-      Way.find(ids).each do |way|
-        doc.root << way.to_xml_node
-      end
+    if ids.length == 0
+      raise OSM::APIBadUserInput.new("No ways were given to search for")
+    end
 
-      render :text => doc.to_s, :content_type => "text/xml"
-    else
-      render :nothing => true, :status => :bad_request
+    doc = OSM::API.new.get_xml_doc
+
+    Way.find(ids).each do |way|
+      doc.root << way.to_xml_node
     end
+
+    render :text => doc.to_s, :content_type => "text/xml"
   end
 
   ##
@@ -105,9 +108,7 @@ class WayController < ApplicationController
   # :id parameter. note that this used to return deleted ways as well, but
   # this seemed not to be the expected behaviour, so it was removed.
   def ways_for_node
-    wayids = WayNode.find(:all, 
-                          :conditions => ['node_id = ?', params[:id]]
-                          ).collect { |ws| ws.id[0] }.uniq
+    wayids = WayNode.where(:node_id => params[:id]).collect { |ws| ws.id[0] }.uniq
 
     doc = OSM::API.new.get_xml_doc