Port to OL 7.4 and Cesium 107

openlayers · Jul 21, 2023 · 791343d · 791343d
1 parent d196f62
commit 791343d
Show file tree

Hide file tree

Showing 29 changed files with 852 additions and 719 deletions.
diff --git a/.RELEASE.md.swp b/.RELEASE.md.swp
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,7 @@
 
 * Changes
   * Add function to grab a screenshot from rendered Cesium globe (client side printing)
+  * Port to OL 7.4 and CesiumJS 1.107
 
 # v 2.14.0 - 2023-04-26
 

diff --git a/buildtools/release.sh b/buildtools/release.sh
@@ -26,4 +26,4 @@ echo
 echo "cd ../.. && rm -rf $BUILD && npm publish && buildtools/publish-website.sh"
 echo "git tag $TAG && git push --tags"
 echo
-echo "In addition, create the release on github and announce it"
+echo "In addition, create the release on github (upload the zip) and announce it"
diff --git a/buildtools/webpack.commons.js b/buildtools/webpack.commons.js
@@ -41,7 +41,6 @@ const ruleTS = {
       plugins: [
         ['@babel/plugin-syntax-dynamic-import'],
         ['@babel/plugin-transform-typescript', {allowDeclareFields: true}],
-        ['@babel/proposal-class-properties'],
       ]
     }
   },

diff --git a/examples/customProj.js b/examples/customProj.js
@@ -47,7 +47,7 @@ const ol3d = new OLCesium({
   }
 });
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 ol3d.setEnabled(true);
 
 document.getElementById('enable').addEventListener('click', () => ol3d.setEnabled(!ol3d.getEnabled()));
diff --git a/examples/exports.js b/examples/exports.js
@@ -25,7 +25,7 @@ const ol2d = new olMap({
 
 const ol3d = new OLCesium({map: ol2d});
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 
 ol3d.setEnabled(true);
 const camera = ol3d.getCamera();

diff --git a/examples/fillstyle.js b/examples/fillstyle.js
@@ -78,7 +78,7 @@ const map = new olMap({
 Cesium.Ion.defaultAccessToken = OLCS_ION_TOKEN;
 const ol3d = new OLCesium({map, target: 'map3d'});
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 ol3d.setEnabled(true);
 
 window['ol3d'] = ol3d;

diff --git a/examples/groundvectors.js b/examples/groundvectors.js
@@ -138,7 +138,7 @@ Cesium.Ion.defaultAccessToken = OLCS_ION_TOKEN;
 vectorLayer.set('altitudeMode', 'clampToGround');
 const ol3d = new OLCesium({map, target: 'map3d'});
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 ol3d.setEnabled(true);
 
 window['toggleClampToGround'] = function() {

diff --git a/examples/icon-position.js b/examples/icon-position.js
@@ -94,7 +94,7 @@ const map = new olMap({
 Cesium.Ion.defaultAccessToken = OLCS_ION_TOKEN;
 const ol3d = new OLCesium({map, target: 'map3d'});
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 ol3d.setEnabled(true);
 
 window['toggleClampToGround'] = function() {

diff --git a/examples/image-static.js b/examples/image-static.js
@@ -48,7 +48,7 @@ const ol3d = new OLCesium({
   map: ol2d
 });
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 ol3d.setEnabled(true);
 
 

diff --git a/examples/imageWMS.js b/examples/imageWMS.js
@@ -47,7 +47,7 @@ const ol3d = new OLCesium({
   }
 });
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 ol3d.setEnabled(true);
 
 document.getElementById('enable').addEventListener('click', () => ol3d.setEnabled(!ol3d.getEnabled()));
diff --git a/examples/kml.js b/examples/kml.js
@@ -31,7 +31,7 @@ const ol2d = new olMap({
 
 const ol3d = new OLCesium({map: ol2d});
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 
 ol3d.getDataSources().add(Cesium.KmlDataSource.load(
     'https://api3.geo.admin.ch/ogcproxy?url=' +

diff --git a/examples/main.js b/examples/main.js
@@ -43,7 +43,7 @@ const ol3d = new OLCesium({
   }
 });
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 ol3d.setEnabled(true);
 
 
@@ -58,3 +58,4 @@ window['toggleTime'] = function() {
     timeElt.style.display = 'none';
   }
 };
+
diff --git a/examples/overlay.js b/examples/overlay.js
@@ -38,7 +38,7 @@ const ol3d = new OLCesium({
   target: 'map3d'
 });
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 
 class OverlayHandler {
   constructor(ol2d, ol3d, scene) {

diff --git a/examples/print.js b/examples/print.js
@@ -36,7 +36,7 @@ const ol3d = new OLCesium({
   map: ol2d,
 });
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 ol3d.setEnabled(true);
 
 

diff --git a/examples/rastersync.js b/examples/rastersync.js
@@ -41,7 +41,7 @@ const ol2d = new olMap({
 Cesium.Ion.defaultAccessToken = OLCS_ION_TOKEN;
 const ol3d = new OLCesium({map: ol2d, target: 'map3d'});
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 
 ol3d.setEnabled(true);
 

diff --git a/examples/rotate.js b/examples/rotate.js
@@ -33,7 +33,7 @@ const map = new olMap({
 Cesium.Ion.defaultAccessToken = OLCS_ION_TOKEN;
 const ol3d = new OLCesium({map/*, target: 'map3d'*/});
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 ol3d.setEnabled(true);
 
 

diff --git a/examples/sidebyside.js b/examples/sidebyside.js
@@ -29,7 +29,7 @@ const ol2d = new olMap({
 
 const ol3d = new OLCesium({map: ol2d, target: 'map3d'});
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 ol3d.setEnabled(true);
 
 document.getElementById('enable').addEventListener('click', () => ol3d.setEnabled(!ol3d.getEnabled()));
diff --git a/examples/synthvectors.js b/examples/synthvectors.js
@@ -37,7 +37,7 @@ const map = new olMap({
 Cesium.Ion.defaultAccessToken = OLCS_ION_TOKEN;
 const ol3d = new OLCesium({map});
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 ol3d.setEnabled(true);
 
 // Show off 3D feature picking

diff --git a/examples/tracking.js b/examples/tracking.js
@@ -68,7 +68,7 @@ const map = new olMap({
 Cesium.Ion.defaultAccessToken = OLCS_ION_TOKEN;
 const ol3d = new OLCesium({map/*, target: 'map3d'*/});
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 ol3d.setEnabled(true);
 
 let tracking = false;

diff --git a/examples/vectors.js b/examples/vectors.js
@@ -335,7 +335,7 @@ dragAndDropInteraction.on('addfeatures', (event) => {
 Cesium.Ion.defaultAccessToken = OLCS_ION_TOKEN;
 const ol3d = new OLCesium({map, target: 'map3d'});
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 ol3d.setEnabled(true);
 
 const csLabels = new Cesium.LabelCollection();

diff --git a/examples/wmts.js b/examples/wmts.js
@@ -64,7 +64,7 @@ const ol3d = new OLCesium({
   map: ol2d,
 });
 const scene = ol3d.getCesiumScene();
-scene.terrainProvider = Cesium.createWorldTerrain();
+Cesium.createWorldTerrainAsync().then(tp => scene.terrainProvider = tp);
 ol3d.setEnabled(true);
 
 document.getElementById('enable').addEventListener('click', () => ol3d.setEnabled(!ol3d.getEnabled()));