X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6adcce4e5d75fa21dea85742fa36ee3b97247b01..15ff7b9843481dc12a3e1e774c26b1a72dcb7e4b:/config/routes.rb diff --git a/config/routes.rb b/config/routes.rb index 4351b65ce..435cff9eb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -102,12 +102,11 @@ OpenStreetMap::Application.routes.draw do end # 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" @@ -116,9 +115,10 @@ OpenStreetMap::Application.routes.draw do match '/user/:display_name/notes' => 'notes#mine', :via => :get match '/browse/friends' => 'changeset#list', :via => :get, :friends => true, :as => "friend_changesets" match '/browse/nearby' => 'changeset#list', :via => :get, :nearby => true, :as => "nearby_changesets" - match '/browse/changesets' => 'changeset#list', :via => :get - match '/browse/changesets/feed' => 'changeset#feed', :via => :get, :defaults => { :format => :atom } - match '/browse' => 'changeset#list', :via => :get + + get '/browse/changesets/feed', :to => redirect('/history/feed') + get '/browse/changesets', :to => redirect('/history') + get '/browse', :to => redirect('/history') # web site root :to => 'site#index', :via => [:get, :post] @@ -127,6 +127,7 @@ OpenStreetMap::Application.routes.draw do match '/copyright' => 'site#copyright', :via => :get match '/welcome' => 'site#welcome', :via => :get, :as => :welcome match '/help' => 'site#help', :via => :get, :as => :help + match '/about' => 'site#about', :via => :get, :as => :about match '/history' => 'changeset#list', :via => :get match '/history/feed' => 'changeset#feed', :via => :get, :defaults => { :format => :atom } match '/export' => 'site#export', :via => :get @@ -214,7 +215,7 @@ OpenStreetMap::Application.routes.draw do match '/users/:status' => 'user#list', :via => [:get, :post] # geocoder - match '/geocoder/search' => 'geocoder#search', :via => :post + match '/search' => 'geocoder#search', :via => :get, :as => :search match '/geocoder/search_us_postcode' => 'geocoder#search_us_postcode', :via => :get match '/geocoder/search_uk_postcode' => 'geocoder#search_uk_postcode', :via => :get match '/geocoder/search_ca_postcode' => 'geocoder#search_ca_postcode', :via => :get @@ -224,7 +225,6 @@ OpenStreetMap::Application.routes.draw do match '/geocoder/search_geonames_reverse' => 'geocoder#search_geonames_reverse', :via => :get # export - match '/export/start' => 'export#start', :via => :get match '/export/finish' => 'export#finish', :via => :post match '/export/embed' => 'export#embed', :via => :get