Skip to content

Commit 03191f3

Browse files
mramatomramato
committed
Merge pull request #3707 from TomPed/use-https
Use https://
2 parents 2e0fff6 + 682b150 commit 03191f3

38 files changed

+70
-69
lines changed

‎Apps/Sandcastle/gallery/ArcGIS MapServer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
// Add an ArcGIS MapServer imagery layer
3333
var imageryLayers = viewer.imageryLayers;
3434
imageryLayers.addImageryProvider(new Cesium.ArcGisMapServerImageryProvider({
35-
url : '//nationalmap.gov.au/proxy/http://www.ga.gov.au/gis/rest/services/earth_science/GA_Surface_Geology_of_Australia_WM/MapServer'
35+
url : 'https://nationalmap.gov.au/proxy/http://www.ga.gov.au/gis/rest/services/earth_science/GA_Surface_Geology_of_Australia_WM/MapServer'
3636
}));
3737

3838
// Start off looking at Australia.

‎Apps/Sandcastle/gallery/CZML Path.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1864,7 +1864,7 @@
18641864
];
18651865

18661866
var terrainProvider = new Cesium.CesiumTerrainProvider({
1867-
url : '//assets.agi.com/stk-terrain/world',
1867+
url : 'https://assets.agi.com/stk-terrain/world',
18681868
requestVertexNormals : true
18691869
});
18701870

‎Apps/Sandcastle/gallery/Cesium Inspector.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
globe.depthTestAgainstTerrain = true;
3838

3939
var cesiumTerrainProviderHeightmaps = new Cesium.CesiumTerrainProvider({
40-
url : '//assets.agi.com/stk-terrain/world',
40+
url : 'https://assets.agi.com/stk-terrain/world',
4141
requestWaterMask: true,
4242
requestVertexNormals: true
4343
});

‎Apps/Sandcastle/gallery/Imagery Layers Manipulation.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -114,26 +114,26 @@
114114
addBaseLayerOption(
115115
'Bing Maps Road',
116116
new Cesium.BingMapsImageryProvider({
117-
url: '//dev.virtualearth.net',
117+
url : 'https://dev.virtualearth.net',
118118
mapStyle: Cesium.BingMapsStyle.ROAD
119119
}));
120120
addBaseLayerOption(
121121
'ArcGIS World Street Maps',
122122
new Cesium.ArcGisMapServerImageryProvider({
123-
url : '//server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer'
123+
url : 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer'
124124
}));
125125
addBaseLayerOption(
126126
'OpenStreetMaps',
127127
Cesium.createOpenStreetMapImageryProvider());
128128
addBaseLayerOption(
129129
'MapQuest OpenStreetMaps',
130130
Cesium.createOpenStreetMapImageryProvider({
131-
url: '//otile1-s.mqcdn.com/tiles/1.0.0/osm/'
131+
url : 'https://otile1-s.mqcdn.com/tiles/1.0.0/osm/'
132132
}));
133133
addBaseLayerOption(
134134
'Stamen Maps',
135135
Cesium.createOpenStreetMapImageryProvider({
136-
url: '//stamen-tiles.a.ssl.fastly.net/watercolor/',
136+
url : 'https://stamen-tiles.a.ssl.fastly.net/watercolor/',
137137
fileExtension: 'jpg',
138138
credit: 'Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under CC BY SA.'
139139
}));
@@ -158,7 +158,7 @@
158158
addAdditionalLayerOption(
159159
'United States GOES Infrared',
160160
new Cesium.WebMapServiceImageryProvider({
161-
url : '//mesonet.agron.iastate.edu/cgi-bin/wms/goes/conus_ir.cgi?',
161+
url : 'https://mesonet.agron.iastate.edu/cgi-bin/wms/goes/conus_ir.cgi?',
162162
layers : 'goes_conus_ir',
163163
credit : 'Infrared data courtesy Iowa Environmental Mesonet',
164164
parameters : {
@@ -170,7 +170,7 @@
170170
addAdditionalLayerOption(
171171
'United States Weather Radar',
172172
new Cesium.WebMapServiceImageryProvider({
173-
url : '//mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi?',
173+
url : 'https://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi?',
174174
layers : 'nexrad-n0r',
175175
credit : 'Radar data courtesy Iowa Environmental Mesonet',
176176
parameters : {

‎Apps/Sandcastle/gallery/Imagery Layers.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
//Sandcastle_Begin
3030
var viewer = new Cesium.Viewer('cesiumContainer', {
3131
imageryProvider : new Cesium.ArcGisMapServerImageryProvider({
32-
url : '//server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer'
32+
url : 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer'
3333
}),
3434
baseLayerPicker : false
3535
});
3636

3737
var layers = viewer.imageryLayers;
3838
var blackMarble = layers.addImageryProvider(Cesium.createTileMapServiceImageryProvider({
39-
url : '//cesiumjs.org/blackmarble',
39+
url : 'https://cesiumjs.org/blackmarble',
4040
credit : 'Black Marble imagery courtesy NASA Earth Observatory',
4141
flipXY : true // Only old gdal2tile.py generated tilesets need this flag.
4242
}));

‎Apps/Sandcastle/gallery/Interpolation.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
//Use STK World Terrain
4242
viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
43-
url : '//assets.agi.com/stk-terrain/world',
43+
url : 'https://assets.agi.com/stk-terrain/world',
4444
requestWaterMask : true,
4545
requestVertexNormals : true
4646
});

‎Apps/Sandcastle/gallery/Terrain Exaggeration.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
});
3535

3636
var cesiumTerrainProviderMeshes = new Cesium.CesiumTerrainProvider({
37-
url : '//assets.agi.com/stk-terrain/world',
37+
url : 'https://assets.agi.com/stk-terrain/world',
3838
requestWaterMask : true,
3939
requestVertexNormals : true
4040
});

‎Apps/Sandcastle/gallery/Terrain.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
var viewer = new Cesium.Viewer('cesiumContainer');
4242

4343
var cesiumTerrainProviderMeshes = new Cesium.CesiumTerrainProvider({
44-
url : '//assets.agi.com/stk-terrain/world',
44+
url : 'https://assets.agi.com/stk-terrain/world',
4545
requestWaterMask : true,
4646
requestVertexNormals : true
4747
});
@@ -51,7 +51,7 @@
5151
var ellipsoidProvider = new Cesium.EllipsoidTerrainProvider();
5252

5353
var vrTheWorldProvider = new Cesium.VRTheWorldTerrainProvider({
54-
url : '//www.vr-theworld.com/vr-theworld/tiles1.0.0/73/',
54+
url : 'https://www.vr-theworld.com/vr-theworld/tiles1.0.0/73/',
5555
credit : 'Terrain data courtesy VT MÄK'
5656
});
5757

@@ -65,14 +65,14 @@
6565
text : 'CesiumTerrainProvider - STK World Terrain - no effects',
6666
onselect : function() {
6767
viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
68-
url : '//assets.agi.com/stk-terrain/world'
68+
url : 'https://assets.agi.com/stk-terrain/world'
6969
});
7070
}
7171
}, {
7272
text : 'CesiumTerrainProvider - STK World Terrain w/ Lighting',
7373
onselect : function() {
7474
viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
75-
url : '//assets.agi.com/stk-terrain/world',
75+
url : 'https://assets.agi.com/stk-terrain/world',
7676
requestVertexNormals : true
7777
});
7878
viewer.scene.globe.enableLighting = true;
@@ -81,7 +81,7 @@
8181
text : 'CesiumTerrainProvider - STK World Terrain w/ Water',
8282
onselect : function() {
8383
viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
84-
url : '//assets.agi.com/stk-terrain/world',
84+
url : 'https://assets.agi.com/stk-terrain/world',
8585
requestWaterMask : true
8686
});
8787
}

‎Apps/Sandcastle/gallery/Web Map Service (WMS).html

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
// Add a WMS imagery layer
3333
var imageryLayers = viewer.imageryLayers;
3434
imageryLayers.addImageryProvider(new Cesium.WebMapServiceImageryProvider({
35-
url : '//nationalmap.gov.au/proxy/http://geoserver.nationalmap.nicta.com.au/geotopo_250k/ows',
35+
url : 'https://nationalmap.gov.au/proxy/http://geoserver.nationalmap.nicta.com.au/geotopo_250k/ows',
3636
layers : 'Hydrography:bores',
3737
parameters : {
3838
transparent : true,

‎Apps/Sandcastle/gallery/development/BillboardClampToGround.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
var viewer = new Cesium.Viewer('cesiumContainer');
3636

3737
var cesiumTerrainProviderMeshes = new Cesium.CesiumTerrainProvider({
38-
url : '//assets.agi.com/stk-terrain/world'
38+
url : 'https://assets.agi.com/stk-terrain/world'
3939
});
4040
viewer.terrainProvider = cesiumTerrainProviderMeshes;
4141
viewer.scene.globe.depthTestAgainstTerrain = true;

‎Apps/Sandcastle/gallery/development/Billboards Instancing.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
var context = scene.context;
3838

3939
var cesiumTerrainProviderMeshes = new Cesium.CesiumTerrainProvider({
40-
url : '//assets.agi.com/stk-terrain/world'
40+
url : 'https://assets.agi.com/stk-terrain/world'
4141
});
4242

4343
viewer.terrainProvider = cesiumTerrainProviderMeshes;

‎Apps/Sandcastle/gallery/development/Fog.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
//Sandcastle_Begin
4646
var viewer = new Cesium.Viewer('cesiumContainer');
4747
viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
48-
url : '//assets.agi.com/stk-terrain/world',
48+
url : 'https://assets.agi.com/stk-terrain/world',
4949
requestWaterMask : true,
5050
requestVertexNormals : true
5151
});

‎Apps/Sandcastle/gallery/development/Ground Primitive.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
var viewer = new Cesium.Viewer('cesiumContainer');
3333
var scene = viewer.scene;
3434
scene.terrainProvider = new Cesium.CesiumTerrainProvider({
35-
url: '//assets.agi.com/stk-terrain/world',
35+
url : 'https://assets.agi.com/stk-terrain/world',
3636
requestVertexNormals : true
3737
});
3838

‎CHANGES.md

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Change Log
1515
* Fixed `Color.fromCssColorString` from reusing the input `result` alpha value in some cases.
1616
* Fix issue with billboard collections that have at least one billboard with an aligned axis and at least one billboard without an aligned axis. [#3318](https://github.com/AnalyticalGraphicsInc/cesium/issues/3318)
1717
* Fix a race condition that would cause the terrain to continue loading and unloading or cause a crash when changing terrain providers. [#3690](https://github.com/AnalyticalGraphicsInc/cesium/issues/3690)
18+
* All external urls are now https by default to make Cesium work better with non-server-based applications. [#3650](https://github.com/AnalyticalGraphicsInc/cesium/issues/3650)
1819

1920
### 1.19 - 2016-03-01
2021

‎Source/Core/ArcGisImageServerTerrainProvider.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ define([
5555
*
5656
* @example
5757
* var terrainProvider = new Cesium.ArcGisImageServerTerrainProvider({
58-
* url : '//elevation.arcgisonline.com/ArcGIS/rest/services/WorldElevation/DTMEllipsoidal/ImageServer',
58+
* url : 'https://elevation.arcgisonline.com/ArcGIS/rest/services/WorldElevation/DTMEllipsoidal/ImageServer',
5959
* token : 'KED1aF_I4UzXOHy3BnhwyBHU4l5oY6rO6walkmHoYqGp4XyIWUd5YZUC1ZrLAzvV40pR6gBXQayh0eFA8m6vPg..',
6060
* proxy : new Cesium.DefaultProxy('/terrain/')
6161
* });

‎Source/Core/CesiumTerrainProvider.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ define([
7272
* // Construct a terrain provider that uses per vertex normals for lighting
7373
* // to add shading detail to an imagery provider.
7474
* var terrainProvider = new Cesium.CesiumTerrainProvider({
75-
* url : '//assets.agi.com/stk-terrain/world',
75+
* url : 'https://assets.agi.com/stk-terrain/world',
7676
* requestVertexNormals : true
7777
* });
7878
*

‎Source/Core/VRTheWorldTerrainProvider.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ define([
6161
*
6262
* @example
6363
* var terrainProvider = new Cesium.VRTheWorldTerrainProvider({
64-
* url : '//www.vr-theworld.com/vr-theworld/tiles1.0.0/73/'
64+
* url : 'https://www.vr-theworld.com/vr-theworld/tiles1.0.0/73/'
6565
* });
6666
* viewer.terrainProvider = terrainProvider;
6767
*

‎Source/Core/sampleTerrain.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ define([
3131
* @example
3232
* // Query the terrain height of two Cartographic positions
3333
* var terrainProvider = new Cesium.CesiumTerrainProvider({
34-
* url : '//assets.agi.com/stk-terrain/world'
34+
* url : 'https://assets.agi.com/stk-terrain/world'
3535
* });
3636
* var positions = [
3737
* Cesium.Cartographic.fromDegrees(86.925145, 27.988257),

‎Source/DataSources/KmlDataSource.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ define([
602602
y = 7 - Math.min(y / 32, 7);
603603
var iconNum = (8 * y) + x;
604604

605-
href = '//maps.google.com/mapfiles/kml/pal' + palette + '/icon' + iconNum + '.png';
605+
href = 'https://maps.google.com/mapfiles/kml/pal' + palette + '/icon' + iconNum + '.png';
606606
}
607607

608608
href = resolveHref(href, dataSource._proxy, sourceUri, uriResolver);

‎Source/Scene/ArcGisMapServerImageryProvider.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ define([
105105
*
106106
* @example
107107
* var esri = new Cesium.ArcGisMapServerImageryProvider({
108-
* url: '//services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'
108+
* url : 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'
109109
* });
110110
*
111111
* @see {@link http://resources.esri.com/help/9.3/arcgisserver/apis/rest/|ArcGIS Server REST API}

‎Source/Scene/BingMapsImageryProvider.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ define([
8787
*
8888
* @example
8989
* var bing = new Cesium.BingMapsImageryProvider({
90-
* url : '//dev.virtualearth.net',
90+
* url : 'https://dev.virtualearth.net',
9191
* key : 'get-yours-at-https://www.bingmapsportal.com/',
9292
* mapStyle : Cesium.BingMapsStyle.AERIAL
9393
* });

‎Source/Scene/GoogleEarthImageryProvider.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ define([
9292
*
9393
* @example
9494
* var google = new Cesium.GoogleEarthImageryProvider({
95-
* url : '//earth.localdomain',
95+
* url : 'https://earth.localdomain',
9696
* channel : 1008
9797
* });
9898
*

‎Source/Scene/MapboxImageryProvider.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ define([
2828
* @constructor
2929
*
3030
* @param {Object} [options] Object with the following properties:
31-
* @param {String} [options.url='//api.mapbox.com/v4/'] The Mapbox server url.
31+
* @param {String} [options.url='https://api.mapbox.com/v4/'] The Mapbox server url.
3232
* @param {String} options.mapId The Mapbox Map ID.
3333
* @param {String} [options.accessToken] The public access token for the imagery.
3434
* @param {String} [options.format='png'] The format of the image request.
@@ -61,7 +61,7 @@ define([
6161
}
6262
//>>includeEnd('debug');
6363

64-
var url = defaultValue(options.url, '//api.mapbox.com/v4/');
64+
var url = defaultValue(options.url, 'https://api.mapbox.com/v4/');
6565
this._url = url;
6666
this._mapId = mapId;
6767
this._accessToken = MapboxApi.getAccessToken(options.accessToken);

‎Source/Scene/OpenStreetMapImageryProvider.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ define([
3838
* @constructor
3939
*
4040
* @param {Object} [options] Object with the following properties:
41-
* @param {String} [options.url='//a.tile.openstreetmap.org'] The OpenStreetMap server url.
41+
* @param {String} [options.url='https://a.tile.openstreetmap.org'] The OpenStreetMap server url.
4242
* @param {String} [options.fileExtension='png'] The file extension for images on the server.
4343
* @param {Object} [options.proxy] A proxy to use for requests. This object is expected to have a getURL function which returns the proxied URL.
4444
* @param {Rectangle} [options.rectangle=Rectangle.MAX_VALUE] The rectangle of the layer.
@@ -60,7 +60,7 @@ define([
6060
* @example
6161
* // OpenStreetMap tile provider
6262
* var osm = new Cesium.OpenStreetMapImageryProvider({
63-
* url : '//a.tile.openstreetmap.org/'
63+
* url : 'https://a.tile.openstreetmap.org/'
6464
* });
6565
*
6666
* @see {@link http://wiki.openstreetmap.org/wiki/Main_Page|OpenStreetMap Wiki}
@@ -72,7 +72,7 @@ define([
7272
deprecationWarning('OpenStreetMapImageryProvider', 'OpenStreetMapImageryProvider is deprecated. It will be removed in Cesium 1.18. Use createOpenStreetMapImageryProvider instead.');
7373
options = defaultValue(options, {});
7474

75-
var url = defaultValue(options.url, '//a.tile.openstreetmap.org/');
75+
var url = defaultValue(options.url, 'https://a.tile.openstreetmap.org/');
7676

7777
if (!trailingSlashRegex.test(url)) {
7878
url = url + '/';

‎Source/Scene/UrlTemplateImageryProvider.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ define([
127127
* @example
128128
* // Access Natural Earth II imagery, which uses a TMS tiling scheme and Geographic (EPSG:4326) project
129129
* var tms = new Cesium.UrlTemplateImageryProvider({
130-
* url : '//cesiumjs.org/tilesets/imagery/naturalearthii/{z}/{x}/{reverseY}.jpg',
130+
* url : 'https://cesiumjs.org/tilesets/imagery/naturalearthii/{z}/{x}/{reverseY}.jpg',
131131
* credit : '© Analytical Graphics, Inc.',
132132
* tilingScheme : new Cesium.GeographicTilingScheme(),
133133
* maximumLevel : 5

‎Source/Scene/WebMapServiceImageryProvider.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ define([
8383
*
8484
* @example
8585
* var provider = new Cesium.WebMapServiceImageryProvider({
86-
* url: '//sampleserver1.arcgisonline.com/ArcGIS/services/Specialty/ESRI_StatesCitiesRivers_USA/MapServer/WMSServer',
86+
* url : 'https://sampleserver1.arcgisonline.com/ArcGIS/services/Specialty/ESRI_StatesCitiesRivers_USA/MapServer/WMSServer',
8787
* layers : '0',
8888
* proxy: new Cesium.DefaultProxy('/proxy/')
8989
* });

‎Source/Scene/createOpenStreetMapImageryProvider.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ define([
2727
* @exports createOpenStreetMapImageryProvider
2828
*
2929
* @param {Object} [options] Object with the following properties:
30-
* @param {String} [options.url='//a.tile.openstreetmap.org'] The OpenStreetMap server url.
30+
* @param {String} [options.url='https://a.tile.openstreetmap.org'] The OpenStreetMap server url.
3131
* @param {String} [options.fileExtension='png'] The file extension for images on the server.
3232
* @param {Object} [options.proxy] A proxy to use for requests. This object is expected to have a getURL function which returns the proxied URL.
3333
* @param {Rectangle} [options.rectangle=Rectangle.MAX_VALUE] The rectangle of the layer.
@@ -50,7 +50,7 @@ define([
5050
*
5151
* @example
5252
* var osm = Cesium.createOpenStreetMapImageryProvider({
53-
* url : '//a.tile.openstreetmap.org/'
53+
* url : 'https://a.tile.openstreetmap.org/'
5454
* });
5555
*
5656
* @see {@link http://wiki.openstreetmap.org/wiki/Main_Page|OpenStreetMap Wiki}
@@ -59,7 +59,7 @@ define([
5959
function createOpenStreetMapImageryProvider(options) {
6060
options = defaultValue(options, {});
6161

62-
var url = defaultValue(options.url, '//a.tile.openstreetmap.org/');
62+
var url = defaultValue(options.url, 'https://a.tile.openstreetmap.org/');
6363

6464
if (!trailingSlashRegex.test(url)) {
6565
url = url + '/';

‎Source/Widgets/BaseLayerPicker/BaseLayerPicker.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ define([
6161
* map of the world.\nhttp://www.openstreetmap.org',
6262
* creationFunction : function() {
6363
* return Cesium.createOpenStreetMapImageryProvider({
64-
* url : '//a.tile.openstreetmap.org/'
64+
* url : 'https://a.tile.openstreetmap.org/'
6565
* });
6666
* }
6767
* }));
@@ -73,7 +73,7 @@ define([
7373
* in this global view of the Earth at night as seen by NASA/NOAA\'s Suomi NPP satellite.',
7474
* creationFunction : function() {
7575
* return Cesium.createTileMapServiceImageryProvider({
76-
* url : '//cesiumjs.org/blackmarble',
76+
* url : 'https://cesiumjs.org/blackmarble',
7777
* credit : 'Black Marble imagery courtesy NASA Earth Observatory',
7878
* flipXY : true
7979
* });

0 commit comments

Comments
 (0)