Changeset 15535 in josm for trunk

Timestamp:

2019-11-20T21:53:15+01:00 (5 years ago)

Author:

Klumbumbus

Message:

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

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (3 diffs)
• images/presets/nautical/tidal_channel.svg (added)
• src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (1 diff)
• styles/standard/elemstyles.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -1555 +1555 @@
   <group name="Water" name_context="main group" icon="presets/nautical/waterway_river.svg">
     <group name="Water" name_context="sub group" icon="presets/nautical/waterway_river.svg">
-        <item name="Drain" icon="presets/nautical/waterway_drain.svg" type="way" preset_name_label="true">
-            <link wiki="Tag:waterway=drain" />
-            <space />
-            <key key="waterway" value="drain" />
-            <optional>
-                <text key="name" text="Name" />
-                <reference ref="waterway" />
-            </optional>
-        </item> <!-- Drain -->
-        <item name="Ditch" icon="presets/nautical/waterway_ditch.svg" type="way" preset_name_label="true">
-            <link wiki="Tag:waterway=ditch" />
-            <space />
-            <key key="waterway" value="ditch" />
-            <optional>
-                <text key="name" text="Name" />
-                <reference ref="waterway" />
-            </optional>
-        </item> <!-- Ditch -->
+        <item name="River" icon="presets/nautical/waterway_river.svg" type="way" preset_name_label="true">
+            <link wiki="Tag:waterway=river" />
+            <space />
+            <key key="waterway" value="river" />
+            <text key="name" text="Name" />
+            <optional>
+                <reference ref="waterway_wikipedia" />
+                <check key="lock" text="Lock" disable_off="true" />
+            </optional>
+            <reference ref="water_access" />
+        </item> <!-- River -->
         <item name="Stream" icon="presets/nautical/waterway_stream.svg" type="way" preset_name_label="true">
             <link wiki="Tag:waterway=stream" />
@@ -1583 +1576 @@
             <reference ref="water_access" />
         </item> <!-- Stream -->
-        <item name="River" icon="presets/nautical/waterway_river.svg" type="way" preset_name_label="true">
-            <link wiki="Tag:waterway=river" />
-            <space />
-            <key key="waterway" value="river" />
-            <text key="name" text="Name" />
-            <optional>
-                <reference ref="waterway_wikipedia" />
-                <check key="lock" text="Lock" disable_off="true" />
-            </optional>
-            <reference ref="water_access" />
-        </item> <!-- River -->
+        <item name="Tidal channel" icon="presets/nautical/tidal_channel.svg" type="way" preset_name_label="true">
+            <link wiki="Tag:waterway=tidal_channel" />
+            <space />
+            <key key="waterway" value="tidal_channel" />
+            <optional>
+                <text key="name" text="Name" />
+                <check key="salt" text="Salt Water" disable_off="true" />
+                <check key="intermittent" text="Intermittent" disable_off="true" />
+                <check key="seasonal" text="Seasonal" disable_off="true" />
+                <text key="width" text="Width (meters)" />
+                <text key="wikipedia" text="Wikipedia" />
+            </optional>
+        </item> <!-- Tidal channel -->
         <item name="Canal" icon="presets/nautical/waterway_canal.svg" type="way" preset_name_label="true">
             <link wiki="Tag:waterway=canal" />
@@ -1609 +1604 @@
             <reference ref="water_access" />
         </item> <!-- Canal -->
+        <item name="Drain" icon="presets/nautical/waterway_drain.svg" type="way" preset_name_label="true">
+            <link wiki="Tag:waterway=drain" />
+            <space />
+            <key key="waterway" value="drain" />
+            <optional>
+                <text key="name" text="Name" />
+                <reference ref="waterway" />
+            </optional>
+        </item> <!-- Drain -->
+        <item name="Ditch" icon="presets/nautical/waterway_ditch.svg" type="way" preset_name_label="true">
+            <link wiki="Tag:waterway=ditch" />
+            <space />
+            <key key="waterway" value="ditch" />
+            <optional>
+                <text key="name" text="Name" />
+                <reference ref="waterway" />
+            </optional>
+        </item> <!-- Ditch -->
         <separator/>
         <item name="Spring" icon="presets/landmark/spring.svg" type="node,closedway" preset_name_label="true">

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -72 +72 @@
                 "(aerialway=j-bar & -oneway=no) | "+
                 "(aerialway=platter & -oneway=no) | "+
-                "waterway=stream | waterway=river | waterway=ditch | waterway=drain | "+
+                "waterway=stream | waterway=river | waterway=ditch | waterway=drain | waterway=tidal_channel | "+
                 "(\"piste:type\"=downhill & -area=yes) | (\"piste:type\"=sled & -area=yes) | (man_made=\"piste:halfpipe\" & -area=yes) | "+
                 "junction=circular | junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+

trunk/styles/standard/elemstyles.mapcss

@@ -4579 +4579 @@
     color: water#0000ff;
 }
+way[waterway=tidal_channel] {
+    width: 1;
+    color: tidal_channel#0000ff;
+}
 way[waterway=river][intermittent=yes],
 area[waterway=riverbank][intermittent=yes],
@@ -4584 +4588 @@
 way[waterway=stream][intermittent=yes],
 way[waterway=ditch][intermittent=yes],
-way[waterway=drain][intermittent=yes] {
+way[waterway=drain][intermittent=yes],
+way[waterway=tidal_channel][intermittent=yes] {
     dashes: 15, 5;
 }