From: John Firebaugh <john.firebaugh@gmail.com>
Date: Sat, 28 Sep 2013 22:02:36 +0000 (-0700)
Subject: Redirect ?node=n and similar to browse pages
X-Git-Tag: live~4625^2~256
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e838dddf12eab85e43683cb07f1f0c4619d7a47e

Redirect ?node=n and similar to browse pages
---

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 4945aaa4f..32a0f8cb5 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -97,7 +97,15 @@ class SiteController < ApplicationController
       anchor << "layers=N"
     end
 
-    if anchor.present?
+    if params[:node]
+      redirect_to node_path(params[:node])
+    elsif params[:way]
+      redirect_to way_path(params[:way])
+    elsif params[:relation]
+      redirect_to relation_path(params[:relation])
+    elsif params[:note]
+      redirect_to browse_note_path(params[:note])
+    elsif anchor.present?
       redirect_to params.merge(:anchor => anchor.join('&'))
     end
   end
diff --git a/config/routes.rb b/config/routes.rb
index 4351b65ce..a1321d7f2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -103,11 +103,11 @@ OpenStreetMap::Application.routes.draw do
 
   # Data browsing
   match '/browse/start' => 'browse#start', :via => :get
-  match '/browse/way/:id' => 'browse#way', :via => :get, :id => /\d+/
+  match '/browse/way/:id' => 'browse#way', :via => :get, :id => /\d+/, :as => :way
   match '/browse/way/:id/history' => 'browse#way_history', :via => :get, :id => /\d+/
-  match '/browse/node/:id' => 'browse#node', :via => :get, :id => /\d+/
+  match '/browse/node/:id' => 'browse#node', :via => :get, :id => /\d+/, :as => :node
   match '/browse/node/:id/history' => 'browse#node_history', :via => :get, :id => /\d+/
-  match '/browse/relation/:id' => 'browse#relation', :via => :get, :id => /\d+/
+  match '/browse/relation/:id' => 'browse#relation', :via => :get, :id => /\d+/, :as => :relation
   match '/browse/relation/:id/history' => 'browse#relation_history', :via => :get, :id => /\d+/
   match '/browse/changeset/:id' => 'browse#changeset', :via => :get, :as => :changeset, :id => /\d+/
   match '/browse/note/:id' => 'browse#note', :via => :get, :id => /\d+/, :as => "browse_note"