Changeset 15953 in josm


Ignore:
Timestamp:
2020-02-28T21:56:12+01:00 (5 weeks 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/validator/ignoretags.cfg

    r15931 r15953  
    412412K:healthcare=hospital
    413413K:healthcare=pharmacy
     414K:healthcare=clinic
     415K:healthcare=centre
     416K:healthcare=physiotherapist
    414417K:golf=cartpath
    415418K:man_made=water_tap
  • trunk/data/validator/unnecessary.mapcss

    r15761 r15953  
    113113*[name][name=~/^(?i)(cemetery|cementerio|cimetière|cmentarz|friedhof)$/][amenity=grave_yard],
    114114*[name][name=~/^(?i)(cemetery|cementerio|cimetière|cmentarz|friedhof)$/][landuse=cemetery],
    115 *[name][name=~/^(?i)(mairie|rathaus)$/][amenity=townhall],
    116115*[name][name=~/^(?i)(monument aux morts|war memorial)$/][historic=memorial][memorial=war_memorial],
    117116*[name][name=~/^(?i)(school|école|Школа)$/][building=school],
  • trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java

    r15926 r15953  
    146146    public static AutoFilterRule[] defaultRules() {
    147147        return new AutoFilterRule[]{
     148            new AutoFilterRule("admin_level", 11),
     149            new AutoFilterRule("building:levels", 17),
     150            new AutoFilterRule("frequency", 5),
     151            new AutoFilterRule("gauge", 5),
     152            new AutoFilterRule("incline", 13)
     153                    .setValueExtractor(s -> Integer.parseInt(s.replaceAll("%$", "")))
     154                    .setValueFormatter(v -> v + "\u2009%"),
     155            new AutoFilterRule("lanes", 13),
     156            new AutoFilterRule("layer", 16)
     157                    .setDefaultValueSupplier(AutoFilterRule::defaultLayer),
    148158            new AutoFilterRule("level", 17)
    149159                // #17109, support values like 0.5 or 1.5 - level values are multiplied by 2 when parsing, values are divided by 2 for formatting
    150160                .setValueExtractor(s -> (int) (Double.parseDouble(s) * 2.))
    151161                .setValueFormatter(v -> DecimalFormat.getInstance(Locale.ROOT).format(v / 2.)),
    152             new AutoFilterRule("layer", 16)
    153                     .setDefaultValueSupplier(AutoFilterRule::defaultLayer),
    154162            new AutoFilterRule("maxspeed", 16)
    155163                    .setValueExtractor(s -> Integer.parseInt(s.replace(" mph", ""))),
    156164            new AutoFilterRule("voltage", 5)
    157                     .setValueFormatter(s -> s % 1000 == 0 ? (s / 1000) + "kV" : s + "V"),
    158             new AutoFilterRule("building:levels", 17),
    159             new AutoFilterRule("gauge", 5),
    160             new AutoFilterRule("frequency", 5),
    161             new AutoFilterRule("incline", 13)
    162                     .setValueExtractor(s -> Integer.parseInt(s.replaceAll("%$", "")))
    163                     .setValueFormatter(v -> v + "\u2009%"),
    164             new AutoFilterRule("lanes", 13),
    165             new AutoFilterRule("admin_level", 11)
     165                    .setValueFormatter(s -> s % 1000 == 0 ? (s / 1000) + "kV" : s + "V")
    166166        };
    167167    }
     
    206206    @Override
    207207    public String toString() {
    208         return key + '[' + minZoomLevel + ']';
     208        return key + " [" + minZoomLevel + ']';
    209209    }
    210210}
Note: See TracChangeset for help on using the changeset viewer.