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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 6ea27deaf..2ce49b7e8 100644
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -84,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 :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 :text => doc.to_s, :content_type => "text/xml"
   end
 
   ##