Changeset 9610 in josm

Timestamp:

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

Author:

stoecker

Message:

fix #12425 - add checksum based no-tile detection

Location:

trunk

Files:

• data/maps.xsd (modified) (1 diff)
• src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (6 diffs)
• src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/imagery/ImageryReader.java (modified) (6 diffs)

trunk/data/maps.xsd

@@ -680 +680 @@
                                                                 </xs:complexType>
                                                         </xs:element>
+                                                        <!-- list of checksums, that indicate "no tile at this zoom level" situation -->
+                                                        <xs:element name="no-tile-checksum" minOccurs="0" maxOccurs="unbounded">
+                                                                <xs:complexType>
+                                                                        <xs:attribute name="type" type="xs:string" />
+                                                                        <xs:attribute name="value" type="xs:string" />
+                                                                </xs:complexType>
+                                                        </xs:element>
                                                         <!-- tile size provided by imagery source. Default - 256 -->
                                                         <xs:element name="tile-size" minOccurs="0" maxOccurs="1" type="xs:positiveInteger" />

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

@@ -220 +220 @@
         @pref String description;
         @pref Map<String, String> noTileHeaders;
+        @pref Map<String, String> noTileChecksums;
         @pref int tileSize = OsmMercator.DEFAUL_TILE_SIZE;
         @pref Map<String, String> metadataHeaders;
@@ -281 +282 @@
             }
 
+            if (i.noTileChecksums != null && !i.noTileChecksums.isEmpty()) {
+                noTileChecksums = i.noTileChecksums;
+            }
+
             if (i.metadataHeaders != null && !i.metadataHeaders.isEmpty()) {
                 metadataHeaders = i.metadataHeaders;
@@ -409 +414 @@
             noTileHeaders = e.noTileHeaders;
         }
+        if (e.noTileChecksums != null) {
+            noTileChecksums = e.noTileChecksums;
+        }
         setTileSize(e.tileSize);
         metadataHeaders = e.metadataHeaders;
@@ -440 +448 @@
         this.description = i.description;
         this.noTileHeaders = i.noTileHeaders;
+        this.noTileChecksums = i.noTileChecksums;
         this.metadataHeaders = i.metadataHeaders;
         this.isEpsg4326To3857Supported = i.isEpsg4326To3857Supported;
@@ -485 +494 @@
                 Objects.equals(this.description, other.description) &&
                 Objects.equals(this.noTileHeaders, other.noTileHeaders) &&
+                Objects.equals(this.noTileChecksums, other.noTileChecksums) &&
                 Objects.equals(this.metadataHeaders, other.metadataHeaders);
     }
@@ -978 +988 @@
 
     /**
+     * Sets the map of &lt;checksum type, checksum value&gt; that if any tile with that checksum
+     * will be returned, then this tile will be treated as "no tile at this zoom level"
+     *
+     * @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) {
+       this.noTileChecksums = noTileChecksums;
+    }
+
+    @Override
+    public Map<String, String> getNoTileChecksums() {
+        return noTileChecksums;
+    }
+
+    /**
      * Returns the map of &lt;header name, metadata key&gt; indicating, which HTTP headers should
      * be moved to metadata

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

@@ -206 +206 @@
         Collection<String> newKnownDefaults = new TreeSet<>(knownDefaults);
         for (ImageryInfo def : defaultLayers) {
-            // temporary migration code, so all user preferences will get updated with new settings from JOSM site (can be removed ~Dez. 2015)
-            if (def.getNoTileHeaders() != null || def.getTileSize() > 0 || def.getMetadataHeaders() != null) {
-                for (ImageryInfo i: layers) {
-                    if (isSimilar(def,  i)) {
-                        if (def.getNoTileHeaders() != null) {
-                            i.setNoTileHeaders(def.getNoTileHeaders());
-                        }
-                        if (def.getTileSize() > 0) {
-                            i.setTileSize(def.getTileSize());
-                        }
-                        if (def.getMetadataHeaders() != null && def.getMetadataHeaders().size() > 0) {
-                            i.setMetadataHeaders(def.getMetadataHeaders());
-                        }
-                        changed = true;
-                    }
-                }
-            }
-
             if (def.isDefaultEntry()) {
                 boolean isKnownDefault = false;

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;