Prevent error when name is null or undefined (fixes #8804)

CHANGES.md

@@ -25,6 +25,7 @@
 - Fixed a bug where switching from perspective to orthographic caused triangles to overlap each other incorrectly. [#8346](https://github.com/CesiumGS/cesium/issues/8346)
 - Fixed a bug where switching to orthographic camera on the first frame caused the zoom level to be incorrect. [#8853](https://github.com/CesiumGS/cesium/pull/8853)
 - Fixed `scene.pickFromRay` intersection inaccuracies. [#8439](https://github.com/CesiumGS/cesium/issues/8439)
+- Fixed a bug where a null or undefined name property passed to the `Entity` constructor would throw an exception.[#8832](https://github.com/CesiumGS/cesium/pull/8832)
 
 ### 1.70.1 - 2020-06-10
 

CONTRIBUTORS.md

@@ -268,3 +268,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
 - [Wang Bao](https://github.com/xiaobaogeit)
 - [John Remsberg](https://github.com/easternmotors)
 - [Bao Thien Tran](https://github.com/baothientran)
+- [Yonatan Kra](https://github.com/yonatankra)

Source/DataSources/Entity.js

@@ -594,8 +594,10 @@ Entity.prototype.merge = function (source) {
   for (var i = 0; i < propertyNamesLength; i++) {
     var name = sourcePropertyNames[i];
 
-    //Ignore parent when merging, this only happens at construction time.
-    if (name === "parent") {
+    //While source is required by the API to be an Entity, we internally call this method from the
+    //constructor with an options object to configure initial custom properties.
+    //So we need to ignore reserved-non-property.
+    if (name === "parent" || name === "name" || name === "availability") {
       continue;
     }
 

Specs/DataSources/EntitySpec.js

@@ -179,6 +179,21 @@ describe("DataSources/Entity", function () {
     }
   });
 
+  it("merge ignores reserved property names when called with a plain object.", function () {
+    var entity = new Entity();
+
+    //Technically merge requires passing an Entity instance, but we call it internally
+    //with a plain object during construction to set up custom properties.
+    entity.merge({
+      name: undefined,
+      availability: undefined,
+      parent: undefined,
+    });
+    expect(entity.name).toBeUndefined();
+    expect(entity.availability).toBeUndefined();
+    expect(entity.parent).toBeUndefined();
+  });
+
   it("merge does not overwrite availability", function () {
     var entity = new Entity();
     var interval = TimeInterval.fromIso8601({