workaround for paths in Potlatch getpresets, plus diary link

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index a9a56203a2ebc8b76c398678cb32f0f834450d5b..76a7fff79e59e1dc7e8e76e322a8ecf25ceb6d3f 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -70,7 +70,78 @@ class AmfController < ApplicationController
                presettype=''
                presetcategory=''
                
-               File.open("config/potlatch/presets.txt") do |file|
+#              File.open("config/potlatch/presets.txt") do |file|
+
+               # Temporary patch to get around filepath problem
+               # To remove this patch and make the code nice again:
+               # 1. uncomment above line
+               # 2. fix the path in the above line
+               # 3. delete this here document, and the following line (StringIO....)
+               
+txt=<<-EOF
+way/road
+motorway: highway=motorway,ref=(type road number)
+trunk road: highway=trunk,ref=(type road number),name=(type road name)
+primary road: highway=primary,ref=(type road number),name=(type road name)
+secondary road: highway=secondary,ref=(type road number),name=(type road name)
+residential road: highway=residential,name=(type road name)
+unclassified road: highway=unclassified,name=(type road name)
+
+way/footway
+footpath: highway=footway,foot=yes
+bridleway: highway=bridleway,foot=yes
+byway: highway=unsurfaced,foot=yes
+permissive path: highway=footway,foot=permissive
+
+way/cycleway
+cycle lane: highway=cycleway,cycleway=lane,ncn_ref=
+cycle track: highway=cycleway,cycleway=track,ncn_ref=
+cycle lane (NCN): highway=cycleway,cycleway=lane,name=(type name here),ncn_ref=(type route number)
+cycle track (NCN): highway=cycleway,cycleway=track,name=(type name here),ncn_ref=(type route number)
+
+way/waterway
+canal: waterway=canal,name=(type name here)
+navigable river: waterway=river,boat=yes,name=(type name here)
+navigable drain: waterway=drain,boat=yes,name=(type name here)
+derelict canal: waterway=derelict_canal,name=(type name here)
+unnavigable river: waterway=river,boat=no,name=(type name here)
+unnavigable drain: waterway=drain,boat=no,name=(type name here)
+
+way/railway
+railway: railway=rail
+tramway: railway=tram
+light railway: railway=light_rail
+preserved railway: railway=preserved
+disused railway tracks: railway=disused
+course of old railway: railway=abandoned
+
+point/road
+mini roundabout: highway=mini_roundabout
+traffic lights: highway=traffic_signals
+
+point/footway
+bridge: highway=bridge
+gate: highway=gate
+stile: highway=stile
+cattle grid: highway=cattle_grid
+
+point/cycleway
+gate: highway=gate
+
+point/waterway
+lock gate: waterway=lock_gate
+weir: waterway=weir
+aqueduct: waterway=aqueduct
+winding hole: waterway=turning_point
+mooring: waterway=mooring
+
+point/railway
+station: railway=station
+viaduct: railway=viaduct
+level crossing: railway=crossing
+EOF
+
+StringIO.open(txt) do |file|
                        file.each_line {|line|
                                t=line.chomp
                                if (t=~/(\w+)\/(\w+)/) then

diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index 2328fb39a1eb1cc129e438b2b572d84ed6bc103b..65999abaadb71e34a51ace43145ccb5079cd7082 100644 (file)
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -1,5 +1,6 @@
 <h2><%= @this_user.display_name %></h2>
 <% if @user and @this_user.id == @user.id %>
+<h3>Messages</h3>
 <% if @user.has_messages? %>
 <p>You have <%=@user.get_new_messages.length %> new messages and <%=@user.get_all_messages.length -  @user.get_new_messages.length %> old messages:</p> 
 
@@ -52,13 +53,16 @@
 <br />
 <%= link_to 'show all messages', :controller => 'user', :action => 'view', :display_name => @user.display_name, :unread => true %>
 <br />
-<br />
+<h3>Your account</h3>
 Go to <%= link_to 'your account page', :controller => 'user', :action => 'account', :display_name => @user.display_name %> to see who's mapping in your area.
-
+<br />
+<br />
+<%= link_to 'View your diary', :controller => 'user', :action=>'diary', :display_name => @user.display_name %>
 
 <% else %>
 <%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => @this_user.id %><br /><br /> 
 <%= link_to 'Add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %><br /><br />
+<%= link_to 'Diary', :controller => 'user', :action=>'diary', :display_name => @this_user.display_name %>
 <% end %>
 <br />
 <br />