Changeset 9610 in josm for trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

Timestamp:

2016-01-24T14:42:03+01:00 (8 years ago)

Author:

stoecker

Message:

fix #12425 - add checksum based no-tile detection

File:

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

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

@@ -45 +45 @@
         SHAPE,
         NO_TILE,
+        NO_TILESUM,
         METADATA,
         UNKNOWN,            // element is not recognized in the current context
@@ -94 +95 @@
         private List<String> projections;
         private Map<String, String> noTileHeaders;
+        private Map<String, String> noTileChecksums;
         private Map<String, String> metadataHeaders;
 
@@ -107 +109 @@
             projections = null;
             noTileHeaders = null;
+            noTileChecksums = null;
         }
 
@@ -125 +128 @@
                     newState = State.ENTRY;
                     noTileHeaders = new HashMap<>();
+                    noTileChecksums = new HashMap<>();
                     metadataHeaders = new HashMap<>();
                 }
@@ -170 +174 @@
                     noTileHeaders.put(atts.getValue("name"), atts.getValue("value"));
                     newState = State.NO_TILE;
+                } else if ("no-tile-checksum".equals(qName)) {
+                    noTileChecksums.put(atts.getValue("type"), atts.getValue("value"));
+                    newState = State.NO_TILESUM;
                 } else if ("metadata-header".equals(qName)) {
                     metadataHeaders.put(atts.getValue("header-name"), atts.getValue("metadata-key"));
@@ -225 +232 @@
                     entry.setNoTileHeaders(noTileHeaders);
                     noTileHeaders = null;
+                    entry.setNoTileChecksums(noTileChecksums);
+                    noTileChecksums = null;
                     entry.setMetadataHeaders(metadataHeaders);
                     metadataHeaders = null;