Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

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

diff --git a/config/potlatch/presets.txt b/config/potlatch/presets.txt
old mode 100755 (executable)
new mode 100644 (file)
index 5d696da..ecca87d
--- a/config/potlatch/presets.txt
+++ b/config/potlatch/presets.txt
@@ -3,13 +3,15 @@ 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)
+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=
 
 way/footway
 footpath: highway=footway,foot=yes
-bridleway: highway=bridleway,foot=yes,horse=yes,bicycle=yes
-byway: highway=byway,foot=yes,horse=yes,bicycle=yes,motorcar=yes
+bridleway: highway=bridleway,foot=yes
+byway: highway=unsurfaced,foot=yes
 permissive path: highway=footway,foot=permissive
 
 way/cycleway
@@ -25,6 +27,7 @@ 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)
+stream: waterway=stream,boat=no,name=(type name here)
 
 way/railway
 railway: railway=rail
@@ -34,27 +37,61 @@ preserved railway: railway=preserved
 disused railway tracks: railway=disused
 course of old railway: railway=abandoned
 
+way/natural
+lake: natural=water,landuse=
+forest: landuse=forest,natural=
+
 point/road
-mini roundabout: highway=mini_roundabout
-traffic lights: highway=traffic_signals
+mini roundabout: place=,highway=mini_roundabout
+traffic lights: place=,highway=traffic_signals
 
 point/footway
-bridge: highway=bridge
-gate: highway=gate
-stile: highway=stile
-cattle grid: highway=cattle_grid
+bridge: place=,highway=bridge
+gate: place=,highway=gate
+stile: place=,highway=stile
+cattle grid: place=,highway=cattle_grid
 
 point/cycleway
-gate: highway=gate
+gate: place=,highway=gate
 
 point/waterway
-lock gate: waterway=lock_gate
-weir: waterway=weir
-aqueduct: waterway=aqueduct
-winding hole: waterway=turning_point
-mooring: waterway=mooring
+lock gate: place=,waterway=lock_gate
+weir: place=,waterway=weir
+aqueduct: place=,waterway=aqueduct
+winding hole: place=,waterway=turning_point
+mooring: place=,waterway=mooring
 
 point/railway
-station: railway=station
-viaduct: railway=viaduct
-level crossing: railway=crossing
+station: place=,railway=station
+viaduct: place=,railway=viaduct
+level crossing: place=,railway=crossing
+
+point/natural
+peak: place=,natural=peak
+
+POI/road
+car park: place=,amenity=parking
+petrol station: place=,amenity=fuel
+
+POI/cycleway
+bike park: place=,amenity=bicycle_parking
+
+POI/place
+city: place=city,name=(type name here),is_in=(type region or county)
+town: place=town,name=(type name here),is_in=(type region or county)
+suburb: place=suburb,name=(type name here),is_in=(type region or county)
+village: place=village,name=(type name here),is_in=(type region or county)
+hamlet: place=hamlet,name=(type name here),is_in=(type region or county)
+
+POI/tourism
+attraction: place=,tourism=attraction,amenity=,religion=,denomination=
+church: place=,tourism=,amenity=place_of_worship,name=(type name here),religion=christian,denomination=(type denomination here)
+hotel: place=,tourism=hotel,amenity=,religion=,denomination=
+other religious: place=,tourism=,amenity=place_of_worship,name=(type name here),religion=(type religion),denomination=
+post box: place=,amenity=post_box,tourism=,name=,religion=,denomination=
+post office: place=,amenity=post_office,tourism=,name=,religion=,denomination=
+pub: place=,tourism=,amenity=pub,name=(type name here),religion=,denomination=
+school: place=,tourism=,amenity=school,name=(type name here),religion=,denomination=
+
+POI/natural
+peak: place=,natural=peak