Update sandcastles

Apps/Sandcastle/gallery/I3S 3D Object Layer.html

@@ -59,7 +59,7 @@ <h1>Loading...</h1>
         });
         // Create i3s and Cesium3DTileset options to pass optional parameters useful for debugging and visualizing
         const cesium3dTilesetOptions = {
-          skipLevelOfDetail: true,
+          skipLevelOfDetail: false,
           debugShowBoundingVolume: false,
         };
         const i3sOptions = {

Apps/Sandcastle/gallery/I3S Feature Picking.html

@@ -39,68 +39,53 @@ <h1>Loading...</h1>
         "use strict";
         //Sandcastle_Begin
         const viewer = new Cesium.Viewer("cesiumContainer", {
-          terrainProvider: new Cesium.createWorldTerrain({}),
+          terrainProvider: new Cesium.createWorldTerrain(),
           animation: false,
           timeline: false,
         });
-        //More datasets to tour can be added here..
+        // More datasets to tour can be added here...
         // The url passed to I3SDataProvider supports loading a single Indexed 3D Scene (I3S) layer (.<host>/SceneServer/layers/<id>) or a collection of scene layers (.<host>/SceneServer) from a SceneServer.
         const tours = {
           "New York":
             "https://tiles.arcgis.com/tiles/z2tnIkrLQ2BRzr6P/arcgis/rest/services/NYC_Attributed_v17/SceneServer",
         };
-        // Initialize a terrain provider which provides geoid conversion between gravity releated (typically I3S datasets) and ellipsoidiaL based
-        // height systems (cesium world terrain).
+        // Initialize a terrain provider which provides geoid conversion between gravity related (typically I3S datasets) and ellipsoidal based
+        // height systems (Cesium World Terrain).
         // If this is not specified, or the URL is invalid no geoid conversion will be applied.
-        // The source Data used in this transcoding service was compiled from https://earth-info.nga.mil/#tab_wgs84-data and is based on EGM2008 Gravity Model
+        // The source data used in this transcoding service was compiled from https://earth-info.nga.mil/#tab_wgs84-data and is based on EGM2008 Gravity Model
         const geoidService = new Cesium.ArcGISTiledElevationTerrainProvider({
           url:
             "https://tiles.arcgis.com/tiles/z2tnIkrLQ2BRzr6P/arcgis/rest/services/EGM2008/ImageServer",
         });
-        // Create i3s and cesiumTileset options to pass optional parameters useful for debuging and visualizing
+        // Create i3s and Cesium3DTileset options to pass optional parameters useful for debugging and visualizing
         const cesium3dTilesetOptions = {
-          skipLevelOfDetail: true,
+          skipLevelOfDetail: false,
           debugShowBoundingVolume: false,
         };
         const i3sOptions = {
+          url: tours["New York"],
           traceFetches: false, // for tracing I3S fetches
           geoidTiledTerrainProvider: geoidService, // pass the geoid service
-          cesium3dTilesetOptions: cesium3dTilesetOptions,
+          cesium3dTilesetOptions: cesium3dTilesetOptions, // options for internal Cesium3dTileset
         };
 
-        //Create I3S data provider.
-        const i3sProvider = new Cesium.I3SDataProvider(
-          "",
-          tours["New York"],
-          i3sOptions
-        );
-        i3sProvider.load();
+        // Create I3S data provider
+        const i3sProvider = new Cesium.I3SDataProvider(i3sOptions);
 
-        //Center camera on I3S once it's loaded
+        // Center camera on I3S once it's loaded
         i3sProvider.readyPromise.then(function () {
-          const midLon =
-            (i3sProvider.extent.minLongitude +
-              i3sProvider.extent.maxLongitude) /
-            2;
-          const midLat =
-            (i3sProvider.extent.minLatitude + i3sProvider.extent.maxLatitude) /
-            2;
+          const center = Cesium.Rectangle.center(i3sProvider.extent);
+          center.height = 10000.0;
           viewer.camera.setView({
-            destination: Cesium.Ellipsoid.WGS84.cartographicToCartesian(
-              new Cesium.Cartographic(
-                Cesium.Math.toRadians(midLon),
-                Cesium.Math.toRadians(midLat),
-                10000.0
-              )
-            ),
+            destination: Cesium.Ellipsoid.WGS84.cartographicToCartesian(center),
           });
         });
 
-        //add the i3s layer provider as a primitive data type
+        // Add the i3s layer provider as a primitive data type
         viewer.scene.primitives.add(i3sProvider);
         // An entity object which will hold info about the currently selected feature for infobox display
         const selectedEntity = new Cesium.Entity();
-        // Silhouette a feature on selection and show metadata in the InfoBox.
+        // Show metadata in the InfoBox.
         viewer.screenSpaceEventHandler.setInputAction(function onLeftClick(
           movement
         ) {
@@ -113,9 +98,8 @@ <h1>Loading...</h1>
           const pickedPosition = viewer.scene.pickPosition(movement.position);
 
           if (
-            pickedFeature &&
-            pickedFeature.content &&
-            pickedFeature.content.tile.i3sNode
+            Cesium.defined(pickedFeature.content) &&
+            Cesium.defined(pickedFeature.content.tile.i3sNode)
           ) {
             const i3sNode = pickedFeature.content.tile.i3sNode;
             i3sNode.loadFields().then(function () {
@@ -127,7 +111,7 @@ <h1>Loading...</h1>
                   pickedPosition.z
                 );
                 let description = "No attributes";
-                let name = "";
+                let name;
                 if (
                   location.index !== -1 &&
                   geometry.customAttributes.featureIndex
@@ -141,19 +125,15 @@ <h1>Loading...</h1>
                     description =
                       '<table class="cesium-infoBox-defaultTable"><tbody>';
                     for (const fieldName in i3sNode.fields) {
-                      if (fieldName) {
+                      if (i3sNode.fields.hasOwnProperty(fieldName)) {
                         const field = i3sNode.fields[fieldName];
-                        description +=
-                          `<tr><th>` + `${field.name}` + `</th><td>`;
-                        description +=
-                          `${field.values[featureIndex]}` + `</td></tr>`;
+                        description += `<tr><th>${field.name}</th><td>`;
+                        description += `${field.values[featureIndex]}</td></tr>`;
                         console.log(
-                          `${field.name}` +
-                            `: ` +
-                            `${field.values[featureIndex]}`
+                          `${field.name}: ${field.values[featureIndex]}`
                         );
                         if (
-                          (!name || 0 === name.length) &&
+                          !Cesium.defined(name) &&
                           isNameProperty(field.name)
                         ) {
                           name = field.values[featureIndex];
@@ -163,7 +143,7 @@ <h1>Loading...</h1>
                     description += `</tbody></table>`;
                   }
                 }
-                if (!name || 0 === name.length) {
+                if (!Cesium.defined(name)) {
                   name = "unknown";
                 }
                 selectedEntity.name = name;

Apps/Sandcastle/gallery/I3S IntegratedMesh Layer.html

@@ -43,7 +43,7 @@ <h1>Loading...</h1>
           animation: false,
           timeline: false,
         });
-        //supress terrain data to avoid clashing with IntegratedMesh layer geometry
+        // Suppress terrain data to avoid clashing with IntegratedMesh layer geometry
         viewer.scene.globe.depthTestAgainstTerrain = false;
         // More datasets to tour can be added here..
         // The url passed to I3SDataProvider supports loading a single Indexed 3D Scene (I3S) layer (.<host>/SceneServer/layers/<id>) or a collection of scene layers (.<host>/SceneServer) from a SceneServer.
@@ -66,35 +66,21 @@ <h1>Loading...</h1>
           debugShowBoundingVolume: false,
         };
         const i3sOptions = {
+          url: tours["Frankfurt"],
           traceFetches: false, // for tracing I3S fetches
           geoidTiledTerrainProvider: geoidService, // pass the geoid service
-          cesium3dTilesetOptions: cesium3dTilesetOptions,
+          cesium3dTilesetOptions: cesium3dTilesetOptions, // options for internal Cesium3dTileset
         };
+
         // Create I3S data provider
-        const i3sProvider = new Cesium.I3SDataProvider(
-          "",
-          tours["Frankfurt"],
-          i3sOptions
-        );
-        i3sProvider.load();
+        const i3sProvider = new Cesium.I3SDataProvider(i3sOptions);
 
-        //Center camera on I3S once it's loaded
+        // Center camera on I3S once it's loaded
         i3sProvider.readyPromise.then(function () {
-          const midLon =
-            (i3sProvider.extent.minLongitude +
-              i3sProvider.extent.maxLongitude) /
-            2;
-          const midLat =
-            (i3sProvider.extent.minLatitude + i3sProvider.extent.maxLatitude) /
-            2;
+          const center = Cesium.Rectangle.center(i3sProvider.extent);
+          center.height = 10000.0;
           viewer.camera.setView({
-            destination: Cesium.Ellipsoid.WGS84.cartographicToCartesian(
-              new Cesium.Cartographic(
-                Cesium.Math.toRadians(midLon),
-                Cesium.Math.toRadians(midLat),
-                10000.0
-              )
-            ),
+            destination: Cesium.Ellipsoid.WGS84.cartographicToCartesian(center),
           });
         });