Changeset 8146 in josm for trunk


Ignore:
Timestamp:
2015-03-20T20:50:06+01:00 (5 years ago)
Author:
Klumbumbus
Message:

fix #11242 - add some more waterway access rules to presets (patch by skyper)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r8145 r8146  
    309309        </optional>
    310310    </chunk>
     311    <chunk id="waterway">
     312        <reference ref="name_layer" />
     313        <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
     314        <combo key="tunnel" text="Tunnel" values="culvert,yes" />
     315        <text key="width" text="Width (meters)" />
     316    </chunk>
     317    <chunk id="waterway_wikipedia">
     318        <reference ref="waterway" />
     319        <text key="wikipedia" text="Wikipedia" />
     320    </chunk>
     321    <chunk id="water_access">
     322        <optional text="Water access rules:">
     323            <combo key="ship" text="Ship" values="yes,designated,destination,delivery,permissive,private,no" />
     324            <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
     325            <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
     326            <combo key="canoe" text="Canoe" values="yes,designated,destination,delivery,permissive,private,no" />
     327        </optional>
     328    </chunk>
    311329  <!-- Link chunks -->
    312330  <chunk id="link_contact_address">
     
    16751693            <space />
    16761694            <key key="waterway" value="drain" />
    1677             <text key="name" text="Name" />
    1678             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1679             <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
     1695            <optional>
     1696                <reference ref="waterway" />
     1697            </optional>
    16801698        </item> <!-- Drain -->
    16811699        <item name="Ditch" icon="presets/waterway.png" type="way" preset_name_label="true">
     
    16871705            <space />
    16881706            <key key="waterway" value="ditch" />
    1689             <text key="name" text="Name" />
    1690             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1691             <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
     1707            <optional>
     1708                <reference ref="waterway" />
     1709            </optional>
    16921710        </item> <!-- Ditch -->
    16931711        <item name="Stream" icon="presets/waterway.png" type="way" preset_name_label="true">
     
    17041722            <space />
    17051723            <key key="waterway" value="stream" />
    1706             <text key="name" text="Name" />
    1707             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1708             <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
    1709             <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
    1710             <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
     1724            <optional>
     1725                <reference ref="waterway_wikipedia" />
     1726            </optional>
     1727            <reference ref="water_access" />
    17111728        </item> <!-- Stream -->
    1712         <item name="Canal" icon="presets/waterway.png" type="way" preset_name_label="true">
    1713             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
    1714                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=canal"
    1715                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=canal"
    1716                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=canal"
    1717                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:waterway=canal"
    1718                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=canal"
    1719                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=canal" />
    1720             <space />
    1721             <key key="waterway" value="canal" />
    1722             <reference ref="name_wikipedia" />
    1723             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1724             <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
    1725             <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
    1726         </item> <!-- Canal -->
    17271729        <item name="River" icon="presets/river.png" type="way" preset_name_label="true">
    17281730            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
     
    17371739            <space />
    17381740            <key key="waterway" value="river" />
    1739             <reference ref="name_wikipedia" />
    1740             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1741             <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
    1742             <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
    1743             <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
     1741            <optional>
     1742                <reference ref="waterway_wikipedia" />
     1743            </optional>
     1744            <reference ref="water_access" />
    17441745        </item> <!-- River -->
     1746        <item name="Canal" icon="presets/waterway.png" type="way" preset_name_label="true">
     1747            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
     1748                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=canal"
     1749                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=canal"
     1750                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=canal"
     1751                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:waterway=canal"
     1752                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=canal"
     1753                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=canal" />
     1754            <space />
     1755            <key key="waterway" value="canal" />
     1756            <optional>
     1757                <reference ref="name_layer" />
     1758                <combo key="tunnel" text="Tunnel" values="culvert,yes" />
     1759                <text key="width" text="Width (meters)" />
     1760                <text key="wikipedia" text="Wikipedia" />
     1761            </optional>
     1762            <reference ref="water_access" />
     1763        </item> <!-- Canal -->
    17451764        <separator/>
    17461765        <item name="Spring" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
     
    18721891            <check key="salt" text="Salt Water" disable_off="true" />
    18731892            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
    1874             <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
    1875             <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
     1893            <text key="wikipedia" text="Wikipedia" />
     1894            <reference ref="water_access" />
    18761895        </item> <!-- Water -->
    18771896        <item name="Coastline" icon="presets/coastline.png" type="way,closedway,relation" preset_name_label="true">
Note: See TracChangeset for help on using the changeset viewer.