Index: resources/data/defaultpresets.xml
===================================================================
--- resources/data/defaultpresets.xml	(revision 18386)
+++ resources/data/defaultpresets.xml	(working copy)
@@ -250,10 +250,10 @@
         <combo key="access" text="General Access" values="yes,private,customers,permissive,permit,no" values_sort="false" />
     </chunk>
     <chunk id="path_access_modes">
-        <combo key="ski" text="Ski" values="yes,official,designated,permissive,permit,private,no" values_sort="false" />
-        <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
+        <combo key="ski" text="Ski" values="yes,official,designated,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
+        <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
         <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
-        <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
+        <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
         <space />
         <label text="Tags which are implied and do not need to be set are `motor_vehicle=no` and `emergency=destination`." />
         <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
@@ -1007,70 +1007,6 @@
             <reference ref="link_road_access_restrictions" />
         </item> <!-- Construction -->
         <separator/>
-        <item name="Road Restrictions" icon="presets/vehicle/restriction/maxspeed.svg" type="node,way,closedway,multipolygon" preset_name_label="true" > <!-- There are links from MP relations to this preset -->
-            <link wiki="Key:access" />
-            <space />
-            <checkgroup columns="3" >
-                <check key="oneway" text="Oneway" />
-                <check key="toll" text="Toll" />
-                <check key="noexit" text="No exit (cul-de-sac)" disable_off="true" />
-                <check key="winter_road" text="Winter road" disable_off="true" />
-                <check key="ice_road" text="Ice road" disable_off="true" />
-            </checkgroup>
-            <text key="maxspeed" text="Max. speed (km/h)" />
-            <text key="maxspeed:forward" text="Max. speed in way direction" />
-            <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
-            <text key="maxspeed:hgv" text="Max. speed Heavy Goods Vehicles (km/h)" match="key" />
-            <text key="maxspeed:advisory" text="Signposted advisory max. speed (km/h)" />
-            <text key="minspeed" text="Min. speed (km/h)" match="key" />
-            <space />
-            <reference ref="highway_max" />
-            <space />
-            <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" values_context="overtaking" values_sort="false" match="key" />
-            <preset_link preset_name="Access Restrictions" />
-        </item> <!-- Road Restrictions -->
-        <item name="Access Restrictions" icon="presets/vehicle/restriction/restrictions.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true"> <!-- There are links from MPs and route relations to this preset -->
-            <link wiki="Key:access" />
-            <space />
-            <label text="Some road types already imply some access restrictions which should not be set again." />
-            <space />
-            <label text="Transport mode restrictions" />
-            <combo key="access" text="General Access" values="yes,destination,delivery,permissive,permit,private,customers,agricultural,forestry,no" values_searchable="true" values_sort="false" match="key" />
-            <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,permit,private,use_sidepath,no" values_sort="false" match="key" />
-            <reference ref="wheelchair" />
-            <combo key="ski" text="Ski" values="yes,official,designated,permissive,permit,private,no" values_sort="false" />
-            <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
-            <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" match="key" />
-            <space />
-            <label text="Vehicles per type" />
-            <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
-            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,use_sidepath,no" values_sort="false" match="key" />
-            <combo key="carriage" text="Carriage" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
-            <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
-            <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
-            <combo key="moped" text="Moped" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
-            <combo key="mofa" text="Mofa" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
-            <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
-            <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
-            <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
-            <combo key="bdouble" text="B-double road train" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
-            <combo key="agricultural" text="Agricultural Vehicles (with restrictions e.g. max. 25 km/h)" values="yes,official,designated,destination,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
-            <combo key="4wd_only" text="4WD only" values="yes,recommended,no" values_sort="false" match="key" />
-            <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
-            <combo key="golf_cart" text="Golf cart" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" match="key" />
-            <space />
-            <label text="Vehicles per use" />
-            <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,no" values_sort="false" match="keyvalue" />
-            <combo key="disabled" text="Disabled" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
-            <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
-            <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
-            <combo key="bus" text="Public Transportation Bus" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
-            <combo key="taxi" text="Taxi" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
-            <combo key="tourist_bus" text="Tourist buses" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
-            <combo key="hazmat" text="Hazmat" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
-            <preset_link preset_name="Road Restrictions" />
-        </item> <!-- Access Restrictions -->
-        <separator/>
         <item name="Roundabout" icon="presets/vehicle/restriction/roundabout_right.svg" type="node,way,closedway" preset_name_label="true">
             <link wiki="Tag:junction=roundabout" />
             <space />
@@ -1137,7 +1073,7 @@
                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
                 <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
                 <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
-                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
+                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
             </optional>
             <reference ref="link_road_access_restrictions" />
         </item> <!-- Track -->
@@ -1162,9 +1098,9 @@
                     <check key="segregated" text="Segregated" />
                     <check key="informal" text="Informal" disable_off="true" />
                 </checkgroup>
-                <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
+                <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
                 <reference ref="wheelchair" />
-                <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
+                <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
                 <reference ref="path_access_modes" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -1182,13 +1118,13 @@
                 <space />
                 <label text="Depending on the country, several access tags are implied and do not need to be set." />
                 <label text="Globally, `horse=designated` and `motor_vehicle=no` are implied." />
-                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
+                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
                 <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
-                <combo key="foot" text="Foot" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
+                <combo key="foot" text="Foot" values="yes,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
                 <reference ref="wheelchair" />
-                <combo key="bicycle" text="Bicycle" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
+                <combo key="bicycle" text="Bicycle" values="yes,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
                 <combo key="ski" text="Ski" values="yes,permissive,private,no" values_sort="false" />
-                <combo key="snowmobile" text="Snowmobile" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
+                <combo key="snowmobile" text="Snowmobile" values="yes,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
                 <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
             </optional>
@@ -1220,10 +1156,10 @@
                 <label text="Globally, `bicycle=designated` is implied." />
                 <combo key="foot" text="Pedestrians" values="yes,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
                 <reference ref="wheelchair" />
-                <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" values_sort="false" />
-                <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
+                <combo key="ski" text="Ski" values="yes,official,designated,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
+                <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
                 <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
-                <combo key="horse" text="Horse" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
+                <combo key="horse" text="Horse" values="yes,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
                 <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
             </optional>
@@ -1275,11 +1211,11 @@
                 <space />
                 <label text="Depending on the country, several access tags are implied and do not need to be set." />
                 <label text="Globally, `foot=designated` is implied." />
-                <combo key="bicycle" text="Bicycle" values="yes,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
-                <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" values_sort="false" />
-                <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
+                <combo key="bicycle" text="Bicycle" values="yes,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
+                <combo key="ski" text="Ski" values="yes,official,designated,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
+                <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
                 <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
-                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
+                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
                 <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
             </optional>
@@ -1316,6 +1252,135 @@
             </optional>
         </item> <!-- Steps -->
     </group> <!-- Ways -->
+    <group name="Passageways" icon="presets/transport/passage/tunnel.svg">
+        <item name="Tunnel" icon="presets/transport/passage/tunnel.svg" type="way" preset_name_label="true">
+            <link wiki="Key:tunnel" />
+            <key key="tunnel" value="yes" />
+            <optional>
+                <text key="name" text="Name" />
+                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
+                <text key="width" text="Width (meters)" />
+                <text key="maxheight" text="Max. height (meters)" />
+                <text key="maxwidth" text="Max. width (meters)" match="key" />
+                <space />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <text key="maxspeed:forward" text="Max. speed in way direction" />
+                <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
+                <space />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <check key="toll" text="Toll" />
+            </optional>
+        </item> <!-- Tunnel -->
+        <item name="Building Passage" icon="presets/transport/passage/tunnel_building_passage.svg" type="way" preset_name_label="true">
+            <link wiki="Key:tunnel" />
+            <key key="tunnel" value="building_passage" />
+            <optional>
+                <reference ref="name_layer" />
+                <text key="width" text="Width (meters)" />
+                <text key="maxheight" text="Max. height (meters)" />
+                <text key="maxspeed" text="Max. speed (km/h)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+            </optional>
+        </item> <!-- Building Passage -->
+        <item name="Arcade" icon="presets/transport/passage/arcade.svg" type="way" preset_name_label="true">
+            <link wiki="Key:covered" />
+            <space />
+            <key key="covered" value="arcade" />
+            <check key="arcade:left" value_on="open" text="Open on left side" disable_off="true" />
+            <check key="arcade:right" value_on="open" text="Open on right side" disable_off="true" />
+            <optional>
+                <reference ref="name_layer" />
+                <text key="width" text="Width (meters)" />
+            </optional>
+        </item> <!-- Arcade -->
+        <item name="Colonnade" icon="presets/transport/passage/colonnade.svg" type="way" preset_name_label="true">
+            <link wiki="Key:covered" />
+            <space />
+            <key key="covered" value="colonnade" />
+            <check key="colonnade:left" value_on="open" text="Open on left side" disable_off="true" />
+            <check key="colonnade:right" value_on="open" text="Open on right side" disable_off="true" />
+            <optional>
+                <reference ref="name_layer" />
+                <text key="width" text="Width (meters)" />
+            </optional>
+        </item> <!-- Colonnade -->
+        <item name="Avalanche Protector" icon="presets/transport/passage/tunnel_avalanche_protector.svg" type="way" preset_name_label="true">
+            <link wiki="Key:tunnel" />
+            <space />
+            <key key="tunnel" value="avalanche_protector" />
+            <check key="avalanche_protector:left" value_on="open" text="Open on left side" disable_off="true" />
+            <check key="avalanche_protector:right" value_on="open" text="Open on right side" disable_off="true" />
+            <optional>
+                <reference ref="name_layer" />
+                <text key="width" text="Width (meters)" />
+                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+            </optional>
+        </item> <!-- Avalanche Protector -->
+    </group> <!-- Passageways -->
+    <item name="Road Restrictions" icon="presets/vehicle/restriction/maxspeed.svg" type="node,way,closedway,multipolygon" preset_name_label="true" > <!-- There are links from MP relations to this preset -->
+        <link wiki="Key:access" />
+        <space />
+        <checkgroup columns="3" >
+            <check key="oneway" text="Oneway" />
+            <check key="toll" text="Toll" />
+            <check key="noexit" text="No exit (cul-de-sac)" disable_off="true" />
+            <check key="winter_road" text="Winter road" disable_off="true" />
+            <check key="ice_road" text="Ice road" disable_off="true" />
+        </checkgroup>
+        <text key="maxspeed" text="Max. speed (km/h)" />
+        <text key="maxspeed:forward" text="Max. speed in way direction" />
+        <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
+        <text key="maxspeed:hgv" text="Max. speed Heavy Goods Vehicles (km/h)" match="key" />
+        <text key="maxspeed:advisory" text="Signposted advisory max. speed (km/h)" />
+        <text key="minspeed" text="Min. speed (km/h)" match="key" />
+        <space />
+        <reference ref="highway_max" />
+        <space />
+        <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" values_context="overtaking" values_sort="false" match="key" />
+        <preset_link preset_name="Access Restrictions" />
+    </item> <!-- Road Restrictions -->
+    <item name="Access Restrictions" icon="presets/vehicle/restriction/restrictions.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true"> <!-- There are links from MPs and route relations to this preset -->
+        <link wiki="Key:access" />
+        <space />
+        <label text="Some road types already imply some access restrictions which should not be set again." />
+        <space />
+        <label text="Transport mode restrictions" />
+        <combo key="access" text="General Access" values="yes,destination,delivery,permissive,permit,private,customers,agricultural,forestry,no" values_searchable="true" values_sort="false" match="key" />
+        <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,use_sidepath,no" values_sort="false" match="key" />
+        <reference ref="wheelchair" />
+        <combo key="ski" text="Ski" values="yes,official,designated,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
+        <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
+        <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
+        <space />
+        <label text="Vehicles per type" />
+        <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
+        <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,use_sidepath,no" values_sort="false" match="key" />
+        <combo key="carriage" text="Carriage" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
+        <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
+        <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
+        <combo key="moped" text="Moped" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
+        <combo key="mofa" text="Mofa" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
+        <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
+        <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
+        <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
+        <combo key="bdouble" text="B-double road train" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
+        <combo key="agricultural" text="Agricultural Vehicles (with restrictions e.g. max. 25 km/h)" values="yes,official,designated,destination,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
+        <combo key="4wd_only" text="4WD only" values="yes,recommended,no" values_sort="false" match="key" />
+        <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
+        <combo key="golf_cart" text="Golf cart" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
+        <space />
+        <label text="Vehicles per use" />
+        <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,no" values_sort="false" match="keyvalue" />
+        <combo key="disabled" text="Disabled" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
+        <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
+        <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
+        <combo key="bus" text="Public Transportation Bus" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
+        <combo key="taxi" text="Taxi" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
+        <combo key="tourist_bus" text="Tourist buses" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
+        <combo key="hazmat" text="Hazmat" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
+        <preset_link preset_name="Road Restrictions" />
+    </item> <!-- Access Restrictions -->
+    <separator/>
     <group name="Waypoints" icon="presets/vehicle/waypoints.svg">
         <item name="Motorway Junction" icon="presets/vehicle/motorway_junction.svg" type="node" preset_name_label="true">
             <link wiki="Tag:highway=motorway_junction" />
@@ -1927,71 +1992,55 @@
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Sally Port -->
     </group> <!-- Barriers -->
-    <group name="Passageways" icon="presets/transport/passage/tunnel.svg">
-        <item name="Tunnel" icon="presets/transport/passage/tunnel.svg" type="way" preset_name_label="true">
-            <link wiki="Key:tunnel" />
-            <key key="tunnel" value="yes" />
-            <optional>
-                <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
-                <text key="width" text="Width (meters)" />
-                <text key="maxheight" text="Max. height (meters)" />
-                <text key="maxwidth" text="Max. width (meters)" match="key" />
-                <space />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <text key="maxspeed:forward" text="Max. speed in way direction" />
-                <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
-                <space />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <check key="toll" text="Toll" />
-            </optional>
-        </item> <!-- Tunnel -->
-        <item name="Building Passage" icon="presets/transport/passage/tunnel_building_passage.svg" type="way" preset_name_label="true">
-            <link wiki="Key:tunnel" />
-            <key key="tunnel" value="building_passage" />
-            <optional>
-                <reference ref="name_layer" />
-                <text key="width" text="Width (meters)" />
-                <text key="maxheight" text="Max. height (meters)" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-            </optional>
-        </item> <!-- Building Passage -->
-        <item name="Arcade" icon="presets/transport/passage/arcade.svg" type="way" preset_name_label="true">
-            <link wiki="Key:covered" />
-            <space />
-            <key key="covered" value="arcade" />
-            <check key="arcade:left" value_on="open" text="Open on left side" disable_off="true" />
-            <check key="arcade:right" value_on="open" text="Open on right side" disable_off="true" />
-            <optional>
-                <reference ref="name_layer" />
-                <text key="width" text="Width (meters)" />
-            </optional>
-        </item> <!-- Arcade -->
-        <item name="Colonnade" icon="presets/transport/passage/colonnade.svg" type="way" preset_name_label="true">
-            <link wiki="Key:covered" />
-            <space />
-            <key key="covered" value="colonnade" />
-            <check key="colonnade:left" value_on="open" text="Open on left side" disable_off="true" />
-            <check key="colonnade:right" value_on="open" text="Open on right side" disable_off="true" />
-            <optional>
-                <reference ref="name_layer" />
-                <text key="width" text="Width (meters)" />
-            </optional>
-        </item> <!-- Colonnade -->
-        <item name="Avalanche Protector" icon="presets/transport/passage/tunnel_avalanche_protector.svg" type="way" preset_name_label="true">
-            <link wiki="Key:tunnel" />
+    <separator/>
+    <item name="Highway Area" icon="presets/transport/way/way_residential.svg" type="closedway,multipolygon" preset_name_label="true">
+        <link wiki="Key:area:highway" />
             <space />
-            <key key="tunnel" value="avalanche_protector" />
-            <check key="avalanche_protector:left" value_on="open" text="Open on left side" disable_off="true" />
-            <check key="avalanche_protector:right" value_on="open" text="Open on right side" disable_off="true" />
+        <combo key="area:highway" text="Type of highway" values_context="highway" values_searchable="true" values_sort="false" match="key!"> <!-- FIXME: two icons missing -->
+            <list_entry value="motorway" display_value="Motorway" icon="presets/transport/way/way_motorway.svg" />
+            <list_entry value="motorway_link" display_value="Motorway Link" icon="presets/transport/way/way_motorway_link.svg" />
+            <list_entry value="trunk" display_value="Trunk" icon="presets/transport/way/way_trunk.svg" />
+            <list_entry value="trunk_link" display_value="Trunk Link" icon="presets/transport/way/way_trunk_link.svg" />
+            <list_entry value="primary" display_value="Primary" icon="presets/transport/way/way_primary.svg" />
+            <list_entry value="primary_link" display_value="Primary Link" icon="presets/transport/way/way_primary_link.svg" />
+            <list_entry value="secondary" display_value="Secondary" icon="presets/transport/way/way_secondary.svg" />
+            <list_entry value="secondary_link" display_value="Secondary" icon="presets/transport/way/way_secondary_link.svg" />
+            <list_entry value="tertiary" display_value="Tertiary" icon="presets/transport/way/way_tertiary.svg" />
+            <list_entry value="tertiary_link" display_value="Tertiary Link" icon="presets/transport/way/way_tertiary_link.svg" />
+            <list_entry value="unclassified" display_value="Unclassified" icon="presets/transport/way/way_unclassified.svg" />
+            <list_entry value="residential" display_value="Residential" icon="presets/transport/way/way_residential.svg" />
+            <list_entry value="living_street" display_value="Living Street" icon="presets/transport/way/way_living_street.svg" />
+            <list_entry value="pedestrian" display_value="Pedestrian" icon="presets/transport/way/way_pedestrian.svg" />
+            <list_entry value="bus_guideway" display_value="Bus Guideway" icon="presets/transport/railway/bus_guideway.svg" />
+            <list_entry value="busway" display_value="Bus Rapid Transit" />
+            <list_entry value="service" display_value="Service" icon="presets/transport/way/way_service.svg" />
+            <list_entry value="escape" display_value="Escape" icon="presets/transport/way/way_escape.svg" />
+            <list_entry value="raceway" display_value="Raceway" icon="presets/sport/raceway.svg"  />
+            <list_entry value="road" display_value="Road (Unknown Type)" icon="presets/transport/way/way_road.svg" />
+            <list_entry value="construction" display_value="Construction" icon="presets/transport/way/way_construction.svg" />
+            <list_entry value="track" display_value="Track" icon="presets/transport/way/track.svg" />
+            <list_entry value="path" display_value="Path" icon="presets/transport/way/path.svg" />
+            <list_entry value="bridleway" display_value="Dedicated Bridleway" icon="presets/transport/way/dedicated_bridleway.svg" />
+            <list_entry value="cycleway" display_value="Dedicated Cycleway" icon="presets/transport/way/dedicated_cycleway.svg" />
+            <list_entry value="footway" display_value="Dedicated Footway" icon="presets/transport/way/dedicated_footway.svg" />
+            <list_entry value="steps" display_value="Steps" icon="presets/transport/way/steps.svg" />
+            <list_entry value="shoulder" display_value="Shoulder" />
+            <list_entry value="traffic_island" display_value="Traffic Island" icon="presets/vehicle/island.svg" />
+            <list_entry value="passing_place" display_value="Passing Place" icon="presets/vehicle/passing_place.svg" />
+            <list_entry value="turning_circle" display_value="Turning Circle" icon="presets/vehicle/turning_circle.svg" />
+            <list_entry value="turning_loop" display_value="Turning Loop" icon="presets/vehicle/turning_loop.svg" />
+        </combo>
             <optional>
-                <reference ref="name_layer" />
-                <text key="width" text="Width (meters)" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+            <combo key="junction" text="Junction" values_searchable="true" values_sort="false">
+                <list_entry value="roundabout" display_value="Roundabout" icon="presets/vehicle/restriction/roundabout_right.svg" />
+                <list_entry value="circular" display_value="Circular junction" icon="presets/vehicle/restriction/junction_circular.svg" />
+                <list_entry value="mini_roundabout" display_value="Mini-Roundabout" icon="presets/vehicle/restriction/mini_roundabout_left.svg" />
+                <list_entry value="yes" display_value="Junction" name_context="junction=yes" icon="presets/vehicle/junction.svg" />
+            </combo>
+            <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
+            <check key="covered" text="Covered" disable_off="true" />
             </optional>
-        </item> <!-- Avalanche Protector -->
-    </group> <!-- Passageways -->
+    </item> <!-- Highway Area -->
   </group> <!-- Highways -->
   <group name="Water" name_context="main group" icon="presets/nautical/waterway_river.svg">
     <group name="Water" name_context="sub group" icon="presets/nautical/waterway_river.svg">
Index: resources/styles/standard/elemstyles.mapcss
===================================================================
--- resources/styles/standard/elemstyles.mapcss	(revision 18324)
+++ resources/styles/standard/elemstyles.mapcss	(working copy)
@@ -71,6 +71,12 @@
   default: false;
 }
 
+setting::area_highway_opacity {
+    type: double;
+    label: tr("area:highway opacity");
+    default: 0.1;
+}
+
 /*********************/
 /* turn restrictions */
 /*********************/
@@ -530,6 +536,223 @@
     set icon_z17;
 }
 
+/*********************/
+/* area:highway tags */
+/*********************/
+
+area["area:highway"="motorway"]:closed {
+    fill-color: motorway#809bc0;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="motorway_link"]:closed {
+    fill-color: motorway#809bc0;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="trunk"]:closed {
+    fill-color: trunk#7fc97f;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="trunk_link"]:closed {
+    fill-color: trunk#7fc97f;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="primary"]:closed {
+    fill-color: primary#fb805f;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="primary_link"]:closed {
+    fill-color: primary#fb805f;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="secondary"]:closed {
+    fill-color: secondary#fdbf6f;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="secondary_link"]:closed {
+    fill-color: secondary#fdbf6f;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="tertiary"]:closed {
+    fill-color: tertiary#f7f496;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="tertiary_link"]:closed {
+    fill-color: tertiary#f7f496;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="unclassified"]:closed {
+    fill-color: street#c0c0c0;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="residential"]:closed {
+    fill-color: street#c0c0c0;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="road"]:closed {
+    fill-color: highway_road#770000;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="living_street"]:closed {
+    fill-color: street#c0c0c0;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+    dashes-background-color: livingdashed#00ff00;
+}
+area["area:highway"="pedestrian"]:closed {
+    fill-color: foot#00ff00;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="raceway"]:closed {
+    fill-color: raceway#ff80ff;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="service"]:closed {
+    fill-color: service#809bc0;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="cycleway"]:closed {
+    fill-color: bicycle#b100ff;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="footway"]:closed {
+    fill-color: foot#00ff00;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="track"]:closed {
+    fill-color: highway_track#6e541c;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="bridleway"]:closed {
+    fill-color: horse#a18559;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="path"]:closed {
+    fill-color: foot#00ff00;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="construction"]:closed {
+    fill-color: construction#ffff00;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="steps"]:closed {
+    fill-color: foot#00ff00;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="bus_guideway"]:closed {
+    fill-color: rail#404040;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="escape"]:closed {
+    fill-color: street#c0c0c0;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="traffic_island"]:closed {
+    fill-color: street#c0c0c0;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="platform"]:closed {
+    fill-color: highway_platform#c0c0c0;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="bus_stop"]:closed {
+    fill-color: bus#89cbeb;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="busway"]:closed {
+    fill-color: bus#89cbeb;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="shoulder"]:closed {
+    fill-color: street#c0c0c0;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="emergency_bay"]:closed {
+    fill-color: street#c0c0c0;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="passing_place"]:closed {
+    fill-color: street#c0c0c0;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="turning_circle"]:closed {
+    fill-color: street#c0c0c0;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+area["area:highway"="turning_loop"]:closed {
+    fill-color: street#c0c0c0;
+    fill-opacity: setting("area_highway_opacity");
+    width: 1;
+    dashes: 9,3;
+}
+
+
 /****************/
 /* highway tags */
 /****************/
@@ -726,13 +949,7 @@
 way[highway=raceway][area?], relation[type=multipolygon][highway=raceway] {
     fill-color: raceway#ff80ff;
 }
-area[junction=yes] {
-    fill-color: junction#c0c0c0;
-}
-node[junction=yes] {
-    icon-image: "presets/vehicle/junction.svg";
-    set icon_z17;
-}
+
 node[highway=traffic_mirror] {
     icon-image: "presets/vehicle/traffic_mirror.svg";
     set icon_z17;
@@ -975,6 +1192,15 @@
 /* junction tag */
 /****************/
 
+area["junction"][!"junction"?!] {
+    set junctionArea;
+}
+
+node[junction=yes] {
+    icon-image: "presets/vehicle/junction.svg";
+    set icon_z17;
+}
+
 node[junction=roundabout] {
     icon-image: "presets/vehicle/restriction/roundabout_left.svg";
     set icon_z17;
@@ -984,6 +1210,30 @@
     set icon_z17;
 }
 
+area.junctionArea[!"area:highway"] {
+    fill-color: junction#c0c0c0;
+}
+
+/********************************/
+/* area:highway + junction tags */
+/********************************/
+
+area.junctionArea["area:highway"]:closed {
+    dashes-background-color: junction#c0c0c0;
+}
+area.junctionArea["area:highway"]:clockwise:closed {
+    right-casing-width: 10;
+    right-casing-color: junction#c0c0c0;
+    right-casing-linejoin: miter;
+    right-casing-opacity: setting("area_highway_opacity") + 0.1;
+}
+area.junctionArea["area:highway"]:anticlockwise:closed {
+    left-casing-width: 10;
+    left-casing-color: junction#c0c0c0;
+    left-casing-linejoin: miter;
+    left-casing-opacity: setting("area_highway_opacity") + 0.1;
+}
+
 /*****************/
 /* cycleway tags */
 /*****************/