Fix bug where yellow icon is shown when icon tag is empty #5819

CHANGES.md

@@ -20,6 +20,7 @@ Change Log
 * Fixed removing multiple event listeners within event callbacks. [#5827](https://github.com/AnalyticalGraphicsInc/cesium/issues/5827)
 * Running `buildApps` now creates a built version of Sandcastle which uses the built version of Cesium for better performance.
 * Fixed a tileset traversal bug when the `skipLevelOfDetail` optimization is off. [#5869](https://github.com/AnalyticalGraphicsInc/cesium/issues/5869)
+* Fixed bug with placemarks in imported KML: placemarks with no specified icon would be displayed with default icon. [#5819](https://github.com/AnalyticalGraphicsInc/cesium/issues/5819)
 
 ### 1.37 - 2017-09-01
 

CONTRIBUTORS.md

@@ -92,6 +92,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
    * [Jannes Bolling](https://github.com/jbo023)
 * [Logilab](https://www.logilab.fr/)
    * [Florent Cayré](https://github.com/fcayre/)
+* [Novetta](http://www.novetta.com/)
+   * [Joshua Bernstein](https://github.com/jbernstein/)
 
 ## [Individual CLA](Documentation/Contributors/CLAs/individual-cla-agi-v1.0.txt)
 * [Victor Berchet](https://github.com/vicb)

Source/DataSources/KmlDataSource.js

@@ -1111,7 +1111,7 @@ define([
             entity.billboard = billboard;
         }
 
-        if (!defined(billboard.image)) {
+        if (!defined(styleEntity.billboard) && !defined(billboard.image)) {
             billboard.image = dataSource._pinBuilder.fromColor(Color.YELLOW, 64);
         }
 

Specs/Data/KML/simpleEmptyIconStyle.kml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2">
+<Document>
+	<Placemark>
+		<Style>
+			<IconStyle>
+			</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>

Specs/Data/KML/simpleNoIcon.kml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2">
+<Document>
+	<Placemark>
+		<Style>
+			<IconStyle>
+			  <Icon>
+			  </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>

Specs/Data/KML/simpleNoStyle.kml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2">
+<Document>
+	<Placemark>
+		<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>

Specs/DataSources/KmlDataSourceSpec.js

@@ -263,6 +263,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 === 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 === dataSource._pinBuilder.fromColor(Color.YELLOW, 64));
+        });
+    });
+
     it('sets DataSource name from Document', function() {
         var kml = '<?xml version="1.0" encoding="UTF-8"?>\
             <Document>\