Changeset 8418 in josm for trunk/src/org/openstreetmap/josm/io/imagery

Timestamp:

2015-05-23T00:46:21+02:00 (9 years ago)

Author:

wiktorn

Message:

Add posibility to display HTTP headers in Show Tile Info dialog. Closes #11456

File:

• trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -42 +42 @@
         SHAPE,
         NO_TILE,
+        METADATA,
         UNKNOWN,            // element is not recognized in the current context
     }
@@ -88 +89 @@
         private List<String> projections;
         private Map<String, String> noTileHeaders;
+        private Map<String, String> metadataHeaders;
 
         @Override
@@ -117 +119 @@
                     skipEntry = false;
                     newState = State.ENTRY;
+                    noTileHeaders = new HashMap<>();
+                    metadataHeaders = new HashMap<>();
                 }
                 break;
@@ -157 +161 @@
                     newState = State.PROJECTIONS;
                 } else if ("no-tile-header".equals(qName)) {
-                    noTileHeaders = new HashMap<>();
                     noTileHeaders.put(atts.getValue("name"), atts.getValue("value"));
                     newState = State.NO_TILE;
+                } else if ("metadata-header".equals(qName)) {
+                    metadataHeaders.put(atts.getValue("header-name"), atts.getValue("metadata-key"));
+                    newState = State.METADATA;
                 }
                 break;
@@ -196 +202 @@
                 skipEntry = true;
             }
-            return;
         }
 
@@ -211 +216 @@
             case ENTRY:
                 if ("entry".equals(qName)) {
+                    entry.setNoTileHeaders(noTileHeaders);
+                    noTileHeaders = null;
+                    entry.setMetadataHeaders(metadataHeaders);
+                    metadataHeaders = null;
+
                     if (!skipEntry) {
                         entries.add(entry);
@@ -332 +342 @@
                 break;
             case NO_TILE:
-                entry.setNoTileHeaders(noTileHeaders);
-                noTileHeaders = null;
                 break;