Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Cesium.externs.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ Cesium.BillboardCollection = function() {};
/**
* @typedef {{
* image: (string|HTMLCanvasElement|Image),
* color: (Cesium.Color|undefined),
* verticalOrigin: (Cesium.VerticalOrigin|undefined),
* horizontalOrigin: (Cesium.HorizontalOrigin|undefined),
* position: !Cesium.Cartesian3
Expand Down Expand Up @@ -471,7 +472,7 @@ Cesium.CameraEventAggregator.prototype.isDestroyed = function() {};


/**
*/
*/
Cesium.CameraEventAggregator.prototype.destroy = function() {};


Expand Down
2 changes: 1 addition & 1 deletion ol3
Submodule ol3 updated from bcd983 to 13ce41
6 changes: 6 additions & 0 deletions src/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -787,9 +787,15 @@ goog.require('olcs.core.OlLayerPrimitive');
}
var center = geometry.getCoordinates();
var position = olcs.core.ol4326CoordinateToCesiumCartesian(center);
var color;
var opacity = imageStyle.getOpacity();
if (goog.isDef(opacity)) {
color = new Cesium.Color(1.0, 1.0, 1.0, opacity);
}
var bb = billboards.add({
// always update Cesium externs before adding a property
image: image,
color: color,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
position: position
});
Expand Down