Merge pull request #301 from openlayers/port_ol3_cesium

Port to latest OL3 and Cesium versions

CHANGES.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.11
+
+* Changes
+  * Port to Cesium 1.16.
+  * Port to OL 3.12.0
+
 ## v1.10 - 2015-11-30
 
 * Breaking changes

package.json

@@ -12,18 +12,18 @@
     "url": "https://github.com/openlayers/ol3-cesium/issues"
   },
   "dependencies": {
-    "async": "~0.2.10",
-    "htmlparser2": "~3.7.1"
+    "async": "1.5.0",
+    "htmlparser2": "3.7.1"
   },
   "devDependencies": {
-    "closure-util": "1.8.0",
-    "geojsonhint": "^1.0.0",
-    "fs-extra": "~0.8.1",
-    "graceful-fs": "~3.0.2",
-    "jsdoc": "~3.3.0-alpha7",
-    "jshint": "~2.5.1",
-    "nomnom": "~1.6.2",
-    "temp": "~0.7.0",
-    "walk": "~2.3.3"
+    "closure-util": "1.9.0",
+    "geojsonhint": "1.0.0",
+    "fs-extra": "0.26.2",
+    "graceful-fs": "4.1.2",
+    "jsdoc": "~3.4.0",
+    "jshint": "2.8.0",
+    "nomnom": "1.8.1",
+    "temp": "0.8.3",
+    "walk": "2.3.9"
   }
 }

src/featureconverter.js

@@ -783,33 +783,41 @@ olcs.FeatureConverter.prototype.olStyleToCesium =
  * Evaluates style function, blend arrays, get default style.
  * @param {ol.layer.Vector|ol.layer.Image} layer
  * @param {!ol.Feature} feature
- * @param {ol.style.StyleFunction|undefined} fallbackStyle
+ * @param {ol.style.StyleFunction|undefined} fallbackStyleFunction
  * @param {number} resolution
  * @return {ol.style.Style} null if no style is available
  * @api
  */
 olcs.FeatureConverter.prototype.computePlainStyle =
-    function(layer, feature, fallbackStyle, resolution) {
-  var featureStyle = feature.getStyleFunction();
-  var style;
-  if (goog.isDef(featureStyle)) {
-    style = featureStyle.call(feature, resolution);
+    function(layer, feature, fallbackStyleFunction, resolution) {
+  /**
+   * @type {ol.FeatureStyleFunction|undefined}
+   */
+  var featureStyleFunction = feature.getStyleFunction();
+
+  /**
+   * @type {ol.style.Style|Array.<ol.style.Style>}
+   */
+  var style = null;
+
+  if (featureStyleFunction) {
+    style = featureStyleFunction.call(feature, resolution);
   }
-  if (!goog.isDefAndNotNull(style) && goog.isDefAndNotNull(fallbackStyle)) {
-    style = fallbackStyle(feature, resolution);
+
+  if (!style && fallbackStyleFunction) {
+    style = fallbackStyleFunction(feature, resolution);
   }
 
-  if (!goog.isDef(style)) {
+  if (!style) {
     // The feature must not be displayed
     return null;
   }
 
-  goog.asserts.assert(Array.isArray(style));
   // FIXME combine materials as in cesium-materials-pack?
   // then this function must return a custom material
   // More simply, could blend the colors like described in
   // http://en.wikipedia.org/wiki/Alpha_compositing
-  return style[0];
+  return Array.isArray(style) ? style[0] : style;
 };
 
 
@@ -935,6 +943,9 @@ olcs.FeatureConverter.prototype.olVectorLayerToCesium =
     if (!goog.isDefAndNotNull(feature)) {
       continue;
     }
+    /**
+     * @type {ol.style.StyleFunction|undefined}
+     */
     var layerStyle;
     if (olLayer instanceof ol.layer.Image) {
       var imageSource = olLayer.getSource();
@@ -977,6 +988,9 @@ olcs.FeatureConverter.prototype.convert =
     return null;
   }
 
+  /**
+   * @type {ol.style.StyleFunction|undefined}
+   */
   var layerStyle;
   if (layer instanceof ol.layer.Image) {
     var imageSource = layer.getSource();