Bas Couwenberg pushed to branch master at Debian GIS Project / jmapviewer
Commits: f1be1d32 by Bas Couwenberg at 2024-08-30T17:24:41+02:00 New upstream version 2.22+dfsg - - - - - db2e7b1b by Bas Couwenberg at 2024-08-30T17:24:41+02:00 Update upstream source from tag 'upstream/2.22+dfsg' Update to upstream version '2.22+dfsg' with Debian dir ddaa24a3e9002ddd54adfc948dd03b047254a08d - - - - - db7adc6d by Bas Couwenberg at 2024-08-30T17:24:54+02:00 New upstream release. - - - - - ea7063c0 by Bas Couwenberg at 2024-08-30T17:25:50+02:00 Set distribution to unstable. - - - - - 3 changed files: - debian/changelog - src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java - − src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java.rej Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +jmapviewer (2.22+dfsg-1) unstable; urgency=medium + + * New upstream release. + + -- Bas Couwenberg <[email protected]> Fri, 30 Aug 2024 17:25:39 +0200 + jmapviewer (2.21+dfsg-1) unstable; urgency=medium * New upstream release. ===================================== 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/-/compare/a8b5f1877e1efb87f28fa2505d61d76989b854fe...ea7063c02efc37af58036105089aa20fa503f242 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/-/compare/a8b5f1877e1efb87f28fa2505d61d76989b854fe...ea7063c02efc37af58036105089aa20fa503f242 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
