Skip to content

Commit

Permalink
Merge pull request #3124 from AnalyticalGraphicsInc/kml-stinks
Browse files Browse the repository at this point in the history 
Be more lenient when processing KML coordinates
  • Loading branch information
@pjcozzi
pjcozzi committed Oct 23, 2015
2 parents 6552144 + a772110 commit 275d1be
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 37 deletions.
37 changes: 18 additions & 19 deletions Source/DataSources/KmlDataSource.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ define([
'../Core/createGuid',
'../Core/defaultValue',
'../Core/defined',
'../Core/definedNotNull',
'../Core/defineProperties',
'../Core/DeveloperError',
'../Core/Ellipsoid',
Expand Down Expand Up @@ -60,6 +61,7 @@ define([
createGuid,
defaultValue,
defined,
definedNotNull,
defineProperties,
DeveloperError,
Ellipsoid,
Expand Down Expand Up @@ -276,14 +278,14 @@ define([
}

function readCoordinate(value) {
//Google Earth treats empty or missing coordinates as 0.
if (!defined(value)) {
return undefined;
return Cartesian3.fromDegrees(0, 0, 0);
}

var digits = value.match(/[^\s,\n]+/g);
if (digits.length !== 2 && digits.length !== 3) {
window.console.log('KML - Invalid coordinates: ' + value);
return undefined;
if (!definedNotNull(digits)) {
return Cartesian3.fromDegrees(0, 0, 0);
}

var longitude = parseFloat(digits[0]);
Expand All @@ -303,6 +305,10 @@ define([
}

var tuples = element.textContent.match(/[^\s\n]+/g);
if (!definedNotNull(tuples)) {
return undefined;
}

var length = tuples.length;
var result = new Array(length);
var resultIndex = 0;
Expand Down Expand Up @@ -438,12 +444,13 @@ define([
}

var colorOptions = {};

function parseColorString(value, isRandom) {
if (!defined(value)) {
return undefined;
}

if(value[0] === '#'){
if (value[0] === '#') {
value = value.substring(1);
}

Expand Down Expand Up @@ -843,7 +850,7 @@ define([
}

if ((defined(altitudeMode) && altitudeMode !== 'clampToGround') || //
(defined(gxAltitudeMode) && gxAltitudeMode !== 'clampToSeaFloor')) {
(defined(gxAltitudeMode) && gxAltitudeMode !== 'clampToSeaFloor')) {
window.console.log('KML - Unknown altitudeMode: ' + defaultValue(altitudeMode, gxAltitudeMode));
}

Expand Down Expand Up @@ -927,9 +934,6 @@ define([
var extrude = queryBooleanValue(geometryNode, 'extrude', namespaces.kml);

var position = readCoordinate(coordinatesString);
if (!defined(position)) {
return;
}

entity.position = createPositionPropertyFromAltitudeMode(new ConstantPositionProperty(position), altitudeMode, gxAltitudeMode);
processPositionGraphics(dataSource, entity, styleEntity);
Expand Down Expand Up @@ -1028,12 +1032,9 @@ define([
var coordinates = [];
var times = [];
for (var i = 0; i < length; i++) {
//An empty position is OK according to the spec
var position = readCoordinate(coordNodes[i].textContent);
if (defined(position)) {
coordinates.push(position);
times.push(JulianDate.fromIso8601(timeNodes[i].textContent));
}
coordinates.push(position);
times.push(JulianDate.fromIso8601(timeNodes[i].textContent));
}
var property = new SampledPositionProperty();
property.addSamples(times, coordinates);
Expand Down Expand Up @@ -1114,12 +1115,9 @@ define([
var positions = [];
times = [];
for (var x = 0; x < length; x++) {
//An empty position is OK according to the spec
var position = readCoordinate(coordNodes[x].textContent);
if (defined(position)) {
positions.push(position);
times.push(JulianDate.fromIso8601(timeNodes[x].textContent));
}
positions.push(position);
times.push(JulianDate.fromIso8601(timeNodes[x].textContent));
}

if (interpolate) {
Expand Down Expand Up @@ -1191,6 +1189,7 @@ define([
}

var scratchDiv = document.createElement('div');

function processDescription(node, entity, styleEntity, uriResolver) {
var i;
var key;
Expand Down
70 changes: 53 additions & 17 deletions Specs/DataSources/KmlDataSourceSpec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1704,21 +1704,21 @@ defineSuite([
expect(label.eyeOffset).toBeUndefined();
expect(label.pixelOffsetScaleByDistance).toBeUndefined();

expect(label.text).toBeUndefined();
expect(label.fillColor).toBeUndefined();
expect(label.outlineColor).toBeUndefined();
expect(label.outlineWidth).toBeUndefined();
expect(label.show).toBeUndefined();
expect(label.scale).toBeUndefined();
expect(label.verticalOrigin).toBeUndefined();
expect(label.eyeOffset).toBeUndefined();
expect(label.pixelOffsetScaleByDistance).toBeUndefined();
expect(label.text).toBeUndefined();
expect(label.fillColor).toBeUndefined();
expect(label.outlineColor).toBeUndefined();
expect(label.outlineWidth).toBeUndefined();
expect(label.show).toBeUndefined();
expect(label.scale).toBeUndefined();
expect(label.verticalOrigin).toBeUndefined();
expect(label.eyeOffset).toBeUndefined();
expect(label.pixelOffsetScaleByDistance).toBeUndefined();

expect(label.font.getValue()).toEqual('16px sans-serif');
expect(label.style.getValue()).toEqual(LabelStyle.FILL_AND_OUTLINE);
expect(label.horizontalOrigin.getValue()).toEqual(HorizontalOrigin.LEFT);
expect(label.pixelOffset.getValue()).toEqual(new Cartesian2(17, 0));
expect(label.translucencyByDistance.getValue()).toEqual(new NearFarScalar(3000000, 1.0, 5000000, 0.0));
expect(label.font.getValue()).toEqual('16px sans-serif');
expect(label.style.getValue()).toEqual(LabelStyle.FILL_AND_OUTLINE);
expect(label.horizontalOrigin.getValue()).toEqual(HorizontalOrigin.LEFT);
expect(label.pixelOffset.getValue()).toEqual(new Cartesian2(17, 0));
expect(label.translucencyByDistance.getValue()).toEqual(new NearFarScalar(3000000, 1.0, 5000000, 0.0));
});
});

Expand Down Expand Up @@ -1961,7 +1961,7 @@ defineSuite([
return KmlDataSource.load(parser.parseFromString(kml, "text/xml")).then(function(dataSource) {
var entities = dataSource.entities.values;
expect(entities.length).toEqual(1);
expect(entities[0].position).toBeUndefined();
expect(entities[0].position.getValue(Iso8601.MINIMUM_VALUE)).toEqual(Cartesian3.fromDegrees(0, 0, 0));
expect(entities[0].polyline).toBeUndefined();
});
});
Expand All @@ -1970,14 +1970,31 @@ defineSuite([
var kml = '<?xml version="1.0" encoding="UTF-8"?>\
<Placemark>\
<Point>\
<altitudeMode>absolute</altitudeMode>\
<coordinates>1,2,3,4</coordinates>\
</Point>\
</Placemark>';

return KmlDataSource.load(parser.parseFromString(kml, "text/xml")).then(function(dataSource) {
var entities = dataSource.entities.values;
expect(entities.length).toEqual(1);
expect(entities[0].position).toBeUndefined();
expect(entities[0].position.getValue(Iso8601.MINIMUM_VALUE)).toEqual(Cartesian3.fromDegrees(1, 2, 3));
expect(entities[0].polyline).toBeUndefined();
});
});

it('Geometry Point: handles empty coordinates', function() {
var kml = '<?xml version="1.0" encoding="UTF-8"?>\
<Placemark>\
<Point>\
<coordinates></coordinates>\
</Point>\
</Placemark>';

return KmlDataSource.load(parser.parseFromString(kml, "text/xml")).then(function(dataSource) {
var entities = dataSource.entities.values;
expect(entities.length).toEqual(1);
expect(entities[0].position.getValue(Iso8601.MINIMUM_VALUE)).toEqual(Cartesian3.fromDegrees(0, 0, 0));
expect(entities[0].polyline).toBeUndefined();
});
});
Expand Down Expand Up @@ -2133,6 +2150,25 @@ defineSuite([
});
});

it('Geometry Polygon: handles empty coordinates', function() {
var kml = '<?xml version="1.0" encoding="UTF-8"?>\
<Placemark>\
<Polygon>\
<outerBoundaryIs>\
<LinearRing>\
<coordinates>\
</coordinates>\
</LinearRing>\
</outerBoundaryIs>\
</Polygon>\
</Placemark>';

return KmlDataSource.load(parser.parseFromString(kml, "text/xml")).then(function(dataSource) {
var entity = dataSource.entities.values[0];
expect(entity.polygon.hierarchy).toBeUndefined();
});
});

it('Geometry Polygon: without holes', function() {
var kml = '<?xml version="1.0" encoding="UTF-8"?>\
<Placemark>\
Expand Down Expand Up @@ -2851,4 +2887,4 @@ defineSuite([
expect(entity.label.text.getValue()).toBe('bob');
});
});
});
});
4 changes: 3 additions & 1 deletion Specs/Widgets/Viewer/ViewerSpec.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*global defineSuite*/
defineSuite([
'Widgets/Viewer/Viewer',
'Core/Cartesian3',
'Core/ClockRange',
'Core/ClockStep',
Expand Down Expand Up @@ -33,6 +34,7 @@ defineSuite([
'Widgets/SelectionIndicator/SelectionIndicator',
'Widgets/Timeline/Timeline'
], function(
Viewer,
Cartesian3,
ClockRange,
ClockStep,
Expand Down Expand Up @@ -938,4 +940,4 @@ defineSuite([
expect(preMixinDataSource.entities.collectionChanged._listeners.length).not.toEqual(preMixinListenerCount);
expect(postMixinDataSource.entities.collectionChanged._listeners.length).not.toEqual(postMixinListenerCount);
});
}, 'WebGL');
}, 'WebGL');

0 comments on commit 275d1be

Please sign in to comment.