Merge pull request #288 from gberaudo/several_fixes

Several small fixes

build/ol3cesium.json

@@ -27,8 +27,10 @@
       "api", "observable"
     ],
     "compilation_level": "ADVANCED_OPTIMIZATIONS",
+    "language_in": "ECMASCRIPT5_STRICT",
+    "language_out": "ECMASCRIPT5_STRICT",
     "warning_level": "VERBOSE",
-    "output_wrapper": "(function(){%output%})();",
+    "output_wrapper": "(function(){%output%}).call(window);",
     "use_types_for_optimization": true,
     "create_source_map": "dist/ol3cesium.js.map",
     "source_map_format": "V3"

examples/vectors.html

@@ -22,7 +22,7 @@
     <div><input type="button" value="Add/remove one feature"
       onclick="javascript:addOrRemoveOneFeature()" /></div>
     <div><input type="button" value="Toggle clampToGround mode"
-      onclick="javascript:toggleClampToGround()" /></div>
+      onclick="javascript:toggleClampToGround(); ol3d.getAutoRenderLoop().restartRenderLoop()" /></div>
     <div>Vectors are synchronized from the ol3 map to the Cesium scene.
       <br/>3D positioning and some styling is supported.<br />The render loop is automatically stopped when idle.</div>
     <script src="../ol3/build/ol.js"></script>

src/abstractsynchronizer.js

@@ -12,6 +12,7 @@ goog.require('ol.layer.Group');
  * @param {!Cesium.Scene} scene
  * @constructor
  * @template T
+ * @struct
  * @api
  */
 olcs.AbstractSynchronizer = function(map, scene) {
@@ -247,12 +248,12 @@ olcs.AbstractSynchronizer.prototype.listenForGroupChanges_ = function(group) {
  */
 olcs.AbstractSynchronizer.prototype.destroyAll = function() {
   this.removeAllCesiumObjects(true); // destroy
-  goog.object.forEach(this.olGroupListenKeys, function(keys) {
+  goog.object.forEach(this.olGroupListenKeys_, function(keys) {
     keys.forEach(ol.Observable.unByKey);
   });
-  goog.object.forEach(this.olLayerListenKeys, ol.Observable.unByKey);
-  this.olGroupListenKeys = {};
-  this.olLayerListenKeys = {};
+  goog.object.forEach(this.olLayerListenKeys_, ol.Observable.unByKey);
+  this.olGroupListenKeys_ = {};
+  this.olLayerListenKeys_ = {};
   this.layerMap = {};
 };
 

src/autorenderloop.js

@@ -10,6 +10,7 @@ goog.provide('olcs.AutoRenderLoop');
  * @constructor
  * @param {olcs.OLCesium} ol3d
  * @param {boolean} debug
+ * @struct
  */
 olcs.AutoRenderLoop = function(ol3d, debug) {
   this.ol3d = ol3d;
@@ -245,7 +246,7 @@ olcs.AutoRenderLoop.prototype.notifyRepaintRequired = function() {
   if (this.verboseRendering && this.stoppedRendering) {
     console.log('starting rendering @ ' + Date.now());
   }
-  this._lastCameraMoveTime = Date.now();
+  this.lastCameraMoveTime_ = Date.now();
   // TODO: do not unblock if not blocked by us
   this.ol3d.setBlockCesiumRendering(false);
   this.stoppedRendering = false;

src/camera.js

@@ -14,6 +14,7 @@ goog.require('olcs.core');
  * @param {!ol.Map} map
  * @constructor
  * @api
+ * @struct
  */
 olcs.Camera = function(scene, map) {
   /**

src/dragbox.js

@@ -27,6 +27,7 @@ olcs.DragBoxEventType = {
  * @extends {goog.events.EventTarget}
  * @param {Object=} opt_options Options.
  * @api
+ * @struct
  */
 olcs.DragBox = function(opt_options) {
 

src/featureconverter.js

@@ -15,6 +15,7 @@ goog.require('olcs.core.VectorLayerCounterpart');
  * @param {!Cesium.Scene} scene Cesium scene.
  * @constructor
  * @api
+ * @struct
  */
 olcs.FeatureConverter = function(scene) {
 
@@ -900,11 +901,6 @@ olcs.FeatureConverter.prototype.olFeatureToCesium =
  */
 olcs.FeatureConverter.prototype.olVectorLayerToCesium =
     function(olLayer, olView, featurePrimitiveMap) {
-  var source = olLayer.getSource();
-  if (source instanceof ol.source.ImageVector) {
-    source = source.getSource();
-  }
-  var features = source.getFeatures();
   var proj = olView.getProjection();
   var resolution = olView.getResolution();
 
@@ -914,6 +910,19 @@ olcs.FeatureConverter.prototype.olVectorLayerToCesium =
     // are defined
     throw new Error('View not ready');
   }
+
+  var source = olLayer.getSource();
+  if (olLayer instanceof ol.layer.Image) {
+    if (source instanceof ol.source.ImageVector) {
+      source = source.getSource();
+    } else {
+      // Not supported
+      return new olcs.core.VectorLayerCounterpart(proj, this.scene);
+    }
+  }
+
+  goog.asserts.assertInstanceof(source, ol.source.Vector);
+  var features = source.getFeatures();
   var counterpart = new olcs.core.VectorLayerCounterpart(proj, this.scene);
   var context = counterpart.context;
   for (var i = 0; i < features.length; ++i) {
@@ -923,7 +932,9 @@ olcs.FeatureConverter.prototype.olVectorLayerToCesium =
     }
     var layerStyle;
     if (olLayer instanceof ol.layer.Image) {
-      layerStyle = olLayer.getSource().getStyleFunction();
+      var imageSource = olLayer.getSource();
+      goog.asserts.assertInstanceof(imageSource, ol.source.ImageVector);
+      layerStyle = imageSource.getStyleFunction();
     } else {
       layerStyle = olLayer.getStyleFunction();
     }
@@ -963,7 +974,12 @@ olcs.FeatureConverter.prototype.convert =
 
   var layerStyle;
   if (layer instanceof ol.layer.Image) {
-    layerStyle = layer.getSource().getStyleFunction();
+    var imageSource = layer.getSource();
+    if (imageSource instanceof ol.source.ImageVector) {
+      layerStyle = imageSource.getStyleFunction();
+    } else {
+      return null;
+    }
   } else {
     layerStyle = layer.getStyleFunction();
   }

src/ol3cesium.js

@@ -13,6 +13,7 @@ goog.require('olcs.VectorSynchronizer');
  * @param {!olcsx.OLCesiumOptions} options Options.
  * @constructor
  * @api
+ * @struct
  */
 olcs.OLCesium = function(options) {
 

src/rastersynchronizer.js

@@ -13,6 +13,7 @@ goog.require('olcs.core');
  * @constructor
  * @extends {olcs.AbstractSynchronizer.<Cesium.ImageryLayer>}
  * @api
+ * @struct
  */
 olcs.RasterSynchronizer = function(map, scene) {
   /**

src/vectorsynchronizer.js

@@ -16,6 +16,7 @@ goog.require('olcs.core.VectorLayerCounterpart');
  * @constructor
  * @extends {olcs.AbstractSynchronizer.<olcs.core.VectorLayerCounterpart>}
  * @api
+ * @struct
  */
 olcs.VectorSynchronizer = function(map, scene, opt_converter) {
 
@@ -94,8 +95,8 @@ olcs.VectorSynchronizer.prototype.createSingleLayerCounterparts =
   goog.asserts.assertInstanceof(olLayer, ol.layer.Layer);
 
   var source = olLayer.getSource();
-  if (olLayer.getSource() instanceof ol.source.ImageVector) {
-    source = olLayer.getSource().getSource();
+  if (source instanceof ol.source.ImageVector) {
+    source = source.getSource();
   }
 
   goog.asserts.assertInstanceof(source, ol.source.Vector);