Changeset 11159 in josm for trunk

Timestamp:

2016-10-24T19:39:25+02:00 (8 years ago)

Author:

Klumbumbus

Message:

adjust sport=skiing validator warnings

Location:

trunk

Files:

• data/validator/combinations.mapcss (modified) (2 diffs)
• data/validator/deprecated.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java (modified) (1 diff)

trunk/data/validator/combinations.mapcss

@@ -338 +338 @@
 
 /* #9593, #11183, #12418, #12761 */
-*[sport][!building][!club][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground|ice_rink|horse_riding)$/][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
+*[sport][sport!=skiing][!building][!club][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground|ice_rink|horse_riding)$/][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
     throwWarning: tr("sport without physical feature");
     group: tr("missing tag");
@@ -344 +344 @@
     assertNoMatch: "node sport=tennis leisure=pitch";
     assertNoMatch: "node sport=beachvolleyball natural=beach";
-    assertNoMatch: "node sport=skiiing landuse=piste";
+    assertNoMatch: "node sport=skiing"; /* skiing has deprecated warning */
     assertNoMatch: "node sport=swimming tourism=hotel";
     assertNoMatch: "node sport=10pin amenity=restaurant";

trunk/data/validator/deprecated.mapcss

@@ -524 +524 @@
 
 /* unclear definition, see #11183 */
-*[sport=skiing][!piste:type] {
+*[sport=skiing] {
   throwWarning: tr("Definition of {0} is unclear", "{0.tag}");
-  suggestAlternative: {1.key};
+  suggestAlternative: tr("{0} + {1} + {2}", "piste:type=*", "piste:difficulty=*", "piste:grooming=*");
+  group: tr("deprecated tagging");
 }
 

trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java

@@ -140 +140 @@
         new UnclosedWaysCheck(1103, "amenities", marktr("amenities type {0}")),
         new UnclosedWaysCheck(1104, "sport",     marktr("sport type {0}"),
-                new HashSet<>(Arrays.asList("water_slide", "climbing"))),
+                new HashSet<>(Arrays.asList("water_slide", "climbing", "skiing"))),
         new UnclosedWaysCheck(1105, "tourism",   marktr("tourism type {0}"),
                 new HashSet<>(Arrays.asList("attraction", "artwork"))),