Merge remote-tracking branch 'origin/master' into null-crs

# Conflicts:
#	CHANGES.md

Author: mramato

CHANGES.md

@@ -13,6 +13,7 @@ Change Log
 * Fixed a bug where creating a custom geometry with attributes and indices that have values that are not a typed array would cause a crash. [#4419](https://github.com/AnalyticalGraphicsInc/cesium/pull/4419)
 * Fixed a bug with rotated, textured rectangles. [#4430](https://github.com/AnalyticalGraphicsInc/cesium/pull/4430)
 * Fixed a bug when morphing from 2D to 3D. [#4388](https://github.com/AnalyticalGraphicsInc/cesium/pull/4388)
+* Fixed a bug where when KML features had duplicate IDs, only one was drawn. [#3941](https://github.com/AnalyticalGraphicsInc/cesium/issues/3941)
 * `GeoJsonDataSource` now treats null crs values as a no-op instead of failing to load.
 * `GeoJsonDataSource` now gracefully handles missing style icons instead of failing to load.
 * Added `Rectangle.simpleIntersection`.

Source/DataSources/KmlDataSource.js

@@ -285,13 +285,24 @@ define([
 
     // an optional context is passed to allow for some malformed kmls (those with multiple geometries with same ids) to still parse
     // correctly, as they do in Google Earth.
-    function getOrCreateEntity(node, entityCollection, context) {
+    function createEntity(node, entityCollection, context) {
         var id = queryStringAttribute(node, 'id');
         id = defined(id) && id.length !== 0 ? id : createGuid();
         if(defined(context)){
             id = context + id;
         }
-        var entity = entityCollection.getOrCreateEntity(id);
+
+        // If we have a duplicate ID just generate one.
+        // This isn't valid KML but Google Earth handles this case.
+        var entity = entityCollection.getById(id);
+        if (defined(entity)) {
+            id = createGuid();
+            if(defined(context)){
+                id = context + id;
+            }
+        }
+
+        entity = entityCollection.add(new Entity({id : id}));
         if (!defined(entity.kml)) {
             entity.addProperty('kml');
             entity.kml = new KmlFeatureData();
@@ -1358,7 +1369,7 @@ define([
             var childNode = childNodes.item(i);
             var geometryProcessor = geometryTypes[childNode.localName];
             if (defined(geometryProcessor)) {
-                var childEntity = getOrCreateEntity(childNode, entityCollection, context);
+                var childEntity = createEntity(childNode, entityCollection, context);
                 childEntity.parent = entity;
                 childEntity.name = entity.name;
                 childEntity.availability = entity.availability;
@@ -1514,7 +1525,7 @@ define([
     }
 
     function processFeature(dataSource, parent, featureNode, entityCollection, styleCollection, sourceUri, uriResolver) {
-        var entity = getOrCreateEntity(featureNode, entityCollection);
+        var entity = createEntity(featureNode, entityCollection);
         var kmlData = entity.kml;
         var styleEntity = computeFinalStyle(entity, dataSource, featureNode, styleCollection, sourceUri, uriResolver);
 

Specs/DataSources/KmlDataSourceSpec.js

@@ -406,6 +406,23 @@ defineSuite([
         });
     });
 
+    it('Feature: duplicate id', function() {
+        var kml = '<?xml version="1.0" encoding="UTF-8"?>\
+        <Document xmlns="http://www.opengis.net/kml/2.2"\
+                  xmlns:gx="http://www.google.com/kml/ext/2.2">\
+            <Placemark id="Bob">\
+            </Placemark>\
+            <Placemark id="Bob">\
+            </Placemark>\
+        </Document>';
+
+        return KmlDataSource.load(parser.parseFromString(kml, "text/xml"), options).then(function(dataSource) {
+            var entities = dataSource.entities.values;
+            expect(entities[0].id).toBe('Bob');
+            expect(entities[1].id).not.toBe('Bob');
+        });
+    });
+
     it('Feature: name', function() {
         var kml = '<?xml version="1.0" encoding="UTF-8"?>\
         <Placemark>\