Merge pull request #412 from fredj/update

Update dependencies
openlayers · Nov 2, 2016 · 251aaab · 251aaab
2 parents 2f42726 + 46d7196
commit 251aaab
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,11 +1,13 @@
 # Changelog
 
-# v 1.21 -
+# v 1.21 - 2016-11-02
 
 * Changes
   * Add olcs.OLCesium.trackedFeature property to make Cesium automatically track an
     OpenLayers point feature. When active, the Cesium camera will follow changes of
     the feature position. This requires using stacked view.
+  * Port to OpenLayers 3.19.1.
+  * Port to Cesium 1.27.
 
 # v 1.20 - 2016-09-02
 

diff --git a/cesium b/cesium
diff --git a/ol3 b/ol3
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "geojsonhint": "1.2.1",
     "fs-extra": "0.30.0",
     "jsdoc": "~3.4.0",
-    "eslint": "3.8.1",
+    "eslint": "3.9.1",
     "eslint-config-openlayers": "5.0.0",
     "nomnom": "1.8.1",
     "temp": "0.8.3",

diff --git a/src/camera.js b/src/camera.js
@@ -276,8 +276,10 @@ olcs.Camera.prototype.getPosition = function() {
   var carto = Cesium.Ellipsoid.WGS84.cartesianToCartographic(
       this.cam_.position);
 
-  var pos = this.fromLonLat_([ol.math.toDegrees(carto.longitude),
-                              ol.math.toDegrees(carto.latitude)]);
+  var pos = this.fromLonLat_([
+    ol.math.toDegrees(carto.longitude),
+    ol.math.toDegrees(carto.latitude)
+  ]);
   goog.asserts.assert(!goog.isNull(pos));
   return pos;
 };