Merge pull request #548 from openlayers/update_dependencies_for_1.34

Update dependencies
openlayers · Jan 24, 2018 · 88758c4 · 88758c4
2 parents 59c05de + a0e6bf3
commit 88758c4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 27 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,9 +1,10 @@
 # Changelog
 
-# v 1.34
+# v 1.34 - 2018-01-24
 
 * Changes
   * Allow overriding the 3D extent by setting an olcs.extent property in raster layers.
+  * Port to OpenLayers 4.6.4 and Cesium 1.41.
 
 # v 1.33 - 2017-12-07
 

diff --git a/examples/customProj.js b/examples/customProj.js
@@ -10,26 +10,23 @@ goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
 goog.require('ol.Map');
 goog.require('ol.proj');
-goog.require('ol.proj.proj4');
 
-if (typeof ol.proj.proj4.get() == 'function') {
-  const epsg21781def = [
-    '+proj=somerc',
-    '+lat_0=46.95240555555556',
-    '+lon_0=7.439583333333333',
-    '+k_0=1',
-    '+x_0=600000',
-    '+y_0=200000',
-    '+ellps=bessel',
-    '+towgs84=674.374,15.056,405.346,0,0,0,0',
-    '+units=m',
-    '+no_defs'
-  ].join(' ');
-  const epsg21781extent = [420000, 30000, 900000, 350000];
+const epsg21781def = [
+  '+proj=somerc',
+  '+lat_0=46.95240555555556',
+  '+lon_0=7.439583333333333',
+  '+k_0=1',
+  '+x_0=600000',
+  '+y_0=200000',
+  '+ellps=bessel',
+  '+towgs84=674.374,15.056,405.346,0,0,0,0',
+  '+units=m',
+  '+no_defs'
+].join(' ');
+const epsg21781extent = [420000, 30000, 900000, 350000];
 
-  ol.proj.proj4.get().defs('EPSG:21781', epsg21781def);
-  ol.proj.get('EPSG:21781').setExtent(epsg21781extent);
-}
+proj4.defs('EPSG:21781', epsg21781def);
+ol.proj.get('EPSG:21781').setExtent(epsg21781extent);
 
 const customProjSource = new ol.source.ImageWMS({
   attributions: '© <a href="http://www.geo.admin.ch/internet/geoportal/' +

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ol-cesium",
-  "version": "1.33.0",
+  "version": "1.34.0",
   "description": "OpenLayers Cesium integration library",
   "scripts": {},
   "main": "./dist/olcesium.js",
@@ -17,17 +17,17 @@
     "htmlparser2": "3.9.2"
   },
   "devDependencies": {
-    "@camptocamp/cesium": "1.40.0",
-    "@camptocamp/closure-util": "1.26.0",
+    "@camptocamp/cesium": "1.41.0",
+    "@camptocamp/closure-util": "1.27.0",
     "@mapbox/geojsonhint": "2.0.1",
-    "eslint": "4.12.0",
-    "eslint-config-openlayers": "7.0.0",
-    "eslint-plugin-googshift": "0.9.2",
+    "eslint": "4.16.0",
+    "eslint-config-openlayers": "9.0.0",
+    "eslint-plugin-googshift": "0.9.3",
     "fs-extra": "3.0.1",
-    "googshift": "0.9.2",
+    "googshift": "0.9.7",
     "jsdoc": "3.5.5",
     "nomnom": "1.8.1",
-    "openlayers": "4.6.2",
+    "openlayers": "4.6.4",
     "temp": "0.8.3",
     "walk": "2.3.9"
   }