Refactor old_relation_controller tests to use factories.

[rails.git] / config / potlatch / presets.txt

diff --git a/config/potlatch/presets.txt b/config/potlatch/presets.txt
index b08d2dcb619a17b5ce2e6b570c1ce07ef7ba91c0..0d966e925585133a2953a047745b548246f896d3 100644 (file)
--- a/config/potlatch/presets.txt
+++ b/config/potlatch/presets.txt
@@ -6,13 +6,14 @@ secondary road: highway=secondary,ref=(type road number),name=(type road name)
 tertiary road: highway=tertiary,ref=(type road number),name=(type road name)
 unclassified road: highway=unclassified,ref=,name=(type road name)
 residential road: highway=residential,ref=,name=(type road name)
-service road: highway=service,ref=,name=
+service road: highway=service,ref=
 unknown road: highway=road
 
 way/footway
 public footpath: highway=footway,foot=yes,tracktype=
 permissive path: highway=footway,foot=permissive,tracktype=
 bridleway: highway=bridleway,foot=yes,tracktype=
+unofficial path: highway=path
 paved track: highway=track,foot=,surface=paved
 gravel track: highway=track,foot=,surface=gravel
 dirt track: highway=track,foot=,surface=dirt
@@ -20,9 +21,9 @@ grass track: highway=track,foot=,surface=grass
 
 way/cycleway
 cycle track: highway=cycleway,ncn_ref=,rcn_ref=,lcn_ref=
-cycle track (national route): highway=cycleway,ncn_ref=(type route number)
-cycle track (regional route): highway=cycleway,rcn_ref=(type route number)
-cycle track (local route): highway=cycleway,lcn_ref=(type route number)
+national route: highway=cycleway,ncn_ref=(type route number)
+regional route: highway=cycleway,rcn_ref=(type route number)
+local route: highway=cycleway,lcn_ref=(type route number)
 
 way/waterway
 canal: waterway=canal,name=(type name here)
@@ -54,7 +55,7 @@ ruins: place=,tourism=,historic=ruins,name=(type name here)
 
 way/recreation
 golf course: landuse=,leisure=golf_course
-pitch: landuse=,leisure=pitch, sport=(type sport here)
+pitch: landuse=,leisure=pitch,sport=(type sport here)
 playground: landuse=,leisure=playground
 recreation ground: landuse=recreation_ground,leisure=
 sports centre: landuse=,leisure=sports_centre
@@ -71,11 +72,11 @@ way/natural
 coastline: natural=coastline,landuse=,leisure=
 fell: natural=fell,landuse=,leisure=
 heath: natural=heath,landuse=,leisure=
-lake: natural=water,landuse=,leisure=
 forest: landuse=forest,natural=,leisure=
 marsh: natural=marsh,landuse=,leisure=
 nature reserve: leisure=nature_reserve,landuse=,natural=
 scree: natural=scree,landuse=,leisure=
+water: natural=water,landuse=,leisure=
 woodland: natural=wood,landuse=,leisure=
 
 way/landuse
@@ -99,14 +100,15 @@ mini roundabout: place=,highway=mini_roundabout
 traffic lights: place=,highway=traffic_signals
 
 point/footway
-bridge: place=,highway=bridge
-gate: place=,highway=gate
-stile: place=,highway=stile
-cattle grid: place=,highway=cattle_grid
+gate: place=,barrier=gate
+stile: place=,barrier=stile
+cattle grid: place=,barrier=cattle_grid
 
 point/cycleway
-bike park: place=,highway=,amenity=bicycle_parking,capacity=(type number of spaces)
-gate: place=,highway=gate,amenity=,capacity=
+bike park: place=,barrier=,amenity=bicycle_parking,capacity=(type number of spaces)
+bollard: place=,barrier=bollard,amenity=,capacity=
+cycle barrier: place=,barrier=cycle_barrier,amenity=,capacity=
+gate: place=,barrier=gate,amenity=,capacity=
 
 point/waterway
 lock: place=,waterway=,lock=yes,name=(type name here)
@@ -177,7 +179,7 @@ windmill: man_made=windmill,power=,amenity=,name=,religion=,denomination=
 
 POI/recreation
 golf course: leisure=golf_course
-pitch: leisure=pitch, sport=(type sport here)
+pitch: leisure=pitch,sport=(type sport here)
 playground: leisure=playground
 recreation ground: landuse=recreation_ground,leisure=
 sports centre: leisure=sports_centre