Fix case with no style tag, and add test CesiumGS#5819

josh-bernstein · Sep 29, 2017 · b60dc73 · b60dc73
1 parent 848e6af
commit b60dc73
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/Source/DataSources/KmlDataSource.js b/Source/DataSources/KmlDataSource.js
@@ -1111,6 +1111,10 @@ define([
  entity.billboard = billboard;
  }
 
+ if (!defined(styleEntity.billboard) && !defined(billboard.image)) {
+ billboard.image = dataSource._pinBuilder.fromColor(Color.YELLOW, 64);
+ }
+
  var scale = 1.0;
  if (defined(billboard.scale)) {
  scale = billboard.scale.getValue();

diff --git a/Specs/DataSources/KmlDataSourceSpec.js b/Specs/DataSources/KmlDataSourceSpec.js
@@ -271,7 +271,19 @@ defineSuite([
  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);
+ 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));
  });
  });