X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/09c5740b5bb94c75a5c8c83cdbb80ae7b5ccbdf4..33790824d6b32d103e0dc69bf6877373266744fe:/app/controllers/way_controller.rb

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index f2cda21bc..dd9b65fd8 100644
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,32 +1,32 @@
 class WayController < ApplicationController
-  require 'xml/libxml'
+  require "xml/libxml"
 
-  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 :check_api_writable, :only => [:create, :update, :delete]
-  before_filter :check_api_readable, :except => [:create, :update, :delete]
-  after_filter :compress_output
-  around_filter :api_call_handle_error, :api_call_timeout
+  skip_before_action :verify_authenticity_token
+  before_action :authorize, :only => [:create, :update, :delete]
+  before_action :require_allow_write_api, :only => [:create, :update, :delete]
+  before_action :require_public_data, :only => [:create, :update, :delete]
+  before_action :check_api_writable, :only => [:create, :update, :delete]
+  before_action :check_api_readable, :except => [:create, :update, :delete]
+  around_action :api_call_handle_error, :api_call_timeout
 
   def create
     assert_method :put
 
     way = Way.from_xml(request.raw_post, true)
-    
+
     if way
       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"
     else
@@ -37,12 +37,12 @@ class WayController < ApplicationController
   def update
     way = Way.find(params[:id])
     new_way = Way.from_xml(request.raw_post)
-    
-    if new_way and new_way.id == way.id
+
+    if new_way && new_way.id == way.id
       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
 
@@ -50,19 +50,20 @@ class WayController < ApplicationController
   def delete
     way = Way.find(params[:id])
     new_way = Way.from_xml(request.raw_post)
-    
-    if new_way and new_way.id == way.id
+
+    if new_way && new_way.id == way.id
       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,10 +71,11 @@ 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
       render :text => "", :status => :gone
@@ -81,33 +83,31 @@ class WayController < ApplicationController
   end
 
   def ways
-    begin
-      ids = params['ways'].split(',').collect { |w| w.to_i }
-    rescue
-      ids = []
+    unless params["ways"]
+      fail 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(&:to_i)
 
-      Way.find(ids).each do |way|
-        doc.root << way.to_xml_node
-      end
+    if ids.length == 0
+      fail 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
 
   ##
-  # returns all the ways which are currently using the node given in the 
+  # returns all the ways which are currently using the node given in the
   # :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