X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e6a1003509f3bdcfbc2af2b21ed80ff5febb2e3e..34e3e51456774127d43408b7ab65c24f41373f62:/app/controllers/way_controller.rb?ds=sidebyside

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 9f797d1d8..3291ce8b7 100644
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -14,20 +14,20 @@ class WayController < ApplicationController
     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.last_modified = way.timestamp
-    
+
     if way.visible
       render :text => way.to_xml.to_s, :content_type => "text/xml"
     else
@@ -38,12 +38,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
       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
 
@@ -51,18 +51,18 @@ 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
       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.includes(:nodes => :node_tags).find(params[:id])
-    
+
     if way.visible
       visible_nodes = {}
       changeset_cache = {}
@@ -76,7 +76,7 @@ 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"
     else
       render :text => "", :status => :gone
@@ -84,27 +84,27 @@ 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
 
   ##
-  # 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