@sports-alliance/sports-lib 7.1.1 → 7.2.2

package/lib/cjs/events/adapters/importers/suunto/importer.suunto.json.js

@@ -100,6 +100,18 @@ const data_speed_zone_two_duration_1 = require("../../../../data/data.speed-zone
 const data_speed_zone_three_duration_1 = require("../../../../data/data.speed-zone-three-duration");
 const data_speed_zone_four_duration_1 = require("../../../../data/data.speed-zone-four-duration");
 const data_speed_zone_five_duration_1 = require("../../../../data/data.speed-zone-five-duration");
+const data_ground_contact_time_1 = require("../../../../data/data.ground-contact-time");
+const data_ground_contact_time_avg_1 = require("../../../../data/data.ground-contact-time-avg");
+const data_ground_contact_time_max_1 = require("../../../../data/data.ground-contact-time-max");
+const data_ground_contact_time_min_1 = require("../../../../data/data.ground-contact-time-min");
+const data_vertical_oscillation_1 = require("../../../../data/data.vertical-oscillation");
+const data_vertical_oscillation_avg_1 = require("../../../../data/data.vertical-oscillation-avg");
+const data_vertical_oscillation_max_1 = require("../../../../data/data.vertical-oscillation-max");
+const data_vertical_oscillation_min_1 = require("../../../../data/data.vertical-oscillation-min");
+const data_fitness_age_1 = require("../../../../data/data.fitness-age");
+const data_max_hr_setting_1 = require("../../../../data/data.max-hr-setting");
+const data_depth_1 = require("../../../../data/data.depth");
+const data_depth_max_1 = require("../../../../data/data.depth-max");
 const file_type_enum_1 = require("../../file-type.enum");
 const activity_parsing_options_1 = require("../../../../activities/activity-parsing-options");
 class EventImporterSuuntoJSON {
@@ -152,8 +164,11 @@ class EventImporterSuuntoJSON {
                 : [];
             // Create the activities
             const activities = activityStartEventSamples.map((activityStartEventSample, index) => {
+                // If no stop event, use the last sample time as end date
+                const lastSampleTime = eventJSONObject.DeviceLog.Samples[eventJSONObject.DeviceLog.Samples.length - 1].TimeISO8601;
+                const fallbackEndTime = stopEventSample ? stopEventSample.TimeISO8601 : lastSampleTime;
                 const activity = new activity_1.Activity(new Date(activityStartEventSample.TimeISO8601), activityStartEventSamples.length - 1 === index
-                    ? new Date(stopEventSample ? stopEventSample.TimeISO8601 : (eventJSONObject.DeviceLog.Header.TimeISO8601 || eventJSONObject.DeviceLog.Header.DateTime))
+                    ? new Date(fallbackEndTime)
                     : new Date(activityStartEventSamples[index + 1].TimeISO8601), activity_types_1.ActivityTypes[(importer_suunto_activity_ids_1.ImporterSuuntoActivityIds[activityStartEventSample.Events[0].Activity.ActivityType])], creator, options);
                 // Set the end date to the stop event time if the activity is the last or the only one else set it on the next itery time
                 // Create the stats these are a 1:1 ref arrays
@@ -268,10 +283,6 @@ class EventImporterSuuntoJSON {
             // @todo check if start and end date can derive from the json
             const event = new event_1.Event('', activities[0].startDate, activities[activities.length - 1].endDate, file_type_enum_1.FileType.SUUNTO);
             activities.forEach(activity => event.addActivity(activity));
-            // Populate the event stats from the Header Object // @todo maybe remove
-            this.getStats(eventJSONObject.DeviceLog.Header).forEach(stat => {
-                event.addStat(stat);
-            });
             // Get the settings and add it to all activities as it's logical
             if (eventJSONObject.DeviceLog.Header.Settings) {
                 this.getSettings(eventJSONObject.DeviceLog.Header.Settings).forEach(stat => {
@@ -285,9 +296,12 @@ class EventImporterSuuntoJSON {
                     stat instanceof data_pool_length_1.DataPoolLength);
                 stats.forEach(stat => activities[0].addStat(stat));
             }
-            // @todo see how we can have those event stats persisted as the below generation wipes those off.
             // Generate stats
             event_utilities_1.EventUtilities.generateStatsForAll(event);
+            // Populate the event stats from the Header Object
+            this.getStats(eventJSONObject.DeviceLog.Header).forEach(stat => {
+                event.addStat(stat);
+            });
             resolve(event);
         });
     }
@@ -355,8 +369,12 @@ class EventImporterSuuntoJSON {
         return samples;
     }
     static setStreamsForActivity(activity, samples) {
+        // console.log(`Setting streams for activity with ${samples.length} samples`);
         exports.SuuntoSampleMapper.forEach(sampleMapping => {
             const subjectSamples = samples.filter(sample => (0, helpers_1.isNumberOrString)(sample[sampleMapping.sampleField]));
+            // if (sampleMapping.sampleField === 'GroundContactTime') {
+            //    console.log(`GCT Samples found: ${subjectSamples.length}`);
+            // }
             if (subjectSamples.length) {
                 activity.addStream(activity.createStream(sampleMapping.dataType));
                 subjectSamples.forEach(subjectSample => {
@@ -525,6 +543,53 @@ class EventImporterSuuntoJSON {
                 }
             }
         }
+        // Ground Contact Time (Running Dynamics)
+        if (object.hasOwnProperty('GroundContactTime')) {
+            if (Array.isArray(object.GroundContactTime)) {
+                if ((0, helpers_1.isNumber)(object.GroundContactTime[0].Avg)) {
+                    stats.push(new data_ground_contact_time_avg_1.DataGroundContactTimeAvg(object.GroundContactTime[0].Avg * 1000)); // Convert s to ms
+                }
+                if ((0, helpers_1.isNumber)(object.GroundContactTime[0].Max)) {
+                    stats.push(new data_ground_contact_time_max_1.DataGroundContactTimeMax(object.GroundContactTime[0].Max * 1000));
+                }
+                if ((0, helpers_1.isNumber)(object.GroundContactTime[0].Min)) {
+                    stats.push(new data_ground_contact_time_min_1.DataGroundContactTimeMin(object.GroundContactTime[0].Min * 1000));
+                }
+            }
+        }
+        // Vertical Oscillation (Running Dynamics)
+        if (object.hasOwnProperty('VerticalOscillation')) {
+            if (Array.isArray(object.VerticalOscillation)) {
+                if ((0, helpers_1.isNumber)(object.VerticalOscillation[0].Avg)) {
+                    stats.push(new data_vertical_oscillation_avg_1.DataVerticalOscillationAvg(object.VerticalOscillation[0].Avg * 1000)); // Convert m to mm
+                }
+                if ((0, helpers_1.isNumber)(object.VerticalOscillation[0].Max)) {
+                    stats.push(new data_vertical_oscillation_max_1.DataVerticalOscillationMax(object.VerticalOscillation[0].Max * 1000));
+                }
+                if ((0, helpers_1.isNumber)(object.VerticalOscillation[0].Min)) {
+                    stats.push(new data_vertical_oscillation_min_1.DataVerticalOscillationMin(object.VerticalOscillation[0].Min * 1000));
+                }
+            }
+        }
+        // Fitness Age
+        if ((0, helpers_1.isNumber)(object.FitnessAge)) {
+            stats.push(new data_fitness_age_1.DataFitnessAge(object.FitnessAge));
+        }
+        // Personal MaxHR
+        if (object.Personal && (0, helpers_1.isNumber)(object.Personal.MaxHR)) {
+            stats.push(new data_max_hr_setting_1.DataMaxHRSetting(object.Personal.MaxHR * 60)); // Convert from Hz to bpm
+        }
+        // Depth (Diving)
+        if (object.hasOwnProperty('Depth')) {
+            if (Array.isArray(object.Depth)) {
+                if ((0, helpers_1.isNumber)(object.Depth[0].Max) && object.Depth[0].Max > 0) {
+                    stats.push(new data_depth_max_1.DataDepthMax(object.Depth[0].Max));
+                }
+            }
+            else if ((0, helpers_1.isNumber)(object.Depth.Max) && object.Depth.Max > 0) {
+                stats.push(new data_depth_max_1.DataDepthMax(object.Depth.Max));
+            }
+        }
         return stats;
     }
 }
@@ -717,5 +782,20 @@ exports.SuuntoSampleMapper = [
         dataType: data_battery_voltage_1.DataBatteryVoltage.type,
         sampleField: 'BatteryVoltage',
         convertSampleValue: (value) => Number(value)
+    },
+    {
+        dataType: data_vertical_oscillation_1.DataVerticalOscillation.type,
+        sampleField: 'VerticalOscillation',
+        convertSampleValue: (value) => Number(value * 1000) // Convert m to mm
+    },
+    {
+        dataType: data_ground_contact_time_1.DataGroundContactTime.type,
+        sampleField: 'GroundContactTime',
+        convertSampleValue: (value) => Number(value * 1000) // Convert s to ms
+    },
+    {
+        dataType: data_depth_1.DataDepth.type,
+        sampleField: 'Depth',
+        convertSampleValue: (value) => Number(value)
     }
 ];

package/lib/cjs/events/utilities/activity.utilities.js

@@ -82,6 +82,18 @@ const data_speed_zone_two_duration_1 = require("../../data/data.speed-zone-two-d
 const data_speed_zone_three_duration_1 = require("../../data/data.speed-zone-three-duration");
 const data_speed_zone_four_duration_1 = require("../../data/data.speed-zone-four-duration");
 const data_speed_zone_five_duration_1 = require("../../data/data.speed-zone-five-duration");
+const data_ground_contact_time_1 = require("../../data/data.ground-contact-time");
+const data_ground_contact_time_avg_1 = require("../../data/data.ground-contact-time-avg");
+const data_ground_contact_time_max_1 = require("../../data/data.ground-contact-time-max");
+const data_ground_contact_time_min_1 = require("../../data/data.ground-contact-time-min");
+const data_ground_contact_time_balance_left_1 = require("../../data/data-ground-contact-time-balance-left");
+const data_ground_contact_time_balance_right_1 = require("../../data/data-ground-contact-time-balance-right");
+const data_vertical_oscillation_1 = require("../../data/data.vertical-oscillation");
+const data_vertical_oscillation_avg_1 = require("../../data/data.vertical-oscillation-avg");
+const data_vertical_oscillation_max_1 = require("../../data/data.vertical-oscillation-max");
+const data_vertical_oscillation_min_1 = require("../../data/data.vertical-oscillation-min");
+const data_stance_time_balance_left_1 = require("../../data/data-stance-time-balance-left");
+const data_stance_time_balance_right_1 = require("../../data/data-stance-time-balance-right");
 const data_store_1 = require("../../data/data.store");
 const data_start_position_1 = require("../../data/data.start-position");
 const data_end_position_1 = require("../../data/data.end-position");
@@ -101,8 +113,6 @@ const data_altitude_smooth_1 = require("../../data/data.altitude-smooth");
 const data_grade_smooth_1 = require("../../data/data.grade-smooth");
 const data_swolf_25m_1 = require("../../data/data.swolf-25m");
 const data_swolf_50m_1 = require("../../data/data.swolf-50m");
-const data_stance_time_balance_left_1 = require("../../data/data-stance-time-balance-left");
-const data_stance_time_balance_right_1 = require("../../data/data-stance-time-balance-right");
 const low_pass_filter_1 = require("./grade-calculator/low-pass-filter");
 const data_power_normalized_1 = require("../../data/data.power-normalized");
 const data_power_work_1 = require("../../data/data.power-work");
@@ -1310,11 +1320,37 @@ class ActivityUtilities {
             activity.addStat(new data_left_balance_1.DataLeftBalance(100 - avgRightBalance));
         }
         // Assign L/R balance stance time from streams if exists
+        if (!activity.getStat(data_ground_contact_time_balance_left_1.DataGroundContactTimeBalanceLeft.type) && activity.hasStreamData(data_ground_contact_time_balance_left_1.DataGroundContactTimeBalanceLeft.type)) {
+            const avgStanceTimeLeftBalance = this.round(this.getDataTypeAvg(activity, data_ground_contact_time_balance_left_1.DataGroundContactTimeBalanceLeft.type), 2);
+            activity.addStat(new data_ground_contact_time_balance_left_1.DataGroundContactTimeBalanceLeft(avgStanceTimeLeftBalance));
+            activity.addStat(new data_ground_contact_time_balance_right_1.DataGroundContactTimeBalanceRight(100 - avgStanceTimeLeftBalance));
+        }
+        // Backward compatibility for Stance Time Balance
         if (!activity.getStat(data_stance_time_balance_left_1.DataStanceTimeBalanceLeft.type) && activity.hasStreamData(data_stance_time_balance_left_1.DataStanceTimeBalanceLeft.type)) {
             const avgStanceTimeLeftBalance = this.round(this.getDataTypeAvg(activity, data_stance_time_balance_left_1.DataStanceTimeBalanceLeft.type), 2);
             activity.addStat(new data_stance_time_balance_left_1.DataStanceTimeBalanceLeft(avgStanceTimeLeftBalance));
             activity.addStat(new data_stance_time_balance_right_1.DataStanceTimeBalanceRight(100 - avgStanceTimeLeftBalance));
         }
+        // Ground Contact Time
+        if (!activity.getStat(data_ground_contact_time_max_1.DataGroundContactTimeMax.type) && activity.hasStreamData(data_ground_contact_time_1.DataGroundContactTime.type)) {
+            activity.addStat(new data_ground_contact_time_max_1.DataGroundContactTimeMax(this.getDataTypeMax(activity, data_ground_contact_time_1.DataGroundContactTime.type)));
+        }
+        if (!activity.getStat(data_ground_contact_time_min_1.DataGroundContactTimeMin.type) && activity.hasStreamData(data_ground_contact_time_1.DataGroundContactTime.type)) {
+            activity.addStat(new data_ground_contact_time_min_1.DataGroundContactTimeMin(this.getDataTypeMin(activity, data_ground_contact_time_1.DataGroundContactTime.type)));
+        }
+        if (!activity.getStat(data_ground_contact_time_avg_1.DataGroundContactTimeAvg.type) && activity.hasStreamData(data_ground_contact_time_1.DataGroundContactTime.type)) {
+            activity.addStat(new data_ground_contact_time_avg_1.DataGroundContactTimeAvg(this.getDataTypeAvg(activity, data_ground_contact_time_1.DataGroundContactTime.type)));
+        }
+        // Vertical Oscillation
+        if (!activity.getStat(data_vertical_oscillation_max_1.DataVerticalOscillationMax.type) && activity.hasStreamData(data_vertical_oscillation_1.DataVerticalOscillation.type)) {
+            activity.addStat(new data_vertical_oscillation_max_1.DataVerticalOscillationMax(this.getDataTypeMax(activity, data_vertical_oscillation_1.DataVerticalOscillation.type)));
+        }
+        if (!activity.getStat(data_vertical_oscillation_min_1.DataVerticalOscillationMin.type) && activity.hasStreamData(data_vertical_oscillation_1.DataVerticalOscillation.type)) {
+            activity.addStat(new data_vertical_oscillation_min_1.DataVerticalOscillationMin(this.getDataTypeMin(activity, data_vertical_oscillation_1.DataVerticalOscillation.type)));
+        }
+        if (!activity.getStat(data_vertical_oscillation_avg_1.DataVerticalOscillationAvg.type) && activity.hasStreamData(data_vertical_oscillation_1.DataVerticalOscillation.type)) {
+            activity.addStat(new data_vertical_oscillation_avg_1.DataVerticalOscillationAvg(this.getDataTypeAvg(activity, data_vertical_oscillation_1.DataVerticalOscillation.type)));
+        }
     }
     static generateMissingSpeedDerivedStatsForActivity(activity) {
         // Pace

package/lib/esm/data/data-ground-contact-time-balance-left.d.ts

@@ -0,0 +1,4 @@
+import { DataGroundContactTimeBalance } from './data-ground-contact-time-balance';
+export declare class DataGroundContactTimeBalanceLeft extends DataGroundContactTimeBalance {
+    static type: string;
+}

package/lib/esm/data/data-ground-contact-time-balance-right.d.ts

@@ -0,0 +1,4 @@
+import { DataGroundContactTimeBalance } from './data-ground-contact-time-balance';
+export declare class DataGroundContactTimeBalanceRight extends DataGroundContactTimeBalance {
+    static type: string;
+}

package/lib/esm/data/data-ground-contact-time-balance.d.ts

@@ -0,0 +1,3 @@
+import { DataPercent } from './data.percent';
+export declare abstract class DataGroundContactTimeBalance extends DataPercent {
+}

package/lib/esm/data/data-stance-time-balance-left.d.ts

@@ -1,4 +1,5 @@
 import { DataStanceTimeBalance } from './data-stance-time-balance';
+/** @deprecated Use DataGroundContactTimeBalanceLeft instead */
 export declare class DataStanceTimeBalanceLeft extends DataStanceTimeBalance {
     static type: string;
 }

package/lib/esm/data/data-stance-time-balance-right.d.ts

@@ -1,4 +1,5 @@
 import { DataStanceTimeBalance } from './data-stance-time-balance';
+/** @deprecated Use DataGroundContactTimeBalanceRight instead */
 export declare class DataStanceTimeBalanceRight extends DataStanceTimeBalance {
     static type: string;
 }

package/lib/esm/data/data-stance-time-balance.d.ts

@@ -1,3 +1,4 @@
 import { DataPercent } from './data.percent';
+/** @deprecated Use DataGroundContactTimeBalance instead */
 export declare abstract class DataStanceTimeBalance extends DataPercent {
 }

package/lib/esm/data/data.depth-max.d.ts

@@ -0,0 +1,5 @@
+import { DataNumber } from './data.number';
+export declare class DataDepthMax extends DataNumber {
+    static type: string;
+    static unit: string;
+}

package/lib/esm/data/data.depth.d.ts

@@ -0,0 +1,5 @@
+import { DataNumber } from './data.number';
+export declare class DataDepth extends DataNumber {
+    static type: string;
+    static unit: string;
+}

package/lib/esm/data/data.fitness-age.d.ts

@@ -0,0 +1,5 @@
+import { DataNumber } from './data.number';
+export declare class DataFitnessAge extends DataNumber {
+    static type: string;
+    static unit: string;
+}

package/lib/esm/data/data.ground-contact-time-avg.d.ts

@@ -0,0 +1,5 @@
+import { DataNumber } from './data.number';
+export declare class DataGroundContactTimeAvg extends DataNumber {
+    static type: string;
+    static unit: string;
+}

package/lib/esm/data/data.ground-contact-time-max.d.ts

@@ -0,0 +1,5 @@
+import { DataNumber } from './data.number';
+export declare class DataGroundContactTimeMax extends DataNumber {
+    static type: string;
+    static unit: string;
+}

package/lib/esm/data/data.ground-contact-time-min.d.ts

@@ -0,0 +1,5 @@
+import { DataNumber } from './data.number';
+export declare class DataGroundContactTimeMin extends DataNumber {
+    static type: string;
+    static unit: string;
+}

package/lib/esm/data/data.ground-contact-time.d.ts

@@ -0,0 +1,5 @@
+import { DataNumber } from './data.number';
+export declare class DataGroundContactTime extends DataNumber {
+    static type: string;
+    static unit: string;
+}

package/lib/esm/data/data.max-hr-setting.d.ts

@@ -0,0 +1,5 @@
+import { DataNumber } from './data.number';
+export declare class DataMaxHRSetting extends DataNumber {
+    static type: string;
+    static unit: string;
+}

package/lib/esm/data/data.stance-time.d.ts

@@ -1,4 +1,5 @@
 import { DataNumber } from './data.number';
+/** @deprecated Use DataGroundContactTime instead */
 export declare class DataStanceTime extends DataNumber {
     static type: string;
     static unit: string;

package/lib/esm/data/data.vertical-oscillation-avg.d.ts

@@ -0,0 +1,5 @@
+import { DataNumber } from './data.number';
+export declare class DataVerticalOscillationAvg extends DataNumber {
+    static type: string;
+    static unit: string;
+}

package/lib/esm/data/data.vertical-oscillation-max.d.ts

@@ -0,0 +1,5 @@
+import { DataNumber } from './data.number';
+export declare class DataVerticalOscillationMax extends DataNumber {
+    static type: string;
+    static unit: string;
+}

package/lib/esm/data/data.vertical-oscillation-min.d.ts

@@ -0,0 +1,5 @@
+import { DataNumber } from './data.number';
+export declare class DataVerticalOscillationMin extends DataNumber {
+    static type: string;
+    static unit: string;
+}