Changeset 11913 in josm for trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
- Timestamp:
- 2017-04-15T01:38:46+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
r11884 r11913 98 98 99 99 private static class Parser extends DefaultHandler { 100 private static final String MAX_ZOOM = "max-zoom"; 101 private static final String MIN_ZOOM = "min-zoom"; 102 private static final String TILE_SIZE = "tile-size"; 103 private static final String TRUE = "true"; 104 100 105 private StringBuilder accumulator = new StringBuilder(); 101 106 … … 155 160 metadataHeaders = new HashMap<>(); 156 161 String best = atts.getValue("eli-best"); 157 if ( "true".equals(best)) {162 if (TRUE.equals(best)) { 158 163 entry.setBestMarked(true); 159 164 } … … 164 169 "type", 165 170 "url", 166 "min-zoom",167 "max-zoom",168 "tile-size",171 MIN_ZOOM, 172 MAX_ZOOM, 173 TILE_SIZE, 169 174 }).contains(qName)) { 170 175 newState = State.MIRROR_ATTRIBUTE; … … 184 189 "url", 185 190 "eula", 186 "min-zoom",187 "max-zoom",191 MIN_ZOOM, 192 MAX_ZOOM, 188 193 "attribution-text", 189 194 "attribution-url", … … 195 200 "icon", 196 201 "date", 197 "tile-size",202 TILE_SIZE, 198 203 "valid-georeference", 199 204 }).contains(qName)) { … … 264 269 } 265 270 states.push(newState); 266 if (newState == State.UNKNOWN && "true".equals(atts.getValue("mandatory"))) {271 if (newState == State.UNKNOWN && TRUE.equals(atts.getValue("mandatory"))) { 267 272 skipEntry = true; 268 273 } … … 319 324 mirrorEntry.setUrl(accumulator.toString()); 320 325 break; 321 case "min-zoom":322 case "max-zoom":326 case MIN_ZOOM: 327 case MAX_ZOOM: 323 328 Integer val = null; 324 329 try { … … 330 335 mirrorEntry = null; 331 336 } else { 332 if ( "min-zoom".equals(qName)) {337 if (MIN_ZOOM.equals(qName)) { 333 338 mirrorEntry.setDefaultMinZoom(val); 334 339 } else { … … 337 342 } 338 343 break; 339 case "tile-size":344 case TILE_SIZE: 340 345 Integer tileSize = null; 341 346 try { … … 383 388 case "default": 384 389 switch (accumulator.toString()) { 385 case "true":390 case TRUE: 386 391 entry.setDefaultEntry(true); 387 392 break; … … 399 404 entry.setEulaAcceptanceRequired(accumulator.toString()); 400 405 break; 401 case "min-zoom":402 case "max-zoom":406 case MIN_ZOOM: 407 case MAX_ZOOM: 403 408 Integer val = null; 404 409 try { … … 410 415 skipEntry = true; 411 416 } else { 412 if ( "min-zoom".equals(qName)) {417 if (MIN_ZOOM.equals(qName)) { 413 418 entry.setDefaultMinZoom(val); 414 419 } else { … … 441 446 entry.setIcon(accumulator.toString()); 442 447 break; 443 case "tile-size":448 case TILE_SIZE: 444 449 Integer tileSize = null; 445 450 try {
Note:
See TracChangeset
for help on using the changeset viewer.