Changeset 8135 in josm for trunk


Ignore:
Timestamp:
2015-03-13T20:34:02+01:00 (10 years ago)
Author:
Klumbumbus
Message:

fix #11223 - remove waterway=wadi and waterway=rapids, update natural=ridge, natural=valley and intermittent=yes

Location:
trunk
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r8125 r8135  
    16741674            <text key="name" text="Name" />
    16751675            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     1676            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
    16761677        </item> <!-- Drain -->
    16771678        <item name="Ditch" icon="presets/waterway.png" type="way" preset_name_label="true">
    … …  
    16851686            <text key="name" text="Name" />
    16861687            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     1688            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
    16871689        </item> <!-- Ditch -->
    16881690        <item name="Stream" icon="presets/waterway.png" type="way" preset_name_label="true">
    … …  
    17011703            <text key="name" text="Name" />
    17021704            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     1705            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
    17031706        </item> <!-- Stream -->
    1704         <item name="Wadi" icon="presets/waterway.png" type="way" preset_name_label="true">
    1705             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=wadi" />
    1706             <space />
    1707             <key key="waterway" value="wadi" />
    1708             <text key="name" text="Name" />
    1709             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1710         </item> <!-- Wadi -->
    17111707        <item name="Canal" icon="presets/waterway.png" type="way" preset_name_label="true">
    17121708            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
    … …  
    17361732            <reference ref="name_wikipedia" />
    17371733            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     1734            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
    17381735        </item> <!-- River -->
    17391736        <separator/>
    … …  
    18941891            <key key="waterway" value="riverbank" />
    18951892            <text key="name" text="Name" />
     1893            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
    18961894        </item> <!-- Riverbank -->
    18971895        <separator/>
    … …  
    72047202            </optional>
    72057203        </item> <!-- Volcano -->
     7204        <item name="Ridge" icon="presets/ridge.svg" type="way,relation" preset_name_label="true">
     7205            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=ridge"
     7206                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=ridge"
     7207                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=ridge"
     7208                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=ridge"
     7209                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=ridge" />
     7210            <label text="A mountain or hill ridge." />
     7211            <space />
     7212            <key key="natural" value="ridge" />
     7213            <reference ref="name_wikipedia" />
     7214            <text key="ele" text="Elevation" />
     7215        </item> <!-- Ridge -->
     7216        <item name="Valley" icon="presets/valley.svg" type="way,relation" preset_name_label="true">
     7217            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=valley" />
     7218            <label text="A low area between hills." />
     7219            <space />
     7220            <key key="natural" value="valley" />
     7221            <reference ref="name_wikipedia" />
     7222        </item> <!-- Valley -->
    72067223        <item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway,relation" preset_name_label="true">
    72077224            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance"
    … …  
    72407257            <reference ref="name_wikipedia" />
    72417258        </item> <!-- Islet -->
    7242         <item name="Ridge" icon="presets/empty.png" type="way,relation" preset_name_label="true">
    7243             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=ridge"
    7244                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=ridge"
    7245                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=ridge"
    7246                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=ridge"
    7247                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=ridge" />
    7248             <label text="A mountain or hill ridge." />
    7249             <space />
    7250             <key key="natural" value="ridge" />
    7251             <reference ref="name_wikipedia" />
    7252             <text key="ele" text="Elevation" />
    7253         </item> <!-- Ridge -->
    72547259    </group> <!-- Geography -->
    72557260    <group name="Nature" icon="styles/standard/misc/landmark/trees.png">

  • trunk/data/validator/deprecated.mapcss

    r8121 r8135  
    398398  suggestAlternative: {1.key};
    399399}
     400
     401/* see #11223 */
     402*[waterway=wadi] {
     403  throwWarning: tr("{0} is deprecated", "{0.tag}");
     404  suggestAlternative: "{0.key}=* + intermittent=yes";
     405  suggestAlternative: "natural=valley";
     406}

  • trunk/data/validator/geometry.mapcss

    r8089 r8135  
    3030node[waterway=river],
    3131node[waterway=canal],
    32 node[waterway=wadi],
    3332node[waterway=stream],
    3433node[waterway=ditch],
    … …  
    3635node[natural=coastline],
    3736node[natural=ridge],
     37node[natural=valley],
    3838node[natural=tree_row] {
    3939  throwWarning: tr("{0} on a node. Should be used on a way.", "{0.tag}");

  • trunk/styles/standard/elemstyles.mapcss

    r8134 r8135  
    39093909    color: natural#002f00;
    39103910}
     3911way[natural=valley] {
     3912    width: 1;
     3913    color: natural#002f00;
     3914}
    39113915area[natural=scree] {
    39123916    fill-color: natural#002f00;
    … …  
    40204024node[natural=land],
    40214025node[natural=bare_rock],
    4022 node[natural=ridge] {
     4026node[natural=ridge],
     4027node[natural=valley] {
    40234028    icon-image: "misc/deprecated.png";
    40244029    set icon_z17;
    … …  
    40384043    color: riverbank#0000cf;
    40394044}
    4040 way[waterway=canal], way[waterway=wadi] {
     4045way[waterway=canal] {
    40414046    width: 2;
    40424047    color: water#0000ff;
    … …  
    40944099node[waterway=weir] {
    40954100    icon-image: "nautical/weir.png";
    4096     set icon_z17;
    4097     text: auto;
    4098 }
    4099 way[waterway=rapids] {
    4100     width: 2;
    4101     color: rapids#8080ff;
    4102 }
    4103 node[waterway=rapids] {
    4104     icon-image: "misc/no_icon.png";
    41054101    set icon_z17;
    41064102    text: auto;
Note: See TracChangeset for help on using the changeset viewer.