Changeset 18259 in josm for trunk/resources


Ignore:
Timestamp:
2021-10-09T03:54:50+02:00 (3 years ago)
Author:
Don-vip
Message:

fix #21415 - Disable bicycle/horse=no on pedestrian crossing (patch by skyper)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r18249 r18259  
    121121            </checkgroup>
    122122        </optional>
     123    </chunk>
     124    <chunk id="check_crossing_access">
     125        <checkgroup columns="2">
     126            <check key="bicycle" text="Cross by bicycle" icon="presets/vehicle/restriction/plain/bicycle.svg" disable_off="true" />
     127            <check key="horse" text="Cross on horseback" icon="presets/vehicle/restriction/plain/horse.svg" disable_off="true" />
     128        </checkgroup>
    123129    </chunk>
    124130    <chunk id="common_advertising">
    … …  
    13221328            </optional>
    13231329            <optional text="Optional crossing attributes:">
    1324                 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,unmarked,no" />
     1330                <combo key="crossing" text="Pedestrian crossing type" >
     1331                    <list_entry value="uncontrolled" icon="presets/vehicle/crossing.svg" />
     1332                    <list_entry value="traffic_signals" icon="presets/vehicle/crossing_traffic_signals.svg" />
     1333                    <list_entry value="unmarked" icon="presets/vehicle/crossing_unmarked.svg" />
     1334                    <list_entry value="no" />
     1335                </combo>
    13251336                <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
    13261337                <combo key="kerb" text="Kerb" values="flush,lowered,no,raised,rolled,yes" values_context="kerb" />
     1338                <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_i18n="false" values_sort="false" />
    13271339                <check key="crossing:island" text="With island" />
    1328                 <check key="button_operated" text="Button operated" />
    1329                 <check key="traffic_signals:sound" text="Sound signals" />
    1330                 <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_i18n="false" values_sort="false" />
    1331                 <check key="bicycle" text="Cross by bicycle" />
    1332                 <check key="horse" text="Cross on horseback" />
     1340                <reference ref="check_crossing_access" />
     1341                <label text="In case of crossing traffic signals:" />
     1342                <checkgroup columns="2">
     1343                    <check key="button_operated" text="Button operated" />
     1344                    <check key="traffic_signals:sound" text="Sound signals" />
     1345                </checkgroup>
    13331346            </optional>
    13341347            <optional text="Optional values for specific countries">
    … …  
    13761389            <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" />
    13771390            <check key="crossing:island" text="With island" />
    1378             <check key="bicycle" text="Cross by bicycle" />
    1379             <check key="horse" text="Cross on horseback" />
     1391            <reference ref="check_crossing_access" />
    13801392            <label text="In case of traffic signals:" />
    1381             <check key="button_operated" text="Button operated" />
    1382             <check key="traffic_signals:sound" text="Sound signals" />
     1393            <checkgroup columns="2">
     1394                <check key="button_operated" text="Button operated" />
     1395                <check key="traffic_signals:sound" text="Sound signals" />
     1396            </checkgroup>
    13831397        </item> <!-- Pedestrian Crossing -->
    13841398        <group name="Traffic Calming" icon="presets/vehicle/choker.svg">
    … …  
    24092423                <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals" />
    24102424                <reference ref="supervised" />
    2411                 <check key="horse" text="Cross on horseback" />
    2412                 <check key="bicycle" text="Cross by bicycle" />
     2425                <reference ref="check_crossing_access" />
    24132426                <check key="crossing:light" text="Traffic lights" />
    24142427                <check key="crossing:bell" text="Sound signals" />
Note: See TracChangeset for help on using the changeset viewer.