[PATCH] Bing: Automatically reload all tiles with `Error: Attribution is not loaded yet` after successfully loading the attribution

[skyper]

Follow-up of #23721

Copied from 23721#comment:14:

There is still an annoying glitch as the tiles are not automatically reloaded once the attribution was successfully loaded. Right now, Error: Attribution is not loaded yet remains on the screen and I have to manually reload the tiles on every zoom level.

Copied from 23721#comment:16:

Don't we have a "reload error tiles" function. Would simply calling it when attribution is loaded help?

Relative:URL: ^/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2024-08-06 23:58:07 +0200 (Tue, 06 Aug 2024)
Revision:19171
Build-Date:2024-08-07 01:30:30
URL:https://josm.openstreetmap.de/svn/trunk

[taylor.smock]

Replying to stoecker:

Don't we have a "reload error tiles" function. Would simply calling it when attribution is loaded help?

Yes. The problem is calling it from a location where we know that the attribution has been loaded.

We can do one of several different things (semi-psuedocode):

1. Call MainApplication.getLayerManager().getLayersOfType(TMSLayer.class).stream().filter(l -> l.getInfo() == 'Bing').forEach(TMSLayer::reloadTiles)
2. Add an overload with a Runnable that will be called when the attribution is loaded.

(1) is easier, (2) is better IMO.

[taylor.smock]

It turns out we already have some code in place for this. It just doesn't work fully; it only loads error tiles in view.

[taylor.smock]

For those who want to test the following patches:

src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java

@@ -136 +136 @@
         public void run() {
             BingAttributionData attributionLoader = new BingAttributionData();
             try {
+                if (true) throw new IOException("Temp exception"); // I change `true` to `false` and hot reload the class.
                 String xml = attributionLoader.updateIfRequiredString();
                 List<Attribution> ret;
                 try (StringReader sr = new StringReader(xml)) {

What we do is the following:

1. In JMapViewer, we add a new method clearAllErrorTiles that does what it says. By default, it just calls clear(), but the cache implementation we use implements something a bit smarter than that.
2. In AbstractTileSource we add a method that will clear the error tiles
3. In TMSLayer we modify the listener to clear all error tiles

[taylor.smock]

In 36306/osm:

Fix #23841: Bing: Automatically reload all tiles with Error: Attribution is not loaded yet after successfully loading the attribution

[taylor.smock]

In 19191/josm:

Dependency updates

ivy.xml

• org.openstreetmap.jmapviewer:jmapviewer: 2.20 -> 2.21 (see #23841)
• org.eclipse.parsson:parsson: 1.1.6 -> 1.1.7
• org.apache.commons:commons-compress: 1.26.2 -> 1.27.0
• org.tukaani:xz: 1.9 -> 1.10 (PD -> 0BSD)
• org.webjars.npm:tag2link: 2024.7.8 -> 2024.8.12

tools/ivy.xml

• net.sourceforge.pmd:pmd: 7.3.0 -> 7.4.0
• com.google.errorprone:error_prone: 2.29.2 -> 2.30.0

[taylor.smock]

In 19192/josm:

Fix #23841: Bing: Automatically reload all tiles with Error: Attribution is not loaded yet after successfully loading the attribution