Avoid lego translations for coordinates

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 2cf18e33498db6ea0a282c085c5908c8c86f4419..41dc7cfc536cddf041d114a0babb448d2732ad2b 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,94 +1,90 @@
 OpenStreetMap::Application.routes.draw do
   # API
 OpenStreetMap::Application.routes.draw do
   # API

-  get "api/capabilities" => "api#capabilities"
+  namespace :api do
+    get "capabilities" => "capabilities#show" # Deprecated, remove when 0.6 support is removed
+    get "versions" => "versions#show"
+  end

 
   scope "api/0.6" do
 
   scope "api/0.6" do

-    get "capabilities" => "api#capabilities"
-    get "permissions" => "api#permissions"
-
-    put "changeset/create" => "changeset#create"
-    post "changeset/:id/upload" => "changeset#upload", :id => /\d+/
-    get "changeset/:id/download" => "changeset#download", :as => :changeset_download, :id => /\d+/
-    post "changeset/:id/expand_bbox" => "changeset#expand_bbox", :id => /\d+/
-    get "changeset/:id" => "changeset#read", :as => :changeset_read, :id => /\d+/
-    post "changeset/:id/subscribe" => "changeset#subscribe", :as => :changeset_subscribe, :id => /\d+/
-    post "changeset/:id/unsubscribe" => "changeset#unsubscribe", :as => :changeset_unsubscribe, :id => /\d+/
-    put "changeset/:id" => "changeset#update", :id => /\d+/
-    put "changeset/:id/close" => "changeset#close", :id => /\d+/
-    get "changesets" => "changeset#query"
-    post "changeset/:id/comment" => "changeset#comment", :as => :changeset_comment, :id => /\d+/
-    post "changeset/comment/:id/hide" => "changeset#hide_comment", :as => :changeset_comment_hide, :id => /\d+/
-    post "changeset/comment/:id/unhide" => "changeset#unhide_comment", :as => :changeset_comment_unhide, :id => /\d+/
-
-    put "node/create" => "node#create"
-    get "node/:id/ways" => "way#ways_for_node", :id => /\d+/
-    get "node/:id/relations" => "relation#relations_for_node", :id => /\d+/
-    get "node/:id/history" => "old_node#history", :id => /\d+/
-    post "node/:id/:version/redact" => "old_node#redact", :version => /\d+/, :id => /\d+/
-    get "node/:id/:version" => "old_node#version", :id => /\d+/, :version => /\d+/
-    get "node/:id" => "node#read", :id => /\d+/
-    put "node/:id" => "node#update", :id => /\d+/
-    delete "node/:id" => "node#delete", :id => /\d+/
-    get "nodes" => "node#nodes"
-
-    put "way/create" => "way#create"
-    get "way/:id/history" => "old_way#history", :id => /\d+/
-    get "way/:id/full" => "way#full", :id => /\d+/
-    get "way/:id/relations" => "relation#relations_for_way", :id => /\d+/
-    post "way/:id/:version/redact" => "old_way#redact", :version => /\d+/, :id => /\d+/
-    get "way/:id/:version" => "old_way#version", :id => /\d+/, :version => /\d+/
-    get "way/:id" => "way#read", :id => /\d+/
-    put "way/:id" => "way#update", :id => /\d+/
-    delete "way/:id" => "way#delete", :id => /\d+/
-    get "ways" => "way#ways"
-
-    put "relation/create" => "relation#create"
-    get "relation/:id/relations" => "relation#relations_for_relation", :id => /\d+/
-    get "relation/:id/history" => "old_relation#history", :id => /\d+/
-    get "relation/:id/full" => "relation#full", :id => /\d+/
-    post "relation/:id/:version/redact" => "old_relation#redact", :version => /\d+/, :id => /\d+/
-    get "relation/:id/:version" => "old_relation#version", :id => /\d+/, :version => /\d+/
-    get "relation/:id" => "relation#read", :id => /\d+/
-    put "relation/:id" => "relation#update", :id => /\d+/
-    delete "relation/:id" => "relation#delete", :id => /\d+/
-    get "relations" => "relation#relations"
-
-    get "map" => "api#map"
-
-    get "trackpoints" => "api#trackpoints"
-
-    get "changes" => "api#changes"
-
-    get "search" => "search#search_all", :as => "api_search"
-    get "ways/search" => "search#search_ways"
-    get "relations/search" => "search#search_relations"
-    get "nodes/search" => "search#search_nodes"
-
-    get "user/:id" => "user#api_read", :id => /\d+/
-    get "user/details" => "user#api_details"
-    get "user/gpx_files" => "user#api_gpx_files"
-    get "users" => "user#api_users", :as => :api_users
-
-    get "user/preferences" => "user_preferences#read"
-    get "user/preferences/:preference_key" => "user_preferences#read_one"
-    put "user/preferences" => "user_preferences#update"
-    put "user/preferences/:preference_key" => "user_preferences#update_one"
-    delete "user/preferences/:preference_key" => "user_preferences#delete_one"
-
-    post "gpx/create" => "traces#api_create"
-    get "gpx/:id" => "traces#api_read", :id => /\d+/
-    put "gpx/:id" => "traces#api_update", :id => /\d+/
-    delete "gpx/:id" => "traces#api_delete", :id => /\d+/
-    get "gpx/:id/details" => "traces#api_read", :id => /\d+/
-    get "gpx/:id/data" => "traces#api_data"
+    get "capabilities" => "api/capabilities#show"
+    get "permissions" => "api/permissions#show"
+
+    put "changeset/create" => "api/changesets#create"
+    post "changeset/:id/upload" => "api/changesets#upload", :as => :changeset_upload, :id => /\d+/
+    get "changeset/:id/download" => "api/changesets#download", :as => :changeset_download, :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+/
+    put "changeset/:id" => "api/changesets#update", :id => /\d+/
+    put "changeset/:id/close" => "api/changesets#close", :as => :changeset_close, :id => /\d+/
+    get "changesets" => "api/changesets#query"
+    post "changeset/:id/comment" => "api/changeset_comments#create", :as => :changeset_comment, :id => /\d+/
+    post "changeset/comment/:id/hide" => "api/changeset_comments#destroy", :as => :changeset_comment_hide, :id => /\d+/
+    post "changeset/comment/:id/unhide" => "api/changeset_comments#restore", :as => :changeset_comment_unhide, :id => /\d+/
+
+    put "node/create" => "api/nodes#create"
+    get "node/:id/ways" => "api/ways#ways_for_node", :as => :node_ways, :id => /\d+/
+    get "node/:id/relations" => "api/relations#relations_for_node", :as => :node_relations, :id => /\d+/
+    get "node/:id/history" => "api/old_nodes#history", :as => :api_node_history, :id => /\d+/
+    post "node/:id/:version/redact" => "api/old_nodes#redact", :as => :node_version_redact, :version => /\d+/, :id => /\d+/
+    get "node/:id/:version" => "api/old_nodes#version", :as => :node_version, :id => /\d+/, :version => /\d+/
+    get "node/:id" => "api/nodes#show", :as => :api_node, :id => /\d+/
+    put "node/:id" => "api/nodes#update", :id => /\d+/
+    delete "node/:id" => "api/nodes#delete", :id => /\d+/
+    get "nodes" => "api/nodes#index"
+
+    put "way/create" => "api/ways#create"
+    get "way/:id/history" => "api/old_ways#history", :as => :api_way_history, :id => /\d+/
+    get "way/:id/full" => "api/ways#full", :as => :way_full, :id => /\d+/
+    get "way/:id/relations" => "api/relations#relations_for_way", :as => :way_relations, :id => /\d+/
+    post "way/:id/:version/redact" => "api/old_ways#redact", :as => :way_version_redact, :version => /\d+/, :id => /\d+/
+    get "way/:id/:version" => "api/old_ways#version", :as => :way_version, :id => /\d+/, :version => /\d+/
+    get "way/:id" => "api/ways#show", :as => :api_way, :id => /\d+/
+    put "way/:id" => "api/ways#update", :id => /\d+/
+    delete "way/:id" => "api/ways#delete", :id => /\d+/
+    get "ways" => "api/ways#index"
+
+    put "relation/create" => "api/relations#create"
+    get "relation/:id/relations" => "api/relations#relations_for_relation", :as => :relation_relations, :id => /\d+/
+    get "relation/:id/history" => "api/old_relations#history", :as => :api_relation_history, :id => /\d+/
+    get "relation/:id/full" => "api/relations#full", :as => :relation_full, :id => /\d+/
+    post "relation/:id/:version/redact" => "api/old_relations#redact", :as => :relation_version_redact, :version => /\d+/, :id => /\d+/
+    get "relation/:id/:version" => "api/old_relations#version", :as => :relation_version, :id => /\d+/, :version => /\d+/
+    get "relation/:id" => "api/relations#show", :as => :api_relation, :id => /\d+/
+    put "relation/:id" => "api/relations#update", :id => /\d+/
+    delete "relation/:id" => "api/relations#delete", :id => /\d+/
+    get "relations" => "api/relations#index"
+
+    get "map" => "api/map#index"
+
+    get "trackpoints" => "api/tracepoints#index"
+
+    get "changes" => "api/changes#index"
+
+    get "user/:id" => "api/users#show", :id => /\d+/, :as => :api_user
+    get "user/details" => "api/users#details"
+    get "user/gpx_files" => "api/users#gpx_files"
+    get "users" => "api/users#index", :as => :api_users
+
+    resources :user_preferences, :except => [:new, :create, :edit], :param => :preference_key, :path => "user/preferences", :controller => "api/user_preferences" do
+      collection do
+        put "" => "api/user_preferences#update_all", :as => ""
+      end
+    end
+
+    post "gpx/create" => "api/traces#create"
+    get "gpx/:id" => "api/traces#show", :as => :api_trace, :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", :as => :api_trace_data

 
     # AMF (ActionScript) API
 
     # AMF (ActionScript) API

-    post "amf/read" => "amf#amf_read"
-    post "amf/write" => "amf#amf_write"
-    get "swf/trackpoints" => "swf#trackpoints"
+    post "amf/read" => "api/amf#amf_read"
+    post "amf/write" => "api/amf#amf_write"

 
     # Map notes API
 
     # Map notes API

-    resources :notes, :except => [:new, :edit, :update], :constraints => { :id => /\d+/ }, :defaults => { :format => "xml" } do
+    resources :notes, :except => [:new, :edit, :update], :constraints => { :id => /\d+/ }, :defaults => { :format => "xml" }, :controller => "api/notes" do

       collection do
         get "search"
         get "feed", :defaults => { :format => "rss" }
       collection do
         get "search"
         get "feed", :defaults => { :format => "rss" }


@@ -101,29 +97,29 @@ OpenStreetMap::Application.routes.draw do
       end
     end
 
       end
     end
 

-    post "notes/addPOIexec" => "notes#create"
-    post "notes/closePOIexec" => "notes#close"
-    post "notes/editPOIexec" => "notes#comment"
-    get "notes/getGPX" => "notes#index", :format => "gpx"
-    get "notes/getRSSfeed" => "notes#feed", :format => "rss"
+    post "notes/addPOIexec" => "api/notes#create"
+    post "notes/closePOIexec" => "api/notes#close"
+    post "notes/editPOIexec" => "api/notes#comment"
+    get "notes/getGPX" => "api/notes#index", :format => "gpx"
+    get "notes/getRSSfeed" => "api/notes#feed", :format => "rss"

   end
 
   # Data browsing
   get "/way/:id" => "browse#way", :id => /\d+/, :as => :way
   end
 
   # Data browsing
   get "/way/:id" => "browse#way", :id => /\d+/, :as => :way

-  get "/way/:id/history" => "browse#way_history", :id => /\d+/
+  get "/way/:id/history" => "browse#way_history", :id => /\d+/, :as => :way_history

   get "/node/:id" => "browse#node", :id => /\d+/, :as => :node
   get "/node/:id" => "browse#node", :id => /\d+/, :as => :node

-  get "/node/:id/history" => "browse#node_history", :id => /\d+/
+  get "/node/:id/history" => "browse#node_history", :id => /\d+/, :as => :node_history

   get "/relation/:id" => "browse#relation", :id => /\d+/, :as => :relation
   get "/relation/:id" => "browse#relation", :id => /\d+/, :as => :relation

-  get "/relation/:id/history" => "browse#relation_history", :id => /\d+/
+  get "/relation/:id/history" => "browse#relation_history", :id => /\d+/, :as => :relation_history

   get "/changeset/:id" => "browse#changeset", :as => :changeset, :id => /\d+/
   get "/changeset/:id" => "browse#changeset", :as => :changeset, :id => /\d+/

-  get "/changeset/:id/comments/feed" => "changeset#comments_feed", :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" }
+  get "/changeset/:id/comments/feed" => "changeset_comments#index", :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" }

   get "/note/:id" => "browse#note", :id => /\d+/, :as => "browse_note"
   get "/note/new" => "browse#new_note"
   get "/note/:id" => "browse#note", :id => /\d+/, :as => "browse_note"
   get "/note/new" => "browse#new_note"

-  get "/user/:display_name/history" => "changeset#list"
-  get "/user/:display_name/history/feed" => "changeset#feed", :defaults => { :format => :atom }
-  get "/user/:display_name/notes" => "notes#mine"
-  get "/history/friends" => "changeset#list", :friends => true, :as => "friend_changesets", :defaults => { :format => :html }
-  get "/history/nearby" => "changeset#list", :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html }
+  get "/user/:display_name/history" => "changesets#index"
+  get "/user/:display_name/history/feed" => "changesets#feed", :defaults => { :format => :atom }
+  get "/user/:display_name/notes" => "notes#index", :as => :user_notes
+  get "/history/friends" => "changesets#index", :friends => true, :as => "friend_changesets", :defaults => { :format => :html }
+  get "/history/nearby" => "changesets#index", :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html }

 
   get "/browse/way/:id",                :to => redirect(:path => "/way/%{id}")
   get "/browse/way/:id/history",        :to => redirect(:path => "/way/%{id}/history")
 
   get "/browse/way/:id",                :to => redirect(:path => "/way/%{id}")
   get "/browse/way/:id/history",        :to => redirect(:path => "/way/%{id}/history")


@@ -149,41 +145,42 @@ OpenStreetMap::Application.routes.draw do
   get "/welcome" => "site#welcome"
   get "/fixthemap" => "site#fixthemap"
   get "/help" => "site#help"
   get "/welcome" => "site#welcome"
   get "/fixthemap" => "site#fixthemap"
   get "/help" => "site#help"

+  get "/about/:about_locale" => "site#about"

   get "/about" => "site#about"
   get "/about" => "site#about"

-  get "/history" => "changeset#list"
-  get "/history/feed" => "changeset#feed", :defaults => { :format => :atom }
-  get "/history/comments/feed" => "changeset#comments_feed", :as => :changesets_comments_feed, :defaults => { :format => "rss" }
+  get "/history" => "changesets#index"
+  get "/history/feed" => "changesets#feed", :defaults => { :format => :atom }
+  get "/history/comments/feed" => "changeset_comments#index", :as => :changesets_comments_feed, :defaults => { :format => "rss" }

   get "/export" => "site#export"
   get "/export" => "site#export"

-  match "/login" => "user#login", :via => [:get, :post]
-  match "/logout" => "user#logout", :via => [:get, :post]
+  match "/login" => "users#login", :via => [:get, :post]
+  match "/logout" => "users#logout", :via => [:get, :post]

   get "/offline" => "site#offline"
   get "/key" => "site#key"
   get "/id" => "site#id"
   get "/query" => "browse#query"
   get "/offline" => "site#offline"
   get "/key" => "site#key"
   get "/id" => "site#id"
   get "/query" => "browse#query"

-  get "/user/new" => "user#new"
-  post "/user/new" => "user#create"
-  get "/user/terms" => "user#terms"
-  post "/user/save" => "user#save"
-  get "/user/:display_name/confirm/resend" => "user#confirm_resend"
-  match "/user/:display_name/confirm" => "user#confirm", :via => [:get, :post]
-  match "/user/confirm" => "user#confirm", :via => [:get, :post]
-  match "/user/confirm-email" => "user#confirm_email", :via => [:get, :post]
-  post "/user/go_public" => "user#go_public"
-  match "/user/reset-password" => "user#reset_password", :via => [:get, :post]
-  match "/user/forgot-password" => "user#lost_password", :via => [:get, :post]
-  get "/user/suspended" => "user#suspended"
+  get "/user/new" => "users#new"
+  post "/user/new" => "users#create"
+  get "/user/terms" => "users#terms"
+  post "/user/save" => "users#save"
+  get "/user/:display_name/confirm/resend" => "users#confirm_resend", :as => :user_confirm_resend
+  match "/user/:display_name/confirm" => "users#confirm", :via => [:get, :post]
+  match "/user/confirm" => "users#confirm", :via => [:get, :post]
+  match "/user/confirm-email" => "users#confirm_email", :via => [:get, :post]
+  post "/user/go_public" => "users#go_public"
+  match "/user/reset-password" => "users#reset_password", :via => [:get, :post]
+  match "/user/forgot-password" => "users#lost_password", :via => [:get, :post]
+  get "/user/suspended" => "users#suspended"

 
   get "/index.html", :to => redirect(:path => "/")
   get "/create-account.html", :to => redirect(:path => "/user/new")
   get "/forgot-password.html", :to => redirect(:path => "/user/forgot-password")
 
   # omniauth
 
   get "/index.html", :to => redirect(:path => "/")
   get "/create-account.html", :to => redirect(:path => "/user/new")
   get "/forgot-password.html", :to => redirect(:path => "/user/forgot-password")
 
   # omniauth

-  get "/auth/failure" => "user#auth_failure"
-  match "/auth/:provider/callback" => "user#auth_success", :via => [:get, :post], :as => :auth_success
-  match "/auth/:provider" => "user#auth", :via => [:get, :post], :as => :auth
+  get "/auth/failure" => "users#auth_failure"
+  match "/auth/:provider/callback" => "users#auth_success", :via => [:get, :post], :as => :auth_success
+  match "/auth/:provider" => "users#auth", :via => [:get, :post], :as => :auth

 
   # permalink
 
   # permalink

-  get "/go/:code" => "site#permalink", :code => /[a-zA-Z0-9_@~]+[=-]*/
+  get "/go/:code" => "site#permalink", :code => /[a-zA-Z0-9_@~]+[=-]*/, :as => :permalink

 
   # rich text preview
   post "/preview/:type" => "site#preview", :as => :preview
 
   # rich text preview
   post "/preview/:type" => "site#preview", :as => :preview


@@ -196,9 +193,9 @@ OpenStreetMap::Application.routes.draw do
   get "/user/:display_name/traces" => "traces#index"
   get "/user/:display_name/traces/tag/:tag/rss" => "traces#georss", :defaults => { :format => :rss }
   get "/user/:display_name/traces/rss" => "traces#georss", :defaults => { :format => :rss }
   get "/user/:display_name/traces" => "traces#index"
   get "/user/:display_name/traces/tag/:tag/rss" => "traces#georss", :defaults => { :format => :rss }
   get "/user/:display_name/traces/rss" => "traces#georss", :defaults => { :format => :rss }

-  get "/user/:display_name/traces/:id" => "traces#show"
-  get "/user/:display_name/traces/:id/picture" => "traces#picture"
-  get "/user/:display_name/traces/:id/icon" => "traces#icon"
+  get "/user/:display_name/traces/:id" => "traces#show", :as => "show_trace"
+  get "/user/:display_name/traces/:id/picture" => "traces#picture", :as => "trace_picture"
+  get "/user/:display_name/traces/:id/icon" => "traces#icon", :as => "trace_icon"

   get "/traces/tag/:tag/page/:page" => "traces#index", :page => /[1-9][0-9]*/
   get "/traces/tag/:tag" => "traces#index"
   get "/traces/page/:page" => "traces#index", :page => /[1-9][0-9]*/
   get "/traces/tag/:tag/page/:page" => "traces#index", :page => /[1-9][0-9]*/
   get "/traces/tag/:tag" => "traces#index"
   get "/traces/page/:page" => "traces#index", :page => /[1-9][0-9]*/


@@ -208,44 +205,47 @@ OpenStreetMap::Application.routes.draw do
   get "/traces/mine/tag/:tag" => "traces#mine"
   get "/traces/mine/page/:page" => "traces#mine"
   get "/traces/mine" => "traces#mine"
   get "/traces/mine/tag/:tag" => "traces#mine"
   get "/traces/mine/page/:page" => "traces#mine"
   get "/traces/mine" => "traces#mine"

-  post "/trace/create" => "traces#create" # remove after deployment

   get "/trace/create", :to => redirect(:path => "/traces/new")
   get "/trace/:id/data" => "traces#data", :id => /\d+/, :as => "trace_data"
   get "/trace/create", :to => redirect(:path => "/traces/new")
   get "/trace/:id/data" => "traces#data", :id => /\d+/, :as => "trace_data"

-  post "trace/:id/edit" => "traces#update" # remove after deployment

   get "/trace/:id/edit", :to => redirect(:path => "/traces/%{id}/edit")
   get "/trace/:id/edit", :to => redirect(:path => "/traces/%{id}/edit")

-  post "/trace/:id/delete" => "traces#delete", :id => /\d+/

 
   # diary pages
 
   # diary pages

-  match "/diary/new" => "diary_entry#new", :via => [:get, :post]
-  get "/diary/friends" => "diary_entry#list", :friends => true, :as => "friend_diaries"
-  get "/diary/nearby" => "diary_entry#list", :nearby => true, :as => "nearby_diaries"
-  get "/user/:display_name/diary/rss" => "diary_entry#rss", :defaults => { :format => :rss }
-  get "/diary/:language/rss" => "diary_entry#rss", :defaults => { :format => :rss }
-  get "/diary/rss" => "diary_entry#rss", :defaults => { :format => :rss }
-  get "/user/:display_name/diary/comments/:page" => "diary_entry#comments", :page => /[1-9][0-9]*/
-  get "/user/:display_name/diary/comments/" => "diary_entry#comments"
-  get "/user/:display_name/diary" => "diary_entry#list"
-  get "/diary/:language" => "diary_entry#list"
-  get "/diary" => "diary_entry#list"
-  get "/user/:display_name/diary/:id" => "diary_entry#view", :id => /\d+/, :as => :diary_entry
-  post "/user/:display_name/diary/:id/newcomment" => "diary_entry#comment", :id => /\d+/
-  match "/user/:display_name/diary/:id/edit" => "diary_entry#edit", :via => [:get, :post], :id => /\d+/
-  post "/user/:display_name/diary/:id/hide" => "diary_entry#hide", :id => /\d+/, :as => :hide_diary_entry
-  post "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entry#hidecomment", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment
-  post "/user/:display_name/diary/:id/subscribe" => "diary_entry#subscribe", :as => :diary_entry_subscribe, :id => /\d+/
-  post "/user/:display_name/diary/:id/unsubscribe" => "diary_entry#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/
+  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 }
+  get "/user/:display_name/diary/comments/:page" => "diary_entries#comments", :page => /[1-9][0-9]*/
+  get "/user/:display_name/diary/comments/" => "diary_entries#comments", :as => :diary_comments
+  get "/user/:display_name/diary" => "diary_entries#index"
+  get "/diary/:language" => "diary_entries#index"
+  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+/, :as => :comment_diary_entry
+  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+/

 
   # user pages
 
   # user pages

-  get "/user/:display_name" => "user#show", :as => "user"
-  match "/user/:display_name/make_friend" => "user#make_friend", :via => [:get, :post], :as => "make_friend"
-  match "/user/:display_name/remove_friend" => "user#remove_friend", :via => [:get, :post], :as => "remove_friend"
-  match "/user/:display_name/account" => "user#account", :via => [:get, :post]
-  get "/user/:display_name/set_status" => "user#set_status", :as => :set_status_user
-  get "/user/:display_name/delete" => "user#delete", :as => :delete_user
+  resources :users, :path => "user", :param => :display_name, :only => [:show, :destroy]
+  match "/user/:display_name/account" => "users#account", :via => [:get, :post], :as => "user_account"
+  post "/user/:display_name/set_status" => "users#set_status", :as => :set_status_user
+
+  # friendships
+  match "/user/:display_name/make_friend" => "friendships#make_friend", :via => [:get, :post], :as => "make_friend"
+  match "/user/:display_name/remove_friend" => "friendships#remove_friend", :via => [:get, :post], :as => "remove_friend"

 
   # user lists
 
   # user lists

-  match "/users" => "user#list", :via => [:get, :post]
-  match "/users/:status" => "user#list", :via => [:get, :post]
+  match "/users" => "users#index", :via => [:get, :post]
+  match "/users/:status" => "users#index", :via => [:get, :post]

 
   # geocoder
   get "/search" => "geocoder#search"
 
   # geocoder
   get "/search" => "geocoder#search"


@@ -264,7 +264,9 @@ OpenStreetMap::Application.routes.draw do
   get "/export/embed" => "export#embed"
 
   # messages
   get "/export/embed" => "export#embed"
 
   # messages

-  resources :messages, :only => [:create, :show] do
+  resources :messages, :only => [:create, :show, :destroy] do
+    post :mark
+    match :reply, :via => [:get, :post]

     collection do
       get :inbox
       get :outbox
     collection do
       get :inbox
       get :outbox


@@ -274,9 +276,6 @@ OpenStreetMap::Application.routes.draw do
   get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox")
   get "/message/new/:display_name" => "messages#new", :as => "new_message"
   get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}")
   get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox")
   get "/message/new/:display_name" => "messages#new", :as => "new_message"
   get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}")

-  post "/message/mark/:message_id" => "messages#mark", :as => "mark_message"
-  match "/message/reply/:message_id" => "messages#reply", :via => [:get, :post], :as => "reply_message"
-  post "/message/delete/:message_id" => "messages#destroy", :as => "destroy_message"

 
   # oauth admin pages (i.e: for setting up new clients, etc...)
   scope "/user/:display_name" do
 
   # oauth admin pages (i.e: for setting up new clients, etc...)
   scope "/user/:display_name" do


@@ -292,8 +291,8 @@ OpenStreetMap::Application.routes.draw do
   # roles and banning pages
   post "/user/:display_name/role/:role/grant" => "user_roles#grant", :as => "grant_role"
   post "/user/:display_name/role/:role/revoke" => "user_roles#revoke", :as => "revoke_role"
   # roles and banning pages
   post "/user/:display_name/role/:role/grant" => "user_roles#grant", :as => "grant_role"
   post "/user/:display_name/role/:role/revoke" => "user_roles#revoke", :as => "revoke_role"

-  get "/user/:display_name/blocks" => "user_blocks#blocks_on"
-  get "/user/:display_name/blocks_by" => "user_blocks#blocks_by"
+  get "/user/:display_name/blocks" => "user_blocks#blocks_on", :as => "user_blocks_on"
+  get "/user/:display_name/blocks_by" => "user_blocks#blocks_by", :as => "user_blocks_by"

   get "/blocks/new/:display_name" => "user_blocks#new", :as => "new_user_block"
   resources :user_blocks
   match "/blocks/:id/revoke" => "user_blocks#revoke", :via => [:get, :post], :as => "revoke_user_block"
   get "/blocks/new/:display_name" => "user_blocks#new", :as => "new_user_block"
   resources :user_blocks
   match "/blocks/:id/revoke" => "user_blocks#revoke", :via => [:get, :post], :as => "revoke_user_block"