From 5c6feee6abf35ebcb25f2863cd301e1b3cd7695e Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 30 Aug 2017 08:12:48 +0200 Subject: [PATCH 1/3] Fix Entity id type in EntityCollection The Entity id type is String. --- Source/DataSources/EntityCollection.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/DataSources/EntityCollection.js b/Source/DataSources/EntityCollection.js index 51c09888200c..209ac6025207 100644 --- a/Source/DataSources/EntityCollection.js +++ b/Source/DataSources/EntityCollection.js @@ -325,7 +325,7 @@ define([ /** * Removes an entity with the provided id from the collection. * - * @param {Object} id The id of the entity to remove. + * @param {String} id The id of the entity to remove. * @returns {Boolean} true if the item was removed, false if no item with the provided id existed in the collection. */ EntityCollection.prototype.removeById = function(id) { @@ -382,7 +382,7 @@ define([ /** * Gets an entity with the specified id. * - * @param {Object} id The id of the entity to retrieve. + * @param {String} id The id of the entity to retrieve. * @returns {Entity} The entity with the provided id or undefined if the id did not exist in the collection. */ EntityCollection.prototype.getById = function(id) { @@ -398,7 +398,7 @@ define([ /** * Gets an entity with the specified id or creates it and adds it to the collection if it does not exist. * - * @param {Object} id The id of the entity to retrieve or create. + * @param {String} id The id of the entity to retrieve or create. * @returns {Entity} The new or existing object. */ EntityCollection.prototype.getOrCreateEntity = function(id) { From 8113a3fa90d1037fe71bb4928b67994507234384 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Thu, 31 Aug 2017 08:10:28 +0200 Subject: [PATCH 2/3] Fix Entity id type in CompositeEntityCollection --- Source/DataSources/CompositeEntityCollection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/DataSources/CompositeEntityCollection.js b/Source/DataSources/CompositeEntityCollection.js index 48e806faa94d..2ac9b3a5d7da 100644 --- a/Source/DataSources/CompositeEntityCollection.js +++ b/Source/DataSources/CompositeEntityCollection.js @@ -449,7 +449,7 @@ define([ /** * Gets an entity with the specified id. * - * @param {Object} id The id of the entity to retrieve. + * @param {String} id The id of the entity to retrieve. * @returns {Entity} The entity with the provided id or undefined if the id did not exist in the collection. */ CompositeEntityCollection.prototype.getById = function(id) { From 9e8c390a0730d18c43b1025881f5f730815d18c4 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Thu, 31 Aug 2017 22:25:11 +0200 Subject: [PATCH 3/3] Update CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index fca3c1e2a0d6..28c872526ceb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,7 @@ Change Log ========== ### 1.37 - 2017-09-01 +* Fixed `Entity` id type to be `String` in `EntityCollection` and `CompositeEntityCollection` [#5791](https://github.com/AnalyticalGraphicsInc/cesium/pull/579) * Fixed `replaceState` bug that was causing the `CesiumViewer` demo application to crash in Safari and iOS * Fixed issue where `Model` and `BillboardCollection` would throw an error if the globe is undefined [#5638](https://github.com/AnalyticalGraphicsInc/cesium/issues/5638) * Fixed issue where the `Model` glTF cache loses reference to the model's buffer data. [#5720](https://github.com/AnalyticalGraphicsInc/cesium/issues/5720)