samuel-girard · meyraa · Jan 25, 2019 · Jan 28, 2019 · Jan 30, 2019 · Jan 30, 2019
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
@@ -14,6 +14,7 @@
     comma-dangle: 0,
     no-extra-boolean-cast: 0,
     brace-style: 0,
+    prefer-template: 0,
     no-multiple-empty-lines: 0,
     valid-jsdoc: 0,
     indent: [2, 2, {

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,17 @@
+name: Test
+
+on:
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - name: Make dist
+        run: make dist
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
-/.build
-/.idea
-/dist
-/node_modules
+/.build/
+/dist/
+/node_modules/
 /examples/example-list.js
 /package-lock.json
 /compilation-stats.json
diff --git a/.npmignore b/.npmignore
@@ -1,3 +1,4 @@
 /.build
-/.idea
 examples/example-list.js
+/*.tgz
+/*.zip
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,37 @@
 # Changelog
 
+# v 2.10 - 2019-10-10
+
+* Changes
+  * Add a WMTS example.
+  * Port to Cesium 1.62.
+  * Port to OpenLayers 6 while staying compatible with OpenLayers 5.
+
+# v 2.9 - 2019-04-05
+
+* Changes
+  * Port to Cesium 1.56.1.
+
+# v 2.8 - 2019-03-13
+
+* Changes
+  * Port to Cesium 1.55.
+
+# v 2.7.2 - 2019-02-12
+
+* Changes
+  * Fix a type
+
+# v 2.7.1 - 2019-02-08
+
+* Changes
+  * Fix release
+
+# v 2.7 - 2019-02-08
+* Changes
+  * Port to Cesium 1.54.
+  * Document code using typescript.
+
 # v 2.6 - 2018-12-06
 
 * Changes

diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ help:
 
 .PHONY: serve
 serve: .build/node_modules.timestamp
-	npm run serve
+	npm start
 
 .PHONY: dist
 dist: dist/olcesium.js css/olcs.css CHANGES.md .build/jsdoc.timestamp .build/dist-examples.timestamp lint
@@ -36,8 +36,7 @@ dist-examples: .build/dist-examples.timestamp
 dist-apidoc: .build/jsdoc.timestamp
 
 .build/jsdoc.timestamp: $(SRC_JS_FILES) .build/node_modules.timestamp
-	mkdir -p dist
-	node node_modules/.bin/jsdoc src/olcs -d dist/apidoc
+	npm run doc
 	mkdir -p $(dir $@)
 	touch $@
 
@@ -71,7 +70,7 @@ cleanall:
 	TARGET=examples ./node_modules/.bin/eslint $(filter-out .build/node_modules.timestamp, $^)
 	touch $@
 
-CS_BUILD=node_modules/@camptocamp/cesium/Build
+CS_BUILD=node_modules/cesium/Build
 OL_CSS_DIR=node_modules/ol
 .build/dist-examples.timestamp: dist/examples/index.html $(EXAMPLES_FILES) $(WEBPACK_CONFIG_FILES) .build/node_modules.timestamp
 	npm run build-examples

diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ ol3d.setEnabled(true);
 For Cesium integration see [ol-cesium-webpack-example](https://github.com/gberaudo/ol-cesium-webpack-example)
 based on the official `Cesium With Webpack` example.
 
-### As an old-fashioned independant library
+### As an old-fashioned independent library
 
 - build the library in dist/olcs.js:
 ```bash
@@ -110,7 +110,7 @@ Limitations
 -----------
 
 - OpenLayers unmanaged layers are not discoverable and as a consequence not
-supported. Plain layers should be used instead or the synchronization managed
+supported. Plain layers should be used instead of the synchronization managed
 manually. See https://github.com/openlayers/ol-cesium/issues/350.
 
 - OpenLayers interactions are not supported in 3d. See https://github.com/openlayers/ol-cesium/issues/655.

diff --git a/examples/bing.js b/examples/bing.js
@@ -1,8 +1,6 @@
 /**
  * @module examples.main
  */
-const exports = {};
-
 import OLCesium from 'olcs/OLCesium.js';
 import olView from 'ol/View.js';
 import {defaults as olControlDefaults} from 'ol/control.js';
@@ -23,9 +21,9 @@ const ol2d = new olMap({
   ],
   controls: olControlDefaults({
     attribution: true,
-    attributionOptions: /** @type {olx.control.AttributionOptions} */ ({
+    attributionOptions: {
       collapsible: false
-    })
+    }
   }),
   target: 'map',
   view: new olView({
@@ -45,5 +43,3 @@ scene.terrainProvider = Cesium.createWorldTerrain();
 ol3d.setEnabled(true);
 
 document.getElementById('enable').addEventListener('click', () => ol3d.setEnabled(!ol3d.getEnabled()));
-
-export default exports;
diff --git a/examples/customProj.js b/examples/customProj.js
@@ -1,7 +1,6 @@
 /**
  * @module examples.customProj
  */
-const exports = {};
 import OLCesium from 'olcs/OLCesium.js';
 import olView from 'ol/View.js';
 import olSourceImageWMS from 'ol/source/ImageWMS.js';
@@ -71,5 +70,3 @@ scene.terrainProvider = Cesium.createWorldTerrain();
 ol3d.setEnabled(true);
 
 document.getElementById('enable').addEventListener('click', () => ol3d.setEnabled(!ol3d.getEnabled()));
-
-export default exports;
diff --git a/examples/exports.js b/examples/exports.js
@@ -1,7 +1,6 @@
 /**
  * @module examples.exports
  */
-const exports = {};
 import OLCesium from 'olcs/OLCesium.js';
 import {transform} from 'ol/proj.js';
 import olView from 'ol/View.js';
@@ -44,5 +43,3 @@ setInterval(printInfo, 100);
 document.getElementById('enable').addEventListener('click', () => ol3d.setEnabled(!ol3d.getEnabled()));
 window['camera'] = camera;
 window['olProjTransform'] = transform;
-
-export default exports;
diff --git a/examples/fillstyle.js b/examples/fillstyle.js
@@ -1,7 +1,6 @@
 /**
  * @module examples.vectors
  */
-const exports = {};
 import OLCesium from 'olcs/OLCesium.js';
 import olView from 'ol/View.js';
 import {defaults as olControlDefaults} from 'ol/control.js';
@@ -66,9 +65,9 @@ const map = new olMap({
   ],
   target: 'map2d',
   controls: olControlDefaults({
-    attributionOptions: /** @type {olx.control.AttributionOptions} */ ({
+    attributionOptions: {
       collapsible: false
-    })
+    }
   }),
   view: new olView({
     center: [-2e6, 1e6],
@@ -97,5 +96,3 @@ window['toggleClampToGround'] = function() {
   map.removeLayer(vectorLayer);
   map.addLayer(vectorLayer);
 };
-
-export default exports;
diff --git a/examples/groundvectors.js b/examples/groundvectors.js
@@ -1,7 +1,6 @@
 /**
  * @module examples.vectors
  */
-const exports = {};
 import OLCesium from 'olcs/OLCesium.js';
 import olView from 'ol/View.js';
 import {defaults as olControlDefaults} from 'ol/control.js';
@@ -16,8 +15,8 @@ import olStyleCircle from 'ol/style/Circle.js';
 import olSourceVector from 'ol/source/Vector.js';
 import olFormatGeoJSON from 'ol/format/GeoJSON.js';
 import olLayerVector from 'ol/layer/Vector.js';
-import olFeature from 'ol/Feature';
-import olCircle from 'ol/geom/Circle';
+import olFeature from 'ol/Feature.js';
+import olCircle from 'ol/geom/Circle.js';
 
 const image = new olStyleCircle({
   radius: 5,
@@ -124,9 +123,9 @@ const map = new olMap({
   ],
   target: 'map2d',
   controls: olControlDefaults({
-    attributionOptions: /** @type {olx.control.AttributionOptions} */ ({
+    attributionOptions: {
       collapsible: false
-    })
+    }
   }),
   view: new olView({
     center: [16880670.33392873, -3565966.2275828626],
@@ -156,6 +155,3 @@ window['scene'] = scene;
 document.getElementById('enable').addEventListener('click', () => ol3d.setEnabled(!ol3d.getEnabled()));
 
 ol3d.enableAutoRenderLoop();
-
-
-export default exports;
diff --git a/examples/icon-position.js b/examples/icon-position.js
@@ -1,7 +1,6 @@
 /**
  * @module examples.vectors
  */
-const exports = {};
 import OLCesium from 'olcs/OLCesium.js';
 import olView from 'ol/View.js';
 import {defaults as olControlDefaults} from 'ol/control.js';
@@ -81,9 +80,9 @@ const map = new olMap({
   ],
   target: 'map2d',
   controls: olControlDefaults({
-    attributionOptions: /** @type {olx.control.AttributionOptions} */ ({
+    attributionOptions: {
       collapsible: false
-    })
+    }
   }),
   view: new olView({
     center: [850000, 200000],
@@ -124,6 +123,3 @@ if (pivot) {
   const rotateAroundAxis = olcsCore.rotateAroundAxis;
   rotateAroundAxis(camera, -Math.PI / 4, axis, transform, options);
 }
-
-
-export default exports;
diff --git a/examples/image-static.js b/examples/image-static.js
@@ -1,7 +1,6 @@
 /**
  * @module examples.image-static
  */
-const exports = {};
 import OLCesium from 'olcs/OLCesium.js';
 import {transform} from 'ol/proj.js';
 import olView from 'ol/View.js';
@@ -32,9 +31,9 @@ const ol2d = new olMap({
     })
   ],
   controls: olControlDefaults({
-    attributionOptions: /** @type {olx.control.AttributionOptions} */ ({
+    attributionOptions: {
       collapsible: false
-    })
+    }
   }),
   target: 'map',
   view: new olView({
@@ -53,6 +52,3 @@ ol3d.setEnabled(true);
 
 
 document.getElementById('enable').addEventListener('click', () => ol3d.setEnabled(!ol3d.getEnabled()));
-
-
-export default exports;
diff --git a/examples/imageWMS.js b/examples/imageWMS.js
@@ -1,8 +1,6 @@
 /**
  * @module examples.main
  */
-const exports = {};
-
 import OLCesium from 'olcs/OLCesium.js';
 import olView from 'ol/View.js';
 import {defaults as olControlDefaults} from 'ol/control.js';
@@ -13,7 +11,7 @@ import olLayerTile from 'ol/layer/Tile.js';
 import olMap from 'ol/Map.js';
 
 const imageWMSSource = new olSourceImageWMS({
-  url: 'https://demo.boundlessgeo.com/geoserver/wms',
+  url: 'https://ahocevar.com/geoserver/wms',
   params: {'LAYERS': 'topp:states'},
   ratio: 1
 });
@@ -30,9 +28,9 @@ const ol2d = new olMap({
     })
   ],
   controls: olControlDefaults({
-    attributionOptions: /** @type {olx.control.AttributionOptions} */ ({
+    attributionOptions: {
       collapsible: false
-    })
+    }
   }),
   target: 'map',
   view: new olView({
@@ -52,5 +50,3 @@ scene.terrainProvider = Cesium.createWorldTerrain();
 ol3d.setEnabled(true);
 
 document.getElementById('enable').addEventListener('click', () => ol3d.setEnabled(!ol3d.getEnabled()));
-
-export default exports;
diff --git a/examples/inject_ol_cesium.js b/examples/inject_ol_cesium.js
@@ -7,7 +7,7 @@
   window.IS_DEV = isDev;
   var cs = isDev ? 'CesiumUnminified/Cesium.js' : 'Cesium/Cesium.js';
 
-  window.CESIUM_URL = `../node_modules/@camptocamp/cesium/Build/${cs}`;
+  window.CESIUM_URL = `../node_modules/cesium/Build/${cs}`;
   if (!window.LAZY_CESIUM) {
     document.write(`<scr${'i'}pt type="text/javascript" src="${window.CESIUM_URL}"></scr${'i'}pt>`);
   }

diff --git a/examples/kml.js b/examples/kml.js
@@ -1,7 +1,6 @@
 /**
  * @module examples.kml
  */
-const exports = {};
 import OLCesium from 'olcs/OLCesium.js';
 import {transform} from 'ol/proj.js';
 import olView from 'ol/View.js';
@@ -18,9 +17,9 @@ const ol2d = new olMap({
     })
   ],
   controls: olControlDefaults({
-    attributionOptions: /** @type {olx.control.AttributionOptions} */ ({
+    attributionOptions: {
       collapsible: false
-    })
+    }
   }),
   target: 'map',
   view: new olView({
@@ -42,5 +41,3 @@ ol3d.getDataSources().add(Cesium.KmlDataSource.load(
 ));
 
 document.getElementById('enable').addEventListener('click', () => ol3d.setEnabled(!ol3d.getEnabled()));
-
-export default exports;