Changeset 31855 in osm for applications/viewer

Timestamp:

2015-12-25T14:24:42+01:00 (9 years ago)

Author:

simon04

Message:

Use HTTPS for Bing Aerial

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java (modified) (2 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java

@@ -90 +90 @@
 
     protected URL getAttributionUrl() throws MalformedURLException {
-        return new URL("http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&output=xml&key="
+        return new URL("https://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&output=xml&key="
                 + API_KEY);
     }
@@ -103 +103 @@
             XPath xpath = xPathFactory.newXPath();
             imageUrlTemplate = xpath.compile("//ImageryMetadata/ImageUrl/text()").evaluate(document);
+            imageUrlTemplate = imageUrlTemplate.replace(
+                    "http://ecn.{subdomain}.tiles.virtualearth.net/",
+                    "https://ecn.{subdomain}.tiles.virtualearth.net/");
             imageUrlTemplate = culturePattern.matcher(imageUrlTemplate).replaceAll(Locale.getDefault().toString());
             imageryZoomMax = Integer.valueOf(xpath.compile("//ImageryMetadata/ZoomMax/text()").evaluate(document));