Ticket #17750: josm_17750.patch

File josm_17750.patch, 20.5 KB (added by skyper, 6 years ago)

first patch, still miss some icons

  • resources/data/defaultpresets.xml

     
    9090        <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    9191        <reference ref="railway_electrified_yesno" />
    9292    </chunk>
    93     <chunk id="barrier_5">
    94         <optional text="Allowed traffic:">
    95             <check key="foot" text="Foot"/>
    96             <check key="bicycle" text="Bicycle"/>
    97             <check key="horse" text="Horse" />
    98             <check key="motorcycle" text="Motorcycle" />
    99             <check key="motorcar" text="Motorcar" />
    100         </optional>
    101     </chunk>
    102     <chunk id="barrier_4">
    103         <optional text="Allowed traffic:">
    104             <check key="foot" text="Foot"/>
    105             <check key="bicycle" text="Bicycle"/>
    106             <check key="horse" text="Horse" />
    107             <check key="motorcycle" text="Motorcycle" />
     93    <chunk id="check_access_nomotor">
     94        <optional text="Non-motorized traffic:">
     95            <checkgroup columns="3">
     96                <check key="foot" text="Foot" icon="presets/access/foot.svg" />
     97                <check key="bicycle" text="Bicycle" icon="presets/access/bicycle.svg" />
     98                <check key="horse" text="Horse" icon="presets/access/horse.svg" />
     99            </checkgroup>
     100        <space />
     101        <reference ref="wheelchair" />
    108102        </optional>
    109103    </chunk>
    110     <chunk id="barrier_2">
    111         <optional text="Allowed traffic:">
    112             <check key="foot" text="Foot"/>
    113             <check key="bicycle" text="Bicycle"/>
     104    <chunk id="check_access_motor">
     105        <optional text="Motor vehicle traffic:">
     106            <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
     107            <space />
     108            <checkgroup columns="2">
     109                <check key="motorcar" text="Motorcar" icon="presets/access/motorcar.svg" />
     110                <check key="motorcycle" text="Motorcycle" icon="presets/access/motorcycle.svg" />
     111                <check key="moped" text="Moped" icon="presets/access/moped.svg" />
     112                <check key="mofa" text="Mofa" icon="presets/access/mofa.svg" />
     113            </checkgroup>
    114114        </optional>
    115115    </chunk>
    116116    <chunk id="min_age">
    … …  
    219219    <chunk id="highway_access">
    220220        <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_sort="false" />
    221221    </chunk>
     222    <chunk id="highway_access_vehicle">
     223        <reference ref="highway_access" />
     224        <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
     225    </chunk>
    222226    <chunk id="POI_access">
    223227        <combo key="access" text="General Access" values="yes,private,customers,permissive,no" values_sort="false" />
    224228    </chunk>
    … …  
    14681472        <item name="Block" icon="presets/barrier/block.svg" type="node,way,closedway" preset_name_label="true">
    14691473            <link wiki="Tag:barrier=block" />
    14701474            <key key="barrier" value="block" />
    1471             <reference ref="barrier_4" />
    1472             <optional>
    1473                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1474                 <combo key="material" text="Material" values="concrete,reinforced_concrete,stone" />
    1475             </optional>
     1475            <reference ref="optional_maxwidth" />
     1476            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1477            <space />
     1478            <reference ref="highway_access_vehicle" />
     1479            <reference ref="check_access_nomotor" />
     1480            <reference ref="check_access_motor" />
     1481            <preset_link preset_name="Access Restrictions" />
    14761482        </item> <!-- Block -->
    14771483        <item name="Bollard" icon="presets/barrier/bollard.svg" type="node,way" preset_name_label="true">
    14781484            <link wiki="Tag:barrier=bollard" />
    1479             <space />
    14801485            <key key="barrier" value="bollard" />
    1481             <combo key="bollard" text="Bollard type" values="rising,removable" />
    1482             <reference ref="barrier_4" />
    1483             <optional>
    1484                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1485                 <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
    1486             </optional>
     1486            <space />
     1487            <combo key="bollard" text="Bollard type" values="rising,removable,foldable,fixed" values_searchable="true" />
     1488            <reference ref="optional_maxwidth" />
     1489            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1490            <space />
     1491            <label text="Tags which are implied and do not need to be set are:" />
     1492            <label text="`access=no`, `foot=yes` and `bicycle=yes`" />
     1493            <space />
     1494            <reference ref="highway_access_vehicle" />
     1495            <reference ref="check_access_nomotor" />
     1496            <reference ref="check_access_motor" />
     1497            <preset_link preset_name="Access Restrictions" />
    14871498        </item> <!-- Bollard -->
    14881499        <item name="Cycle Barrier" icon="presets/barrier/cycle_barrier.svg" type="node" preset_name_label="true">
    14891500            <link wiki="Tag:barrier=cycle_barrier" />
    14901501            <key key="barrier" value="cycle_barrier" />
    1491             <reference ref="barrier_4" />
    14921502            <reference ref="optional_maxwidth" />
     1503            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1504            <space />
     1505            <reference ref="highway_access_vehicle" />
     1506            <optional text="Non-motorized traffic:">
     1507                <checkgroup columns="2">
     1508                    <check key="foot" text="Foot" icon="presets/access/foot.svg" />
     1509                    <check key="horse" text="Horse" icon="presets/access/horse.svg" />
     1510                </checkgroup>
     1511                <space />
     1512                <reference ref="wheelchair" />
     1513                <combo key="bicycle" text="Bicycle" values="yes,designated,dismount,no" values_sort="false" />
     1514            </optional>
     1515            <reference ref="check_access_motor" />
     1516            <preset_link preset_name="Access Restrictions" />
    14931517        </item> <!-- Cycle Barrier -->
    14941518        <item name="Cattle Grid" icon="presets/barrier/cattle_grid.svg" type="node" preset_name_label="true">
    14951519            <link wiki="Tag:barrier=cattle_grid" />
    14961520            <key key="barrier" value="cattle_grid" />
    1497             <reference ref="barrier_4" />
     1521            <reference ref="optional_maxwidth" />
     1522            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1523            <space />
     1524            <reference ref="highway_access_vehicle" />
     1525            <reference ref="check_access_nomotor" />
     1526            <reference ref="check_access_motor" />
     1527            <preset_link preset_name="Access Restrictions" />
    14981528        </item> <!-- Cattle Grid -->
    1499         <item name="Bus Trap" type="node" preset_name_label="true">
     1529        <item name="Bus Trap" type="node" icon="presets/barrier/bus_trap.svg" preset_name_label="true">
    15001530            <link wiki="Tag:barrier=bus_trap" />
    15011531            <key key="barrier" value="bus_trap" />
    15021532            <reference ref="optional_maxwidth" />
     1533            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1534            <space />
     1535            <label text="Tags which are implied and do not need to be set are:" />
     1536            <label text="`motor_vehicle=no`, `psv=yes`, `foot=yes` and `bicycle=yes`" />
     1537            <space />
     1538            <reference ref="highway_access_vehicle" />
     1539            <reference ref="check_access_nomotor" />
     1540            <reference ref="check_access_motor" />
    15031541        </item> <!-- Bus Trap -->
    15041542        <item name="Spikes" icon="presets/barrier/spikes.svg" type="node" preset_name_label="true">
    15051543            <link wiki="Tag:barrier=spikes" />
    15061544            <key key="barrier" value="spikes" />
    1507             <reference ref="barrier_5" />
     1545            <reference ref="optional_maxwidth" />
     1546            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1547            <space />
     1548            <reference ref="highway_access_vehicle" />
     1549            <reference ref="check_access_nomotor" />
     1550            <reference ref="check_access_motor" />
     1551            <preset_link preset_name="Access Restrictions" />
    15081552        </item> <!-- Spikes -->
    1509         <item name="Toll Booth" icon="presets/barrier/toll_station.svg" type="node,closedway" preset_name_label="true">
     1553        <item name="Height Restrictor" icon="presets/barrier/height_restrictor.svg" type="node" preset_name_label="true">
     1554            <link wiki="Tag:barrier=height_restrictor" />
     1555            <key key="barrier" value="height_restrictor" />
     1556            <reference ref="optional_maxheight_maxwidth" />
     1557            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1558            <space />
     1559            <reference ref="highway_access_vehicle" />
     1560            <reference ref="check_access_nomotor" />
     1561            <reference ref="check_access_motor" />
     1562            <preset_link preset_name="Access Restrictions" />
     1563        </item> <!-- Spikes -->
     1564        <item name="Toll Booth" icon="presets/barrier/toll_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
    15101565            <link wiki="Tag:barrier=toll_booth" />
    15111566            <key key="barrier" value="toll_booth" />
    15121567            <optional>
    1513                 <text key="name" text="Name" />
    1514                 <text key="operator" text="Operator" />
     1568                <reference ref="name_ref_operator" />
     1569                <reference ref="oh" />
     1570                <reference ref="fee_interval" />
     1571                <combo key="lanes" text="Lanes" values="1,2,3,4,5,6" length="3" />
     1572                <text key="maxheight" text="Max. height (meters)" length="7" />
     1573                <text key="maxwidth" text="Max. width (meters)" length="7" />
    15151574            </optional>
     1575            <space />
     1576            <reference ref="highway_access_vehicle" />
     1577            <reference ref="check_access_nomotor" />
     1578            <reference ref="check_access_motor" />
     1579            <preset_link preset_name="Payment Methods" />
     1580            <preset_link preset_name="Access Restrictions" />
    15161581        </item> <!-- Toll Booth -->
    1517         <item name="Border Control" icon="presets/barrier/douane.svg" type="node" preset_name_label="true">
     1582        <item name="Border Control" icon="presets/barrier/douane.svg" type="node,closedway,multipolygon" preset_name_label="true">
    15181583            <link wiki="Tag:barrier=border_control" />
    15191584            <key key="barrier" value="border_control" />
    1520             <reference ref="barrier_5" />
     1585            <optional>
     1586                <reference ref="name_ref_operator" />
     1587                <reference ref="oh" />
     1588                <combo key="lanes" text="Lanes" values="1,2,3,4,5,6" length="3" />
     1589                <text key="maxheight" text="Max. height (meters)" length="7" />
     1590                <text key="maxwidth" text="Max. width (meters)" length="7" />
     1591            </optional>
     1592            <space />
     1593            <reference ref="highway_access_vehicle" />
     1594            <reference ref="check_access_nomotor" />
     1595            <reference ref="check_access_motor" />
     1596            <preset_link preset_name="Access Restrictions" />
    15211597        </item> <!-- Border Control -->
    15221598        <separator/> <!-- *** Linear Barriers *** -->
    15231599        <item name="Hedge" icon="presets/barrier/hedge.svg" type="way,closedway,multipolygon" preset_name_label="true">
    … …  
    15981674        <item name="Entrance (Barrier Opening)" icon="presets/barrier/entrance.svg" type="node" preset_name_label="true">
    15991675            <link wiki="Tag:barrier=entrance" />
    16001676            <key key="barrier" value="entrance" />
    1601             <reference ref="barrier_5" />
    1602             <reference ref="optional_maxwidth" />
     1677            <reference ref="optional_maxheight_maxwidth" />
     1678            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1679            <space />
     1680            <reference ref="highway_access_vehicle" />
     1681            <reference ref="check_access_nomotor" />
     1682            <reference ref="check_access_motor" />
     1683            <preset_link preset_name="Access Restrictions" />
    16031684        </item> <!-- Entrance (Barrier Opening) -->
    16041685        <item name="Gate" icon="presets/barrier/gate.svg" type="node" preset_name_label="true">
    16051686            <link wiki="Tag:barrier=gate" />
    16061687            <key key="barrier" value="gate" />
    1607             <reference ref="barrier_5" />
    16081688            <reference ref="optional_maxheight_maxwidth" />
    1609             <reference ref="highway_access" />
     1689            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1690            <space />
     1691            <reference ref="highway_access_vehicle" />
     1692            <reference ref="check_access_nomotor" />
     1693            <reference ref="check_access_motor" />
     1694            <preset_link preset_name="Access Restrictions" />
    16101695        </item> <!-- Gate -->
    16111696        <item name="Lift Gate" icon="presets/barrier/lift_gate.svg" type="node" preset_name_label="true">
    16121697            <link wiki="Tag:barrier=lift_gate" />
    16131698            <key key="barrier" value="lift_gate" />
    1614             <reference ref="barrier_5" />
    1615             <reference ref="optional_maxwidth" />
    1616             <reference ref="highway_access" />
     1699            <space />
     1700            <combo key="lift_gate:type" text="Type of lift gate" value="single,double" values_context="lift_gate" values_searchable="true" />
     1701            <reference ref="optional_maxwidth" />
     1702            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1703            <space />
     1704            <reference ref="highway_access_vehicle" />
     1705            <reference ref="check_access_nomotor" />
     1706            <reference ref="check_access_motor" />
     1707            <preset_link preset_name="Access Restrictions" />
    16171708        </item> <!-- Lift Gate -->
    16181709        <item name="Swing Gate" icon="presets/barrier/swing_gate.svg" type="node" preset_name_label="true">
    16191710            <link wiki="Tag:barrier=swing_gate" />
    16201711            <key key="barrier" value="swing_gate" />
    1621             <combo key="swing_gate:type" text="Type" values="single,double" values_context="swing_gate" />
    1622             <reference ref="barrier_5" />
     1712            <space />
     1713            <combo key="swing_gate:type" text="Type of swing gate" values="single,double" values_context="swing_gate" values_searchable="true" />
    16231714            <reference ref="optional_maxwidth" />
    1624             <reference ref="highway_access" />
     1715            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1716            <space />
     1717            <reference ref="highway_access_vehicle" />
     1718            <reference ref="check_access_nomotor" />
     1719            <reference ref="check_access_motor" />
     1720            <preset_link preset_name="Access Restrictions" />
    16251721        </item> <!-- Swing Gate -->
    16261722        <item name="Hampshire Gate" type="node" preset_name_label="true">
    16271723            <link wiki="Tag:barrier=hampshire_gate" />
    16281724            <key key="barrier" value="hampshire_gate" />
    1629             <reference ref="barrier_5" />
    16301725            <reference ref="optional_maxwidth" />
     1726            <text key="maxlength" text="Max. length (meters)" match="key" />
     1727            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1728            <space />
     1729            <reference ref="highway_access_vehicle" />
     1730            <reference ref="check_access_nomotor" />
     1731            <reference ref="check_access_motor" />
     1732            <preset_link preset_name="Access Restrictions" />
    16311733        </item> <!-- Hampshire Gate -->
    16321734        <item name="Bump Gate" type="node" preset_name_label="true">
    16331735            <link wiki="Tag:barrier=bump_gate" />
    16341736            <key key="barrier" value="bump_gate" />
    1635             <reference ref="barrier_5" />
    1636             <reference ref="optional_maxwidth" />
     1737            <reference ref="optional_maxheight_maxwidth" />
     1738            <text key="maxlength" text="Max. length (meters)" match="key" />
     1739            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1740            <space />
     1741            <reference ref="highway_access_vehicle" />
     1742            <reference ref="check_access_nomotor" />
     1743            <reference ref="check_access_motor" />
     1744            <preset_link preset_name="Access Restrictions" />
    16371745        </item> <!-- Bump Gate -->
    16381746        <item name="Kissing Gate" icon="presets/barrier/kissing_gate.svg" type="node" preset_name_label="true">
    16391747            <link wiki="Tag:barrier=kissing_gate" />
    16401748            <key key="barrier" value="kissing_gate" />
    1641             <reference ref="barrier_2" />
    16421749            <reference ref="optional_maxwidth" />
     1750            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1751            <space />
     1752            <label text="The tag `foot=yes` is implied and does not need to be set." />
     1753            <space />
     1754            <reference ref="highway_access_vehicle" />
     1755            <reference ref="check_access_nomotor" />
     1756            <preset_link preset_name="Access Restrictions" />
    16431757        </item> <!-- Kissing Gate -->
    16441758        <item name="Chain" icon="presets/barrier/chain.svg" type="node,way,closedway" preset_name_label="true">
    16451759            <link wiki="Tag:barrier=chain" />
    16461760            <key key="barrier" value="chain" />
    1647             <reference ref="barrier_5" />
    16481761            <reference ref="optional_maxwidth" />
     1762            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1763            <space />
     1764            <reference ref="highway_access_vehicle" />
     1765            <reference ref="check_access_nomotor" />
     1766            <reference ref="check_access_motor" />
     1767            <preset_link preset_name="Access Restrictions" />
    16491768        </item> <!-- Chain -->
    16501769        <item name="Stile" icon="presets/barrier/stile.svg" type="node" preset_name_label="true">
    16511770            <link wiki="Tag:barrier=stile" />
    16521771            <space />
    16531772            <key key="barrier" value="stile" />
    1654             <combo key="stile" text="Type" values="ladder,squeezer,stepover" />
    1655             <optional>
    1656                 <combo key="material" text="Material" values="metal,stone,wood" />
    1657             </optional>
    1658             <reference ref="barrier_2" />
     1773            <combo key="stile" text="Type" values="ladder,squeezer,stepover" values_searchable="true" />
     1774            <reference ref="optional_maxwidth" />
     1775            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1776            <space />
     1777            <reference ref="highway_access_vehicle" />
     1778            <reference ref="check_access_nomotor" />
     1779            <preset_link preset_name="Access Restrictions" />
    16591780        </item> <!-- Stile -->
    16601781        <item name="Turnstile" icon="presets/barrier/turnstile.svg" type="node" preset_name_label="true">
    16611782            <link wiki="Tag:barrier=turnstile" />
    16621783            <key key="barrier" value="turnstile" />
    1663             <reference ref="barrier_2" />
     1784            <reference ref="optional_maxwidth" />
     1785            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1786            <space />
     1787            <reference ref="highway_access_vehicle" />
     1788            <reference ref="check_access_nomotor" />
     1789            <preset_link preset_name="Access Restrictions" />
    16641790        </item> <!-- Turnstile -->
    16651791        <item name="Sally Port" icon="presets/barrier/sally_port.svg" type="node" preset_name_label="true">
    16661792            <link wiki="Tag:barrier=sally_port" />
     1793            <space />
    16671794            <key key="barrier" value="sally_port" />
    1668             <reference ref="barrier_5" />
    1669             <reference ref="optional_maxheight_maxwidth" />
     1795            <text key="maxheight" text="Max. height (meters)" match="key" />
     1796            <text key="maxwidth" text="Max. width (meters)" match="key" />
     1797            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1798            <space />
     1799            <reference ref="highway_access_vehicle" />
     1800            <reference ref="check_access_nomotor" />
     1801            <reference ref="check_access_motor" />
     1802            <preset_link preset_name="Access Restrictions" />
    16701803        </item> <!-- Sally Port -->
    16711804    </group> <!-- Barriers -->
    16721805    <group name="Passageways" icon="presets/transport/passage/tunnel.svg">