Skip to content

Commit 9d00201

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix-draped-imagery-removal
# Conflicts: # CHANGES.md
2 parents d353922 + 4b77c39 commit 9d00201

File tree

236 files changed

+11064
-5197
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+11064
-5197
lines changed

.github/workflows/cla.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v5
1414
- name: install node 22
15-
uses: actions/setup-node@v5
15+
uses: actions/setup-node@v6
1616
with:
1717
node-version: '22'
1818
- name: install npm packages

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828
- uses: actions/checkout@v5
2929
- name: install node 22
30-
uses: actions/setup-node@v5
30+
uses: actions/setup-node@v6
3131
with:
3232
node-version: '22'
3333
- name: npm install

.github/workflows/dev.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v5
1515
- name: install node 22
16-
uses: actions/setup-node@v5
16+
uses: actions/setup-node@v6
1717
with:
1818
node-version: '22'
1919
- name: npm install
@@ -34,7 +34,7 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@v5
3636
- name: install node 22
37-
uses: actions/setup-node@v5
37+
uses: actions/setup-node@v6
3838
with:
3939
node-version: '22'
4040
- name: npm install
@@ -51,7 +51,7 @@ jobs:
5151
steps:
5252
- uses: actions/checkout@v5
5353
- name: install node 22
54-
uses: actions/setup-node@v5
54+
uses: actions/setup-node@v6
5555
with:
5656
node-version: '22'
5757
- name: npm install
@@ -67,7 +67,7 @@ jobs:
6767
steps:
6868
- uses: actions/checkout@v5
6969
- name: install node 20
70-
uses: actions/setup-node@v5
70+
uses: actions/setup-node@v6
7171
with:
7272
node-version: '20'
7373
- name: npm install

.github/workflows/prod.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
name: prod
2-
on:
2+
on:
33
push:
4-
branches:
5-
- 'cesium.com'
4+
branches:
5+
- "cesium.com"
66
jobs:
77
lint:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v5
1111
- name: install node 22
12-
uses: actions/setup-node@v5
12+
uses: actions/setup-node@v6
1313
with:
14-
node-version: '22'
14+
node-version: "22"
1515
- name: npm install
1616
run: npm install
1717
- name: lint *.js
@@ -34,15 +34,19 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@v5
3636
- name: install node 22
37-
uses: actions/setup-node@v5
37+
uses: actions/setup-node@v6
3838
with:
39-
node-version: '22'
39+
node-version: "22"
4040
- name: npm install
4141
run: npm install
4242
- name: build website release
4343
run: npm run website-release
4444
- name: build apps
4545
run: npm run build-apps
46+
- name: build types
47+
run: npm run build-ts
48+
- name: build prod sandcastle
49+
run: npm run build-prod -w packages/sandcastle -- -l warn
4650
- name: deploy to cesium.com
4751
if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
4852
run: |
@@ -51,4 +55,4 @@ jobs:
5155
aws s3 sync Build/release/ s3://cesium-website/cesiumjs/releases/$(cat package.json | jq -r '.version' | sed 's/\.0$//')/ --cache-control "public, max-age=1800" --delete
5256
aws s3 sync Build/Documentation/ s3://cesium-website/cesiumjs/ref-doc/ --cache-control "public, max-age=1800" --delete
5357
aws s3 sync Build/CesiumViewer/ s3://cesium-website/cesiumjs/cesium-viewer/ --cache-control "public, max-age=1800" --delete
54-
aws s3 sync Build/Sandcastle/ s3://cesium-sandcastle-website/ --cache-control "public, max-age=1800" --delete
58+
aws s3 sync Build/Sandcastle2/ s3://cesium-sandcastle-website/ --cache-control "public, max-age=1800" --delete

.github/workflows/sandcastle-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v5
2020
- name: install node 22
21-
uses: actions/setup-node@v5
21+
uses: actions/setup-node@v6
2222
with:
2323
node-version: '22'
2424
- name: npm install

Apps/Sandcastle/gallery/Custom DataSource.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
/**
6565
* Gets a human-readable name for this instance.
6666
* @memberof WebGLGlobeDataSource.prototype
67-
* @type {String}
67+
* @type {string}
6868
*/
6969
name: {
7070
get: function () {
@@ -93,7 +93,7 @@
9393
/**
9494
* Gets a value indicating if the data source is currently loading data.
9595
* @memberof WebGLGlobeDataSource.prototype
96-
* @type {Boolean}
96+
* @type {boolean}
9797
*/
9898
isLoading: {
9999
get: function () {
@@ -150,7 +150,7 @@
150150
* so that only one series is viewed at a time. Valid values are defined
151151
* in the seriesNames property.
152152
* @memberof WebGLGlobeDataSource.prototype
153-
* @type {String}
153+
* @type {string}
154154
*/
155155
seriesToDisplay: {
156156
get: function () {
@@ -174,7 +174,7 @@
174174
/**
175175
* Gets or sets the scale factor applied to the height of each line.
176176
* @memberof WebGLGlobeDataSource.prototype
177-
* @type {Number}
177+
* @type {number}
178178
*/
179179
heightScale: {
180180
get: function () {
@@ -190,7 +190,7 @@
190190
/**
191191
* Gets whether or not this data source should be displayed.
192192
* @memberof WebGLGlobeDataSource.prototype
193-
* @type {Boolean}
193+
* @type {boolean}
194194
*/
195195
show: {
196196
get: function () {
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
6+
<meta
7+
name="viewport"
8+
content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"
9+
/>
10+
<meta
11+
name="description"
12+
content="Imagery tiles from Google Maps with additional parameters to create overlays and custom styles."
13+
/>
14+
<meta name="cesium-sandcastle-labels" content="Beginner, Showcases" />
15+
<title>Cesium Demo</title>
16+
<script type="text/javascript" src="../Sandcastle-header.js"></script>
17+
<script type="module" src="../load-cesium-es6.js"></script>
18+
</head>
19+
<body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
20+
<style>
21+
@import url(../templates/bucket.css);
22+
</style>
23+
<div id="cesiumContainer" class="fullSize"></div>
24+
<div id="loadingOverlay"><h1>Loading...</h1></div>
25+
<div id="toolbar"></div>
26+
<script id="cesium_sandcastle_script">
27+
window.startup = async function (Cesium) {
28+
"use strict";
29+
//Sandcastle_Begin
30+
const assetId = 3830184;
31+
32+
const base = Cesium.ImageryLayer.fromProviderAsync(
33+
Cesium.Google2DImageryProvider.fromIonAssetId({
34+
assetId,
35+
mapType: "satellite",
36+
}),
37+
);
38+
39+
const overlay = Cesium.ImageryLayer.fromProviderAsync(
40+
Cesium.Google2DImageryProvider.fromIonAssetId({
41+
assetId,
42+
overlayLayerType: "layerRoadmap",
43+
styles: [
44+
{
45+
stylers: [{ hue: "#00ffe6" }, { saturation: -20 }],
46+
},
47+
{
48+
featureType: "road",
49+
elementType: "geometry",
50+
stylers: [{ lightness: 100 }, { visibility: "simplified" }],
51+
},
52+
],
53+
}),
54+
);
55+
56+
const viewer = new Cesium.Viewer("cesiumContainer", {
57+
animation: false,
58+
baseLayer: false,
59+
baseLayerPicker: false,
60+
geocoder: Cesium.IonGeocodeProviderType.GOOGLE,
61+
timeline: false,
62+
sceneModePicker: false,
63+
navigationHelpButton: false,
64+
homeButton: false,
65+
terrainProvider: await Cesium.CesiumTerrainProvider.fromIonAssetId(1),
66+
});
67+
viewer.geocoder.viewModel.keepExpanded = true;
68+
69+
viewer.imageryLayers.add(base);
70+
viewer.imageryLayers.add(overlay);
71+
72+
viewer.scene.camera.flyTo({
73+
duration: 0,
74+
destination: new Cesium.Rectangle.fromDegrees(
75+
//Philly
76+
-75.280266,
77+
39.867004,
78+
-74.955763,
79+
40.137992,
80+
),
81+
});
82+
//Sandcastle_End
83+
Sandcastle.finishedLoading();
84+
};
85+
if (typeof Cesium !== "undefined") {
86+
window.startupCalled = true;
87+
window.startup(Cesium).catch((error) => {
88+
"use strict";
89+
console.error(error);
90+
});
91+
}
92+
</script>
93+
</body>
94+
</html>
29 KB
Loading
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
6+
<meta
7+
name="viewport"
8+
content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"
9+
/>
10+
<meta name="description" content="Global imagery data from Google Maps." />
11+
<meta name="cesium-sandcastle-labels" content="Beginner, Showcases" />
12+
<title>Cesium Demo</title>
13+
<script type="text/javascript" src="../Sandcastle-header.js"></script>
14+
<script type="module" src="../load-cesium-es6.js"></script>
15+
</head>
16+
<body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
17+
<style>
18+
@import url(../templates/bucket.css);
19+
</style>
20+
<div id="cesiumContainer" class="fullSize"></div>
21+
<div id="loadingOverlay"><h1>Loading...</h1></div>
22+
<div id="toolbar"></div>
23+
<script id="cesium_sandcastle_script">
24+
window.startup = async function (Cesium) {
25+
"use strict";
26+
//Sandcastle_Begin
27+
const assetId = 3830184;
28+
29+
const google = Cesium.ImageryLayer.fromProviderAsync(
30+
Cesium.IonImageryProvider.fromAssetId(assetId),
31+
);
32+
33+
const viewer = new Cesium.Viewer("cesiumContainer", {
34+
animation: false,
35+
baseLayer: false,
36+
baseLayerPicker: false,
37+
geocoder: Cesium.IonGeocodeProviderType.GOOGLE,
38+
timeline: false,
39+
sceneModePicker: false,
40+
navigationHelpButton: false,
41+
homeButton: false,
42+
terrainProvider: await Cesium.CesiumTerrainProvider.fromIonAssetId(1),
43+
});
44+
viewer.geocoder.viewModel.keepExpanded = true;
45+
46+
viewer.imageryLayers.add(google);
47+
48+
viewer.scene.camera.flyTo({
49+
duration: 0,
50+
destination: new Cesium.Rectangle.fromDegrees(
51+
//Philly
52+
-75.280266,
53+
39.867004,
54+
-74.955763,
55+
40.137992,
56+
),
57+
}); //Sandcastle_End
58+
Sandcastle.finishedLoading();
59+
};
60+
if (typeof Cesium !== "undefined") {
61+
window.startupCalled = true;
62+
window.startup(Cesium).catch((error) => {
63+
"use strict";
64+
console.error(error);
65+
});
66+
}
67+
</script>
68+
</body>
69+
</html>
20.1 KB
Loading

0 commit comments

Comments
 (0)