small parallel way fix, plus handy new 'join' keypress (J)

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

diff --git a/config/potlatch/presets.txt b/config/potlatch/presets.txt
index 6be23b99327243ab08fccb655eebcfa7f0fb2b5d..8305c49e143713529e5c2183165b46eb2d49eed3 100644 (file)
--- a/config/potlatch/presets.txt
+++ b/config/potlatch/presets.txt
@@ -7,6 +7,7 @@ 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=
+unknown road: highway=road
 
 way/footway
 public footpath: highway=footway,foot=yes,tracktype=
@@ -53,7 +54,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
@@ -70,11 +71,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
@@ -98,14 +99,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)
@@ -118,7 +120,8 @@ mooring: place=,waterway=mooring,lock=
 point/railway
 station: place=,railway=station,name=(type name here)
 viaduct: place=,railway=viaduct
-level crossing: place=,railway=crossing
+road crossing: place=,railway=level_crossing
+foot crossing: place=,railway=crossing
 
 point/landmark
 pylon: man_made=,power=tower
@@ -175,7 +178,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