From 4080e729dfc3b1c110c87c1c8a7d5096ab9bad96 Mon Sep 17 00:00:00 2001 From: photostu Date: Thu, 5 Feb 2015 10:34:33 -0500 Subject: [PATCH 1/2] bing https logo fix If https is missing from bing logo uri, replace --- src/ol/source/bingmapssource.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmapssource.js index f025874a8f..8184702577 100644 --- a/src/ol/source/bingmapssource.js +++ b/src/ol/source/bingmapssource.js @@ -98,6 +98,9 @@ ol.source.BingMaps.prototype.handleImageryMetadataResponse = } var brandLogoUri = response.brandLogoUri; + if (ol.IS_HTTPS && brandLogoUri.indexOf("https")==-1){ + brandLogoUri = brandLogoUri.replace("http", "https"); + } //var copyright = response.copyright; // FIXME do we need to display this? var resource = response.resourceSets[0].resources[0]; goog.asserts.assert(resource.imageWidth == resource.imageHeight); From 9247dc9f413406dca810c61bf6b43d5ea2d91011 Mon Sep 17 00:00:00 2001 From: photostu Date: Thu, 5 Feb 2015 11:21:13 -0500 Subject: [PATCH 2/2] bing logo https fix syntax to please Travis --- src/ol/source/bingmapssource.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmapssource.js index 8184702577..b2a9bff0fc 100644 --- a/src/ol/source/bingmapssource.js +++ b/src/ol/source/bingmapssource.js @@ -98,8 +98,8 @@ ol.source.BingMaps.prototype.handleImageryMetadataResponse = } var brandLogoUri = response.brandLogoUri; - if (ol.IS_HTTPS && brandLogoUri.indexOf("https")==-1){ - brandLogoUri = brandLogoUri.replace("http", "https"); + if (ol.IS_HTTPS && brandLogoUri.indexOf('https') == -1) { + brandLogoUri = brandLogoUri.replace('http', 'https'); } //var copyright = response.copyright; // FIXME do we need to display this? var resource = response.resourceSets[0].resources[0];