various fixes/enhancements, including a couple to the 0.5 version

app/controllers/amf_controller.rb

@@ -110,16 +110,15 @@ class AmfController < ApplicationController
       args=AMF.getvalue(req)				#  | get response (probably an array)
 
       case message
-        when 'putway';				
-          r=putway(renumberednodes,*args)
-          renumberednodes=r[3]
-          if r[1] != r[2]
-            renumberedways[r[1]] = r[2]
-          end
-          results[index]=AMF.putdata(index,r)
+        when 'putway';				r=putway(renumberednodes,*args)
+									renumberednodes=r[3]
+									if r[1] != r[2] then renumberedways[r[1]] = r[2] end
+									results[index]=AMF.putdata(index,r)
         when 'putrelation';			results[index]=AMF.putdata(index,putrelation(renumberednodes, renumberedways, *args))
         when 'deleteway';			results[index]=AMF.putdata(index,deleteway(*args))
-        when 'putpoi';				results[index]=AMF.putdata(index,putpoi(*args))
+        when 'putpoi';				r=putpoi(*args)
+									if r[1] != r[2] then renumberednodes[r[1]] = r[2] end
+        							results[index]=AMF.putdata(index,r)
         when 'startchangeset';		results[index]=AMF.putdata(index,startchangeset(*args))
       end
     end

config/potlatch/autocomplete.txt

@@ -1,8 +1,9 @@
 # Potlatch autocomplete values
 # each line should be: key / way|point|POI (tab) list_of_values
 # '-' indicates no autocomplete for values
-highway/way		motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,service,bridleway,cycleway,footway,pedestrian,steps,living_street,track
+highway/way		motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,service,bridleway,cycleway,footway,pedestrian,steps,living_street,track,road
 highway/point	mini_roundabout,traffic_signals,crossing,gate,stile,cattle_grid,toll_booth,incline,viaduct,motorway_junction,services,ford,bus_stop,turning_circle
+tracktype/way	grade1,grade2,grade3,grade4,grade5
 junction/way	roundabout
 cycleway/way	lane,track,opposite_lane,opposite_track,opposite
 waterway/way	river,canal,stream,drain,dock,riverbank

config/potlatch/colours.txt

@@ -12,6 +12,7 @@ secondary		0xFDBF6F	1	-
 tertiary		0xFEFECB	1	-
 unclassified	0xE8E8E8	1	-
 residential		0xE8E8E8	1	-
+road			0xAAAAAA	1	-
 footway			0xFF6644	-	-
 cycleway		0xFF6644	-	-
 bridleway		0xFF6644	-	-

config/potlatch/presets.txt

@@ -9,10 +9,14 @@ residential road: highway=residential,ref=,name=(type road name)
 service road: highway=service,ref=,name=
 
 way/footway
-footpath: highway=footway,foot=yes
-bridleway: highway=bridleway,foot=yes
-byway: highway=unsurfaced,foot=yes
-permissive path: highway=footway,foot=permissive
+public footpath: highway=footway,foot=yes,tracktype=
+permissive path: highway=footway,foot=permissive,tracktype=
+bridleway: highway=bridleway,foot=yes,tracktype=
+paved track: highway=track,foot=,tracktype=grade1
+gravel track: highway=track,foot=,tracktype=grade2
+rough track: highway=track,foot=,tracktype=grade3
+dirt track: highway=track,foot=,tracktype=grade4
+grass track: highway=track,foot=,tracktype=grade5
 
 way/cycleway
 cycle lane: highway=cycleway,cycleway=lane,ncn_ref=