Merge remote-tracking branch 'upstream/pull/2160'

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

diff --git a/app/controllers/relations_controller.rb b/app/controllers/relations_controller.rb
index 27bf5cdf8c945b73d5512f5a0b639ea7047fbf6a..8c8005acc68d5e0c3138523b000b49370dfb09e1 100644 (file)
--- a/app/controllers/relations_controller.rb
+++ b/app/controllers/relations_controller.rb
@@ -22,7 +22,7 @@ class RelationsController < ApplicationController
     render :plain => relation.id.to_s
   end
 
-  def read
+  def show
     relation = Relation.find(params[:id])
     response.last_modified = relation.timestamp
     if relation.visible
@@ -123,7 +123,7 @@ class RelationsController < ApplicationController
     end
   end
 
-  def relations
+  def index
     raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]" unless params["relations"]
 
     ids = params["relations"].split(",").collect(&:to_i)