Convert trace counting to use modern arel methods

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 39021218fb00811e4047f45c1f4c0172e0f9164a..9e7466a4ad4f7506b5d165e4584e33aa5424ff87 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -130,19 +130,23 @@ class RelationController < ApplicationController
   end
 
   def relations
   end
 
   def relations

+    if not params['relations']
+      raise OSM::APIBadUserInput.new("The parameter relations is required, and must be of the form relations=id[,id[,id...]]")
+    end
+

     ids = params['relations'].split(',').collect { |w| w.to_i }
 
     ids = params['relations'].split(',').collect { |w| w.to_i }
 

-    if ids.length > 0
-      doc = OSM::API.new.get_xml_doc
+    if ids.length == 0
+      raise OSM::APIBadUserInput.new("No relations were given to search for")
+    end

 
 

-      Relation.find(ids).each do |relation|
-        doc.root << relation.to_xml_node
-      end
+    doc = OSM::API.new.get_xml_doc

 
 

-      render :text => doc.to_s, :content_type => "text/xml"
-    else
-      render :text => "You need to supply a comma separated list of ids.", :status => :bad_request
+    Relation.find(ids).each do |relation|
+      doc.root << relation.to_xml_node

     end
     end

+
+    render :text => doc.to_s, :content_type => "text/xml"

   end
 
   def relations_for_way
   end
 
   def relations_for_way