Ticket #20102: josm_20102.patch

File josm_20102.patch, 45.3 KB (added by skyper, 4 years ago)

adds values_context to preset; all in one patch ready for commit

  • resources/data/defaultpresets.xml

     
    250250        <combo key="access" text="General Access" values="yes,private,customers,permissive,permit,no" values_sort="false" />
    251251    </chunk>
    252252    <chunk id="path_access_modes">
    253         <combo key="ski" text="Ski" values="yes,official,designated,permissive,permit,private,no" values_sort="false" />
    254         <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     253        <combo key="ski" text="Ski" values="yes,official,designated,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     254        <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
    255255        <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
    256         <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     256        <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
    257257        <space />
    258258        <label text="Tags which are implied and do not need to be set are `motor_vehicle=no` and `emergency=destination`." />
    259259        <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    … …  
    10071007            <reference ref="link_road_access_restrictions" />
    10081008        </item> <!-- Construction -->
    10091009        <separator/>
    1010         <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 -->
    1011             <link wiki="Key:access" />
    1012             <space />
    1013             <checkgroup columns="3" >
    1014                 <check key="oneway" text="Oneway" />
    1015                 <check key="toll" text="Toll" />
    1016                 <check key="noexit" text="No exit (cul-de-sac)" disable_off="true" />
    1017                 <check key="winter_road" text="Winter road" disable_off="true" />
    1018                 <check key="ice_road" text="Ice road" disable_off="true" />
    1019             </checkgroup>
    1020             <text key="maxspeed" text="Max. speed (km/h)" />
    1021             <text key="maxspeed:forward" text="Max. speed in way direction" />
    1022             <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
    1023             <text key="maxspeed:hgv" text="Max. speed Heavy Goods Vehicles (km/h)" match="key" />
    1024             <text key="maxspeed:advisory" text="Signposted advisory max. speed (km/h)" />
    1025             <text key="minspeed" text="Min. speed (km/h)" match="key" />
    1026             <space />
    1027             <reference ref="highway_max" />
    1028             <space />
    1029             <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" values_context="overtaking" values_sort="false" match="key" />
    1030             <preset_link preset_name="Access Restrictions" />
    1031         </item> <!-- Road Restrictions -->
    1032         <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 -->
    1033             <link wiki="Key:access" />
    1034             <space />
    1035             <label text="Some road types already imply some access restrictions which should not be set again." />
    1036             <space />
    1037             <label text="Transport mode restrictions" />
    1038             <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" />
    1039             <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,permit,private,use_sidepath,no" values_sort="false" match="key" />
    1040             <reference ref="wheelchair" />
    1041             <combo key="ski" text="Ski" values="yes,official,designated,permissive,permit,private,no" values_sort="false" />
    1042             <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
    1043             <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" match="key" />
    1044             <space />
    1045             <label text="Vehicles per type" />
    1046             <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1047             <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,use_sidepath,no" values_sort="false" match="key" />
    1048             <combo key="carriage" text="Carriage" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1049             <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1050             <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1051             <combo key="moped" text="Moped" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1052             <combo key="mofa" text="Mofa" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1053             <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1054             <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" />
    1055             <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" />
    1056             <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" />
    1057             <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" />
    1058             <combo key="4wd_only" text="4WD only" values="yes,recommended,no" values_sort="false" match="key" />
    1059             <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    1060             <combo key="golf_cart" text="Golf cart" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" match="key" />
    1061             <space />
    1062             <label text="Vehicles per use" />
    1063             <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,no" values_sort="false" match="keyvalue" />
    1064             <combo key="disabled" text="Disabled" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
    1065             <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
    1066             <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
    1067             <combo key="bus" text="Public Transportation Bus" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
    1068             <combo key="taxi" text="Taxi" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
    1069             <combo key="tourist_bus" text="Tourist buses" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
    1070             <combo key="hazmat" text="Hazmat" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
    1071             <preset_link preset_name="Road Restrictions" />
    1072         </item> <!-- Access Restrictions -->
    1073         <separator/>
    10741010        <item name="Roundabout" icon="presets/vehicle/restriction/roundabout_right.svg" type="node,way,closedway" preset_name_label="true">
    10751011            <link wiki="Tag:junction=roundabout" />
    10761012            <space />
    … …  
    11371073                <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    11381074                <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    11391075                <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    1140                 <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1076                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
    11411077            </optional>
    11421078            <reference ref="link_road_access_restrictions" />
    11431079        </item> <!-- Track -->
    … …  
    11621098                    <check key="segregated" text="Segregated" />
    11631099                    <check key="informal" text="Informal" disable_off="true" />
    11641100                </checkgroup>
    1165                 <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1101                <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
    11661102                <reference ref="wheelchair" />
    1167                 <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1103                <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
    11681104                <reference ref="path_access_modes" />
    11691105            </optional>
    11701106            <reference ref="link_road_access_restrictions" />
    … …  
    11821118                <space />
    11831119                <label text="Depending on the country, several access tags are implied and do not need to be set." />
    11841120                <label text="Globally, `horse=designated` and `motor_vehicle=no` are implied." />
    1185                 <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1121                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
    11861122                <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
    1187                 <combo key="foot" text="Foot" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1123                <combo key="foot" text="Foot" values="yes,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
    11881124                <reference ref="wheelchair" />
    1189                 <combo key="bicycle" text="Bicycle" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1125                <combo key="bicycle" text="Bicycle" values="yes,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
    11901126                <combo key="ski" text="Ski" values="yes,permissive,private,no" values_sort="false" />
    1191                 <combo key="snowmobile" text="Snowmobile" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1127                <combo key="snowmobile" text="Snowmobile" values="yes,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
    11921128                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    11931129                <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    11941130            </optional>
    … …  
    12201156                <label text="Globally, `bicycle=designated` is implied." />
    12211157                <combo key="foot" text="Pedestrians" values="yes,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    12221158                <reference ref="wheelchair" />
    1223                 <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" values_sort="false" />
    1224                 <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1159                <combo key="ski" text="Ski" values="yes,official,designated,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1160                <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
    12251161                <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
    1226                 <combo key="horse" text="Horse" values="yes,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1162                <combo key="horse" text="Horse" values="yes,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
    12271163                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    12281164                <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    12291165            </optional>
    … …  
    12751211                <space />
    12761212                <label text="Depending on the country, several access tags are implied and do not need to be set." />
    12771213                <label text="Globally, `foot=designated` is implied." />
    1278                 <combo key="bicycle" text="Bicycle" values="yes,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
    1279                 <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" values_sort="false" />
    1280                 <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1214                <combo key="bicycle" text="Bicycle" values="yes,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
     1215                <combo key="ski" text="Ski" values="yes,official,designated,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1216                <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
    12811217                <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
    1282                 <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
     1218                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
    12831219                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
    12841220                <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    12851221            </optional>
    … …  
    13161252            </optional>
    13171253        </item> <!-- Steps -->
    13181254    </group> <!-- Ways -->
     1255    <group name="Passageways" icon="presets/transport/passage/tunnel.svg">
     1256        <item name="Tunnel" icon="presets/transport/passage/tunnel.svg" type="way" preset_name_label="true">
     1257            <link wiki="Key:tunnel" />
     1258            <key key="tunnel" value="yes" />
     1259            <optional>
     1260                <text key="name" text="Name" />
     1261                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
     1262                <text key="width" text="Width (meters)" />
     1263                <text key="maxheight" text="Max. height (meters)" />
     1264                <text key="maxwidth" text="Max. width (meters)" match="key" />
     1265                <space />
     1266                <text key="maxspeed" text="Max. speed (km/h)" />
     1267                <text key="maxspeed:forward" text="Max. speed in way direction" />
     1268                <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
     1269                <space />
     1270                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     1271                <check key="toll" text="Toll" />
     1272            </optional>
     1273        </item> <!-- Tunnel -->
     1274        <item name="Building Passage" icon="presets/transport/passage/tunnel_building_passage.svg" type="way" preset_name_label="true">
     1275            <link wiki="Key:tunnel" />
     1276            <key key="tunnel" value="building_passage" />
     1277            <optional>
     1278                <reference ref="name_layer" />
     1279                <text key="width" text="Width (meters)" />
     1280                <text key="maxheight" text="Max. height (meters)" />
     1281                <text key="maxspeed" text="Max. speed (km/h)" />
     1282                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     1283            </optional>
     1284        </item> <!-- Building Passage -->
     1285        <item name="Arcade" icon="presets/transport/passage/arcade.svg" type="way" preset_name_label="true">
     1286            <link wiki="Key:covered" />
     1287            <space />
     1288            <key key="covered" value="arcade" />
     1289            <check key="arcade:left" value_on="open" text="Open on left side" disable_off="true" />
     1290            <check key="arcade:right" value_on="open" text="Open on right side" disable_off="true" />
     1291            <optional>
     1292                <reference ref="name_layer" />
     1293                <text key="width" text="Width (meters)" />
     1294            </optional>
     1295        </item> <!-- Arcade -->
     1296        <item name="Colonnade" icon="presets/transport/passage/colonnade.svg" type="way" preset_name_label="true">
     1297            <link wiki="Key:covered" />
     1298            <space />
     1299            <key key="covered" value="colonnade" />
     1300            <check key="colonnade:left" value_on="open" text="Open on left side" disable_off="true" />
     1301            <check key="colonnade:right" value_on="open" text="Open on right side" disable_off="true" />
     1302            <optional>
     1303                <reference ref="name_layer" />
     1304                <text key="width" text="Width (meters)" />
     1305            </optional>
     1306        </item> <!-- Colonnade -->
     1307        <item name="Avalanche Protector" icon="presets/transport/passage/tunnel_avalanche_protector.svg" type="way" preset_name_label="true">
     1308            <link wiki="Key:tunnel" />
     1309            <space />
     1310            <key key="tunnel" value="avalanche_protector" />
     1311            <check key="avalanche_protector:left" value_on="open" text="Open on left side" disable_off="true" />
     1312            <check key="avalanche_protector:right" value_on="open" text="Open on right side" disable_off="true" />
     1313            <optional>
     1314                <reference ref="name_layer" />
     1315                <text key="width" text="Width (meters)" />
     1316                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     1317            </optional>
     1318        </item> <!-- Avalanche Protector -->
     1319    </group> <!-- Passageways -->
     1320    <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 -->
     1321        <link wiki="Key:access" />
     1322        <space />
     1323        <checkgroup columns="3" >
     1324            <check key="oneway" text="Oneway" />
     1325            <check key="toll" text="Toll" />
     1326            <check key="noexit" text="No exit (cul-de-sac)" disable_off="true" />
     1327            <check key="winter_road" text="Winter road" disable_off="true" />
     1328            <check key="ice_road" text="Ice road" disable_off="true" />
     1329        </checkgroup>
     1330        <text key="maxspeed" text="Max. speed (km/h)" />
     1331        <text key="maxspeed:forward" text="Max. speed in way direction" />
     1332        <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
     1333        <text key="maxspeed:hgv" text="Max. speed Heavy Goods Vehicles (km/h)" match="key" />
     1334        <text key="maxspeed:advisory" text="Signposted advisory max. speed (km/h)" />
     1335        <text key="minspeed" text="Min. speed (km/h)" match="key" />
     1336        <space />
     1337        <reference ref="highway_max" />
     1338        <space />
     1339        <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" values_context="overtaking" values_sort="false" match="key" />
     1340        <preset_link preset_name="Access Restrictions" />
     1341    </item> <!-- Road Restrictions -->
     1342    <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 -->
     1343        <link wiki="Key:access" />
     1344        <space />
     1345        <label text="Some road types already imply some access restrictions which should not be set again." />
     1346        <space />
     1347        <label text="Transport mode restrictions" />
     1348        <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" />
     1349        <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,use_sidepath,no" values_sort="false" match="key" />
     1350        <reference ref="wheelchair" />
     1351        <combo key="ski" text="Ski" values="yes,official,designated,permissive,permit,private,agricultural,forestry,no" values_sort="false" />
     1352        <combo key="dog" text="Dog" values="yes,leashed,unleashed,official,designated,permissive,permit,private,no" values_sort="false" match="key" />
     1353        <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1354        <space />
     1355        <label text="Vehicles per type" />
     1356        <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1357        <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,use_sidepath,no" values_sort="false" match="key" />
     1358        <combo key="carriage" text="Carriage" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1359        <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1360        <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1361        <combo key="moped" text="Moped" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1362        <combo key="mofa" text="Mofa" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1363        <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1364        <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" />
     1365        <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" />
     1366        <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" />
     1367        <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" />
     1368        <combo key="4wd_only" text="4WD only" values="yes,recommended,no" values_sort="false" match="key" />
     1369        <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" />
     1370        <combo key="golf_cart" text="Golf cart" values="yes,official,designated,permissive,destination,delivery,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
     1371        <space />
     1372        <label text="Vehicles per use" />
     1373        <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,no" values_sort="false" match="keyvalue" />
     1374        <combo key="disabled" text="Disabled" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1375        <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1376        <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1377        <combo key="bus" text="Public Transportation Bus" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1378        <combo key="taxi" text="Taxi" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1379        <combo key="tourist_bus" text="Tourist buses" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1380        <combo key="hazmat" text="Hazmat" values="yes,official,designated,destination,permissive,permit,private,no" values_sort="false" match="key" />
     1381        <preset_link preset_name="Road Restrictions" />
     1382    </item> <!-- Access Restrictions -->
     1383    <separator/>
    13191384    <group name="Waypoints" icon="presets/vehicle/waypoints.svg">
    13201385        <item name="Motorway Junction" icon="presets/vehicle/motorway_junction.svg" type="node" preset_name_label="true">
    13211386            <link wiki="Tag:highway=motorway_junction" />
    … …  
    19271992            <preset_link preset_name="Access Restrictions" />
    19281993        </item> <!-- Sally Port -->
    19291994    </group> <!-- Barriers -->
    1930     <group name="Passageways" icon="presets/transport/passage/tunnel.svg">
    1931         <item name="Tunnel" icon="presets/transport/passage/tunnel.svg" type="way" preset_name_label="true">
    1932             <link wiki="Key:tunnel" />
    1933             <key key="tunnel" value="yes" />
    1934             <optional>
    1935                 <text key="name" text="Name" />
    1936                 <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
    1937                 <text key="width" text="Width (meters)" />
    1938                 <text key="maxheight" text="Max. height (meters)" />
    1939                 <text key="maxwidth" text="Max. width (meters)" match="key" />
    1940                 <space />
    1941                 <text key="maxspeed" text="Max. speed (km/h)" />
    1942                 <text key="maxspeed:forward" text="Max. speed in way direction" />
    1943                 <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
    1944                 <space />
    1945                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    1946                 <check key="toll" text="Toll" />
    1947             </optional>
    1948         </item> <!-- Tunnel -->
    1949         <item name="Building Passage" icon="presets/transport/passage/tunnel_building_passage.svg" type="way" preset_name_label="true">
    1950             <link wiki="Key:tunnel" />
    1951             <key key="tunnel" value="building_passage" />
    1952             <optional>
    1953                 <reference ref="name_layer" />
    1954                 <text key="width" text="Width (meters)" />
    1955                 <text key="maxheight" text="Max. height (meters)" />
    1956                 <text key="maxspeed" text="Max. speed (km/h)" />
    1957                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    1958             </optional>
    1959         </item> <!-- Building Passage -->
    1960         <item name="Arcade" icon="presets/transport/passage/arcade.svg" type="way" preset_name_label="true">
    1961             <link wiki="Key:covered" />
    1962             <space />
    1963             <key key="covered" value="arcade" />
    1964             <check key="arcade:left" value_on="open" text="Open on left side" disable_off="true" />
    1965             <check key="arcade:right" value_on="open" text="Open on right side" disable_off="true" />
    1966             <optional>
    1967                 <reference ref="name_layer" />
    1968                 <text key="width" text="Width (meters)" />
    1969             </optional>
    1970         </item> <!-- Arcade -->
    1971         <item name="Colonnade" icon="presets/transport/passage/colonnade.svg" type="way" preset_name_label="true">
    1972             <link wiki="Key:covered" />
    1973             <space />
    1974             <key key="covered" value="colonnade" />
    1975             <check key="colonnade:left" value_on="open" text="Open on left side" disable_off="true" />
    1976             <check key="colonnade:right" value_on="open" text="Open on right side" disable_off="true" />
    1977             <optional>
    1978                 <reference ref="name_layer" />
    1979                 <text key="width" text="Width (meters)" />
    1980             </optional>
    1981         </item> <!-- Colonnade -->
    1982         <item name="Avalanche Protector" icon="presets/transport/passage/tunnel_avalanche_protector.svg" type="way" preset_name_label="true">
    1983             <link wiki="Key:tunnel" />
     1995    <separator/>
     1996    <item name="Highway Area" icon="presets/transport/way/way_residential.svg" type="closedway,multipolygon" preset_name_label="true">
     1997        <link wiki="Key:area:highway" />
    19841998            <space />
    1985             <key key="tunnel" value="avalanche_protector" />
    1986             <check key="avalanche_protector:left" value_on="open" text="Open on left side" disable_off="true" />
    1987             <check key="avalanche_protector:right" value_on="open" text="Open on right side" disable_off="true" />
     1999        <combo key="area:highway" text="Type of highway" values_context="highway" values_searchable="true" values_sort="false" match="key!"> <!-- FIXME: two icons missing -->
     2000            <list_entry value="motorway" display_value="Motorway" icon="presets/transport/way/way_motorway.svg" />
     2001            <list_entry value="motorway_link" display_value="Motorway Link" icon="presets/transport/way/way_motorway_link.svg" />
     2002            <list_entry value="trunk" display_value="Trunk" icon="presets/transport/way/way_trunk.svg" />
     2003            <list_entry value="trunk_link" display_value="Trunk Link" icon="presets/transport/way/way_trunk_link.svg" />
     2004            <list_entry value="primary" display_value="Primary" icon="presets/transport/way/way_primary.svg" />
     2005            <list_entry value="primary_link" display_value="Primary Link" icon="presets/transport/way/way_primary_link.svg" />
     2006            <list_entry value="secondary" display_value="Secondary" icon="presets/transport/way/way_secondary.svg" />
     2007            <list_entry value="secondary_link" display_value="Secondary" icon="presets/transport/way/way_secondary_link.svg" />
     2008            <list_entry value="tertiary" display_value="Tertiary" icon="presets/transport/way/way_tertiary.svg" />
     2009            <list_entry value="tertiary_link" display_value="Tertiary Link" icon="presets/transport/way/way_tertiary_link.svg" />
     2010            <list_entry value="unclassified" display_value="Unclassified" icon="presets/transport/way/way_unclassified.svg" />
     2011            <list_entry value="residential" display_value="Residential" icon="presets/transport/way/way_residential.svg" />
     2012            <list_entry value="living_street" display_value="Living Street" icon="presets/transport/way/way_living_street.svg" />
     2013            <list_entry value="pedestrian" display_value="Pedestrian" icon="presets/transport/way/way_pedestrian.svg" />
     2014            <list_entry value="bus_guideway" display_value="Bus Guideway" icon="presets/transport/railway/bus_guideway.svg" />
     2015            <list_entry value="busway" display_value="Bus Rapid Transit" />
     2016            <list_entry value="service" display_value="Service" icon="presets/transport/way/way_service.svg" />
     2017            <list_entry value="escape" display_value="Escape" icon="presets/transport/way/way_escape.svg" />
     2018            <list_entry value="raceway" display_value="Raceway" icon="presets/sport/raceway.svg"  />
     2019            <list_entry value="road" display_value="Road (Unknown Type)" icon="presets/transport/way/way_road.svg" />
     2020            <list_entry value="construction" display_value="Construction" icon="presets/transport/way/way_construction.svg" />
     2021            <list_entry value="track" display_value="Track" icon="presets/transport/way/track.svg" />
     2022            <list_entry value="path" display_value="Path" icon="presets/transport/way/path.svg" />
     2023            <list_entry value="bridleway" display_value="Dedicated Bridleway" icon="presets/transport/way/dedicated_bridleway.svg" />
     2024            <list_entry value="cycleway" display_value="Dedicated Cycleway" icon="presets/transport/way/dedicated_cycleway.svg" />
     2025            <list_entry value="footway" display_value="Dedicated Footway" icon="presets/transport/way/dedicated_footway.svg" />
     2026            <list_entry value="steps" display_value="Steps" icon="presets/transport/way/steps.svg" />
     2027            <list_entry value="shoulder" display_value="Shoulder" />
     2028            <list_entry value="traffic_island" display_value="Traffic Island" icon="presets/vehicle/island.svg" />
     2029            <list_entry value="passing_place" display_value="Passing Place" icon="presets/vehicle/passing_place.svg" />
     2030            <list_entry value="turning_circle" display_value="Turning Circle" icon="presets/vehicle/turning_circle.svg" />
     2031            <list_entry value="turning_loop" display_value="Turning Loop" icon="presets/vehicle/turning_loop.svg" />
     2032        </combo>
    19882033            <optional>
    1989                 <reference ref="name_layer" />
    1990                 <text key="width" text="Width (meters)" />
    1991                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     2034            <combo key="junction" text="Junction" values_searchable="true" values_sort="false">
     2035                <list_entry value="roundabout" display_value="Roundabout" icon="presets/vehicle/restriction/roundabout_right.svg" />
     2036                <list_entry value="circular" display_value="Circular junction" icon="presets/vehicle/restriction/junction_circular.svg" />
     2037                <list_entry value="mini_roundabout" display_value="Mini-Roundabout" icon="presets/vehicle/restriction/mini_roundabout_left.svg" />
     2038                <list_entry value="yes" display_value="Junction" name_context="junction=yes" icon="presets/vehicle/junction.svg" />
     2039            </combo>
     2040            <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
     2041            <check key="covered" text="Covered" disable_off="true" />
    19922042            </optional>
    1993         </item> <!-- Avalanche Protector -->
    1994     </group> <!-- Passageways -->
     2043    </item> <!-- Highway Area -->
    19952044  </group> <!-- Highways -->
    19962045  <group name="Water" name_context="main group" icon="presets/nautical/waterway_river.svg">
    19972046    <group name="Water" name_context="sub group" icon="presets/nautical/waterway_river.svg">

  • resources/styles/standard/elemstyles.mapcss

     
    7171  default: false;
    7272}
    7373
     74setting::area_highway_opacity {
     75    type: double;
     76    label: tr("area:highway opacity");
     77    default: 0.1;
     78}
     79
    7480/*********************/
    7581/* turn restrictions */
    7682/*********************/
    … …  
    530536    set icon_z17;
    531537}
    532538
     539/*********************/
     540/* area:highway tags */
     541/*********************/
     542
     543area["area:highway"="motorway"]:closed {
     544    fill-color: motorway#809bc0;
     545    fill-opacity: setting("area_highway_opacity");
     546    width: 1;
     547    dashes: 9,3;
     548}
     549area["area:highway"="motorway_link"]:closed {
     550    fill-color: motorway#809bc0;
     551    fill-opacity: setting("area_highway_opacity");
     552    width: 1;
     553    dashes: 9,3;
     554}
     555area["area:highway"="trunk"]:closed {
     556    fill-color: trunk#7fc97f;
     557    fill-opacity: setting("area_highway_opacity");
     558    width: 1;
     559    dashes: 9,3;
     560}
     561area["area:highway"="trunk_link"]:closed {
     562    fill-color: trunk#7fc97f;
     563    fill-opacity: setting("area_highway_opacity");
     564    width: 1;
     565    dashes: 9,3;
     566}
     567area["area:highway"="primary"]:closed {
     568    fill-color: primary#fb805f;
     569    fill-opacity: setting("area_highway_opacity");
     570    width: 1;
     571    dashes: 9,3;
     572}
     573area["area:highway"="primary_link"]:closed {
     574    fill-color: primary#fb805f;
     575    fill-opacity: setting("area_highway_opacity");
     576    width: 1;
     577    dashes: 9,3;
     578}
     579area["area:highway"="secondary"]:closed {
     580    fill-color: secondary#fdbf6f;
     581    fill-opacity: setting("area_highway_opacity");
     582    width: 1;
     583    dashes: 9,3;
     584}
     585area["area:highway"="secondary_link"]:closed {
     586    fill-color: secondary#fdbf6f;
     587    fill-opacity: setting("area_highway_opacity");
     588    width: 1;
     589    dashes: 9,3;
     590}
     591area["area:highway"="tertiary"]:closed {
     592    fill-color: tertiary#f7f496;
     593    fill-opacity: setting("area_highway_opacity");
     594    width: 1;
     595    dashes: 9,3;
     596}
     597area["area:highway"="tertiary_link"]:closed {
     598    fill-color: tertiary#f7f496;
     599    fill-opacity: setting("area_highway_opacity");
     600    width: 1;
     601    dashes: 9,3;
     602}
     603area["area:highway"="unclassified"]:closed {
     604    fill-color: street#c0c0c0;
     605    fill-opacity: setting("area_highway_opacity");
     606    width: 1;
     607    dashes: 9,3;
     608}
     609area["area:highway"="residential"]:closed {
     610    fill-color: street#c0c0c0;
     611    fill-opacity: setting("area_highway_opacity");
     612    width: 1;
     613    dashes: 9,3;
     614}
     615area["area:highway"="road"]:closed {
     616    fill-color: highway_road#770000;
     617    fill-opacity: setting("area_highway_opacity");
     618    width: 1;
     619    dashes: 9,3;
     620}
     621area["area:highway"="living_street"]:closed {
     622    fill-color: street#c0c0c0;
     623    fill-opacity: setting("area_highway_opacity");
     624    width: 1;
     625    dashes: 9,3;
     626    dashes-background-color: livingdashed#00ff00;
     627}
     628area["area:highway"="pedestrian"]:closed {
     629    fill-color: foot#00ff00;
     630    fill-opacity: setting("area_highway_opacity");
     631    width: 1;
     632    dashes: 9,3;
     633}
     634area["area:highway"="raceway"]:closed {
     635    fill-color: raceway#ff80ff;
     636    fill-opacity: setting("area_highway_opacity");
     637    width: 1;
     638    dashes: 9,3;
     639}
     640area["area:highway"="service"]:closed {
     641    fill-color: service#809bc0;
     642    fill-opacity: setting("area_highway_opacity");
     643    width: 1;
     644    dashes: 9,3;
     645}
     646area["area:highway"="cycleway"]:closed {
     647    fill-color: bicycle#b100ff;
     648    fill-opacity: setting("area_highway_opacity");
     649    width: 1;
     650    dashes: 9,3;
     651}
     652area["area:highway"="footway"]:closed {
     653    fill-color: foot#00ff00;
     654    fill-opacity: setting("area_highway_opacity");
     655    width: 1;
     656    dashes: 9,3;
     657}
     658area["area:highway"="track"]:closed {
     659    fill-color: highway_track#6e541c;
     660    fill-opacity: setting("area_highway_opacity");
     661    width: 1;
     662    dashes: 9,3;
     663}
     664area["area:highway"="bridleway"]:closed {
     665    fill-color: horse#a18559;
     666    fill-opacity: setting("area_highway_opacity");
     667    width: 1;
     668    dashes: 9,3;
     669}
     670area["area:highway"="path"]:closed {
     671    fill-color: foot#00ff00;
     672    fill-opacity: setting("area_highway_opacity");
     673    width: 1;
     674    dashes: 9,3;
     675}
     676area["area:highway"="construction"]:closed {
     677    fill-color: construction#ffff00;
     678    fill-opacity: setting("area_highway_opacity");
     679    width: 1;
     680    dashes: 9,3;
     681}
     682area["area:highway"="steps"]:closed {
     683    fill-color: foot#00ff00;
     684    fill-opacity: setting("area_highway_opacity");
     685    width: 1;
     686    dashes: 9,3;
     687}
     688area["area:highway"="bus_guideway"]:closed {
     689    fill-color: rail#404040;
     690    fill-opacity: setting("area_highway_opacity");
     691    width: 1;
     692    dashes: 9,3;
     693}
     694area["area:highway"="escape"]:closed {
     695    fill-color: street#c0c0c0;
     696    fill-opacity: setting("area_highway_opacity");
     697    width: 1;
     698    dashes: 9,3;
     699}
     700area["area:highway"="traffic_island"]:closed {
     701    fill-color: street#c0c0c0;
     702    fill-opacity: setting("area_highway_opacity");
     703    width: 1;
     704    dashes: 9,3;
     705}
     706area["area:highway"="platform"]:closed {
     707    fill-color: highway_platform#c0c0c0;
     708    fill-opacity: setting("area_highway_opacity");
     709    width: 1;
     710    dashes: 9,3;
     711}
     712area["area:highway"="bus_stop"]:closed {
     713    fill-color: bus#89cbeb;
     714    fill-opacity: setting("area_highway_opacity");
     715    width: 1;
     716    dashes: 9,3;
     717}
     718area["area:highway"="busway"]:closed {
     719    fill-color: bus#89cbeb;
     720    fill-opacity: setting("area_highway_opacity");
     721    width: 1;
     722    dashes: 9,3;
     723}
     724area["area:highway"="shoulder"]:closed {
     725    fill-color: street#c0c0c0;
     726    fill-opacity: setting("area_highway_opacity");
     727    width: 1;
     728    dashes: 9,3;
     729}
     730area["area:highway"="emergency_bay"]:closed {
     731    fill-color: street#c0c0c0;
     732    fill-opacity: setting("area_highway_opacity");
     733    width: 1;
     734    dashes: 9,3;
     735}
     736area["area:highway"="passing_place"]:closed {
     737    fill-color: street#c0c0c0;
     738    fill-opacity: setting("area_highway_opacity");
     739    width: 1;
     740    dashes: 9,3;
     741}
     742area["area:highway"="turning_circle"]:closed {
     743    fill-color: street#c0c0c0;
     744    fill-opacity: setting("area_highway_opacity");
     745    width: 1;
     746    dashes: 9,3;
     747}
     748area["area:highway"="turning_loop"]:closed {
     749    fill-color: street#c0c0c0;
     750    fill-opacity: setting("area_highway_opacity");
     751    width: 1;
     752    dashes: 9,3;
     753}
     754
     755
    533756/****************/
    534757/* highway tags */
    535758/****************/
    … …  
    726949way[highway=raceway][area?], relation[type=multipolygon][highway=raceway] {
    727950    fill-color: raceway#ff80ff;
    728951}
    729 area[junction=yes] {
    730     fill-color: junction#c0c0c0;
    731 }
    732 node[junction=yes] {
    733     icon-image: "presets/vehicle/junction.svg";
    734     set icon_z17;
    735 }
     952
    736953node[highway=traffic_mirror] {
    737954    icon-image: "presets/vehicle/traffic_mirror.svg";
    738955    set icon_z17;
    … …  
    9751192/* junction tag */
    9761193/****************/
    9771194
     1195area["junction"][!"junction"?!] {
     1196    set junctionArea;
     1197}
     1198
     1199node[junction=yes] {
     1200    icon-image: "presets/vehicle/junction.svg";
     1201    set icon_z17;
     1202}
     1203
    9781204node[junction=roundabout] {
    9791205    icon-image: "presets/vehicle/restriction/roundabout_left.svg";
    9801206    set icon_z17;
    … …  
    9841210    set icon_z17;
    9851211}
    9861212
     1213area.junctionArea[!"area:highway"] {
     1214    fill-color: junction#c0c0c0;
     1215}
     1216
     1217/********************************/
     1218/* area:highway + junction tags */
     1219/********************************/
     1220
     1221area.junctionArea["area:highway"]:closed {
     1222    dashes-background-color: junction#c0c0c0;
     1223}
     1224area.junctionArea["area:highway"]:clockwise:closed {
     1225    right-casing-width: 10;
     1226    right-casing-color: junction#c0c0c0;
     1227    right-casing-linejoin: miter;
     1228    right-casing-opacity: setting("area_highway_opacity") + 0.1;
     1229}
     1230area.junctionArea["area:highway"]:anticlockwise:closed {
     1231    left-casing-width: 10;
     1232    left-casing-color: junction#c0c0c0;
     1233    left-casing-linejoin: miter;
     1234    left-casing-opacity: setting("area_highway_opacity") + 0.1;
     1235}
     1236
    9871237/*****************/
    9881238/* cycleway tags */
    9891239/*****************/