Ticket #24663: patch_24663.txt

File patch_24663.txt, 1.5 KB (added by DanProgs <Abenteurer.2901@…>, 5 days ago)
Line 
1### Eclipse Workspace Patch 1.0
2#P JMapViewer
3Index: src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
4===================================================================
5--- src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java (revision 36494)
6+++ src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java (working copy)
7@@ -8,6 +8,7 @@
8 import java.net.URISyntaxException;
9 import java.net.URL;
10 import java.util.ArrayList;
11+import java.util.Collections;
12 import java.util.List;
13 import java.util.Locale;
14 import java.util.concurrent.Callable;
15@@ -112,6 +113,8 @@
16 String url = imageUrlTemplate;
17 url = PATTERN_SUBDOMAIN.matcher(url).replaceAll(subdomain);
18 url = PATTERN_QUADKEY.matcher(url).replaceAll(computeQuadTree(zoom, tilex, tiley));
19+
20+ url = PATTERN_CULTURE.matcher(url).replaceAll(Locale.getDefault().toString());
21
22 return url;
23 }
24@@ -229,7 +232,7 @@
25 } catch (SAXException | ParserConfigurationException | XPathExpressionException | NumberFormatException e) {
26 LOG.log(Level.SEVERE, "Could not parse Bing aerials attribution metadata.", e);
27 }
28- return null;
29+ return Collections.emptyList();
30 }
31
32 @Override
33@@ -337,7 +340,7 @@
34 Thread.currentThread().interrupt();
35 }
36 }
37- return null;
38+ return Collections.emptyList();
39 }
40
41 @Override