From d5d36871816a1efe18259107fd8f0d38fbef2897 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@camptocamp.com>
Date: Wed, 17 Dec 2014 10:28:24 +0100
Subject: [PATCH] Set billboard opacity

---
 Cesium.externs.js | 3 ++-
 ol3               | 2 +-
 src/core.js       | 6 ++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Cesium.externs.js b/Cesium.externs.js
index 44533d1fe..82889d805 100644
--- a/Cesium.externs.js
+++ b/Cesium.externs.js
@@ -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
@@ -471,7 +472,7 @@ Cesium.CameraEventAggregator.prototype.isDestroyed = function() {};
 
 
 /**
- */
+*/
 Cesium.CameraEventAggregator.prototype.destroy = function() {};
 
 
diff --git a/ol3 b/ol3
index bcd983723..13ce41a1d 160000
--- a/ol3
+++ b/ol3
@@ -1 +1 @@
-Subproject commit bcd983723fd0f791d6283a65facfc2b3b5ab9b77
+Subproject commit 13ce41a1d52f2e845b6559513f501f38c89809f6
diff --git a/src/core.js b/src/core.js
index 7813c07e3..7e3e47e5a 100644
--- a/src/core.js
+++ b/src/core.js
@@ -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
       });