Changeset 17286 in josm

Timestamp:

2020-10-30T17:25:44+01:00 (4 years ago)

Author:

Klumbumbus

Message:

fix #19952 - Change sport combo to multiselect, update ignorelist

Location:

trunk/resources/data

Files:

• defaultpresets.xml (modified) (3 diffs)
• validator/ignoretags.cfg (modified) (3 diffs)
• validator/multiple.mapcss (modified) (1 diff)

trunk/resources/data/defaultpresets.xml

@@ -215 +215 @@
     </chunk>
     <chunk id="sport">
-        <combo key="sport" text="Sport" values="10pin,9pin,american_football,archery,athletics,australian_football,baseball,basketball,beachvolleyball,billiards,boules,bowls,canadian_football,canoe,chess,climbing,cricket,croquet,curling,cycling,dog_racing,equestrian,field_hockey,fitness,gaelic_games,golf,gymnastics,handball,horse_racing,ice_hockey,ice_skating,karting,model_aerodrome,motocross,motor,multi,pelota,racquet,rc_car,roller_skating,rowing,rugby_league,rugby_union,running,safety_training,scuba_diving,shooting,skateboard,soccer,surfing,swimming,table_tennis,tennis,volleyball" values_context="sport" />
+        <multiselect key="sport" text="Sport" values="10pin;9pin;american_football;archery;athletics;australian_football;baseball;basketball;beachvolleyball;billiards;boules;bowls;canadian_football;canoe;chess;climbing;cricket;croquet;curling;cycling;dog_racing;equestrian;field_hockey;fitness;gaelic_games;golf;gymnastics;handball;horse_racing;ice_hockey;ice_skating;karting;model_aerodrome;motocross;motor;multi;pelota;racquet;rc_car;roller_skating;rowing;rugby_league;rugby_union;running;safety_training;scuba_diving;shooting;skateboard;soccer;surfing;swimming;table_tennis;tennis;volleyball" values_context="sport" />
     </chunk>
     <chunk id="highway_access">
@@ -2098 +2098 @@
                 <reference ref="POI_access" />
                 <combo key="surface" text="Surface" values="gravel,pebblestone,sand" />
-                <combo key="sport" text="Sport" values="swimming,surfing" />
+                <multiselect key="sport" text="Sport" values="swimming;surfing" rows="3"/>
                 <combo key="nudism" text="Nudism" values="yes,no,obligatory,designated,customary,permissive" />
             </optional>
@@ -4834 +4834 @@
             <key key="leisure" value="track" />
             <text key="name" text="Name" />
-            <combo key="sport" text="Sport" values="athletics,cycling,dog_racing,equestrian,horse_racing,running,roller_skating,ice_skating" values_context="sport" />
+            <multiselect key="sport" text="Sport" values="athletics;cycling;dog_racing;equestrian;horse_racing;running;roller_skating;ice_skating" values_context="sport" />
             <reference ref="sport_surface" />
             <check key="area" text="Area" />

trunk/resources/data/validator/ignoretags.cfg

@@ -157 +157 @@
 E:faa
 E:dataset
+E:sport
+E:cuisine
 ;
 ; Ignore valid and semi-valid keys that end with...
@@ -264 +266 @@
 K:amenity=mobile_money_agent
 ;
-; Cuisine Tags
-;
-K:cuisine=pie
-;
 ; Historic Tags
 ;
@@ -360 +358 @@
 ; Craft Key/Value Pairs
 K:craft=tailor
-;
-; Sports Tags
-;
-K:sport=boxing
-K:sport=netball
-K:sport=cliff_diving
 ;
 ; Tourism Tags

trunk/resources/data/validator/multiple.mapcss

@@ -34 +34 @@
 *[traffic_sign        =~ /^(;.*|.*;;.*|.*;)$/],
 *[voltage             =~ /^(;.*|.*;;.*|.*;)$/],
+*[sport               =~ /^(;.*|.*;;.*|.*;)$/],
 *[cuisine             =~ /^(;.*|.*;;.*|.*;)$/] {
         throwWarning: tr("empty value in semicolon-separated ''{0}''", "{0.key}");