Changeset 19165 in josm for trunk


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r19164 r19165  
    26912691                <text key="aerialway:duration" text="Typical journey time in minutes" />
    26922692                <check key="aerialway:heating" text="Has heating?" />
     2693                <combo key="usage" text="Usage" values="industrial,freight,tourism" values_context="usage" values_searchable="true" />
    26932694                <space />
    26942695                <text key="operator" text="Operator" />
    … …  
    27082709                <check key="aerialway:bubble" text="Has bubble?" />
    27092710                <check key="aerialway:heating" text="Has heating?" />
     2711                <combo key="usage" text="Usage" values="industrial,freight,tourism" values_context="usage" values_searchable="true" />
    27102712                <space />
    27112713                <text key="operator" text="Operator" />
    … …  
    27802782            <key key="aerialway" value="goods" />
    27812783            <optional>
     2784                <combo key="usage" text="Usage" values="industrial,freight,tourism" values_context="usage" values_searchable="true" />
    27822785                <reference ref="name_ref_operator" />
    27832786                <text key="aerialway:duration" text="Typical journey time in minutes" />
    … …  
    27892792            <key key="aerialway" value="zip_line" />
    27902793            <optional>
     2794                <combo key="usage" text="Usage" values="industrial,freight,tourism" values_context="usage" values_searchable="true" />
     2795                <space />
    27912796                <reference ref="name_ref_operator" />
    27922797                <reference ref="oh" />
    … …  
    28012806            <space />
    28022807            <key key="aerialway" value="station" />
     2808            <combo key="usage" text="Usage" values="industrial,freight,tourism" values_context="usage" values_searchable="true" />
    28032809            <reference ref="name_ref_operator" />
    28042810        </item> <!-- Station -->
    … …  
    28072813            <space />
    28082814            <key key="aerialway" value="pylon" />
     2815            <combo key="usage" text="Usage" values="industrial,freight,tourism" values_context="usage" values_searchable="true" />
    28092816            <reference ref="name_ref" />
    28102817        </item> <!-- Pylon -->

  • trunk/resources/data/validator/combinations.mapcss

    r19140 r19165  
    557557/* {0.key} without {1.key} or {2.key} see #10140 */
    558558*[building:levels][!building][!building:part],
    559 way[usage][!railway][!waterway][route!=railway][man_made!=pipeline] {
     559way[usage][!railway][!waterway][route!=railway][man_made!=pipeline][!aerialway] {
    560560  throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.key}");
    561561  group: tr("missing tag");
Note: See TracChangeset for help on using the changeset viewer.