Changeset 15953 in josm

Timestamp:

2020-02-28T21:56:12+01:00 (5 years ago)

Author:

Klumbumbus

Message:

• see #14965 - Sort Autofilter tags alphabetical and add a space before the zoom level
• see #17629 - Don't warn about name=mairie|rathaus (was agreed, see ticket:17629#comment:13 et seqq. but forgotten)
• see #15309 - Ignore more healthcare tags for now

Location:

trunk

Files:

• data/validator/ignoretags.cfg (modified) (1 diff)
• data/validator/unnecessary.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java (modified) (2 diffs)

trunk/data/validator/ignoretags.cfg

@@ -412 +412 @@
 K:healthcare=hospital
 K:healthcare=pharmacy
+K:healthcare=clinic
+K:healthcare=centre
+K:healthcare=physiotherapist
 K:golf=cartpath
 K:man_made=water_tap

trunk/data/validator/unnecessary.mapcss

@@ -113 +113 @@
 *[name][name=~/^(?i)(cemetery|cementerio|cimetière|cmentarz|friedhof)$/][amenity=grave_yard],
 *[name][name=~/^(?i)(cemetery|cementerio|cimetière|cmentarz|friedhof)$/][landuse=cemetery],
-*[name][name=~/^(?i)(mairie|rathaus)$/][amenity=townhall],
 *[name][name=~/^(?i)(monument aux morts|war memorial)$/][historic=memorial][memorial=war_memorial],
 *[name][name=~/^(?i)(school|école|Школа)$/][building=school],

trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java

@@ -146 +146 @@
     public static AutoFilterRule[] defaultRules() {
         return new AutoFilterRule[]{
+            new AutoFilterRule("admin_level", 11),
+            new AutoFilterRule("building:levels", 17),
+            new AutoFilterRule("frequency", 5),
+            new AutoFilterRule("gauge", 5),
+            new AutoFilterRule("incline", 13)
+                    .setValueExtractor(s -> Integer.parseInt(s.replaceAll("%$", "")))
+                    .setValueFormatter(v -> v + "\u2009%"),
+            new AutoFilterRule("lanes", 13),
+            new AutoFilterRule("layer", 16)
+                    .setDefaultValueSupplier(AutoFilterRule::defaultLayer),
             new AutoFilterRule("level", 17)
                 // #17109, support values like 0.5 or 1.5 - level values are multiplied by 2 when parsing, values are divided by 2 for formatting
                 .setValueExtractor(s -> (int) (Double.parseDouble(s) * 2.))
                 .setValueFormatter(v -> DecimalFormat.getInstance(Locale.ROOT).format(v / 2.)),
-            new AutoFilterRule("layer", 16)
-                    .setDefaultValueSupplier(AutoFilterRule::defaultLayer),
             new AutoFilterRule("maxspeed", 16)
                     .setValueExtractor(s -> Integer.parseInt(s.replace(" mph", ""))),
             new AutoFilterRule("voltage", 5)
-                    .setValueFormatter(s -> s % 1000 == 0 ? (s / 1000) + "kV" : s + "V"),
-            new AutoFilterRule("building:levels", 17),
-            new AutoFilterRule("gauge", 5),
-            new AutoFilterRule("frequency", 5),
-            new AutoFilterRule("incline", 13)
-                    .setValueExtractor(s -> Integer.parseInt(s.replaceAll("%$", "")))
-                    .setValueFormatter(v -> v + "\u2009%"),
-            new AutoFilterRule("lanes", 13),
-            new AutoFilterRule("admin_level", 11)
+                    .setValueFormatter(s -> s % 1000 == 0 ? (s / 1000) + "kV" : s + "V")
         };
     }
@@ -206 +206 @@
     @Override
     public String toString() {
-        return key + '[' + minZoomLevel + ']';
+        return key + " [" + minZoomLevel + ']';
     }
 }