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

[Bas Couwenberg (@sebastic)]

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


Commits:
81a7f3de by Bas Couwenberg at 2025-02-05T05:28:44+01:00
New upstream version 2.24+dfsg
- - - - -
80c90df5 by Bas Couwenberg at 2025-02-05T05:28:45+01:00
Update upstream source from tag 'upstream/2.24+dfsg'

Update to upstream version '2.24+dfsg'
with Debian dir 00f2527d6ce898baedd230cb5cd14fd195225929
- - - - -
676d2c24 by Bas Couwenberg at 2025-02-05T05:28:57+01:00
New upstream release.

- - - - -
537477c7 by Bas Couwenberg at 2025-02-05T05:29:52+01:00
Set distribution to unstable.

- - - - -


2 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+jmapviewer (2.24+dfsg-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 05 Feb 2025 05:29:43 +0100
+
 jmapviewer (2.23+dfsg-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
=====================================
@@ -158,7 +158,9 @@ public class BingAerialTileSource extends TMSTileSource {
         String key = FeatureAdapter.getSetting(API_KEY_SETTING, API_KEY);
         if (API_KEY.equals(key)) { // If the API key has not been customized, we try to retrieve the API key
             try {
-                key = FeatureAdapter.retrieveApiKey(this.getId());
+                String rkey = FeatureAdapter.retrieveApiKey(this.getId());
+                if (rkey != null)
+                    key = rkey;
             } catch (IOException ioException) {
                 FeatureAdapter.getLogger(this.getClass()).log(Level.WARNING, "Failed to retrieve api key", ioException);
             }



View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/-/compare/f7e6736058393b265ac9ac0780a5c71382a394e3...537477c74c5e7ac823bb7d8765df667e06658fb5

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/-/compare/f7e6736058393b265ac9ac0780a5c71382a394e3...537477c74c5e7ac823bb7d8765df667e06658fb5
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/20250205/91d8e764/attachment-0001.htm>