From: Richard Fairhurst <richard@systemed.net>
Date: Tue, 25 Nov 2008 00:15:30 +0000 (+0000)
Subject: various fixes/enhancements, including a couple to the 0.5 version
X-Git-Tag: live~7658^2~130
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ecefee485b8dc033d020bd6b67d9ae4559ec796a?ds=inline

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

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 589005d3c..43bec41a1 100644
--- a/app/controllers/amf_controller.rb
+++ b/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
diff --git a/config/potlatch/autocomplete.txt b/config/potlatch/autocomplete.txt
index 86b6c62b8..ad6cb0154 100755
--- a/config/potlatch/autocomplete.txt
+++ b/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
diff --git a/config/potlatch/colours.txt b/config/potlatch/colours.txt
index c54247cb1..ec1c2de03 100644
--- a/config/potlatch/colours.txt
+++ b/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	-	-
diff --git a/config/potlatch/presets.txt b/config/potlatch/presets.txt
index 1917b5a6c..c46f9d12a 100644
--- a/config/potlatch/presets.txt
+++ b/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=
diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index cf17a3091..3a1b8c4d1 100755
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ