Merge pull request #7004 from AnalyticalGraphicsInc/terrain-sandcastle

Check for `sampleTerrainMostDetailed` support in terrain sandcastle example
CesiumGS · Sep 10, 2018 · 5e28dfb · 5e28dfb
2 parents 7058d9a + e1f21f3
commit 5e28dfb
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/Apps/Sandcastle/gallery/Terrain.html b/Apps/Sandcastle/gallery/Terrain.html
@@ -10,10 +10,12 @@
     <script type="text/javascript" src="../Sandcastle-header.js"></script>
     <script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
     <script type="text/javascript">
-    require.config({
-        baseUrl : '../../../Source',
-        waitSeconds : 60
-    });
+        if(typeof require === 'function') {
+            require.config({
+                baseUrl : '../../../Source',
+                waitSeconds : 120
+            });
+        }
     </script>
 </head>
 <body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
@@ -191,6 +193,10 @@
 }, 'sampleButtons');
 
 Sandcastle.addToolbarButton('Sample Most Detailed Everest Terrain', function() {
+    if (!Cesium.defined(viewer.terrainProvider.availability)) {
+        console.log('sampleTerrainMostDetailed is not supported for the selected terrain provider');
+        return;
+    }
     var terrainSamplePositions = createGrid(0.0005);
     Cesium.when(Cesium.sampleTerrainMostDetailed(viewer.terrainProvider, terrainSamplePositions), sampleTerrainSuccess);
     lookAtMtEverest();