feat(cesium): support altitude modes via ground primitives

externs/Cesium.externs.js

@@ -202,6 +202,26 @@ Cesium.BlendOption = {
 };
 
 
+/**
+ * @enum {number}
+ */
+Cesium.ArcType = {
+ NONE: 0,
+ GEODESIC: 1,
+ RHUMB: 2
+};
+
+
+/**
+ * @enum {number}
+ */
+Cesium.ClassificationType = {
+ TERRAIN: 0,
+ CESIUM_3D_TILE: 1,
+ BOTH: 2,
+ NUMBER_OF_CLASSIFICATION_TYPES: 3
+};
+
 
 /**
  * @constructor
@@ -1568,6 +1588,12 @@ Cesium.Globe.prototype.enableLighting;
 Cesium.Globe.prototype.depthTestAgainstTerrain;
 
 
+/**
+ * @type {boolean}
+ */
+Cesium.Globe.prototype.showGroundAtmosphere;
+
+
 /**
  * @param {!Cesium.Cartographic} cartographic
  * @return {number|undefined}
@@ -1877,6 +1903,47 @@ Cesium.optionsGroundPrimitive;
 Cesium.GroundPrimitive = function(opt_opts) {};
 
 
+/**
+ * @constructor
+ * @param {Cesium.optionsGroundPolylinePrimitive} opt_opts
+ * @extends {Cesium.Primitive}
+ */
+Cesium.GroundPolylinePrimitive = function(opt_opts) {};
+
+
+/**
+ * @typedef {{
+ * geometryInstances: (!Cesium.GeometryInstance|!Array<!Cesium.GeometryInstance>),
+ * appearance: !Cesium.Appearance,
+ * show: (boolean|undefined),
+ * interleave: (boolean|undefined),
+ * releaseGeometryInstances: (boolean|undefined),
+ * allowPicking: (boolean|undefined),
+ * asynchronous: (boolean|undefined),
+ * classificationType: (Cesium.ClassificationType|undefined)
+ * }}
+ */
+Cesium.optionsGroundPolylinePrimitive;
+
+
+/**
+ * @constructor
+ * @param {Cesium.optionsGroundPolylineGeometry=} opt_opts
+ */
+Cesium.GroundPolylineGeometry = function(opt_opts) {};
+
+
+/**
+ * @typedef {{
+ * positions: Array<Cesium.Cartesian3>,
+ * width: (number|undefined),
+ * granularity: (number|undefined),
+ * loop: (boolean|undefined),
+ * arcType: (Cesium.ArcType|undefined)
+ * }}
+ */
+Cesium.optionsGroundPolylineGeometry;
+
 
 /**
  * @constructor
@@ -1968,82 +2035,27 @@ Cesium.LabelCollection = function(opt_options) {};
 
 
 /**
- * @constructor
- * @struct
- */
-Cesium.optionsLabelCollection = function() {};
-
-
-/**
- * @type {string| undefined}
- */
-Cesium.optionsLabelCollection.prototype.text;
-
-
-/**
- * @type {string| undefined}
- */
-Cesium.optionsLabelCollection.prototype.font;
-
-
-/**
- * @type {Cesium.Cartesian2| undefined}
- */
-Cesium.optionsLabelCollection.prototype.pixelOffset;
-
-
-/**
- * @type {Cesium.Cartesian3|undefined}
- */
-Cesium.optionsLabelCollection.prototype.position;
-
-
-/**
- * @type {Cesium.Color|undefined}
- */
-Cesium.optionsLabelCollection.prototype.fillColor;
-
-
-/**
- * @type {Cesium.Color|undefined}
- */
-Cesium.optionsLabelCollection.prototype.outlineColor;
-
-
-/**
- * @type {number|undefined}
- */
-Cesium.optionsLabelCollection.prototype.outlineWidth;
-
-
-/**
- * @type {boolean|undefined}
- */
-Cesium.optionsLabelCollection.prototype.show;
-
-
-/**
- * @type {number|undefined}
- */
-Cesium.optionsLabelCollection.prototype.style;
-
-
-/**
- * @type {Cesium.HorizontalOrigin|undefined}
- */
-Cesium.optionsLabelCollection.prototype.horizontalOrigin;
-
-
-/**
- * @type {Cesium.VerticalOrigin|undefined}
- */
-Cesium.optionsLabelCollection.prototype.verticalOrigin;
-
-
-/**
- * @type {Cesium.HeightReference|undefined}
+ * @typedef {{
+ * show: (boolean|undefined),
+ * position: (Cesium.Cartesian3|undefined),
+ * text: (string|undefined),
+ * font: (string|undefined),
+ * fillColor: (Cesium.Color|undefined),
+ * outlineColor: (Cesium.Color|undefined),
+ * outlineWidth: (number|undefined),
+ * showBackground: (boolean|undefined),
+ * backgroundColor: (Cesium.Color|undefined),
+ * backgroundPadding: (Cesium.Cartesian2|undefined),
+ * style: (Cesium.LabelStyle|undefined),
+ * pixelOffset: (Cesium.Cartesian2|undefined),
+ * eyeOffset: (Cesium.Cartesian3|undefined),
+ * horizontalOrigin: (Cesium.HorizontalOrigin|undefined),
+ * verticalOrigin: (Cesium.VerticalOrigin|undefined),
+ * scale: (number|undefined),
+ * heightReference: (Cesium.HeightReference|undefined)
+ * }}
  */
-Cesium.optionsLabelCollection.prototype.heightReference;
+Cesium.optionsLabelCollection;
 
 
 /**
@@ -2642,6 +2654,7 @@ Cesium.Transforms.headingPitchRollToFixedFrame = function(origin, hpr, opt_ellip
  * Cesium.BillboardCollection|Cesium.Billboard|
  * Cesium.LabelCollection|Cesium.Label|
  * Cesium.PrimitiveCollection|Cesium.Primitive|
+ * Cesium.GroundPrimitive|Cesium.GroundPolylinePrimitive|
  * Cesium.Cesium3DTileset)
  * }
  */
@@ -3970,6 +3983,13 @@ Cesium.Scene.prototype.context;
 Cesium.Scene.prototype.fog;
 
 
+
+/**
+ * @type {!boolean}
+ */
+Cesium.Scene.prototype.highDynamicRange;
+
+
 /**
  */
 Cesium.Scene.prototype.initializeFrame = function() {};
@@ -4074,6 +4094,12 @@ Cesium.Scene.prototype.mode;
 Cesium.Scene.prototype.primitives;
 
 
+/**
+ * @type {!Cesium.PrimitiveCollection}
+ */
+Cesium.Scene.prototype.groundPrimitives;
+
+
 /**
  * @type {Object}
  */

package.json

@@ -270,7 +270,7 @@
  "blob-polyfill": "^2.0.20171115",
  "bootstrap": "4.3.1",
  "bootswatch": "4.3.1",
- "cesium": "1.49.0",
+ "cesium": "1.60",
  "compass-mixins": "^0.12.10",
  "crossfilter2": "^1.4.5",
  "d3": "^3.5.17",

src/os/data/recordfield.js

@@ -8,6 +8,7 @@ goog.require('goog.object');
  */
 os.data.RecordField = {
  ALPHA: 'alpha',
+ ALTITUDE_MODE: 'altitudeMode',
  COLOR: 'color',
  ELLIPSE: 'ellipse',
  GEOM: 'geometry',

src/os/feature/feature.js

@@ -526,10 +526,11 @@ os.feature.setAltitude = function(feature, opt_field) {
  * @param {ol.Feature} feature The feature
  * @param {boolean=} opt_replace If existing values should be replaced
  * @param {ol.geom.Geometry=} opt_geometry Alternate geometry to populate the fields
+ * @param {boolean=} opt_silent
  *
  * @suppress {accessControls} To allow direct access to feature metadata.
  */
-os.feature.populateCoordFields = function(feature, opt_replace, opt_geometry) {
+os.feature.populateCoordFields = function(feature, opt_replace, opt_geometry, opt_silent) {
  var changed = false;
  var geom = opt_geometry || feature.getGeometry();
  if (geom instanceof ol.geom.Point) {
@@ -582,7 +583,7 @@ os.feature.populateCoordFields = function(feature, opt_replace, opt_geometry) {
  }
 
  // fire a change event if anything was updated, so the UI can update
- if (changed) {
+ if (!opt_silent && changed) {
  feature.changed();
  }
 };

src/os/mapcontainer.js

@@ -893,6 +893,7 @@ os.MapContainer.prototype.init = function() {
  this.drawingLayer_.setSticky(true);
  this.drawingLayer_.setSynchronizerType(os.layer.SynchronizerType.DRAW);
  this.drawingLayer_.renderLegend = goog.nullFunction;
+ this.drawingLayer_.set(os.data.RecordField.ALTITUDE_MODE, os.webgl.AltitudeMode.CLAMP_TO_GROUND);
 
  var tileGroup = new os.layer.Group();
  tileGroup.setPriority(-2);

src/os/mixin/geometrymixin.js

@@ -146,6 +146,51 @@ ol.geom.Geometry.prototype.toLonLat = function() {
  return this;
 };
 
+(function() {
+ var oldPoints = ol.geom.MultiPoint.prototype.getPoints;
+
+ /**
+ * @return {Array<ol.geom.Point>}
+ * @suppress {accessControls}
+ */
+ ol.geom.MultiPoint.prototype.getPoints = function() {
+ var points = oldPoints.call(this);
+ for (var i = 0, n = points.length; i < n; i++) {
+ ol.obj.assign(points[i].values_, this.values_);
+ }
+ return points;
+ };
+
+ var oldLines = ol.geom.MultiLineString.prototype.getLineStrings;
+
+ /**
+ * @return {Array<ol.geom.LineString>}
+ * @suppress {accessControls}
+ */
+ ol.geom.MultiLineString.prototype.getLineStrings = function() {
+ var lines = oldLines.call(this);
+ for (var i = 0, n = lines.length; i < n; i++) {
+ ol.obj.assign(lines[i].values_, this.values_);
+ }
+ return lines;
+ };
+
+
+ var oldPolys = ol.geom.MultiPolygon.prototype.getPolygons;
+
+ /**
+ * @return {Array<ol.geom.Polygon>}
+ * @suppress {accessControls}
+ */
+ ol.geom.MultiPolygon.prototype.getPolygons = function() {
+ var polys = oldPolys.call(this);
+ for (var i = 0, n = polys.length; i < n; i++) {
+ ol.obj.assign(polys[i].values_, this.values_);
+ }
+ return polys;
+ };
+})();
+
 
 (function() {
  /**

src/os/mixin/polygonmixin.js

@@ -0,0 +1,22 @@
+goog.provide('os.mixin.polygon');
+
+goog.require('ol.geom.Polygon');
+
+
+(function() {
+ var old = ol.geom.Polygon.prototype.getLinearRings;
+
+ /**
+ * @return {Array<ol.geom.LinearRing>}
+ * @suppress {accessControls}
+ */
+ ol.geom.Polygon.prototype.getLinearRings = function() {
+ var rings = old.call(this);
+
+ for (var i = 0, n = rings.length; i < n; i++) {
+ ol.obj.assign(rings[i].values_, this.values_);
+ }
+
+ return rings;
+ };
+})();