Changeset 9613 in josm for trunk/src/org

Timestamp:

2016-01-24T15:14:26+01:00 (9 years ago)

Author:

stoecker

Message:

fix #12437 - see #12425 - fix handling of equal no tile headers with different values - hope the related josm config change does not break anything

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryInfo.java (modified) (3 diffs)
• io/imagery/ImageryReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -219 +219 @@
         @pref String icon;
         @pref String description;
-        @pref Map<String, String> noTileHeaders;
-        @pref Map<String, String> noTileChecksums;
+        @pref Map<String, List<String>> noTileHeaders;
+        @pref Map<String, List<String>> noTileChecksums;
         @pref int tileSize = OsmMercator.DEFAUL_TILE_SIZE;
         @pref Map<String, String> metadataHeaders;
@@ -976 +976 @@
      *
      * @param noTileHeaders Map of &lt;header name, header value&gt; which will be treated as "no tile at this zoom level"
-     * @since 8344
-     */
-    public void setNoTileHeaders(Map<String, String> noTileHeaders) {
+     * @since 9611
+     */
+    public void setNoTileHeaders(Map<String, List<String>> noTileHeaders) {
        this.noTileHeaders = noTileHeaders;
     }
 
     @Override
-    public Map<String, String> getNoTileHeaders() {
+    public Map<String, List<String>> getNoTileHeaders() {
         return noTileHeaders;
     }
@@ -992 +992 @@
      *
      * @param noTileChecksums Map of &lt;checksum type, checksum value&gt; which will be treated as "no tile at this zoom level"
-     * @since 9610
-     */
-    public void setNoTileChecksums(Map<String, String> noTileChecksums) {
+     * @since 9611
+     */
+    public void setNoTileChecksums(Map<String, List<String>> noTileChecksums) {
        this.noTileChecksums = noTileChecksums;
     }
 
     @Override
-    public Map<String, String> getNoTileChecksums() {
+    public Map<String, List<String>> getNoTileChecksums() {
         return noTileChecksums;
     }

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

@@ -94 +94 @@
         private String lang;
         private List<String> projections;
-        private Map<String, String> noTileHeaders;
-        private Map<String, String> noTileChecksums;
+        private Map<String, List<String> > noTileHeaders;
+        private Map<String, List<String> > noTileChecksums;
         private Map<String, String> metadataHeaders;
 
@@ -172 +172 @@
                     newState = State.PROJECTIONS;
                 } else if ("no-tile-header".equals(qName)) {
-                    noTileHeaders.put(atts.getValue("name"), atts.getValue("value"));
+                    String name = atts.getValue("name");
+                    List<String> l;
+                    if (noTileHeaders.containsKey(name)) {
+                        l = noTileHeaders.get(name);
+                    } else {
+                        l = new ArrayList<String>();
+                        noTileHeaders.put(atts.getValue("name"), l);
+                    }
+                    l.add(atts.getValue("value"));
                     newState = State.NO_TILE;
                 } else if ("no-tile-checksum".equals(qName)) {
-                    noTileChecksums.put(atts.getValue("type"), atts.getValue("value"));
+                    String type = atts.getValue("type");
+                    List<String> l;
+                    if (noTileChecksums.containsKey(type)) {
+                        l = noTileChecksums.get(type);
+                    } else {
+                        l = new ArrayList<String>();
+                        noTileChecksums.put(type, l);
+                    }
+                    l.add(atts.getValue("value"));
                     newState = State.NO_TILESUM;
                 } else if ("metadata-header".equals(qName)) {