ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle UTC midnight wrap around, fixes #5371

Browse Source
This commit is contained in:
Tom Payne
2016-05-23 20:31:32 +02:00
parent 7196e18479
commit a6a621834f
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/format/igcformat.js
View File

@@ -128,6 +128,7 @@ ol.format.IGC.prototype.readFeatureFromText = function(text, opt_options) {
var year = 2000; var year = 2000;
var month = 0; var month = 0;
var day = 1; var day = 1;
var lastDateTime = -1;
var i, ii; var i, ii;
for (i = 0, ii = lines.length; i < ii; ++i) { for (i = 0, ii = lines.length; i < ii; ++i) {
var line = lines[i]; var line = lines[i];
@@ -160,7 +161,12 @@ ol.format.IGC.prototype.readFeatureFromText = function(text, opt_options) {
flatCoordinates.push(z); flatCoordinates.push(z);
} }
var dateTime = Date.UTC(year, month, day, hour, minute, second); var dateTime = Date.UTC(year, month, day, hour, minute, second);
// Detect UTC midnight wrap around.
if (dateTime < lastDateTime) {
dateTime = Date.UTC(year, month, day + 1, hour, minute, second);
}
flatCoordinates.push(dateTime / 1000); flatCoordinates.push(dateTime / 1000);
lastDateTime = dateTime;
} }
} else if (line.charAt(0) == 'H') { } else if (line.charAt(0) == 'H') {
m = ol.format.IGC.HFDTE_RECORD_RE_.exec(line); m = ol.format.IGC.HFDTE_RECORD_RE_.exec(line);

17
test/spec/ol/format/igcformat.test.js
View File

@@ -20,6 +20,7 @@ describe('ol.format.IGC', function() {
'B0848484556256N00651095EA0205102039000\n' + 'B0848484556256N00651095EA0205102039000\n' +
'B0855534556037N00651011EA0259302513000\n' + 'B0855534556037N00651011EA0259302513000\n' +
'B0903354554964N00648049EA0272402758000\n' + 'B0903354554964N00648049EA0272402758000\n' +
'B0848484556256N00651095EA0205102039000\n' +
'GAB890A77AFE5CE63979AF6B1BED7F07D\n' + 'GAB890A77AFE5CE63979AF6B1BED7F07D\n' +
'G62BB282E44D63A1149EF2F5E8AF6F2F1\n' + 'G62BB282E44D63A1149EF2F5E8AF6F2F1\n' +
'GEC14381987B15F81003EDE1E01A47843\n' + 'GEC14381987B15F81003EDE1E01A47843\n' +
@@ -49,7 +50,8 @@ describe('ol.format.IGC', function() {
expect(geom.getCoordinates()).to.eql([ expect(geom.getCoordinates()).to.eql([
[6.851583333333333, 45.9376, 1303202928], [6.851583333333333, 45.9376, 1303202928],
[6.850183333333334, 45.93395, 1303203353], [6.850183333333334, 45.93395, 1303203353],
[6.800816666666667, 45.916066666666666, 1303203815]]); [6.800816666666667, 45.916066666666666, 1303203815],
[6.851583333333333, 45.9376, 1303289328]]);
}); });
it('does transform and read a feature', function() { it('does transform and read a feature', function() {
@@ -69,9 +71,12 @@ describe('ol.format.IGC', function() {
var expectedPoint3 = ol.proj.transform( var expectedPoint3 = ol.proj.transform(
[6.800816666666667, 45.916066666666666], 'EPSG:4326', 'EPSG:3857'); [6.800816666666667, 45.916066666666666], 'EPSG:4326', 'EPSG:3857');
expectedPoint3.push(1303203815); expectedPoint3.push(1303203815);
var expectedPoint4 = ol.proj.transform(
[6.851583333333333, 45.9376], 'EPSG:4326', 'EPSG:3857');
expectedPoint4.push(1303289328);
expect(geom.getCoordinates()).to.eql( expect(geom.getCoordinates()).to.eql(
[expectedPoint1, expectedPoint2, expectedPoint3]); [expectedPoint1, expectedPoint2, expectedPoint3, expectedPoint4]);
}); });
}); });
@@ -92,7 +97,8 @@ describe('ol.format.IGC', function() {
expect(geom.getCoordinates()).to.eql([ expect(geom.getCoordinates()).to.eql([
[6.851583333333333, 45.9376, 1303202928], [6.851583333333333, 45.9376, 1303202928],
[6.850183333333334, 45.93395, 1303203353], [6.850183333333334, 45.93395, 1303203353],
[6.800816666666667, 45.916066666666666, 1303203815]]); [6.800816666666667, 45.916066666666666, 1303203815],
[6.851583333333333, 45.9376, 1303289328]]);
}); });
it('does transform and read features', function() { it('does transform and read features', function() {
@@ -114,9 +120,12 @@ describe('ol.format.IGC', function() {
var expectedPoint3 = ol.proj.transform( var expectedPoint3 = ol.proj.transform(
[6.800816666666667, 45.916066666666666], 'EPSG:4326', 'EPSG:3857'); [6.800816666666667, 45.916066666666666], 'EPSG:4326', 'EPSG:3857');
expectedPoint3.push(1303203815); expectedPoint3.push(1303203815);
var expectedPoint4 = ol.proj.transform(
[6.851583333333333, 45.9376], 'EPSG:4326', 'EPSG:3857');
expectedPoint4.push(1303289328);
expect(geom.getCoordinates()).to.eql( expect(geom.getCoordinates()).to.eql(
[expectedPoint1, expectedPoint2, expectedPoint3]); [expectedPoint1, expectedPoint2, expectedPoint3, expectedPoint4]);
}); });
}); });