Merge pull request #658 from openlayers/prepare_for_2.3

Prepare for 2.3
openlayers · Sep 27, 2018 · a3a64e1 · a3a64e1
2 parents db913c2 + bc042d8
commit a3a64e1
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 32 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,10 +1,12 @@
 # Changelog
 
-# v 2.3
+# v 2.3 - 2018-09-27
 
 * Changes
   * Port to OpenLayers 5.2.0.
   * Add image static support.
+  * Improve old fashioned build.
+  * Port to Cesium 1.49.
 
 # v 2.2.2 - 2018-08-24
 

diff --git a/buildtools/webpack.commons.js b/buildtools/webpack.commons.js
@@ -1,8 +1,7 @@
 const path = require('path');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
 
 
-const babelPresets = [['env', {
+const babelPresets = [['@babel/preset-env', {
   'targets': {
     'browsers': ['last 2 versions', 'Firefox ESR', 'ie 11'],
   },
@@ -32,13 +31,6 @@ const olcsRule = {
   }
 };
 
-const cssRule = {
-  test: /\.css$/,
-  use: ExtractTextPlugin.extract({
-    use: 'css-loader'
-  })
-};
-
 const htmlRule = {
   test: /\.html$/,
   use: [{
@@ -66,13 +58,11 @@ const config = {
     rules: [
       olRule,
       olcsRule,
-      cssRule,
       htmlRule,
       iconRule
     ]
   },
   plugins: [
-    new ExtractTextPlugin('[name].css')
   ],
   resolve: {
     modules: [

diff --git a/examples/image-static.js b/examples/image-static.js
@@ -16,6 +16,7 @@ import Static from 'ol/source/ImageStatic.js';
 
 const imageExtent = [-40, 50, -10, 65];
 
+Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0MzAyNzUyYi0zY2QxLTQxZDItODRkOS1hNTA3MDU3ZTBiMDUiLCJpZCI6MjU0MSwiaWF0IjoxNTMzNjI1MTYwfQ.oHn1SUWJa12esu7XUUtEoc1BbEbuZpRocLetw6M6_AA';
 const ol2d = new olMap({
   layers: [
     new olLayerTile({
@@ -47,11 +48,7 @@ const ol3d = new OLCesium({
   map: ol2d
 });
 const scene = ol3d.getCesiumScene();
-const terrainProvider = new Cesium.CesiumTerrainProvider({
-  url: '//assets.agi.com/stk-terrain/world',
-  requestVertexNormals: true
-});
-scene.terrainProvider = terrainProvider;
+scene.terrainProvider = Cesium.createWorldTerrain();
 ol3d.setEnabled(true);
 
 

diff --git a/examples/rotate.js b/examples/rotate.js
@@ -129,8 +129,12 @@ OlcsControl.prototype.resetToNorthZenith = function(callback) {
 
 
 OlcsControl.prototype.rotate = function(angle) {
-  const current = this.ol3d_.getOlView().getRotation();
-  this.ol3d_.getOlView().setRotation(current + angle);
+  const view = this.ol3d_.getOlView();
+  const current = view.getRotation();
+  view.animate({
+    rotation: current + angle,
+    duration: 250
+  });
 };
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ol-cesium",
-  "version": "2.2.2",
+  "version": "2.3.0",
   "description": "OpenLayers Cesium integration library",
   "scripts": {
     "build-examples": "cross-env NODE_ENV=production TARGET=examples webpack --progress --bail",
@@ -19,18 +19,16 @@
     "url": "https://github.com/openlayers/ol-cesium/issues"
   },
   "devDependencies": {
-    "@camptocamp/cesium": "1.48.0",
+    "@babel/core": "7.1.0",
+    "@babel/preset-env": "7.1.0",
+    "@camptocamp/cesium": "1.49.0",
     "@mapbox/geojsonhint": "2.0.1",
-    "babel-core": "6.26.3",
-    "babel-loader": "7.1.5",
-    "babel-preset-env": "1.7.0",
+    "babel-loader": "8.0.2",
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "5.2.0",
-    "css-loader": "1.0.0",
-    "eslint": "5.4.0",
+    "eslint": "5.6.0",
     "eslint-config-openlayers": "11.0.0",
     "eslint-import-resolver-webpack": "^0.10.1",
-    "extract-text-webpack-plugin": "4.0.0-alpha.0",
     "fs-extra": "7.0.0",
     "html-loader": "0.5.5",
     "html-webpack-plugin": "3.2.0",
@@ -41,9 +39,9 @@
     "ol": "5.2.0",
     "proj4": "2.4.4",
     "temp": "0.8.3",
-    "webpack": "4.17.1",
-    "webpack-cli": "3.1.0",
-    "webpack-dev-server": "3.1.5",
-    "webpack-merge": "^4.1.4"
+    "webpack": "^4.20.2",
+    "webpack-cli": "3.1.1",
+    "webpack-dev-server": "3.1.9",
+    "webpack-merge": "4.1.4"
   }
 }
diff --git a/src/olcs/AutoRenderLoop.js b/src/olcs/AutoRenderLoop.js
@@ -28,6 +28,7 @@ class AutoRenderLoop {
    */
   enable() {
     this.scene_.requestRenderMode = true;
+    this.scene_.maximumRenderTimeChange = 1000;
     for (const repaintKey of this.repaintEventNames_) {
       this.canvas_.addEventListener(repaintKey, this._boundNotifyRepaintRequired, false);
     }

diff --git a/src/olcs/FeatureConverter.js b/src/olcs/FeatureConverter.js
@@ -716,13 +716,14 @@ class FeatureConverter {
       cancellers[fuid] = canceller;
 
       const listener = function() {
+        image.removeEventListener('load', listener);
         if (!billboards.isDestroyed() && !cancelled) {
           // Create billboard if the feature is still displayed on the map.
           reallyCreateBillboard();
         }
       };
 
-      image.once('load', listener);
+      image.addEventListener('load', listener);
     } else {
       reallyCreateBillboard();
     }