[Git][debian-gis-team/jmapviewer][master] 4 commits: New upstream version 2.11+dfsg

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / jmapviewer


Commits:
1460c284 by Bas Couwenberg at 2019-07-09T04:14:50Z
New upstream version 2.11+dfsg
- - - - -
d7c5c4bc by Bas Couwenberg at 2019-07-09T04:14:51Z
Update upstream source from tag 'upstream/2.11+dfsg'

Update to upstream version '2.11+dfsg'
with Debian dir e41956a8326a84f1e469245064f59a724fa86f48
- - - - -
24b1e382 by Bas Couwenberg at 2019-07-09T04:15:03Z
New upstream release.

- - - - -
59e308f3 by Bas Couwenberg at 2019-07-09T04:16:04Z
Set distribution to unstable.

- - - - -


2 changed files:

- debian/changelog
- src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,9 @@
-jmapviewer (2.10+dfsg-2) UNRELEASED; urgency=medium
+jmapviewer (2.11+dfsg-1) unstable; urgency=medium
 
+  * New upstream release.
   * Update gbp.conf to use --source-only-changes by default.
 
- -- Bas Couwenberg <sebastic at debian.org>  Sun, 07 Jul 2019 07:34:18 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 09 Jul 2019 06:15:54 +0200
 
 jmapviewer (2.10+dfsg-1) unstable; urgency=medium
 


=====================================
src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
=====================================
@@ -13,7 +13,6 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
@@ -275,9 +274,7 @@ public class BingAerialTileSource extends TMSTileSource {
             }
         }
         try {
-            return attributions.get(0, TimeUnit.MILLISECONDS);
-        } catch (TimeoutException ex) {
-            LOG.log(Level.WARNING, "Bing: attribution data is not yet loaded.");
+            return attributions.get();
         } catch (ExecutionException ex) {
             throw new RuntimeException(ex.getCause());
         } catch (InterruptedException ign) {



View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/compare/4595d452baa37b56f061018d9a28ab3d52649f29...59e308f34cfe6ea8671ca33228fea8ba50d5abe2

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/compare/4595d452baa37b56f061018d9a28ab3d52649f29...59e308f34cfe6ea8671ca33228fea8ba50d5abe2
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190709/82062c79/attachment-0001.html>