X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5f59845575ed313688eca669fd73f4f6a5993c23..751e8ad32c864f50eae9e9359d74a11dc44de007:/config/routes.rb diff --git a/config/routes.rb b/config/routes.rb index 32cd397aa..37ffa2d9a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,8 @@ OpenStreetMap::Application.routes.draw do # API namespace :api do - get "capabilities" => "capabilities#show" + get "capabilities" => "capabilities#show" # Deprecated, remove when 0.6 support is removed + get "versions" => "versions#show" end scope "api/0.6" do @@ -11,7 +12,6 @@ OpenStreetMap::Application.routes.draw do put "changeset/create" => "api/changesets#create" post "changeset/:id/upload" => "api/changesets#upload", :id => /\d+/ get "changeset/:id/download" => "api/changesets#download", :as => :changeset_download, :id => /\d+/ - post "changeset/:id/expand_bbox" => "api/changesets#expand_bbox", :id => /\d+/ get "changeset/:id" => "api/changesets#show", :as => :changeset_show, :id => /\d+/ post "changeset/:id/subscribe" => "api/changesets#subscribe", :as => :changeset_subscribe, :id => /\d+/ post "changeset/:id/unsubscribe" => "api/changesets#unsubscribe", :as => :changeset_unsubscribe, :id => /\d+/ @@ -61,33 +61,27 @@ OpenStreetMap::Application.routes.draw do get "changes" => "api/changes#index" - get "search" => "api/search#search_all", :as => "api_search" - get "ways/search" => "api/search#search_ways" - get "relations/search" => "api/search#search_relations" - get "nodes/search" => "api/search#search_nodes" - - get "user/:id" => "api/users#api_read", :id => /\d+/ - get "user/details" => "api/users#api_details" - get "user/gpx_files" => "api/users#api_gpx_files" - get "users" => "api/users#api_users", :as => :api_users - - get "user/preferences" => "api/user_preferences#read" - get "user/preferences/:preference_key" => "api/user_preferences#read_one" - put "user/preferences" => "api/user_preferences#update" - put "user/preferences/:preference_key" => "api/user_preferences#update_one" - delete "user/preferences/:preference_key" => "api/user_preferences#delete_one" - - post "gpx/create" => "api/traces#api_create" - get "gpx/:id" => "api/traces#api_read", :id => /\d+/ - put "gpx/:id" => "api/traces#api_update", :id => /\d+/ - delete "gpx/:id" => "api/traces#api_delete", :id => /\d+/ - get "gpx/:id/details" => "api/traces#api_read", :id => /\d+/ - get "gpx/:id/data" => "api/traces#api_data" + get "user/:id" => "api/users#show", :id => /\d+/ + get "user/details" => "api/users#details" + get "user/gpx_files" => "api/users#gpx_files" + get "users" => "api/users#index", :as => :api_users + + get "user/preferences" => "api/user_preferences#index" + get "user/preferences/:preference_key" => "api/user_preferences#show" + put "user/preferences" => "api/user_preferences#update_all" + put "user/preferences/:preference_key" => "api/user_preferences#update" + delete "user/preferences/:preference_key" => "api/user_preferences#destroy" + + post "gpx/create" => "api/traces#create" + get "gpx/:id" => "api/traces#show", :id => /\d+/ + put "gpx/:id" => "api/traces#update", :id => /\d+/ + delete "gpx/:id" => "api/traces#destroy", :id => /\d+/ + get "gpx/:id/details" => "api/traces#show", :id => /\d+/ + get "gpx/:id/data" => "api/traces#data" # AMF (ActionScript) API post "amf/read" => "api/amf#amf_read" post "amf/write" => "api/amf#amf_write" - get "swf/trackpoints" => "api/swf#trackpoints" # Map notes API resources :notes, :except => [:new, :edit, :update], :constraints => { :id => /\d+/ }, :defaults => { :format => "xml" }, :controller => "api/notes" do @@ -151,6 +145,7 @@ OpenStreetMap::Application.routes.draw do get "/welcome" => "site#welcome" get "/fixthemap" => "site#fixthemap" get "/help" => "site#help" + get "/about/:about_locale" => "site#about" get "/about" => "site#about" get "/history" => "changesets#index" get "/history/feed" => "changesets#feed", :defaults => { :format => :atom } @@ -213,12 +208,14 @@ OpenStreetMap::Application.routes.draw do get "/trace/create", :to => redirect(:path => "/traces/new") get "/trace/:id/data" => "traces#data", :id => /\d+/, :as => "trace_data" get "/trace/:id/edit", :to => redirect(:path => "/traces/%{id}/edit") - post "/trace/:id/delete" => "traces#delete", :id => /\d+/ # diary pages - match "/diary/new" => "diary_entries#new", :via => [:get, :post] - get "/diary/friends" => "diary_entries#index", :friends => true, :as => "friend_diaries" - get "/diary/nearby" => "diary_entries#index", :nearby => true, :as => "nearby_diaries" + resources :diary_entries, :path => "diary", :only => [:new, :create, :index] do + collection do + get "friends" => "diary_entries#index", :friends => true + get "nearby" => "diary_entries#index", :nearby => true + end + end get "/user/:display_name/diary/rss" => "diary_entries#rss", :defaults => { :format => :rss } get "/diary/:language/rss" => "diary_entries#rss", :defaults => { :format => :rss } get "/diary/rss" => "diary_entries#rss", :defaults => { :format => :rss } @@ -226,12 +223,14 @@ OpenStreetMap::Application.routes.draw do get "/user/:display_name/diary/comments/" => "diary_entries#comments" get "/user/:display_name/diary" => "diary_entries#index" get "/diary/:language" => "diary_entries#index" - get "/diary" => "diary_entries#index" - get "/user/:display_name/diary/:id" => "diary_entries#show", :id => /\d+/, :as => :diary_entry + scope "/user/:display_name" do + resources :diary_entries, :path => "diary", :only => [:edit, :update, :show] + end post "/user/:display_name/diary/:id/newcomment" => "diary_entries#comment", :id => /\d+/ - match "/user/:display_name/diary/:id/edit" => "diary_entries#edit", :via => [:get, :post], :id => /\d+/ post "/user/:display_name/diary/:id/hide" => "diary_entries#hide", :id => /\d+/, :as => :hide_diary_entry + post "/user/:display_name/diary/:id/unhide" => "diary_entries#unhide", :id => /\d+/, :as => :unhide_diary_entry post "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entries#hidecomment", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment + post "/user/:display_name/diary/:id/unhidecomment/:comment" => "diary_entries#unhidecomment", :id => /\d+/, :comment => /\d+/, :as => :unhide_diary_comment post "/user/:display_name/diary/:id/subscribe" => "diary_entries#subscribe", :as => :diary_entry_subscribe, :id => /\d+/ post "/user/:display_name/diary/:id/unsubscribe" => "diary_entries#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/