Merge pull request #297 from bartvde/icon-scale

Take into account scale on icons
openlayers · Dec 10, 2015 · 34ba285 · 34ba285
2 parents 6189779 + d1f65bf
commit 34ba285
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Cesium.externs.js b/Cesium.externs.js
@@ -140,6 +140,7 @@ Cesium.BillboardCollection = function(opt_options) {};
  *   verticalOrigin: (Cesium.VerticalOrigin|undefined),
  *   horizontalOrigin: (Cesium.HorizontalOrigin|undefined),
  *   pixelOffsetScaleByDistance : (Cesium.NearFarScalar|undefined),
+ *   scale: (number|undefined),
  *   scaleByDistance: (Cesium.NearFarScalar|undefined),
  *   position: !Cesium.Cartesian3
  * }}

diff --git a/src/featureconverter.js b/src/featureconverter.js
@@ -518,6 +518,7 @@ olcs.FeatureConverter.prototype.olPointGeometryToCesium =
         // always update Cesium externs before adding a property
         image: image,
         color: color,
+        scale: imageStyle.getScale(),
         heightReference: heightReference,
         verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
         position: position