Merge branch 'master' into update-changes

CHANGES.md

@@ -8,7 +8,7 @@ Change Log
 * The function `Matrix4.getRotation` has been deprecated and renamed to `Matrix4.getMatrix3`. `Matrix4.getRotation` will be removed in version 1.65.
 
 ##### Additions :tada:
-* Added `Matrix3.getRotation` to get the rotational component of the matrix. [#8182](https:/AnalyticalGraphicsInc/cesium/pull/8182)
+* Added `Matrix3.getRotation` to get the rotational component of a matrix with scaling removed. [#8182](https:/AnalyticalGraphicsInc/cesium/pull/8182)
 * Added ability to create partial ellipsoids using both the Entity API and CZML. New ellipsoid geometry properties: `innerRadii`, `minimumClock`, `maximumClock`, `minimumCone`, and `maximumCone`. This affects both `EllipsoidGeometry` and `EllipsoidOutlineGeometry`. See the updated [Sandcastle example](https://cesiumjs.org/Cesium/Apps/Sandcastle/?src=Partial%20Ellipsoids.html&label=Geometries). [#5995](https:/AnalyticalGraphicsInc/cesium/pull/5995)
 * Added `TileMapResourceImageryProvider` and `OpenStreetMapImageryProvider` classes to improve API consistency: [#4812](https:/AnalyticalGraphicsInc/cesium/issues/4812)
 
@@ -22,6 +22,7 @@ Change Log
 * Fixed triangulation bug in polygons using `ArcType.RHUMB`. [#8042](https:/AnalyticalGraphicsInc/cesium/issues/8042)
 * 3D Tiles geometric error now scales with transform. [#8182](https:/AnalyticalGraphicsInc/cesium/pull/8182)
 * Fixed per-feature post processing from sometimes selecting the wrong feature. [#7929](https:/AnalyticalGraphicsInc/cesium/pull/7929)
+* Fixed labels not showing for individual entities in data sources when clustering is enabled. [#6087](https:/AnalyticalGraphicsInc/cesium/issues/6087)
 
 ### 1.61 - 2019-09-03
 

CONTRIBUTORS.md

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

Source/DataSources/EntityCluster.js

@@ -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;
  }