Changeset 11153 in josm

Timestamp:

2016-10-22T01:23:55+02:00 (8 years ago)

Author:

Klumbumbus

Message:

• add display_values and values_sort=false for Route network values (iwn,nwn,...)
• warn about missing sport key on pitches
• see #13804 - group unnecessary tag warnings
• add own colors for sport=multi|running|athletics to avoid false positive validator warning in stadiums (inner style equals MP style)
• fix #13824 - adjust sport=equestrian|horse_racing presets

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (5 diffs)
• data/validator/combinations.mapcss (modified) (1 diff)
• data/validator/unnecessary.mapcss (modified) (2 diffs)
• styles/standard/elemstyles.mapcss (modified) (4 diffs)

trunk/data/defaultpresets.xml

@@ -30 +30 @@
     </chunk>
     <chunk id="riding_surface">
-        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
+        <combo key="leisure" text="Type" values="horse_riding,pitch,sports_centre,stadium,track" values_context="riding" />
         <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
     </chunk>
@@ -9974 +9974 @@
                 <key key="route" value="bicycle"/>
                 <text key="name" text="Name" />
-                <combo key="network" text="Network" values="icn,ncn,rcn,lcn" />
+                <combo key="network" text="Network" values="icn,ncn,rcn,lcn" display_values="international,national,regional,local" values_sort="false" />
                 <optional>
                     <reference ref="route_hikebike_optionals" />
@@ -10021 +10021 @@
                 <key key="route" value="hiking"/>
                 <text key="name" text="Name" />
-                <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" />
+                <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" display_values="international,national,regional,local" values_sort="false"/>
                 <optional>
                     <reference ref="route_hikebike_optionals" />
@@ -10037 +10037 @@
                 <key key="route" value="foot"/>
                 <text key="name" text="Name" />
-                <combo key="network" text="Network" values="rwn,lwn" />
+                <combo key="network" text="Network" values="rwn,lwn" display_values="regional,local" values_sort="false" />
                 <optional>
                     <reference ref="route_hikebike_optionals" />
@@ -10053 +10053 @@
                 <key key="route" value="horse"/>
                 <text key="name" text="Name" />
-                <combo key="network" text="Network" values="ihn,nhn,rhn,lhn" />
+                <combo key="network" text="Network" values="ihn,nhn,rhn,lhn" display_values="international,national,regional,local" values_sort="false" />
                 <optional>
                     <reference ref="route_hikebike_optionals" />

trunk/data/validator/combinations.mapcss

@@ -129 +129 @@
 relation[route=ski][!piste:type][type=route],
 *[tourism=information][!information],
+*[leisure=pitch][!sport],
 *[aeroway=terminal][!building],
 *[power=generator][!generator:source],

trunk/data/validator/unnecessary.mapcss

@@ -7 +7 @@
   /* see #9365 - Useless tag layer=0 */
   throwWarning: tr("{0} is unnecessary", "{0.tag}");
+  group: tr("unnecessary tag");
   fixRemove: "{0.key}";
   assertMatch: "way layer=0";
@@ -20 +21 @@
 area:closed[shop    ][area?] {
   throwWarning: tr("{0} is unnecessary for {1}", "{2.key}", "{1.key}");
+  group: tr("unnecessary tag");
   fixRemove: "{2.key}";
 }

trunk/styles/standard/elemstyles.mapcss

@@ -3707 +3707 @@
 area[sport="9pin"],
 area[sport="10pin"],
-area[sport=athletics],
-area[sport=running],
 area[sport=soccer],
 area[sport=australian_football],
@@ -3724 +3722 @@
 node[sport="10pin"] {
     icon-image: "presets/sport/10pin.svg";
-    set icon_z17;
-}
-node[sport=athletics] {
-    icon-image: "presets/sport/athletics.svg";
-    set icon_z17;
-}
-node[sport=running] {
-    icon-image: "presets/sport/running.svg";
     set icon_z17;
 }
@@ -3854 +3844 @@
     set icon_z17;
 }
-area[sport=multi],
+area[sport=athletics] {
+    fill-color: sport_athletics#cfebd7;
+}
+node[sport=athletics] {
+    icon-image: "presets/sport/athletics.svg";
+    set icon_z17;
+}
+area[sport=running] {
+    fill-color: sport_running#cfebd8;
+}
+node[sport=running] {
+    icon-image: "presets/sport/running.svg";
+    set icon_z17;
+}
+area[sport=multi] {
+    fill-color: sport_multi#cfebd9;
+}
+node[sport=multi] {
+    icon-image: "presets/sport/multi.svg";
+    set icon_z17;
+}
 area[sport=pelota],
 area[sport=racquet],
@@ -3861 +3871 @@
 area[sport=skateboard] {
     fill-color: sport#bde3cb;
-}
-node[sport=multi] {
-    icon-image: "presets/sport/multi.svg";
-    set icon_z17;
 }
 node[sport=pelota] {