Fixed labels don't show for individual entities in datasources when clustering is enabled CesiumGS#6087

Author: Eric Strabala

CHANGES.md

@@ -10,6 +10,7 @@ Change Log
 ##### Fixes :wrench:
 * Fixed an error where `clampToHeightMostDetailed` or `sampleHeightMostDetailed` would crash if entities were created when the promise resolved. [#7690](https://github.com/AnalyticalGraphicsInc/cesium/pull/7690)
 * Fixed an error where many imagery layers within a single tile would cause parts of the tile to render as black on some platforms. [#7649](https://github.com/AnalyticalGraphicsInc/cesium/issues/7649)
+* Fixed labels don't show for individual entities in datasources when clustering is enabled #6087
 
 ### 1.56.1 - 2019-04-02
 

CONTRIBUTORS.md

@@ -68,6 +68,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
    * [Nathan Schulte](https://github.com/nmschulte)
    * [Jed Fong](https://github.com/jedfong)
    * [Brandon McAllister](https://github.com/bmcallis)
+   * [Eric Strabala](https://github.com/emstrabala)
 * [Inovaworks](http://www.inovaworks.com/)
    * [Sergio Flores](https://github.com/relfos)
 * [CubeWerx Inc.](http://www.cubewerx.com/)

Source/DataSources/EntityCluster.js

@@ -1,39 +1,39 @@
 define([
-        '../Core/BoundingRectangle',
-        '../Core/Cartesian2',
-        '../Core/Cartesian3',
-        '../Core/defaultValue',
-        '../Core/defined',
-        '../Core/defineProperties',
-        '../Core/EllipsoidalOccluder',
-        '../Core/Event',
-        '../Core/Matrix4',
-        '../Scene/Billboard',
-        '../Scene/BillboardCollection',
-        '../Scene/Label',
-        '../Scene/LabelCollection',
-        '../Scene/PointPrimitive',
-        '../Scene/PointPrimitiveCollection',
-        '../Scene/SceneMode',
-        '../ThirdParty/kdbush'
-    ], function(
-        BoundingRectangle,
-        Cartesian2,
-        Cartesian3,
-        defaultValue,
-        defined,
-        defineProperties,
-        EllipsoidalOccluder,
-        Event,
-        Matrix4,
-        Billboard,
-        BillboardCollection,
-        Label,
-        LabelCollection,
-        PointPrimitive,
-        PointPrimitiveCollection,
-        SceneMode,
-        kdbush) {
+    '../Core/BoundingRectangle',
+    '../Core/Cartesian2',
+    '../Core/Cartesian3',
+    '../Core/defaultValue',
+    '../Core/defined',
+    '../Core/defineProperties',
+    '../Core/EllipsoidalOccluder',
+    '../Core/Event',
+    '../Core/Matrix4',
+    '../Scene/Billboard',
+    '../Scene/BillboardCollection',
+    '../Scene/Label',
+    '../Scene/LabelCollection',
+    '../Scene/PointPrimitive',
+    '../Scene/PointPrimitiveCollection',
+    '../Scene/SceneMode',
+    '../ThirdParty/kdbush'
+], function(
+    BoundingRectangle,
+    Cartesian2,
+    Cartesian3,
+    defaultValue,
+    defined,
+    defineProperties,
+    EllipsoidalOccluder,
+    Event,
+    Matrix4,
+    Billboard,
+    BillboardCollection,
+    Label,
+    LabelCollection,
+    PointPrimitive,
+    PointPrimitiveCollection,
+    SceneMode,
+    kdbush) {
     'use strict';
 
     /**
@@ -116,8 +116,8 @@ define([
 
         expandBoundingBox(result, pixelRange);
 
-        if (entityCluster._clusterLabels && !defined(item._labelCollection) && defined(item.id) && hasLabelIndex(entityCluster, item.id) && defined(item.id._label)) {
-            var labelIndex = entityCluster._collectionIndicesByEntity[item.id];
+        if (entityCluster._clusterLabels && !defined(item._labelCollection) && defined(item.id) && hasLabelIndex(entityCluster, item.id.id) && defined(item.id._label)) {
+            var labelIndex = entityCluster._collectionIndicesByEntity[item.id.id].labelIndex;
             var label = entityCluster._labelCollection.get(labelIndex);
             var labelBBox = Label.getScreenSpaceBoundingBox(label, coord, labelBoundingBoxScratch);
             expandBoundingBox(labelBBox, pixelRange);
@@ -130,8 +130,8 @@ define([
     function addNonClusteredItem(item, entityCluster) {
         item.clusterShow = true;
 
-        if (!defined(item._labelCollection) && defined(item.id) && hasLabelIndex(entityCluster, item.id) && defined(item.id._label)) {
-            var labelIndex = entityCluster._collectionIndicesByEntity[item.id];
+        if (!defined(item._labelCollection) && defined(item.id) && hasLabelIndex(entityCluster, item.id.id) && defined(item.id._label)) {
+            var labelIndex = entityCluster._collectionIndicesByEntity[item.id.id].labelIndex;
             var label = entityCluster._labelCollection.get(labelIndex);
             label.clusterShow = true;
         }