From 059927ec0df9f4b51212666f6432e87304f12238 Mon Sep 17 00:00:00 2001 From: ggetz Date: Thu, 11 Jan 2018 15:41:29 -0500 Subject: [PATCH] Fix broken Sandcastle terrain and imagery urls --- Apps/Sandcastle/gallery/ArcticDEM.html | 2 +- .../gallery/Imagery Layers Manipulation.html | 10 ++++------ Apps/Sandcastle/gallery/Imagery Layers Split.html | 2 +- Apps/Sandcastle/gallery/Imagery Layers.html | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Apps/Sandcastle/gallery/ArcticDEM.html b/Apps/Sandcastle/gallery/ArcticDEM.html index 788beae764b4..407a1b6b73ab 100644 --- a/Apps/Sandcastle/gallery/ArcticDEM.html +++ b/Apps/Sandcastle/gallery/ArcticDEM.html @@ -31,7 +31,7 @@ // Load ArcticDEM terrain var cesiumTerrainProviderMeshes = new Cesium.CesiumTerrainProvider({ - url : 'http://assets.agi.com/stk-terrain/v1/tilesets/ArticDEM/tiles', + url : 'https://assets.agi.com/stk-terrain/v1/tilesets/ArticDEM/tiles', requestWaterMask : true, requestVertexNormals : true }); diff --git a/Apps/Sandcastle/gallery/Imagery Layers Manipulation.html b/Apps/Sandcastle/gallery/Imagery Layers Manipulation.html index 0376b076d2db..750c94a67c94 100644 --- a/Apps/Sandcastle/gallery/Imagery Layers Manipulation.html +++ b/Apps/Sandcastle/gallery/Imagery Layers Manipulation.html @@ -120,7 +120,7 @@ addBaseLayerOption( 'ArcGIS World Street Maps', new Cesium.ArcGisMapServerImageryProvider({ - url : 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer' + url : 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer' })); addBaseLayerOption( 'OpenStreetMaps', @@ -140,7 +140,7 @@ addBaseLayerOption( 'Natural Earth II (local)', Cesium.createTileMapServiceImageryProvider({ - url : require.toUrl('Assets/Textures/NaturalEarthII') + url : Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII') })); addBaseLayerOption( 'USGS Shaded Relief (via WMTS)', @@ -164,8 +164,7 @@ parameters : { transparent : 'true', format : 'image/png' - }, - proxy : new Cesium.DefaultProxy('/proxy/') + } })); addAdditionalLayerOption( 'United States Weather Radar', @@ -176,8 +175,7 @@ parameters : { transparent : 'true', format : 'image/png' - }, - proxy : new Cesium.DefaultProxy('/proxy/') + } })); addAdditionalLayerOption( 'TileMapService Image', diff --git a/Apps/Sandcastle/gallery/Imagery Layers Split.html b/Apps/Sandcastle/gallery/Imagery Layers Split.html index ff9594838cea..2ea5e9fefb00 100644 --- a/Apps/Sandcastle/gallery/Imagery Layers Split.html +++ b/Apps/Sandcastle/gallery/Imagery Layers Split.html @@ -51,7 +51,7 @@ //Sandcastle_Begin var viewer = new Cesium.Viewer('cesiumContainer', { imageryProvider : new Cesium.ArcGisMapServerImageryProvider({ - url : 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer' + url : 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer' }), baseLayerPicker : false, infoBox : false diff --git a/Apps/Sandcastle/gallery/Imagery Layers.html b/Apps/Sandcastle/gallery/Imagery Layers.html index 40374236616a..524d60262158 100644 --- a/Apps/Sandcastle/gallery/Imagery Layers.html +++ b/Apps/Sandcastle/gallery/Imagery Layers.html @@ -29,7 +29,7 @@ //Sandcastle_Begin var viewer = new Cesium.Viewer('cesiumContainer', { imageryProvider : new Cesium.ArcGisMapServerImageryProvider({ - url : 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer' + url : 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer' }), baseLayerPicker : false });