Changeset 14564 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2018-12-15T19:24:34+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16073 - better detection of bad zoom errors

File:

• trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java (modified) (7 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

@@ -12 +12 @@
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
@@ -137 +138 @@
     }
 
-    private boolean checkTileUrl(ImageryInfo info, AbstractTileSource tileSource, ICoordinate center, int zoom)
+    private String checkTileUrl(ImageryInfo info, AbstractTileSource tileSource, ICoordinate center, int zoom)
             throws IOException {
         TileXY xy = tileSource.latLonToTileXY(center, zoom);
@@ -143 +144 @@
             try {
                 String url = tileSource.getTileUrl(zoom, xy.getXIndex(), xy.getYIndex());
-                checkUrl(info, url).ifPresent(data -> {
+                Optional<byte[]> optional = checkUrl(info, url);
+                String error = "";
+                if (optional.isPresent()) {
+                    byte[] data = optional.get();
                     try (ByteArrayInputStream bais = new ByteArrayInputStream(data)) {
                         if (ImageIO.read(bais) == null) {
-                            addImageError(info, url, data, zoom, "did not return an image");
+                            error = addImageError(info, url, data, zoom, "did not return an image");
                         }
                     } catch (IOException e) {
-                        addImageError(info, url, data, zoom, e.toString());
+                        error = addImageError(info, url, data, zoom, e.toString());
                         Logging.trace(e);
                     }
-                });
-                // Determines if this is a success (no error message with current zoom marker)
-                return errors.getOrDefault(info.getCountryCode(), Collections.emptyMap())
-                              .getOrDefault(info, Collections.emptyList())
-                              .stream().noneMatch(e -> e.contains(zoomMarker(zoom)));
+                }
+                return error;
             } catch (IOException e) {
                 // Try up to three times max to allow Bing source to initialize itself
@@ -171 +172 @@
             }
         }
-        return false;
+        return "";
     }
 
@@ -178 +179 @@
     }
 
-    private void addImageError(ImageryInfo info, String url, byte[] data, int zoom, String defaultMessage) {
+    private String addImageError(ImageryInfo info, String url, byte[] data, int zoom, String defaultMessage) {
         // Check if we have received an error message
         String error = helper.detectErrorMessage(new String(data, StandardCharsets.UTF_8));
-        addError(info, url + zoomMarker(zoom) + (error != null ? error.split("\\n")[0] : defaultMessage));
+        String errorMsg = url + zoomMarker(zoom) + (error != null ? error.split("\\n")[0] : defaultMessage);
+        addError(info, errorMsg);
+        return errorMsg;
     }
 
@@ -258 +261 @@
             int maxZoom = info.getMaxZoom() > 0 ? Math.min(DEFAULT_ZOOM, info.getMaxZoom()) : DEFAULT_ZOOM;
             for (int zoom = info.getMinZoom(); zoom < maxZoom; zoom++) {
-                if (checkTileUrl(info, tileSource, center, zoom)) {
+                if (!isZoomError(checkTileUrl(info, tileSource, center, zoom))) {
                     break;
                 }
@@ -273 +276 @@
             checkEntry(mirror);
         }
+    }
+
+    private static boolean isZoomError(String error) {
+        String[] parts = error.split(" -> ");
+        String lastPart = parts.length > 0 ? parts[parts.length - 1].toLowerCase(Locale.ENGLISH) : "";
+        return lastPart.contains("bbox")
+            || lastPart.contains("bounding box");
     }