### Eclipse Workspace Patch 1.0 #P JMapViewer Index: src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java =================================================================== --- src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java (revision 36494) +++ src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java (working copy) @@ -8,6 +8,7 @@ import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.concurrent.Callable; @@ -112,6 +113,8 @@ String url = imageUrlTemplate; url = PATTERN_SUBDOMAIN.matcher(url).replaceAll(subdomain); url = PATTERN_QUADKEY.matcher(url).replaceAll(computeQuadTree(zoom, tilex, tiley)); + + url = PATTERN_CULTURE.matcher(url).replaceAll(Locale.getDefault().toString()); return url; } @@ -229,7 +232,7 @@ } catch (SAXException | ParserConfigurationException | XPathExpressionException | NumberFormatException e) { LOG.log(Level.SEVERE, "Could not parse Bing aerials attribution metadata.", e); } - return null; + return Collections.emptyList(); } @Override @@ -337,7 +340,7 @@ Thread.currentThread().interrupt(); } } - return null; + return Collections.emptyList(); } @Override