refactor(cesium): reorganize featureconverter

externs/Cesium.externs.js

@@ -1831,7 +1831,7 @@ Cesium.Appearance.prototype.translucent;
  * @typedef {{
  *   asynchronous: (boolean|undefined),
  *   releaseGeometryInstances: (boolean|undefined),
- *   geometryInstances: !Cesium.GeometryInstance,
+ *   geometryInstances: !(Cesium.GeometryInstance|Array<!Cesium.GeometryInstance>),
  *   show: (boolean|undefined),
  *   appearance: !Cesium.Appearance
  * }}
@@ -1959,6 +1959,7 @@ Cesium.optionsGroundPolylinePrimitive;
 
 /**
  * @constructor
+ * @extends {Cesium.Geometry}
  * @param {Cesium.optionsGroundPolylineGeometry=} opt_opts
  */
 Cesium.GroundPolylineGeometry = function(opt_opts) {};
@@ -2366,30 +2367,22 @@ Cesium.ColorGeometryInstanceAttribute.toValue = function(color, opt_result) {};
 
 
 /**
- * @constructor
- * @struct
- */
-Cesium.optionsGeometryInstance = function() {};
-
-
-/**
- * @type {string}
- */
-Cesium.optionsGeometryInstance.prototype.id;
-
-
-/**
- * @type {!Cesium.Geometry}
+ * @typedef {{
+ *  id: (!string|undefined),
+ *  geometry: !Cesium.Geometry,
+ *  attributes: (!Cesium.optionsGeometryInstanceAttribute|undefined),
+ *  modelMatrix: (!Cesium.Matrix4|undefined)
+ * }}
  */
-Cesium.optionsGeometryInstance.prototype.geometry;
+Cesium.optionsGeometryInstance;
 
 
 /**
- * @type {!Cesium.Matrix4}
+ * @typedef {{
+ *   color: Cesium.ColorGeometryInstanceAttribute
+ * }}
  */
-Cesium.optionsGeometryInstance.prototype.modelMatrix;
-
-
+Cesium.optionsGeometryInstanceAttribute;
 
 /**
  * @constructor
@@ -2398,24 +2391,17 @@ Cesium.optionsGeometryInstance.prototype.modelMatrix;
 Cesium.GeometryInstanceAttribute;
 
 
-/**
- * @type {Cesium.GeometryInstanceAttribute| undefined}
- */
-Cesium.optionsGeometryInstance.prototype.attributes;
-
-
 /**
  * @type {Cesium.ColorGeometryInstanceAttribute}
  */
 Cesium.GeometryInstanceAttribute.prototype.color;
 
 
-
 /**
  * @constructor
- * @param {Object} object
+ * @param {Cesium.optionsGeometryInstance} options
  */
-Cesium.GeometryInstance = function(object) {};
+Cesium.GeometryInstance = function(options) {};
 
 
 
@@ -2688,7 +2674,7 @@ Cesium.Transforms.eastNorthUpToFixedFrame = function(origin, opt_ellipsoid, opt_
  * @param {Cesium.Ellipsoid=} opt_ellipsoid .
  * @param {Function=} opt_transform .
  * @param {Cesium.Matrix4=} opt_result .
- * @return {Cesium.Matrix4}
+ * @return {!Cesium.Matrix4}
  */
 Cesium.Transforms.headingPitchRollToFixedFrame = function(origin, hpr, opt_ellipsoid, opt_transform, opt_result) {};
 

karma.conf.js

@@ -25,6 +25,7 @@ module.exports = function(config) {
     files: [
       {pattern: '.build/modernizr.js', watched: false, included: true, served: true},
       {pattern: '.build/xml-lexer.min.js', watched: false, included: true, served: true},
+      {pattern: '.build/webgl-mock.min.js', watched: false, included: true, served: true},
       {pattern: resolver.resolveModulePath('opensphere-asm/dist/os-wasm.*', __dirname), watched: false, included: false, served: true},
       {pattern: resolver.resolveModulePath('opensphere-asm/dist/os-asm.*', __dirname), watched: false, included: false, served: true},
       {pattern: resolver.resolveModulePath('opensphere-asm/dist/os-load.js', __dirname), watched: false, included: true, served: true},
@@ -65,6 +66,7 @@ module.exports = function(config) {
       {pattern: 'test/**/*.json', included: false},
       {pattern: 'test/**/*.xml', included: false},
       {pattern: 'test/resources/**/*', included: false},
+      {pattern: 'images/**/*', included: false},
 
       // source files for the script loader
       {pattern: 'src/**/*.js', watched: false, included: false, served: true},

package.json

@@ -83,8 +83,10 @@
     "pregen:xmllexer": "echo \"window.xmlLexer = require('xml-lexer');\" > .build/xml-lexer.require.js",
     "gen:xmllexer": "browserify .build/xml-lexer.require.js -o .build/xml-lexer.min.js",
     "postgen:xmllexer": "rm .build/xml-lexer.require.js",
+    "gentestlibs": "npm run gen:webgl-mock",
+    "gen:webgl-mock": "browserify vendor/webgl-mock/webgl-mock.require.js -o .build/webgl-mock.min.js",
     "test:gcc": "os-compile .build/gcc-test-args.json",
-    "test:init": "npm run genlibs && npm run compile:resolve -- --exclude resources scss && npm run test:gcc",
+    "test:init": "npm run genlibs && npm run gentestlibs && npm run compile:resolve -- --exclude resources scss && npm run test:gcc",
     "test:debug": "karma start --browsers Chrome --reporters dots",
     "test:run": "karma start --single-run",
     "test": "npm run test:init && npm run test:run",
@@ -281,6 +283,7 @@
     "sass-lint": "^1.12.1",
     "semantic-release": "^15.13.18",
     "surge": "^0.20.4",
+    "webgl-mock": "^0.1.7",
     "xmllint": "^0.1.1"
   },
   "dependencies": {

src/os/mixin/featuremixin.js

@@ -124,14 +124,26 @@ ol.Feature.prototype.setId = function(id) {
   this.id_ = id;
 
   if (this['id'] == null) {
-    this['id'] = ol.Feature.nextId;
-    ol.Feature.nextId++;
+    this['id'] = ol.Feature.nextId++;
   }
 
   this.changed();
 };
 
 
+/**
+ * @return {number} The unique feature ID per session
+ * @suppress {checkTypes}
+ */
+ol.Feature.prototype.getUid = function() {
+  if (this['id'] == null) {
+    this['id'] = ol.Feature.nextId++;
+  }
+
+  return this['id'];
+};
+
+
 /**
  * Fire feature event that won't be handled by OL3. This is added so the event will be created in the same application
  * context as the feature, allowing instanceof to work in Closure's internal event dispatcher.

src/plugin/cesium/cesiumcamera.js

@@ -62,8 +62,6 @@ goog.inherits(plugin.cesium.Camera, olcs.Camera);
 
 /**
  * Replace the olcs camera with ours.
- *
- * @suppress {checkTypes} Because hacks.
  */
 plugin.cesium.replaceCamera = function() {
   olcs.Camera = plugin.cesium.Camera;

src/plugin/cesium/cesiumplugin.js

@@ -41,50 +41,6 @@ goog.inherits(plugin.cesium.Plugin, os.plugin.AbstractPlugin);
 plugin.cesium.Plugin.ID = 'cesium';
 
 
-/**
- * @typedef {{
- *   id: number,
- *   csPattern: (number|undefined)
- * }}
- */
-plugin.cesium.styleLineDashOption;
-
-
-/**
- * Line dash configurations for Cesium
- * Patterns based on 16 bit number to make it look consistent between map engines
- * @type {!Array<!plugin.cesium.styleLineDashOption>}
- * @const
- */
-plugin.cesium.LINE_STYLE_OPTIONS = [
-  {
-    id: 0,
-    csPattern: undefined // []
-  }, {
-    id: 1,
-    csPattern: parseInt('1111111111110000', 2) // [12, 4]
-  }, {
-    id: 2,
-    csPattern: parseInt('1111111100000000', 2) // [8, 8]
-  }, {
-    id: 3,
-    csPattern: parseInt('1111100011111000', 2) // [4, 4, 4, 4]
-  }, {
-    id: 4,
-    csPattern: parseInt('1111100000000000', 2) // [4, 12]
-  }, {
-    id: 5,
-    csPattern: parseInt('1110000011100000', 2) // [2, 6, 2, 6]
-  }, {
-    id: 6,
-    csPattern: parseInt('1111110000111000', 2) // [5, 5, 1, 5]
-  }, {
-    id: 7,
-    csPattern: parseInt('1111111110011100', 2) // [7, 4, 1, 4]
-  }
-];
-
-
 /**
  * @inheritDoc
  */

src/plugin/cesium/cesiumrenderer.js

@@ -100,7 +100,7 @@ plugin.cesium.CesiumRenderer.prototype.isInitialized = function() {
 
 /**
  * @inheritDoc
- * @suppress {accessControls|checkTypes}
+ * @suppress {accessControls}
  */
 plugin.cesium.CesiumRenderer.prototype.initialize = function() {
   if (!this.olCesium_ && this.map) {
@@ -223,7 +223,6 @@ plugin.cesium.CesiumRenderer.prototype.setEnabled = function(value) {
 
 /**
  * @inheritDoc
- * @suppress {checkTypes}
  */
 plugin.cesium.CesiumRenderer.prototype.getCamera = function() {
   return this.olCesium_ ? /** @type {plugin.cesium.Camera} */ (this.olCesium_.getCamera()) : undefined;

src/plugin/cesium/mixin/renderloopmixin.js

@@ -7,16 +7,14 @@ goog.require('os.time.TimelineEventType');
 
 
 /**
- * @suppress {accessControls|checkTypes}
+ * @suppress {accessControls}
  */
 (function() {
   var origEnable = olcs.AutoRenderLoop.prototype.enable;
 
   /**
    * Overridden to listen to <code>os.MapEvent.GL_REPAINT</code> events in addition
    * to timeline show events for rendering the scene.
-   *
-   * @override
    */
   olcs.AutoRenderLoop.prototype.enable = function() {
     os.dispatcher.listen(os.MapEvent.GL_REPAINT, this.notifyRepaintRequired, false, this);
@@ -32,8 +30,6 @@ goog.require('os.time.TimelineEventType');
   /**
    * Overridden to unlisten to <code>os.MapEvent.GL_REPAINT</code> events in addition
    * to timeline show events for rendering the scene.
-   *
-   * @override
    */
   olcs.AutoRenderLoop.prototype.disable = function() {
     os.dispatcher.unlisten(os.MapEvent.GL_REPAINT, this.notifyRepaintRequired, false, this);
@@ -45,7 +41,6 @@ goog.require('os.time.TimelineEventType');
 
   var origNotify = olcs.AutoRenderLoop.prototype.notifyRepaintRequired;
 
-
   var lastRepaintEventTime = 0;
 
   /**
@@ -61,7 +56,7 @@ goog.require('os.time.TimelineEventType');
   /**
    * Overridden because we only care about mouse events if a button is down
    *
-   * @override
+   * @param {Event=} opt_evt
    */
   olcs.AutoRenderLoop.prototype.notifyRepaintRequired = function(opt_evt) {
     if (opt_evt && opt_evt.type && opt_evt.type.indexOf('move') > -1) {