Changeset 8418 in josm for trunk/src/org/openstreetmap/josm/io
- Timestamp:
- 2015-05-23T00:46:21+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
r8390 r8418 42 42 SHAPE, 43 43 NO_TILE, 44 METADATA, 44 45 UNKNOWN, // element is not recognized in the current context 45 46 } … … 88 89 private List<String> projections; 89 90 private Map<String, String> noTileHeaders; 91 private Map<String, String> metadataHeaders; 90 92 91 93 @Override … … 117 119 skipEntry = false; 118 120 newState = State.ENTRY; 121 noTileHeaders = new HashMap<>(); 122 metadataHeaders = new HashMap<>(); 119 123 } 120 124 break; … … 157 161 newState = State.PROJECTIONS; 158 162 } else if ("no-tile-header".equals(qName)) { 159 noTileHeaders = new HashMap<>();160 163 noTileHeaders.put(atts.getValue("name"), atts.getValue("value")); 161 164 newState = State.NO_TILE; 165 } else if ("metadata-header".equals(qName)) { 166 metadataHeaders.put(atts.getValue("header-name"), atts.getValue("metadata-key")); 167 newState = State.METADATA; 162 168 } 163 169 break; … … 196 202 skipEntry = true; 197 203 } 198 return;199 204 } 200 205 … … 211 216 case ENTRY: 212 217 if ("entry".equals(qName)) { 218 entry.setNoTileHeaders(noTileHeaders); 219 noTileHeaders = null; 220 entry.setMetadataHeaders(metadataHeaders); 221 metadataHeaders = null; 222 213 223 if (!skipEntry) { 214 224 entries.add(entry); … … 332 342 break; 333 343 case NO_TILE: 334 entry.setNoTileHeaders(noTileHeaders);335 noTileHeaders = null;336 344 break; 337 345
Note:
See TracChangeset
for help on using the changeset viewer.