Rename browse controller to queries controller

app/abilities/ability.rb

@@ -4,7 +4,7 @@ class Ability
   include CanCan::Ability
 
   def initialize(user)
-    can :query, :browse
+    can :show, :query
     can :show, [Node, Way, Relation]
     can [:index, :show], [OldNode, OldWay, OldRelation]
     can [:show, :new], Note

app/controllers/browse_controller.rb → app/controllers/queries_controller.rb

@@ -1,13 +1,12 @@
-class BrowseController < ApplicationController
+class QueriesController < ApplicationController
   layout :map_layout
 
   before_action :authorize_web
   before_action :set_locale
   before_action -> { check_database_readable(:need_api => true) }
   before_action :require_oauth
-  before_action :update_totp, :only => [:query]
-  around_action :web_timeout
+  before_action :update_totp
   authorize_resource :class => false
 
-  def query; end
+  def show; end
 end

config/locales/en.yml

@@ -401,7 +401,8 @@ en:
       telephone_link: "Call %{phone_number}"
       colour_preview: "Colour %{colour_value} preview"
       email_link: "Email %{email}"
-    query:
+  queries:
+    show:
       title: "Query Features"
       introduction: "Click on the map to find nearby features."
       nearby: "Nearby features"

config/routes.rb

@@ -167,7 +167,7 @@
   get "/offline" => "site#offline"
   get "/key" => "site#key"
   get "/id" => "site#id"
-  get "/query" => "browse#query"
+  resource :query, :only => :show
   get "/user/new" => "users#new"
   post "/user/new" => "users#create"
   get "/user/terms" => "users#terms"

test/controllers/browse_controller_test.rb → test/controllers/queries_controller_test.rb

@@ -1,18 +1,18 @@
 require "test_helper"
 
-class BrowseControllerTest < ActionDispatch::IntegrationTest
+class QueriesControllerTest < ActionDispatch::IntegrationTest
   ##
   # test all routes which lead to this controller
   def test_routes
     assert_routing(
       { :path => "/query", :method => :get },
-      { :controller => "browse", :action => "query" }
+      { :controller => "queries", :action => "show" }
     )
   end
 
-  def test_query
+  def test_show
     get query_path
     assert_response :success
-    assert_template "browse/query"
+    assert_template "queries/show"
   end
 end