From 64106b3e23a52fda1428ab4921e0577ce31a5e6e Mon Sep 17 00:00:00 2001
From: JeremyMarzano-ISPA <jmarzano-sub@novetta.com>
Date: Thu, 9 Nov 2017 10:03:20 -0500
Subject: [PATCH 01/11] Added a function to remove duplicate namespaces in the
 KML file

---
 Source/DataSources/KmlDataSource.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Source/DataSources/KmlDataSource.js b/Source/DataSources/KmlDataSource.js
index 9f8388e3a223..52cefd89ce41 100644
--- a/Source/DataSources/KmlDataSource.js
+++ b/Source/DataSources/KmlDataSource.js
@@ -282,6 +282,26 @@ define([
         return text;
     }
 
+    function removeDuplicateNamespaces(text) {
+        var index = text.indexOf("xmlns:");
+        var endDeclaration = text.indexOf(">", index);
+        var namespace, startIndex, endIndex;
+
+        while ((index !== -1) && (index < endDeclaration)) {
+            namespace = text.slice(index, text.indexOf("\"", index));
+            startIndex = index;
+            index = text.indexOf(namespace, index + 1);
+            if (index !== -1) {
+                endIndex = text.indexOf("\"", (text.indexOf("\"", index) + 1));
+                text = text.slice(0, index -1) + text.slice(endIndex + 1, text.length);
+            }
+            index = text.indexOf("xmlns:", startIndex + 1);
+        }
+
+        return text;
+    }
+
+
     function loadXmlFromZip(reader, entry, uriResolver, deferred) {
         entry.getData(new zip.TextWriter(), function(text) {
             uriResolver.kml = parser.parseFromString(text, 'application/xml');
@@ -2368,6 +2388,9 @@ define([
                             //Insert missing namespaces
                             text = insertNamespaces(text);
 
+                            //Remove Duplicate Namespaces
+                            text = removeDuplicateNamespaces(text);
+
                             //IE raises an exception
                             var kml;
                             var error;

From 7bb806ca1e5c8271dbb67393031f6cd040be4950 Mon Sep 17 00:00:00 2001
From: JeremyMarzano-ISPA <jmarzano-sub@novetta.com>
Date: Thu, 9 Nov 2017 11:11:57 -0500
Subject: [PATCH 02/11] Added Unit test and listed the changes and contributor

---
 CHANGES.md                             |  1 +
 CONTRIBUTORS.md                        |  1 +
 Specs/Data/KML/duplicateNamespace.kml  | 18 +++++++++
 Specs/DataSources/KmlDataSourceSpec.js | 53 ++++----------------------
 4 files changed, 28 insertions(+), 45 deletions(-)
 create mode 100644 Specs/Data/KML/duplicateNamespace.kml

diff --git a/CHANGES.md b/CHANGES.md
index fa2be9350acc..222bd4a3f846 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,7 @@ Change Log
 ### 1.40 - 2017-12-01
 
 * Added ability to support touch event in Imagery Layers Split demo application. [#5948](https://github.com/AnalyticalGraphicsInc/cesium/pull/5948)
+* Added function that removes duplicate namespace declarations while loading a  KML. [#] ()
 
 ### 1.39 - 2017-11-01
 
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index eabe0c63e09f..0832fa8725ea 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -99,6 +99,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
    * [Joshua Bernstein](https://github.com/jbernstein/)
    * [Natanael Rivera](https://github.com/nrivera-Novetta/)
    * [Justin Burr](https://github.com/jburr-nc/)
+   * [Jeremy Marzano] (https://github.com/JeremyMarzano-ISPA/)
 
 ## [Individual CLA](Documentation/Contributors/CLAs/individual-cla-agi-v1.0.txt)
 * [Victor Berchet](https://github.com/vicb)
diff --git a/Specs/Data/KML/duplicateNamespace.kml b/Specs/Data/KML/duplicateNamespace.kml
new file mode 100644
index 000000000000..ca8107d5a335
--- /dev/null
+++ b/Specs/Data/KML/duplicateNamespace.kml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Document xsi:schemaLocation="http://www.opengis.net/kml/2.2 http://schemas.opengis.net/kml/2.2.0/ogckml22.xsd http://www.google.com/kml/ext/2.2 http://code.google.com/apis/kml/schema/kml22gx.xsd">
+    <Placemark>
+        <Style>
+            <IconStyle>
+              <Icon>
+                  <href>image.png</href>
+              </Icon>
+            </IconStyle>
+        </Style>
+        <description><![CDATA[image.png <a href="./image.png">image.png</a><img src="image.png"/>]]></description>
+        <Point>
+            <coordinates>1,2,3</coordinates>
+        </Point>
+    </Placemark>
+</Document>
+</kml>
\ No newline at end of file
diff --git a/Specs/DataSources/KmlDataSourceSpec.js b/Specs/DataSources/KmlDataSourceSpec.js
index d5daecf6fdb3..7f3f2d63f25e 100644
--- a/Specs/DataSources/KmlDataSourceSpec.js
+++ b/Specs/DataSources/KmlDataSourceSpec.js
@@ -244,20 +244,20 @@ defineSuite([
         });
     });
 
-    it('load inserts missing namespace declaration', function() {
-        var dataSource = new KmlDataSource(options);
-        return dataSource.load('Data/KML/undeclaredNamespaces.kml').then(function(source) {
-            expect(source).toBe(dataSource);
-            expect(source.entities.values.length).toEqual(1);
-        });
-    });
-
     it('load rejects nonexistent URL', function() {
         return KmlDataSource.load('test.invalid', options).otherwise(function(e) {
             expect(e).toBeInstanceOf(RequestErrorEvent);
         });
     });
 
+    it('load deletes duplicate namespace declaration', function() {
+        var datasource = new KmlDataSource(options);
+        return datasource.load('Data/KML/duplicateNamespace.kml').then(function(source) {
+            expect(source).toBe(datasource);
+            expect(source.entities.values.length).toEqual(1);
+        });
+    });
+
     it('load rejects loading non-KML URL', function() {
         return KmlDataSource.load('Data/Images/Blue.png', options).otherwise(function(e) {
             expect(e).toBeInstanceOf(RuntimeError);
@@ -271,42 +271,6 @@ defineSuite([
         });
     });
 
-    it('if load contains <icon> tag with no image included, no image is added', function() {
-        var dataSource = new KmlDataSource(options);
-        return loadBlob('Data/KML/simpleNoIcon.kml').then(function(blob) {
-            return dataSource.load(blob);
-        }).then(function(source) {
-            expect(source.entities);
-            expect(source.entities.values.length).toEqual(1);
-            expect(source.entities._entities._array.length).toEqual(1);
-            expect(source.entities._entities._array[0]._billboard._image).toBeUndefined();
-        });
-    });
-
-    it('if load does not contain icon <style> tag for placemark, default yellow pin does show', function() {
-        var dataSource = new KmlDataSource(options);
-        return loadBlob('Data/KML/simpleNoStyle.kml').then(function(blob) {
-            return dataSource.load(blob);
-        }).then(function(source) {
-            expect(source.entities);
-            expect(source.entities.values.length).toEqual(1);
-            expect(source.entities._entities._array.length).toEqual(1);
-            expect(source.entities._entities._array[0]._billboard._image._value).toEqual(dataSource._pinBuilder.fromColor(Color.YELLOW, 64));
-        });
-    });
-
-    it('if load contains empty <IconStyle> tag for placemark, default yellow pin does show', function() {
-        var dataSource = new KmlDataSource(options);
-        return loadBlob('Data/KML/simpleEmptyIconStyle.kml').then(function(blob) {
-            return dataSource.load(blob);
-        }).then(function(source) {
-            expect(source.entities);
-            expect(source.entities.values.length).toEqual(1);
-            expect(source.entities._entities._array.length).toEqual(1);
-            expect(source.entities._entities._array[0]._billboard._image._value).toEqual(dataSource._pinBuilder.fromColor(Color.YELLOW, 64));
-        });
-    });
-
     it('sets DataSource name from Document', function() {
         var kml = '<?xml version="1.0" encoding="UTF-8"?>\
             <Document>\
@@ -852,7 +816,6 @@ defineSuite([
             expect(entity.polygon).toBeUndefined();
             expect(entity.rectangle.coordinates.getValue()).toEqualEpsilon(Rectangle.fromDegrees(3, 1, 4, 2), CesiumMath.EPSILON14);
             expect(entity.rectangle.rotation.getValue()).toEqual(Math.PI / 4);
-            expect(entity.rectangle.stRotation.getValue()).toEqual(Math.PI / 4);
         });
     });
 

From d400d8467d7770175a4d579cdd085bcf225f69b9 Mon Sep 17 00:00:00 2001
From: JeremyMarzano-ISPA <jmarzano-sub@novetta.com>
Date: Thu, 9 Nov 2017 11:27:19 -0500
Subject: [PATCH 03/11] Cleanup

---
 Specs/DataSources/KmlDataSourceSpec.js | 51 ++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/Specs/DataSources/KmlDataSourceSpec.js b/Specs/DataSources/KmlDataSourceSpec.js
index 7f3f2d63f25e..f13d37378438 100644
--- a/Specs/DataSources/KmlDataSourceSpec.js
+++ b/Specs/DataSources/KmlDataSourceSpec.js
@@ -244,9 +244,11 @@ defineSuite([
         });
     });
 
-    it('load rejects nonexistent URL', function() {
-        return KmlDataSource.load('test.invalid', options).otherwise(function(e) {
-            expect(e).toBeInstanceOf(RequestErrorEvent);
+    it('load inserts missing namespace declaration', function() {
+        var dataSource = new KmlDataSource(options);
+        return dataSource.load('Data/KML/undeclaredNamespaces.kml').then(function(source) {
+            expect(source).toBe(dataSource);
+            expect(source.entities.values.length).toEqual(1);
         });
     });
 
@@ -258,6 +260,12 @@ defineSuite([
         });
     });
 
+    it('load rejects nonexistent URL', function() {
+        return KmlDataSource.load('test.invalid', options).otherwise(function(e) {
+            expect(e).toBeInstanceOf(RequestErrorEvent);
+        });
+    });
+
     it('load rejects loading non-KML URL', function() {
         return KmlDataSource.load('Data/Images/Blue.png', options).otherwise(function(e) {
             expect(e).toBeInstanceOf(RuntimeError);
@@ -271,6 +279,42 @@ defineSuite([
         });
     });
 
+    it('if load contains <icon> tag with no image included, no image is added', function() {
+        var dataSource = new KmlDataSource(options);
+        return loadBlob('Data/KML/simpleNoIcon.kml').then(function(blob) {
+            return dataSource.load(blob);
+        }).then(function(source) {
+            expect(source.entities);
+            expect(source.entities.values.length).toEqual(1);
+            expect(source.entities._entities._array.length).toEqual(1);
+            expect(source.entities._entities._array[0]._billboard._image).toBeUndefined();
+        });
+    });
+
+    it('if load does not contain icon <style> tag for placemark, default yellow pin does show', function() {
+        var dataSource = new KmlDataSource(options);
+        return loadBlob('Data/KML/simpleNoStyle.kml').then(function(blob) {
+            return dataSource.load(blob);
+        }).then(function(source) {
+            expect(source.entities);
+            expect(source.entities.values.length).toEqual(1);
+            expect(source.entities._entities._array.length).toEqual(1);
+            expect(source.entities._entities._array[0]._billboard._image._value).toEqual(dataSource._pinBuilder.fromColor(Color.YELLOW, 64));
+        });
+    });
+
+    it('if load contains empty <IconStyle> tag for placemark, default yellow pin does show', function() {
+        var dataSource = new KmlDataSource(options);
+        return loadBlob('Data/KML/simpleEmptyIconStyle.kml').then(function(blob) {
+            return dataSource.load(blob);
+        }).then(function(source) {
+            expect(source.entities);
+            expect(source.entities.values.length).toEqual(1);
+            expect(source.entities._entities._array.length).toEqual(1);
+            expect(source.entities._entities._array[0]._billboard._image._value).toEqual(dataSource._pinBuilder.fromColor(Color.YELLOW, 64));
+        });
+    });
+
     it('sets DataSource name from Document', function() {
         var kml = '<?xml version="1.0" encoding="UTF-8"?>\
             <Document>\
@@ -816,6 +860,7 @@ defineSuite([
             expect(entity.polygon).toBeUndefined();
             expect(entity.rectangle.coordinates.getValue()).toEqualEpsilon(Rectangle.fromDegrees(3, 1, 4, 2), CesiumMath.EPSILON14);
             expect(entity.rectangle.rotation.getValue()).toEqual(Math.PI / 4);
+            expect(entity.rectangle.stRotation.getValue()).toEqual(Math.PI / 4);
         });
     });
 

From 6555c791ff9e3520cd38f0e85787e376469c9fb2 Mon Sep 17 00:00:00 2001
From: JeremyMarzano-ISPA <jmarzano-sub@novetta.com>
Date: Thu, 9 Nov 2017 11:34:33 -0500
Subject: [PATCH 04/11] Fix missing newline in test KML

---
 Source/DataSources/KmlDataSource.js   | 1 -
 Specs/Data/KML/duplicateNamespace.kml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Source/DataSources/KmlDataSource.js b/Source/DataSources/KmlDataSource.js
index 52cefd89ce41..e9959fbc4984 100644
--- a/Source/DataSources/KmlDataSource.js
+++ b/Source/DataSources/KmlDataSource.js
@@ -301,7 +301,6 @@ define([
         return text;
     }
 
-
     function loadXmlFromZip(reader, entry, uriResolver, deferred) {
         entry.getData(new zip.TextWriter(), function(text) {
             uriResolver.kml = parser.parseFromString(text, 'application/xml');
diff --git a/Specs/Data/KML/duplicateNamespace.kml b/Specs/Data/KML/duplicateNamespace.kml
index ca8107d5a335..c17ff7ee30be 100644
--- a/Specs/Data/KML/duplicateNamespace.kml
+++ b/Specs/Data/KML/duplicateNamespace.kml
@@ -15,4 +15,4 @@
         </Point>
     </Placemark>
 </Document>
-</kml>
\ No newline at end of file
+</kml>

From 4b55019129598649e5018e462a2d59548cf2f9e0 Mon Sep 17 00:00:00 2001
From: JeremyMarzano-ISPA <jmarzano-sub@novetta.com>
Date: Thu, 9 Nov 2017 11:51:04 -0500
Subject: [PATCH 05/11] Updated CHANGES.md with the PR information

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 222bd4a3f846..3b60e799f715 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,7 +4,7 @@ Change Log
 ### 1.40 - 2017-12-01
 
 * Added ability to support touch event in Imagery Layers Split demo application. [#5948](https://github.com/AnalyticalGraphicsInc/cesium/pull/5948)
-* Added function that removes duplicate namespace declarations while loading a  KML. [#] ()
+* Added function that removes duplicate namespace declarations while loading a  KML. [#5972](https://github.com/AnalyticalGraphicsInc/cesium/pull/5972)
 
 ### 1.39 - 2017-11-01
 

From 650f40b1a1bda5dbb468bd6c64d3c1ef1cf8dad5 Mon Sep 17 00:00:00 2001
From: JeremyMarzano-ISPA <jmarzano-sub@novetta.com>
Date: Thu, 9 Nov 2017 12:07:40 -0500
Subject: [PATCH 06/11] Changed " to ' for string declarations

---
 Source/DataSources/KmlDataSource.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/DataSources/KmlDataSource.js b/Source/DataSources/KmlDataSource.js
index e9959fbc4984..3da64c269ec4 100644
--- a/Source/DataSources/KmlDataSource.js
+++ b/Source/DataSources/KmlDataSource.js
@@ -283,19 +283,19 @@ define([
     }
 
     function removeDuplicateNamespaces(text) {
-        var index = text.indexOf("xmlns:");
-        var endDeclaration = text.indexOf(">", index);
+        var index = text.indexOf('xmlns:');
+        var endDeclaration = text.indexOf('>', index);
         var namespace, startIndex, endIndex;
 
         while ((index !== -1) && (index < endDeclaration)) {
-            namespace = text.slice(index, text.indexOf("\"", index));
+            namespace = text.slice(index, text.indexOf('\"', index));
             startIndex = index;
             index = text.indexOf(namespace, index + 1);
             if (index !== -1) {
-                endIndex = text.indexOf("\"", (text.indexOf("\"", index) + 1));
+                endIndex = text.indexOf('\"', (text.indexOf('\"', index) + 1));
                 text = text.slice(0, index -1) + text.slice(endIndex + 1, text.length);
             }
-            index = text.indexOf("xmlns:", startIndex + 1);
+            index = text.indexOf('xmlns:', startIndex + 1);
         }
 
         return text;

From d61c00fe41009e77d8079da473a3a23694dbe7b3 Mon Sep 17 00:00:00 2001
From: JeremyMarzano-ISPA <jmarzano-sub@novetta.com>
Date: Tue, 21 Nov 2017 08:08:24 -0500
Subject: [PATCH 07/11] Remove Duplicate Namespaces searches for the same
 namespace until there are no duplicates removed

---
 Source/DataSources/KmlDataSource.js   | 7 +++++--
 Specs/Data/KML/duplicateNamespace.kml | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Source/DataSources/KmlDataSource.js b/Source/DataSources/KmlDataSource.js
index 3da64c269ec4..88e92772897d 100644
--- a/Source/DataSources/KmlDataSource.js
+++ b/Source/DataSources/KmlDataSource.js
@@ -285,7 +285,7 @@ define([
     function removeDuplicateNamespaces(text) {
         var index = text.indexOf('xmlns:');
         var endDeclaration = text.indexOf('>', index);
-        var namespace, startIndex, endIndex;
+        var namespace, startIndex, endIndex, duplicateRemoved;
 
         while ((index !== -1) && (index < endDeclaration)) {
             namespace = text.slice(index, text.indexOf('\"', index));
@@ -294,8 +294,11 @@ define([
             if (index !== -1) {
                 endIndex = text.indexOf('\"', (text.indexOf('\"', index) + 1));
                 text = text.slice(0, index -1) + text.slice(endIndex + 1, text.length);
+                index = text.indexOf('xmlns:', startIndex - 1);
+            }
+            else {
+                index = text.indexOf('xmlns:', startIndex + 1);
             }
-            index = text.indexOf('xmlns:', startIndex + 1);
         }
 
         return text;
diff --git a/Specs/Data/KML/duplicateNamespace.kml b/Specs/Data/KML/duplicateNamespace.kml
index c17ff7ee30be..88fa1f21e850 100644
--- a/Specs/Data/KML/duplicateNamespace.kml
+++ b/Specs/Data/KML/duplicateNamespace.kml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gx="http://www.google.com/kml/ext/2.2" xmlns:gx="http://www.google.com/kml/ext/2.2">
 <Document xsi:schemaLocation="http://www.opengis.net/kml/2.2 http://schemas.opengis.net/kml/2.2.0/ogckml22.xsd http://www.google.com/kml/ext/2.2 http://code.google.com/apis/kml/schema/kml22gx.xsd">
     <Placemark>
         <Style>

From ed60e00b6653d154112b6bdade8a11f8356cbb02 Mon Sep 17 00:00:00 2001
From: JeremyMarzano-ISPA <jmarzano-sub@novetta.com>
Date: Tue, 21 Nov 2017 08:11:39 -0500
Subject: [PATCH 08/11] Removed unnecessary variable

---
 Source/DataSources/KmlDataSource.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/DataSources/KmlDataSource.js b/Source/DataSources/KmlDataSource.js
index 88e92772897d..63a3645c3a57 100644
--- a/Source/DataSources/KmlDataSource.js
+++ b/Source/DataSources/KmlDataSource.js
@@ -285,7 +285,7 @@ define([
     function removeDuplicateNamespaces(text) {
         var index = text.indexOf('xmlns:');
         var endDeclaration = text.indexOf('>', index);
-        var namespace, startIndex, endIndex, duplicateRemoved;
+        var namespace, startIndex, endIndex;
 
         while ((index !== -1) && (index < endDeclaration)) {
             namespace = text.slice(index, text.indexOf('\"', index));

From 34cef557e88dcd2e5bc86ae4be1197f8bcebbc11 Mon Sep 17 00:00:00 2001
From: JeremyMarzano-ISPA <jmarzano-sub@novetta.com>
Date: Tue, 21 Nov 2017 08:14:02 -0500
Subject: [PATCH 09/11] Update CONTRIBUTORS.md

---
 CONTRIBUTORS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 0832fa8725ea..455683c52c20 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -99,7 +99,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
    * [Joshua Bernstein](https://github.com/jbernstein/)
    * [Natanael Rivera](https://github.com/nrivera-Novetta/)
    * [Justin Burr](https://github.com/jburr-nc/)
-   * [Jeremy Marzano] (https://github.com/JeremyMarzano-ISPA/)
+   * [Jeremy Marzano](https://github.com/JeremyMarzano-ISPA/)
 
 ## [Individual CLA](Documentation/Contributors/CLAs/individual-cla-agi-v1.0.txt)
 * [Victor Berchet](https://github.com/vicb)

From a9b0215a3d754951779d499f0aae4d12c1af60a0 Mon Sep 17 00:00:00 2001
From: JeremyMarzano-ISPA <jmarzano-sub@novetta.com>
Date: Thu, 30 Nov 2017 08:00:31 -0500
Subject: [PATCH 10/11] Remove duplicate namespaces from a KMZ

---
 Source/DataSources/KmlDataSource.js    |   4 ++--
 Specs/Data/KML/duplicateNamespace.kmz  | Bin 0 -> 1025 bytes
 Specs/DataSources/KmlDataSourceSpec.js |  14 +++++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 Specs/Data/KML/duplicateNamespace.kmz

diff --git a/Source/DataSources/KmlDataSource.js b/Source/DataSources/KmlDataSource.js
index 465b3dd389cf..2c22d6cbe479 100644
--- a/Source/DataSources/KmlDataSource.js
+++ b/Source/DataSources/KmlDataSource.js
@@ -295,8 +295,7 @@ define([
                 endIndex = text.indexOf('\"', (text.indexOf('\"', index) + 1));
                 text = text.slice(0, index -1) + text.slice(endIndex + 1, text.length);
                 index = text.indexOf('xmlns:', startIndex - 1);
-            }
-            else {
+            } else {
                 index = text.indexOf('xmlns:', startIndex + 1);
             }
         }
@@ -307,6 +306,7 @@ define([
     function loadXmlFromZip(reader, entry, uriResolver, deferred) {
         entry.getData(new zip.TextWriter(), function(text) {
             text = insertNamespaces(text);
+            text = removeDuplicateNamespaces(text);
             uriResolver.kml = parser.parseFromString(text, 'application/xml');
             deferred.resolve();
         });
diff --git a/Specs/Data/KML/duplicateNamespace.kmz b/Specs/Data/KML/duplicateNamespace.kmz
new file mode 100644
index 0000000000000000000000000000000000000000..0e653a838acbf5ffd4ad0969ff87ad131930e1e9
GIT binary patch
literal 1025
zcmWIWW@Zs#-~d8&AO;jjDJ{s!OinCG^-Ii6EiOn*PSwlK&8Z2B&A)BHQ}cbjz#p60
zeUnQL9$3NuI*R9pd*fDnhiMVv9IBGr=JeOw-zXGFmtMA9xpL3q-ow8aCvRN7ZS%qW
z%dT-tn)dJ=`&Bi2-#(kP*<a$+b`<OM_0?|oy`P+8$0)<sZe#K!`}Wg$N^fMGXHH+~
z!(zvB*ZNbSn$v>tz9lcEw?(=BS}0T6duhsh8ReeCjbG1rO%8tR7qQvbQ+M^%tl+e?
zwX1VBF6f^bHMKl4a838u*wEZ*r@uZZnOOhzqMMrXJPnJkw=Y-e6y#e+M{fJ5l6+hE
z&>BObeKN|G&d(fORR!}-P5dD9=4Wz?!_kY!?p^qv;E@%!u9DL~_r+ev9W&>?v}(B)
zv0kaPXrlPz-vMz4ikLWx@4es*5B?+SUnBTuRrCC-&yTgR?%V!FZ7ttEW?3bPs$kpW
z$A0bkXnM$E-nWEp9dpBcHaS={uUyUC9%kp4Z&9>j^6OuJHsr5T+PCwK{p<f_E<c=E
z65HyxZQB<2G5zSBo434M_D7xk@mw!bY7@tGgGT~EKdl)U{{Ii~X6FbhH(k)p$iVQK
ziGd*iXLL#cqcbx(Kd)FnIln|dB{eOvG^eB>Gf%G|FZ~tIhvMf?Cp}6^NO<t|O93a4
zp1_dEXU4|X#{P7hy@Z6sjY)g%#!CEae$ce{w7Ri@L4jC>i<q%N0e7>3^5Hd>3bt=l
z=j~hf=DWmE*C$8M+|zFA+4JJ%BZ)_aHLtHk+*9Ua(tY)kyG4zq;9O?h*)@v}oLG5o
z#mkM0Qsp+EV*MCtn09Zuz2y8m<qLD-v+sRku6C99A#dRGWBJj94@q5*Hc5oFUACGZ
zK0R|+!Mw=-o+}jRF3;~Td(&6xdU9cGcn*uC`3IRD$G$9zJZs?jwj}XZ)jIZn)?aQE
zMeU!q|KH_(Hb1W<o&PTW{hqzS`-g7LS5^ncWIbK!-EW^*xh*i%KehZ|)Zg3b@kf0>
z?Wuo%#JsL;^&Q6U)@@6=(mPeo?2TNVS^ie3`ThRG2bH|VR>j8d`?CE*--YFE*8gNH
z&K)>#;K9pR&o`aZT*xT^i;;WxnD~5vG2#Nm0p5&EA`FNuh8$a<EQSiOXE<~-kj)3h
bD*~Jc+K4Nb1H4(;Kq{GlunR~hGJ|*kLqM>J

literal 0
HcmV?d00001

diff --git a/Specs/DataSources/KmlDataSourceSpec.js b/Specs/DataSources/KmlDataSourceSpec.js
index c6cf39475159..d3c8ea9d8972 100644
--- a/Specs/DataSources/KmlDataSourceSpec.js
+++ b/Specs/DataSources/KmlDataSourceSpec.js
@@ -252,7 +252,15 @@ defineSuite([
         });
     });
 
-    it('load deletes duplicate namespace declaration', function() {
+    it('load inserts missing namespace declaration into kmz', function() {
+        var dataSource = new KmlDataSource(options);
+        return dataSource.load('Data/KML/undeclaredNamespaces.kmz').then(function(source) {
+            expect(source).toBe(dataSource);
+            expect(source.entities.values.length).toEqual(1);
+        });
+    });
+
+    it('load deletes duplicate namespace declaration in kml', function() {
         var datasource = new KmlDataSource(options);
         return datasource.load('Data/KML/duplicateNamespace.kml').then(function(source) {
             expect(source).toBe(datasource);
@@ -260,9 +268,9 @@ defineSuite([
         });
     });
 
-    it('load inserts missing namespace declaration into kmz', function() {
+    it('load deletes duplicate namespace declaration in kmz', function() {
         var dataSource = new KmlDataSource(options);
-        return dataSource.load('Data/KML/undeclaredNamespaces.kmz').then(function(source) {
+        return dataSource.load('Data/KML/duplicateNamespace.kmz').then(function(source) {
             expect(source).toBe(dataSource);
             expect(source.entities.values.length).toEqual(1);
         });

From 64404bd64b6745132707947279796e460fd125a7 Mon Sep 17 00:00:00 2001
From: JeremyMarzano-ISPA <jmarzano-sub@novetta.com>
Date: Thu, 30 Nov 2017 08:04:46 -0500
Subject: [PATCH 11/11] Update CHANGES.md

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index c6b7e85412dc..9ee77eb624a3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,7 +12,7 @@ Change Log
 * Fixed handling of KMZ files with missing `xsi` namespace declarations. [#6003](https://github.com/AnalyticalGraphicsInc/cesium/pull/6003)
 * Fixed a bug where models with animations of different lengths would cause an error. [#5694](https://github.com/AnalyticalGraphicsInc/cesium/issues/5694)
 * Added a `clampAnimations` parameter to `Model` and `Entity.model`. Setting this to `false` allows different length animations to loop asynchronously over the duration of the longest animation.
-* Added function that removes duplicate namespace declarations while loading a  KML. [#5972](https://github.com/AnalyticalGraphicsInc/cesium/pull/5972)
+* Added function that removes duplicate namespace declarations while loading a KML or a KMZ. [#5972](https://github.com/AnalyticalGraphicsInc/cesium/pull/5972)
 
 ### 1.39 - 2017-11-01