X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3880ac5de8150eef3cc5b26eb9814f5c1d681afa..c1cdddf11f363d24f7c18b3e9df15e1bde3c4302:/app/controllers/way_controller.rb?ds=sidebyside

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 6ea27deaf..f7f270575 100644
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,68 +1,64 @@
 class WayController < ApplicationController
-  require 'xml/libxml'
+  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 :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 :text => "", :status => :bad_request
-    end
+
+    # Assume that Way.from_xml has thrown an exception if there is an error parsing the xml
+    way.create_with_history @user
+    render :plain => way.id.to_s
   end
 
   def read
     way = Way.find(params[:id])
-    
+
     response.last_modified = way.timestamp
-    
+
     if way.visible
-      render :text => way.to_xml.to_s, :content_type => "text/xml"
+      render :xml => way.to_xml.to_s
     else
-      render :text => "", :status => :gone
+      head :gone
     end
   end
 
   def update
     way = Way.find(params[:id])
     new_way = Way.from_xml(request.raw_post)
-    
-    if new_way and new_way.id == way.id
-      way.update_from(new_way, @user)
-      render :text => way.version.to_s, :content_type => "text/plain"
-    else
-      render :text => "", :status => :bad_request
+
+    unless new_way && new_way.id == way.id
+      raise OSM::APIBadUserInput.new("The id in the url (#{way.id}) is not the same as provided in the xml (#{new_way.id})")
     end
+
+    way.update_from(new_way, @user)
+    render :plain => way.version.to_s
   end
 
   # This is the API call to delete a way
   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"
+      render :plain => way.version.to_s
     else
-      render :text => "", :status => :bad_request
+      head :bad_request
     end
   end
 
   def full
     way = Way.includes(:nodes => :node_tags).find(params[:id])
-    
+
     if way.visible
       visible_nodes = {}
       changeset_cache = {}
@@ -76,35 +72,35 @@ class WayController < ApplicationController
         end
       end
       doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
-      
-      render :text => doc.to_s, :content_type => "text/xml"
+
+      render :xml => doc.to_s
     else
-      render :text => "", :status => :gone
+      head :gone
     end
   end
 
   def ways
-    begin
-      ids = params['ways'].split(',').collect { |w| w.to_i }
-    rescue
-      ids = []
+    unless 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(&:to_i)
 
-      Way.find(ids).each do |way|
-        doc.root << way.to_xml_node
-      end
+    if ids.empty?
+      raise OSM::APIBadUserInput.new("No ways were given to search for")
+    end
 
-      render :text => doc.to_s, :content_type => "text/xml"
-    else
-      render :text => "", :status => :bad_request
+    doc = OSM::API.new.get_xml_doc
+
+    Way.find(ids).each do |way|
+      doc.root << way.to_xml_node
     end
+
+    render :xml => doc.to_s
   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
@@ -116,6 +112,6 @@ class WayController < ApplicationController
       doc.root << way.to_xml_node if way.visible
     end
 
-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s
   end
 end