fit-file-parser 1.9.4 → 1.10.0

package/README.md

@@ -28,6 +28,7 @@ fs.readFile('./example.fit', function (err, content) {
     speedUnit: 'km/h',
     lengthUnit: 'km',
     temperatureUnit: 'kelvin',
+    pressureUnit: 'bar', // accept bar, cbar and psi (default is bar)
     elapsedRecordField: true,
     mode: 'cascade',
   });

package/dist/binary.js

@@ -232,6 +232,10 @@ function applyOptions(data, field, options) {
         case 'avg_temperature':
         case 'max_temperature':
             return convertTo(data, 'temperatureUnits', options.temperatureUnit);
+        case 'pressure':
+        case 'start_pressure':
+        case 'end_pressure':
+            return convertTo(data, 'pressureUnits', options.pressureUnit);
         default:
             return data;
     }

package/dist/fit-parser.js

@@ -24,6 +24,7 @@ var FitParser = function () {
       lengthUnit: options.lengthUnit || 'm',
       temperatureUnit: options.temperatureUnit || 'celsius',
       elapsedRecordField: options.elapsedRecordField || false,
+      pressureUnit: options.pressureUnit || 'bar',
       mode: options.mode || 'list'
     };
   }
@@ -107,6 +108,8 @@ var FitParser = function () {
       var file_ids = [];
       var monitor_info = [];
       var lengths = [];
+      var tank_updates = [];
+      var tank_summaries = [];
 
       var loopIndex = headerLength;
       var messageTypes = [];
@@ -198,6 +201,12 @@ var FitParser = function () {
           case 'software':
             fitObj.software = message;
             break;
+          case 'tank_update':
+            tank_updates.push(message);
+            break;
+          case 'tank_summary':
+            tank_summaries.push(message);
+            break;
           default:
             if (messageType !== '') {
               fitObj[messageType] = message;
@@ -208,7 +217,10 @@ var FitParser = function () {
 
       if (isCascadeNeeded) {
         fitObj.activity = fitObj.activity || {};
-        fitObj.activity.sessions = (0, _helper.mapDataIntoSession)(sessions, laps, lengths, records);
+        laps = (0, _helper.mapDataIntoLap)(laps, 'records', records);
+        laps = (0, _helper.mapDataIntoLap)(laps, 'lengths', lengths);
+        sessions = (0, _helper.mapDataIntoSession)(sessions, laps);
+        fitObj.activity.sessions = sessions;
         fitObj.activity.events = events;
         fitObj.activity.hrv = hrv;
         fitObj.activity.device_infos = devices;
@@ -235,6 +247,8 @@ var FitParser = function () {
         fitObj.file_ids = file_ids;
         fitObj.monitor_info = monitor_info;
         fitObj.definitions = definitions;
+        fitObj.tank_updates = tank_updates;
+        fitObj.tank_summaries = tank_summaries;
       }
 
       callback(null, fitObj);

package/dist/fit.js

@@ -10,6 +10,8 @@ var metersInOneKilometer = 1000;
 var secondsInOneHour = 3600;
 // according to https://en.wikipedia.org/wiki/Mile
 var metersInOneMile = 1609.344;
+var centiBarsInOneBar = 100;
+var psiInOneBar = 14.5037738;
 
 var FIT = exports.FIT = {
   scConst: 180 / Math.pow(2, 31),
@@ -64,6 +66,20 @@ var FIT = exports.FIT = {
         multiplier: 9 / 5,
         offset: 32
       }
+    },
+    pressureUnits: {
+      cbar: {
+        multiplier: 1,
+        offset: 0
+      },
+      bar: {
+        multiplier: 1 / centiBarsInOneBar,
+        offset: 0
+      },
+      psi: {
+        multiplier: 1 / centiBarsInOneBar * psiInOneBar,
+        offset: 0
+      }
     }
   },
   messages: {
@@ -848,6 +864,19 @@ var FIT = exports.FIT = {
       9: { field: 'o2_toxicity', type: 'uint16', scale: null, offset: 0, units: 'OTUs' },
       10: { field: 'dive_number', type: 'uint32', scale: null, offset: 0, units: '' },
       11: { field: 'bottom_time', type: 'uint32', scale: null, offset: 0, units: 's' }
+    },
+    319: {
+      name: 'tank_update',
+      253: { field: 'timestamp', type: 'date_time', scale: null, offset: 0, units: 's' },
+      0: { field: 'sensor', type: 'uint32', scale: null, offset: 0, units: '' },
+      1: { field: 'pressure', type: 'uint16', scale: null, offset: 0, units: 'cbar' }
+    },
+    323: {
+      name: 'tank_summary',
+      0: { field: 'sensor', type: 'uint32', scale: null, offset: 0, units: '' },
+      1: { field: 'start_pressure', type: 'uint16', scale: null, offset: 0, units: 'cbar' },
+      2: { field: 'end_pressure', type: 'uint16', scale: null, offset: 0, units: 'cbar' },
+      3: { field: 'volume_used', type: 'uint16', scale: null, offset: 0, units: 'cbar' }
     }
   },
   types: {
@@ -961,6 +990,8 @@ var FIT = exports.FIT = {
       268: 'dive_summary',
       285: 'jump',
       317: 'climb_pro',
+      319: 'tank_pressure',
+      323: 'tank_summary',
       65280: 'mfg_range_min',
       65534: 'mfg_range_max'
     },

package/dist/helper.js

@@ -1,25 +1,27 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+
+function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
+
 var mapDataIntoLap = exports.mapDataIntoLap = function mapDataIntoLap(inputLaps, lapKey, data) {
-  var laps = JSON.parse(JSON.stringify(inputLaps));
+  var laps = [].concat(_toConsumableArray(inputLaps));
   var index = 0;
   for (var i = 0; i < laps.length; i++) {
     var lap = laps[i];
     var nextLap = laps[i + 1];
     var tempData = [];
-    var lapStartTime = new Date(lap.startTime).getTime();
+    var lapStartTime = new Date(lap.start_time).getTime();
     var nextLapStartTime = nextLap ? new Date(nextLap.start_time).getTime() : null;
     for (var j = index; j < data.length; j++) {
       var row = data[j];
       if (nextLap) {
         var timestamp = new Date(row.timestamp).getTime();
-        if (lapStartTime <= timestamp && nextLapStartTime >= timestamp) {
+        if (lapStartTime <= timestamp && nextLapStartTime > timestamp) {
           tempData.push(row);
-        } else if (nextLapStartTime < timestamp) {
-          laps[i][lapKey] = tempData;
+        } else if (nextLapStartTime <= timestamp) {
           index = j;
           break;
         }
@@ -36,11 +38,8 @@ var mapDataIntoLap = exports.mapDataIntoLap = function mapDataIntoLap(inputLaps,
   return laps;
 };
 
-var mapDataIntoSession = exports.mapDataIntoSession = function mapDataIntoSession(inputSessions, inputLaps, lengths, records) {
-  var sessions = JSON.parse(JSON.stringify(inputSessions));
-  var laps = JSON.parse(JSON.stringify(inputLaps));
-  laps = mapDataIntoLap(laps, 'lengths', lengths);
-  laps = mapDataIntoLap(laps, 'records', records);
+var mapDataIntoSession = exports.mapDataIntoSession = function mapDataIntoSession(inputSessions, laps) {
+  var sessions = [].concat(_toConsumableArray(inputSessions));
   var lapIndex = 0;
   for (var i = 0; i < sessions.length; i++) {
     var session = sessions[i];
@@ -52,10 +51,9 @@ var mapDataIntoSession = exports.mapDataIntoSession = function mapDataIntoSessio
       var lap = laps[j];
       if (nextSession) {
         var lapStartTime = new Date(lap.start_time).getTime();
-        if (sessionStartTime <= lapStartTime && nextSessionStartTime >= lapStartTime) {
+        if (sessionStartTime <= lapStartTime && nextSessionStartTime > lapStartTime) {
           tempLaps.push(lap);
-        } else if (nextSessionStartTime < lapStartTime) {
-          sessions[i].laps = tempLaps;
+        } else if (nextSessionStartTime <= lapStartTime) {
           lapIndex = j;
           break;
         }

package/package.json

@@ -65,13 +65,14 @@
   },
   "scripts": {
     "example-output": "node_modules/gulp/bin/gulp.js; node examples/example.js examples/example.fit > examples/output.json",
+    "example-output-tank": "node_modules/gulp/bin/gulp.js; node examples/example.js examples/example-diving.fit > examples/output-diving.json",
     "example-output-summary-first": "node_modules/gulp/bin/gulp.js; node examples/example.js examples/triathlon_summary_first.fit > examples/output_summary_first.json",
     "example-output-summary-last": "node_modules/gulp/bin/gulp.js; node examples/example.js examples/triathlon_summary_last.fit > examples/output_summary_last.json",
     "example": "node_modules/gulp/bin/gulp.js; node examples/example.js examples/triathlon_summary_first.fit",
     "test": "node_modules/gulp/bin/gulp.js;",
     "build": "node_modules/gulp/bin/gulp.js babel"
   },
-  "version": "1.9.4",
+  "version": "1.10.0",
   "dependencies": {
     "buffer": "^5.1.0"
   }