Changeset 15953 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2020-02-28T21:56:12+01:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java
r15926 r15953 146 146 public static AutoFilterRule[] defaultRules() { 147 147 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), 148 158 new AutoFilterRule("level", 17) 149 159 // #17109, support values like 0.5 or 1.5 - level values are multiplied by 2 when parsing, values are divided by 2 for formatting 150 160 .setValueExtractor(s -> (int) (Double.parseDouble(s) * 2.)) 151 161 .setValueFormatter(v -> DecimalFormat.getInstance(Locale.ROOT).format(v / 2.)), 152 new AutoFilterRule("layer", 16)153 .setDefaultValueSupplier(AutoFilterRule::defaultLayer),154 162 new AutoFilterRule("maxspeed", 16) 155 163 .setValueExtractor(s -> Integer.parseInt(s.replace(" mph", ""))), 156 164 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") 166 166 }; 167 167 } … … 206 206 @Override 207 207 public String toString() { 208 return key + '['+ minZoomLevel + ']';208 return key + " [" + minZoomLevel + ']'; 209 209 } 210 210 }
Note:
See TracChangeset
for help on using the changeset viewer.