Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use https:// #3707

Merged
merged 1 commit into from
Mar 16, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Apps/Sandcastle/gallery/ArcGIS MapServer.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
// Add an ArcGIS MapServer imagery layer
var imageryLayers = viewer.imageryLayers;
imageryLayers.addImageryProvider(new Cesium.ArcGisMapServerImageryProvider({
url : '//nationalmap.gov.au/proxy/http://www.ga.gov.au/gis/rest/services/earth_science/GA_Surface_Geology_of_Australia_WM/MapServer'
url : 'https://nationalmap.gov.au/proxy/http://www.ga.gov.au/gis/rest/services/earth_science/GA_Surface_Geology_of_Australia_WM/MapServer'
}));

// Start off looking at Australia.
Expand Down
2 changes: 1 addition & 1 deletion Apps/Sandcastle/gallery/CZML Path.html
Original file line number Diff line number Diff line change
Expand Up @@ -1864,7 +1864,7 @@
];

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

Expand Down
2 changes: 1 addition & 1 deletion Apps/Sandcastle/gallery/Cesium Inspector.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
globe.depthTestAgainstTerrain = true;

var cesiumTerrainProviderHeightmaps = new Cesium.CesiumTerrainProvider({
url : '//assets.agi.com/stk-terrain/world',
url : 'https://assets.agi.com/stk-terrain/world',
requestWaterMask: true,
requestVertexNormals: true
});
Expand Down
12 changes: 6 additions & 6 deletions Apps/Sandcastle/gallery/Imagery Layers Manipulation.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,26 +114,26 @@
addBaseLayerOption(
'Bing Maps Road',
new Cesium.BingMapsImageryProvider({
url: '//dev.virtualearth.net',
url : 'https://dev.virtualearth.net',
mapStyle: Cesium.BingMapsStyle.ROAD
}));
addBaseLayerOption(
'ArcGIS World Street Maps',
new Cesium.ArcGisMapServerImageryProvider({
url : '//server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer'
url : 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer'
}));
addBaseLayerOption(
'OpenStreetMaps',
Cesium.createOpenStreetMapImageryProvider());
addBaseLayerOption(
'MapQuest OpenStreetMaps',
Cesium.createOpenStreetMapImageryProvider({
url: '//otile1-s.mqcdn.com/tiles/1.0.0/osm/'
url : 'https://otile1-s.mqcdn.com/tiles/1.0.0/osm/'
}));
addBaseLayerOption(
'Stamen Maps',
Cesium.createOpenStreetMapImageryProvider({
url: '//stamen-tiles.a.ssl.fastly.net/watercolor/',
url : 'https://stamen-tiles.a.ssl.fastly.net/watercolor/',
fileExtension: 'jpg',
credit: 'Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under CC BY SA.'
}));
Expand All @@ -158,7 +158,7 @@
addAdditionalLayerOption(
'United States GOES Infrared',
new Cesium.WebMapServiceImageryProvider({
url : '//mesonet.agron.iastate.edu/cgi-bin/wms/goes/conus_ir.cgi?',
url : 'https://mesonet.agron.iastate.edu/cgi-bin/wms/goes/conus_ir.cgi?',
layers : 'goes_conus_ir',
credit : 'Infrared data courtesy Iowa Environmental Mesonet',
parameters : {
Expand All @@ -170,7 +170,7 @@
addAdditionalLayerOption(
'United States Weather Radar',
new Cesium.WebMapServiceImageryProvider({
url : '//mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi?',
url : 'https://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi?',
layers : 'nexrad-n0r',
credit : 'Radar data courtesy Iowa Environmental Mesonet',
parameters : {
Expand Down
4 changes: 2 additions & 2 deletions Apps/Sandcastle/gallery/Imagery Layers.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
//Sandcastle_Begin
var viewer = new Cesium.Viewer('cesiumContainer', {
imageryProvider : new Cesium.ArcGisMapServerImageryProvider({
url : '//server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer'
url : 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer'
}),
baseLayerPicker : false
});

var layers = viewer.imageryLayers;
var blackMarble = layers.addImageryProvider(Cesium.createTileMapServiceImageryProvider({
url : '//cesiumjs.org/blackmarble',
url : 'https://cesiumjs.org/blackmarble',
credit : 'Black Marble imagery courtesy NASA Earth Observatory',
flipXY : true // Only old gdal2tile.py generated tilesets need this flag.
}));
Expand Down
2 changes: 1 addition & 1 deletion Apps/Sandcastle/gallery/Interpolation.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

//Use STK World Terrain
viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
url : '//assets.agi.com/stk-terrain/world',
url : 'https://assets.agi.com/stk-terrain/world',
requestWaterMask : true,
requestVertexNormals : true
});
Expand Down
2 changes: 1 addition & 1 deletion Apps/Sandcastle/gallery/Terrain Exaggeration.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
});

var cesiumTerrainProviderMeshes = new Cesium.CesiumTerrainProvider({
url : '//assets.agi.com/stk-terrain/world',
url : 'https://assets.agi.com/stk-terrain/world',
requestWaterMask : true,
requestVertexNormals : true
});
Expand Down
10 changes: 5 additions & 5 deletions Apps/Sandcastle/gallery/Terrain.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
var viewer = new Cesium.Viewer('cesiumContainer');

var cesiumTerrainProviderMeshes = new Cesium.CesiumTerrainProvider({
url : '//assets.agi.com/stk-terrain/world',
url : 'https://assets.agi.com/stk-terrain/world',
requestWaterMask : true,
requestVertexNormals : true
});
Expand All @@ -51,7 +51,7 @@
var ellipsoidProvider = new Cesium.EllipsoidTerrainProvider();

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

Expand All @@ -65,14 +65,14 @@
text : 'CesiumTerrainProvider - STK World Terrain - no effects',
onselect : function() {
viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
url : '//assets.agi.com/stk-terrain/world'
url : 'https://assets.agi.com/stk-terrain/world'
});
}
}, {
text : 'CesiumTerrainProvider - STK World Terrain w/ Lighting',
onselect : function() {
viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
url : '//assets.agi.com/stk-terrain/world',
url : 'https://assets.agi.com/stk-terrain/world',
requestVertexNormals : true
});
viewer.scene.globe.enableLighting = true;
Expand All @@ -81,7 +81,7 @@
text : 'CesiumTerrainProvider - STK World Terrain w/ Water',
onselect : function() {
viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
url : '//assets.agi.com/stk-terrain/world',
url : 'https://assets.agi.com/stk-terrain/world',
requestWaterMask : true
});
}
Expand Down
2 changes: 1 addition & 1 deletion Apps/Sandcastle/gallery/Web Map Service (WMS).html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
// Add a WMS imagery layer
var imageryLayers = viewer.imageryLayers;
imageryLayers.addImageryProvider(new Cesium.WebMapServiceImageryProvider({
url : '//nationalmap.gov.au/proxy/http://geoserver.nationalmap.nicta.com.au/geotopo_250k/ows',
url : 'https://nationalmap.gov.au/proxy/http://geoserver.nationalmap.nicta.com.au/geotopo_250k/ows',
layers : 'Hydrography:bores',
parameters : {
transparent : true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
var viewer = new Cesium.Viewer('cesiumContainer');

var cesiumTerrainProviderMeshes = new Cesium.CesiumTerrainProvider({
url : '//assets.agi.com/stk-terrain/world'
url : 'https://assets.agi.com/stk-terrain/world'
});
viewer.terrainProvider = cesiumTerrainProviderMeshes;
viewer.scene.globe.depthTestAgainstTerrain = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
var context = scene.context;

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

viewer.terrainProvider = cesiumTerrainProviderMeshes;
Expand Down
2 changes: 1 addition & 1 deletion Apps/Sandcastle/gallery/development/Fog.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
//Sandcastle_Begin
var viewer = new Cesium.Viewer('cesiumContainer');
viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
url : '//assets.agi.com/stk-terrain/world',
url : 'https://assets.agi.com/stk-terrain/world',
requestWaterMask : true,
requestVertexNormals : true
});
Expand Down
2 changes: 1 addition & 1 deletion Apps/Sandcastle/gallery/development/Ground Primitive.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
var viewer = new Cesium.Viewer('cesiumContainer');
var scene = viewer.scene;
scene.terrainProvider = new Cesium.CesiumTerrainProvider({
url: '//assets.agi.com/stk-terrain/world',
url : 'https://assets.agi.com/stk-terrain/world',
requestVertexNormals : true
});

Expand Down
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Change Log
* Fixed `Color.fromCssColorString` from reusing the input `result` alpha value in some cases.
* 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)
* 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)
* 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)

### 1.19 - 2016-03-01

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/ArcGisImageServerTerrainProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ define([
*
* @example
* var terrainProvider = new Cesium.ArcGisImageServerTerrainProvider({
* url : '//elevation.arcgisonline.com/ArcGIS/rest/services/WorldElevation/DTMEllipsoidal/ImageServer',
* url : 'https://elevation.arcgisonline.com/ArcGIS/rest/services/WorldElevation/DTMEllipsoidal/ImageServer',
* token : 'KED1aF_I4UzXOHy3BnhwyBHU4l5oY6rO6walkmHoYqGp4XyIWUd5YZUC1ZrLAzvV40pR6gBXQayh0eFA8m6vPg..',
* proxy : new Cesium.DefaultProxy('/terrain/')
* });
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/CesiumTerrainProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ define([
* // Construct a terrain provider that uses per vertex normals for lighting
* // to add shading detail to an imagery provider.
* var terrainProvider = new Cesium.CesiumTerrainProvider({
* url : '//assets.agi.com/stk-terrain/world',
* url : 'https://assets.agi.com/stk-terrain/world',
* requestVertexNormals : true
* });
*
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/VRTheWorldTerrainProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ define([
*
* @example
* var terrainProvider = new Cesium.VRTheWorldTerrainProvider({
* url : '//www.vr-theworld.com/vr-theworld/tiles1.0.0/73/'
* url : 'https://www.vr-theworld.com/vr-theworld/tiles1.0.0/73/'
* });
* viewer.terrainProvider = terrainProvider;
*
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/sampleTerrain.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ define([
* @example
* // Query the terrain height of two Cartographic positions
* var terrainProvider = new Cesium.CesiumTerrainProvider({
* url : '//assets.agi.com/stk-terrain/world'
* url : 'https://assets.agi.com/stk-terrain/world'
* });
* var positions = [
* Cesium.Cartographic.fromDegrees(86.925145, 27.988257),
Expand Down
2 changes: 1 addition & 1 deletion Source/DataSources/KmlDataSource.js
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ define([
y = 7 - Math.min(y / 32, 7);
var iconNum = (8 * y) + x;

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

href = resolveHref(href, dataSource._proxy, sourceUri, uriResolver);
Expand Down
2 changes: 1 addition & 1 deletion Source/Scene/ArcGisMapServerImageryProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ define([
*
* @example
* var esri = new Cesium.ArcGisMapServerImageryProvider({
* url: '//services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'
* url : 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'
* });
*
* @see {@link http://resources.esri.com/help/9.3/arcgisserver/apis/rest/|ArcGIS Server REST API}
Expand Down
2 changes: 1 addition & 1 deletion Source/Scene/BingMapsImageryProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ define([
*
* @example
* var bing = new Cesium.BingMapsImageryProvider({
* url : '//dev.virtualearth.net',
* url : 'https://dev.virtualearth.net',
* key : 'get-yours-at-https://www.bingmapsportal.com/',
* mapStyle : Cesium.BingMapsStyle.AERIAL
* });
Expand Down
2 changes: 1 addition & 1 deletion Source/Scene/GoogleEarthImageryProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ define([
*
* @example
* var google = new Cesium.GoogleEarthImageryProvider({
* url : '//earth.localdomain',
* url : 'https://earth.localdomain',
* channel : 1008
* });
*
Expand Down
4 changes: 2 additions & 2 deletions Source/Scene/MapboxImageryProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ define([
* @constructor
*
* @param {Object} [options] Object with the following properties:
* @param {String} [options.url='//api.mapbox.com/v4/'] The Mapbox server url.
* @param {String} [options.url='https://api.mapbox.com/v4/'] The Mapbox server url.
* @param {String} options.mapId The Mapbox Map ID.
* @param {String} [options.accessToken] The public access token for the imagery.
* @param {String} [options.format='png'] The format of the image request.
Expand Down Expand Up @@ -61,7 +61,7 @@ define([
}
//>>includeEnd('debug');

var url = defaultValue(options.url, '//api.mapbox.com/v4/');
var url = defaultValue(options.url, 'https://api.mapbox.com/v4/');
this._url = url;
this._mapId = mapId;
this._accessToken = MapboxApi.getAccessToken(options.accessToken);
Expand Down
6 changes: 3 additions & 3 deletions Source/Scene/OpenStreetMapImageryProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ define([
* @constructor
*
* @param {Object} [options] Object with the following properties:
* @param {String} [options.url='//a.tile.openstreetmap.org'] The OpenStreetMap server url.
* @param {String} [options.url='https://a.tile.openstreetmap.org'] The OpenStreetMap server url.
* @param {String} [options.fileExtension='png'] The file extension for images on the server.
* @param {Object} [options.proxy] A proxy to use for requests. This object is expected to have a getURL function which returns the proxied URL.
* @param {Rectangle} [options.rectangle=Rectangle.MAX_VALUE] The rectangle of the layer.
Expand All @@ -60,7 +60,7 @@ define([
* @example
* // OpenStreetMap tile provider
* var osm = new Cesium.OpenStreetMapImageryProvider({
* url : '//a.tile.openstreetmap.org/'
* url : 'https://a.tile.openstreetmap.org/'
* });
*
* @see {@link http://wiki.openstreetmap.org/wiki/Main_Page|OpenStreetMap Wiki}
Expand All @@ -72,7 +72,7 @@ define([
deprecationWarning('OpenStreetMapImageryProvider', 'OpenStreetMapImageryProvider is deprecated. It will be removed in Cesium 1.18. Use createOpenStreetMapImageryProvider instead.');
options = defaultValue(options, {});

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

if (!trailingSlashRegex.test(url)) {
url = url + '/';
Expand Down
2 changes: 1 addition & 1 deletion Source/Scene/UrlTemplateImageryProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ define([
* @example
* // Access Natural Earth II imagery, which uses a TMS tiling scheme and Geographic (EPSG:4326) project
* var tms = new Cesium.UrlTemplateImageryProvider({
* url : '//cesiumjs.org/tilesets/imagery/naturalearthii/{z}/{x}/{reverseY}.jpg',
* url : 'https://cesiumjs.org/tilesets/imagery/naturalearthii/{z}/{x}/{reverseY}.jpg',
* credit : '© Analytical Graphics, Inc.',
* tilingScheme : new Cesium.GeographicTilingScheme(),
* maximumLevel : 5
Expand Down
2 changes: 1 addition & 1 deletion Source/Scene/WebMapServiceImageryProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ define([
*
* @example
* var provider = new Cesium.WebMapServiceImageryProvider({
* url: '//sampleserver1.arcgisonline.com/ArcGIS/services/Specialty/ESRI_StatesCitiesRivers_USA/MapServer/WMSServer',
* url : 'https://sampleserver1.arcgisonline.com/ArcGIS/services/Specialty/ESRI_StatesCitiesRivers_USA/MapServer/WMSServer',
* layers : '0',
* proxy: new Cesium.DefaultProxy('/proxy/')
* });
Expand Down
6 changes: 3 additions & 3 deletions Source/Scene/createOpenStreetMapImageryProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ define([
* @exports createOpenStreetMapImageryProvider
*
* @param {Object} [options] Object with the following properties:
* @param {String} [options.url='//a.tile.openstreetmap.org'] The OpenStreetMap server url.
* @param {String} [options.url='https://a.tile.openstreetmap.org'] The OpenStreetMap server url.
* @param {String} [options.fileExtension='png'] The file extension for images on the server.
* @param {Object} [options.proxy] A proxy to use for requests. This object is expected to have a getURL function which returns the proxied URL.
* @param {Rectangle} [options.rectangle=Rectangle.MAX_VALUE] The rectangle of the layer.
Expand All @@ -50,7 +50,7 @@ define([
*
* @example
* var osm = Cesium.createOpenStreetMapImageryProvider({
* url : '//a.tile.openstreetmap.org/'
* url : 'https://a.tile.openstreetmap.org/'
* });
*
* @see {@link http://wiki.openstreetmap.org/wiki/Main_Page|OpenStreetMap Wiki}
Expand All @@ -59,7 +59,7 @@ define([
function createOpenStreetMapImageryProvider(options) {
options = defaultValue(options, {});

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

if (!trailingSlashRegex.test(url)) {
url = url + '/';
Expand Down
4 changes: 2 additions & 2 deletions Source/Widgets/BaseLayerPicker/BaseLayerPicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ define([
* map of the world.\nhttp://www.openstreetmap.org',
* creationFunction : function() {
* return Cesium.createOpenStreetMapImageryProvider({
* url : '//a.tile.openstreetmap.org/'
* url : 'https://a.tile.openstreetmap.org/'
* });
* }
* }));
Expand All @@ -73,7 +73,7 @@ define([
* in this global view of the Earth at night as seen by NASA/NOAA\'s Suomi NPP satellite.',
* creationFunction : function() {
* return Cesium.createTileMapServiceImageryProvider({
* url : '//cesiumjs.org/blackmarble',
* url : 'https://cesiumjs.org/blackmarble',
* credit : 'Black Marble imagery courtesy NASA Earth Observatory',
* flipXY : true
* });
Expand Down
Loading