Changeset 19165 in josm for trunk/resources

Timestamp:

2024-08-05T19:41:16+02:00 (4 months ago)

Author:

taylor.smock

Message:

Fix #23298: Improper warning for aerialway=zip_line

Exclude aerialway from combinations check and add usage values to aerialway
presets (where someone has already used the key with the aerialway tag).

Location:

trunk/resources/data

Files:

• defaultpresets.xml (modified) (6 diffs)
• validator/combinations.mapcss (modified) (1 diff)

trunk/resources/data/defaultpresets.xml

@@ -2691 +2691 @@
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
                 <check key="aerialway:heating" text="Has heating?" />
+                <combo key="usage" text="Usage" values="industrial,freight,tourism" values_context="usage" values_searchable="true" />
                 <space />
                 <text key="operator" text="Operator" />
@@ -2708 +2709 @@
                 <check key="aerialway:bubble" text="Has bubble?" />
                 <check key="aerialway:heating" text="Has heating?" />
+                <combo key="usage" text="Usage" values="industrial,freight,tourism" values_context="usage" values_searchable="true" />
                 <space />
                 <text key="operator" text="Operator" />
@@ -2780 +2782 @@
             <key key="aerialway" value="goods" />
             <optional>
+                <combo key="usage" text="Usage" values="industrial,freight,tourism" values_context="usage" values_searchable="true" />
                 <reference ref="name_ref_operator" />
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
@@ -2789 +2792 @@
             <key key="aerialway" value="zip_line" />
             <optional>
+                <combo key="usage" text="Usage" values="industrial,freight,tourism" values_context="usage" values_searchable="true" />
+                <space />
                 <reference ref="name_ref_operator" />
                 <reference ref="oh" />
@@ -2801 +2806 @@
             <space />
             <key key="aerialway" value="station" />
+            <combo key="usage" text="Usage" values="industrial,freight,tourism" values_context="usage" values_searchable="true" />
             <reference ref="name_ref_operator" />
         </item> <!-- Station -->
@@ -2807 +2813 @@
             <space />
             <key key="aerialway" value="pylon" />
+            <combo key="usage" text="Usage" values="industrial,freight,tourism" values_context="usage" values_searchable="true" />
             <reference ref="name_ref" />
         </item> <!-- Pylon -->

trunk/resources/data/validator/combinations.mapcss

@@ -557 +557 @@
 /* {0.key} without {1.key} or {2.key} see #10140 */
 *[building:levels][!building][!building:part],
-way[usage][!railway][!waterway][route!=railway][man_made!=pipeline] {
+way[usage][!railway][!waterway][route!=railway][man_made!=pipeline][!aerialway] {
   throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.key}");
   group: tr("missing tag");