Skip to content

Commit 66bd80f

Browse files
committed
Fix track regex
1 parent e597261 commit 66bd80f

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const verifyChecksum = (data) => {
3333
/**
3434
* regex for GPRMC valid data
3535
*/
36-
const gprmc = /^\$GP(\w{3})\,(\d{6}[.]\d{3})\,([AV])\,(\d{4}[.]\d{4}\,[NS])\,(\d{5}[.]\d{4}\,[WE])\,(\d{1,3}[.]\d{1,3})?\,(\d{1,3}[.]\d{1,3})\,(\d{6})\,((\d{1,3}[.]\d{1,3})?\,([WE])?)\,?([ADENS])?\*([0-9A-F]{2})$/;
36+
const gprmc = /^\$GP(\w{3})\,(\d{6}[.]\d{3})\,([AV])\,(\d{4}[.]\d{4}\,[NS])\,(\d{5}[.]\d{4}\,[WE])\,(\d{1,3}[.]\d{1,3})?\,(\d{1,3}[.]\d{1,3})?\,(\d{6})\,((\d{1,3}[.]\d{1,3})?\,([WE])?)\,?([ADENS])?\*([0-9A-F]{2})$/;
3737

3838
/**
3939
* regex for GPGGA valid data
@@ -177,10 +177,10 @@ const parseRmc = (raw) => {
177177
};
178178
data.gps = r[3] === 'A';
179179
data.speed = {
180-
knots: parseFloat(r[6]),
181-
kmh: knotsToKmh(r[6])
180+
knots: r[6] ? parseFloat(r[6]) : null,
181+
kmh: r[6] ? knotsToKmh(r[6]) : null
182182
};
183-
data.track = r[7] === '' ? null : r[7];
183+
data.track = r[7] ? r[7] : null;
184184
data.magneticVariation = r[9] === ',' ? null : r[9];
185185
data.mode = r[12] ? faaModes[r[12]] : null;
186186
data.valid = true;

0 commit comments

Comments
 (0)