Changeset 14735 in josm for trunk

Timestamp:

2019-01-26T12:26:58+01:00 (5 years ago)

Author:

Klumbumbus

Message:

fix #17253, fix #17254, fix #17255, fix #17256 - remove some false positve validator warnings of attraction=summer_toboggan

Location:

trunk

Files:

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

trunk/data/validator/combinations.mapcss

@@ -201 +201 @@
 }
 
-/* {0.key} without {1.key}, {2.key} or {3.key} */
-way[oneway][!highway][!railway][!aerialway],
-*[snowplowing                  ][!highway][!amenity][!leisure] {
+/* {0.key} without {1.key}, {2.key} or {3.key}, #17253 */
+way[oneway   ][!highway][!railway][!aerialway][attraction!=summer_toboggan],
+*[snowplowing][!highway][!amenity][!leisure] {
   throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.key}", "{3.key}");
   group: tr("missing tag");
 }
 
-/* {0.key} without {1.key}, {2.key} or {3.tag} */
-way[incline                    ][!highway][!railway][aeroway!~/^(runway|taxiway)$/],
+/* {0.key} without {1.key}, {2.key} or {3.tag}, #17255 */
+way[incline                    ][!highway][!railway][aeroway!~/^(runway|taxiway)$/][attraction!=summer_toboggan],
 *[toll                         ][!highway][!barrier][route!~/^(ferry|road)$/] {
   throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.key}", "{3.tag}");
@@ -377 +377 @@
 }
 
-/* #9593, #11183, #12418, #12761 */
-*[sport][sport!=skiing][!building][!club][tourism != hotel][highway != raceway][!leisure][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] {
+/* #9593, #11183, #12418, #12761, #17254  */
+*[sport][sport!=skiing][!building][!club][tourism != hotel][highway != raceway][!leisure][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][attraction!=summer_toboggan] {
     throwWarning: tr("sport without physical feature");
     group: tr("missing tag");

trunk/data/validator/ignoretags.cfg

@@ -187 +187 @@
 K:allotments=plot
 K:land_area=administrative
+K:attraction=summer_toboggan
 ;
 ; Highway Key/Value Pairs

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

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