Merge remote-tracking branch 'origin' into cesium.com

Author: Jeshurun Hembd

.idea/prettier.xml

@@ -10,5 +10,8 @@
   },
   "no-inline-html": {
     "allowed_elements": ["details", "summary"]
+  },
+  "blanks-around-fences": {
+    "list_items": false
   }
 }

.markdownlint.json

@@ -2,5 +2,4 @@
 /ThirdParty
 /Tools/**
 
-CHANGES.md 
-LICENSE.md
+LICENSE.md

.markdownlintignore

@@ -56,12 +56,16 @@
     "dijit",
     "DONT",
     "ecef",
+    "Eigen",
+    "emscripten",
     "EPSG",
     "fxaa",
+    "gdal",
     "glsl",
     "gltf",
     "iframes",
     "iife",
+    "Khronos",
     "lerp",
     "Lilli",
     "maki",
@@ -71,6 +75,7 @@
     "mipmaps",
     "msaa",
     "noaa",
+    "Occludee",
     "Occluder",
     "occluders",
     "octree",
@@ -82,7 +87,10 @@
     "pnts",
     "quantizations",
     "reproject",
+    "slerp",
     "tada",
+    "teme",
+    "tipsify",
     "topo",
     "topojson",
     "Transitioner",
@@ -97,6 +105,7 @@
     "voxel",
     "VVLH",
     "WEBG",
+    "WMTS",
     "xdescribe"
   ]
 }

.vscode/cspell.json

@@ -63,17 +63,17 @@
         viewer.scene.camera.flyTo(birdsEyeView);
 
         // Load feature service geojson files
-        const points = await Cesium.ITwinData.createDataSourceForRealityDataId(
+        const points = await Cesium.ITwinData.loadGeospatialFeatures(
           iTwinId,
-          "57b975f6-fd92-42ba-8014-79911ed606d1",
+          "2380dc1b-1dac-4709-aa5c-f6cb38c4e9f5",
         );
-        const lines = await Cesium.ITwinData.createDataSourceForRealityDataId(
+        const lines = await Cesium.ITwinData.loadGeospatialFeatures(
           iTwinId,
-          "1099c53f-c568-48a3-a57c-0230a6f37229",
+          "613d2310-4d01-43b7-bc92-873a2ca4a4a0",
         );
-        const areas = await Cesium.ITwinData.createDataSourceForRealityDataId(
+        const areas = await Cesium.ITwinData.loadGeospatialFeatures(
           iTwinId,
-          "21eaf0d0-ab90-400f-97cf-adc455b29a78",
+          "93e7ef51-5210-49f2-92a3-c7f6685e102f",
         );
 
         // Add some styling to the lines and points to differentiate types
@@ -86,7 +86,7 @@
             Arrow_Marking: { color: Cesium.Color.YELLOW, icon: "car" },
             Road_Sign: { color: Cesium.Color.ORANGE, icon: "triangle" },
           };
-          const type = entity.properties.Type?.getValue();
+          const type = entity.properties.type?.getValue();
           if (Cesium.defined(type) && Cesium.defined(styleByType[type])) {
             const { color, icon } = styleByType[type];
             const canvas = await pinBuilder.fromMakiIconId(icon, color, 48);
@@ -103,7 +103,7 @@
             Turning_pocket: Cesium.Color.DEEPPINK,
             Yellow_Box: Cesium.Color.GOLD,
           };
-          const type = entity.properties.Type?.getValue();
+          const type = entity.properties.type?.getValue();
           if (Cesium.defined(type) && Cesium.defined(lineColorsByType[type])) {
             entity.polyline.material = lineColorsByType[type];
           }

Apps/Sandcastle/gallery/iTwin Feature Service.html

@@ -419,3 +419,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
 - [Kirn Kim](https://github.com/squrki)
 - [Emanuele Mastaglia](https://github.com/Masty88)
 - [Connor Manning](https://github.com/connormanning)
+- [Isaac Young](https://github.com/ibreathebsb)
+- [Nick Crews](https://github.com/NickCrews)
+- [胡文康](https://github.com/XiaoHu1994)
+- [Parth Petkar](https://github.com/parthpetkar)

CHANGES.md

@@ -0,0 +1,10 @@
+# ExternalInMultipleContents
+
+A tileset that was created as a regression test for
+https://github.com/CesiumGS/cesium/issues/11960
+
+It contains a single root node with 4 contents:
+
+- The first one is a GLB of a red unit cube
+- The remaining three are external tilesets, containing
+  a green, blue, and white unit cube, respectively