Changeset 15535 in josm


Ignore:
Timestamp:
2019-11-20T21:53:15+01:00 (3 weeks ago)
Author:
Klumbumbus
Message:

fix #18128 - add waterway=tidal_channel (icon retrieved from internal stream icon, CC0 and PD licensed), little reorder in the waterway preset menu

Location:
trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r15528 r15535  
    15551555  <group name="Water" name_context="main group" icon="presets/nautical/waterway_river.svg">
    15561556    <group name="Water" name_context="sub group" icon="presets/nautical/waterway_river.svg">
    1557         <item name="Drain" icon="presets/nautical/waterway_drain.svg" type="way" preset_name_label="true">
    1558             <link wiki="Tag:waterway=drain" />
    1559             <space />
    1560             <key key="waterway" value="drain" />
    1561             <optional>
    1562                 <text key="name" text="Name" />
    1563                 <reference ref="waterway" />
    1564             </optional>
    1565         </item> <!-- Drain -->
    1566         <item name="Ditch" icon="presets/nautical/waterway_ditch.svg" type="way" preset_name_label="true">
    1567             <link wiki="Tag:waterway=ditch" />
    1568             <space />
    1569             <key key="waterway" value="ditch" />
    1570             <optional>
    1571                 <text key="name" text="Name" />
    1572                 <reference ref="waterway" />
    1573             </optional>
    1574         </item> <!-- Ditch -->
     1557        <item name="River" icon="presets/nautical/waterway_river.svg" type="way" preset_name_label="true">
     1558            <link wiki="Tag:waterway=river" />
     1559            <space />
     1560            <key key="waterway" value="river" />
     1561            <text key="name" text="Name" />
     1562            <optional>
     1563                <reference ref="waterway_wikipedia" />
     1564                <check key="lock" text="Lock" disable_off="true" />
     1565            </optional>
     1566            <reference ref="water_access" />
     1567        </item> <!-- River -->
    15751568        <item name="Stream" icon="presets/nautical/waterway_stream.svg" type="way" preset_name_label="true">
    15761569            <link wiki="Tag:waterway=stream" />
     
    15831576            <reference ref="water_access" />
    15841577        </item> <!-- Stream -->
    1585         <item name="River" icon="presets/nautical/waterway_river.svg" type="way" preset_name_label="true">
    1586             <link wiki="Tag:waterway=river" />
    1587             <space />
    1588             <key key="waterway" value="river" />
    1589             <text key="name" text="Name" />
    1590             <optional>
    1591                 <reference ref="waterway_wikipedia" />
    1592                 <check key="lock" text="Lock" disable_off="true" />
    1593             </optional>
    1594             <reference ref="water_access" />
    1595         </item> <!-- River -->
     1578        <item name="Tidal channel" icon="presets/nautical/tidal_channel.svg" type="way" preset_name_label="true">
     1579            <link wiki="Tag:waterway=tidal_channel" />
     1580            <space />
     1581            <key key="waterway" value="tidal_channel" />
     1582            <optional>
     1583                <text key="name" text="Name" />
     1584                <check key="salt" text="Salt Water" disable_off="true" />
     1585                <check key="intermittent" text="Intermittent" disable_off="true" />
     1586                <check key="seasonal" text="Seasonal" disable_off="true" />
     1587                <text key="width" text="Width (meters)" />
     1588                <text key="wikipedia" text="Wikipedia" />
     1589            </optional>
     1590        </item> <!-- Tidal channel -->
    15961591        <item name="Canal" icon="presets/nautical/waterway_canal.svg" type="way" preset_name_label="true">
    15971592            <link wiki="Tag:waterway=canal" />
     
    16091604            <reference ref="water_access" />
    16101605        </item> <!-- Canal -->
     1606        <item name="Drain" icon="presets/nautical/waterway_drain.svg" type="way" preset_name_label="true">
     1607            <link wiki="Tag:waterway=drain" />
     1608            <space />
     1609            <key key="waterway" value="drain" />
     1610            <optional>
     1611                <text key="name" text="Name" />
     1612                <reference ref="waterway" />
     1613            </optional>
     1614        </item> <!-- Drain -->
     1615        <item name="Ditch" icon="presets/nautical/waterway_ditch.svg" type="way" preset_name_label="true">
     1616            <link wiki="Tag:waterway=ditch" />
     1617            <space />
     1618            <key key="waterway" value="ditch" />
     1619            <optional>
     1620                <text key="name" text="Name" />
     1621                <reference ref="waterway" />
     1622            </optional>
     1623        </item> <!-- Ditch -->
    16111624        <separator/>
    16121625        <item name="Spring" icon="presets/landmark/spring.svg" type="node,closedway" preset_name_label="true">
  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

    r15364 r15535  
    7272                "(aerialway=j-bar & -oneway=no) | "+
    7373                "(aerialway=platter & -oneway=no) | "+
    74                 "waterway=stream | waterway=river | waterway=ditch | waterway=drain | "+
     74                "waterway=stream | waterway=river | waterway=ditch | waterway=drain | waterway=tidal_channel | "+
    7575                "(\"piste:type\"=downhill & -area=yes) | (\"piste:type\"=sled & -area=yes) | (man_made=\"piste:halfpipe\" & -area=yes) | "+
    7676                "junction=circular | junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+
  • trunk/styles/standard/elemstyles.mapcss

    r15533 r15535  
    45794579    color: water#0000ff;
    45804580}
     4581way[waterway=tidal_channel] {
     4582    width: 1;
     4583    color: tidal_channel#0000ff;
     4584}
    45814585way[waterway=river][intermittent=yes],
    45824586area[waterway=riverbank][intermittent=yes],
     
    45844588way[waterway=stream][intermittent=yes],
    45854589way[waterway=ditch][intermittent=yes],
    4586 way[waterway=drain][intermittent=yes] {
     4590way[waterway=drain][intermittent=yes],
     4591way[waterway=tidal_channel][intermittent=yes] {
    45874592    dashes: 15, 5;
    45884593}
Note: See TracChangeset for help on using the changeset viewer.