From e5331bb7cb6b45444664375229b6068a671601e3 Mon Sep 17 00:00:00 2001
From: pdavidc <paul@paulcollinssoftware.com>
Date: Fri, 23 Dec 2016 15:13:56 -0800
Subject: [PATCH] Migrated WebWW map services to HTTPS, per #66

---
 src/globe/EarthElevationModel.js    | 2 +-
 src/globe/WcsEarthElevationModel.js | 2 +-
 src/layer/BMNGLandsatLayer.js       | 2 +-
 src/layer/BMNGLayer.js              | 2 +-
 src/layer/BingWMSLayer.js           | 2 +-
 src/util/BingImageryUrlBuilder.js   | 2 +-
 src/util/NominatimGeocoder.js       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/globe/EarthElevationModel.js b/src/globe/EarthElevationModel.js
index 563914c2..463300fd 100644
--- a/src/globe/EarthElevationModel.js
+++ b/src/globe/EarthElevationModel.js
@@ -34,7 +34,7 @@ define([
             this.maxElevation = 8850; // Height of Mt. Everest
             this.pixelIsPoint = false; // World Wind WMS elevation layers return pixel-as-area images
 
-            this.urlBuilder = new WmsUrlBuilder("http://worldwind26.arc.nasa.gov/elev",
+            this.urlBuilder = new WmsUrlBuilder("https://worldwind26.arc.nasa.gov/elev",
                 "GEBCO,aster_v2,USGS-NED", "", "1.3.0");
         };
 
diff --git a/src/globe/WcsEarthElevationModel.js b/src/globe/WcsEarthElevationModel.js
index 57b6b6d1..b768bade 100644
--- a/src/globe/WcsEarthElevationModel.js
+++ b/src/globe/WcsEarthElevationModel.js
@@ -33,7 +33,7 @@ define([
             this.maxElevation = 8850; // Height of Mt. Everest
             this.pixelIsPoint = false; // World Wind WMS elevation layers return pixel-as-area images
 
-            this.urlBuilder = new WcsTileUrlBuilder(location.protocol + "//worldwind26.arc.nasa.gov/wms2",
+            this.urlBuilder = new WcsTileUrlBuilder("https://worldwind26.arc.nasa.gov/wms2",
                 "NASA_SRTM30_900m_Tiled", "1.0.0");
         };
 
diff --git a/src/layer/BMNGLandsatLayer.js b/src/layer/BMNGLandsatLayer.js
index 41b79447..6d2227c9 100644
--- a/src/layer/BMNGLandsatLayer.js
+++ b/src/layer/BMNGLandsatLayer.js
@@ -32,7 +32,7 @@ define([
             this.displayName = "Blue Marble & Landsat";
             this.pickEnabled = false;
 
-            this.urlBuilder = new WmsUrlBuilder(location.protocol + "//worldwind25.arc.nasa.gov/wms",
+            this.urlBuilder = new WmsUrlBuilder("https://worldwind25.arc.nasa.gov/wms",
                 "BlueMarble-200405,esat", "", "1.3.0");
         };
 
diff --git a/src/layer/BMNGLayer.js b/src/layer/BMNGLayer.js
index bd6a7883..7303f995 100644
--- a/src/layer/BMNGLayer.js
+++ b/src/layer/BMNGLayer.js
@@ -35,7 +35,7 @@ define([
             this.displayName = "Blue Marble";
             this.pickEnabled = false;
 
-            this.urlBuilder = new WmsUrlBuilder(location.protocol + "//worldwind25.arc.nasa.gov/wms",
+            this.urlBuilder = new WmsUrlBuilder("https://worldwind25.arc.nasa.gov/wms",
                 layerName || "BlueMarble-200405", "", "1.3.0");
         };
 
diff --git a/src/layer/BingWMSLayer.js b/src/layer/BingWMSLayer.js
index c8cca8ea..2ac80e36 100644
--- a/src/layer/BingWMSLayer.js
+++ b/src/layer/BingWMSLayer.js
@@ -27,7 +27,7 @@ define([
             this.pickEnabled = false;
             this.maxActiveAltitude = 10e3;
 
-            this.urlBuilder = new WmsUrlBuilder(location.protocol + "//worldwind27.arc.nasa.gov/wms/virtualearth", "ve", "", "1.3.0");
+            this.urlBuilder = new WmsUrlBuilder("https://worldwind27.arc.nasa.gov/wms/virtualearth", "ve", "", "1.3.0");
         };
 
         BingWMSLayer.prototype = Object.create(TiledImageLayer.prototype);
diff --git a/src/util/BingImageryUrlBuilder.js b/src/util/BingImageryUrlBuilder.js
index a05acdf9..e45e937f 100644
--- a/src/util/BingImageryUrlBuilder.js
+++ b/src/util/BingImageryUrlBuilder.js
@@ -69,7 +69,7 @@ define([
             if (!this.metadataRetrievalInProcess) {
                 this.metadataRetrievalInProcess = true;
 
-                var url = "http://dev.virtualearth.net/REST/V1/Imagery/Metadata/" + this.imagerySet + "/0,0?zl=1&key="
+                var url = "https://dev.virtualearth.net/REST/V1/Imagery/Metadata/" + this.imagerySet + "/0,0?zl=1&key="
                     + this.bingMapsKey;
 
                 // Use JSONP to request the metadata. Can't use XmlHTTPRequest because the virtual earth server doesn't
diff --git a/src/util/NominatimGeocoder.js b/src/util/NominatimGeocoder.js
index 3c7c963e..b7bc0386 100644
--- a/src/util/NominatimGeocoder.js
+++ b/src/util/NominatimGeocoder.js
@@ -24,7 +24,7 @@ define([
              * @type {String}
              * @default http://open.mapquestapi.com/nominatim/v1/search/
              */
-            this.service = "http://open.mapquestapi.com/nominatim/v1/search/";
+            this.service = "https://open.mapquestapi.com/nominatim/v1/search/";
         };
 
         /**