pub-solar/obs-portal
5
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

refactor: use csv parser for obsver1 instead of selfbuilt solution

Browse source
This commit is contained in:
Paul Bienkowski 2020-11-18 21:51:08 +01:00
parent f414d64480
commit f013ab4263
1 changed files with 26 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
logic/tracks.js
View file

@ -52,103 +52,37 @@ function detectFormat(body) {
return Number(match[2]); return Number(match[2]);
} }
if (/^Date;Time/.test(firstLine)) {
return 1;
}
return 'invalid'; return 'invalid';
} }
function* parseObsver1(body) { function* parseObsver1(body) {
let num = 0; if (body.indexOf('\n') < body.length - 1) {
let start = 0; body = body.replace(/\$/g, '\n');
let end = 0;
let currentPoint;
while (end < body.length) {
start = end;
while (body[end] !== ';' && body[end] !== '$' && end < body.length) {
end++;
}
if (body[end] === '$') {
if (currentPoint) {
yield currentPoint;
}
// $ is replacing \n as newlines are not allowed in json strings
num = 0;
}
if (end < body.length) {
const token = body.substr(start, end - start);
end++;
if (token.length > 0) {
if (num === 0 && token === 'Date') {
// we have a header line, ignore it for now, TODO parse it
if (end < body.length) {
while (body[end] !== ';' && body[end] !== '$' && end < body.length) {
end++;
}
start = end;
num = 100;
}
} }
switch (num) { for (const record of csvParse(body, {
case 0: delimiter: ';',
currentPoint = { encoding: 'utf8',
date: token, columns: ['date', 'time', 'latitude', 'longitude', 'course', 'speed', 'd1', 'd2', 'flag', 'private'],
time: '', relax_column_count: true,
latitude: '', cast(value, { column }) {
longitude: '', if (/latitude|longitude|course|speed/.test(column)) {
course: '', return _parseFloat(value);
speed: '', } else {
d1: '', return value;
d2: '', }
flag: '', },
private: '', })) {
}; if (record.date === 'Date') {
break; // ignore header line
continue;
case 1:
currentPoint.time = token;
break;
case 2:
currentPoint.latitude = _parseFloat(token);
break;
case 3:
currentPoint.longitude = _parseFloat(token);
break;
case 4:
currentPoint.course = _parseFloat(token);
break;
case 5:
currentPoint.speed = _parseFloat(token);
break;
case 6:
currentPoint.d1 = token;
break;
case 7:
currentPoint.d2 = token;
break;
case 8:
currentPoint.flag = token;
break;
case 9:
currentPoint.private = token;
break;
} }
num++; yield record;
}
}
}
if (currentPoint) {
yield currentPoint;
} }
} }