Bas Couwenberg pushed to branch upstream at Debian GIS Project / jmapviewer
Commits:
f1be1d32 by Bas Couwenberg at 2024-08-30T17:24:41+02:00
New upstream version 2.22+dfsg
- - - - -
2 changed files:
- src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
- −
src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java.rej
Changes:
=====================================
src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
=====================================
@@ -273,7 +273,7 @@ public class BingAerialTileSource extends TMSTileSource {
List<Attribution> r = parseAttributionText(xml);
LOG.log(Level.FINE, "Successfully loaded Bing attribution
data.");
return r;
- } catch (IOException ex) {
+ } catch (IllegalArgumentException | IOException ex) {
LOG.log(Level.SEVERE, String.format("Could not connect to
Bing API. Will retry in %d seconds.", waitTimeSec));
LOG.log(Level.FINE, ex.getMessage(), ex);
Thread.sleep(TimeUnit.SECONDS.toMillis(waitTimeSec));
=====================================
src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java.rej
deleted
=====================================
@@ -1,25 +0,0 @@
-@@ -286,14 +286,16 @@
- }
- }
- }
-- try {
-- return attributions.get();
-- } catch (ExecutionException ex) {
-- throw new JMapViewerRuntimeException(ex);
-- } catch (InterruptedException ign) {
-- LOG.log(Level.SEVERE, "InterruptedException: {0}",
ign.getMessage());
-- LOG.log(Level.FINE, ign.getMessage(), ign);
-- Thread.currentThread().interrupt();
-+ if (attributions.isDone()) {
-+ try {
-+ return attributions.get();
-+ } catch (ExecutionException ex) {
-+ throw new JMapViewerRuntimeException(ex);
-+ } catch (InterruptedException ign) {
-+ LOG.log(Level.SEVERE, "InterruptedException: {0}",
ign.getMessage());
-+ LOG.log(Level.FINE, ign.getMessage(), ign);
-+ Thread.currentThread().interrupt();
-+ }
- }
- return null;
- }
View it on GitLab:
https://salsa.debian.org/debian-gis-team/jmapviewer/-/commit/f1be1d323ec73fbb468c2c06ae011f408147f364
--
View it on GitLab:
https://salsa.debian.org/debian-gis-team/jmapviewer/-/commit/f1be1d323ec73fbb468c2c06ae011f408147f364
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
