@rasifix/orienteering-utils 2.0.64 → 2.0.66

package/lib/formats/picoevents.js

@@ -48,7 +48,10 @@ var PicoeventsFormat = /** @class */ (function () {
             if (tokens.length < 50) {
                 return;
             }
-            var name = tokens[9];
+            if (idx === 0) {
+                result.relay = tokens[0].endsWith("=R");
+            }
+            var name = tokens[baseClassIdx];
             if (name.indexOf("TW") !== -1 || name.indexOf("TM") !== -1) {
                 return;
             }
@@ -80,7 +83,6 @@ var PicoeventsFormat = /** @class */ (function () {
                 startTime: (0, time_1.formatTime)(startTime),
                 startNumber: clean(tokens[startNumIdx]),
                 runOrLeg: tokens[runOrLegIdx] ? parseInt(tokens[runOrLegIdx]) : undefined,
-                baseCategory: clean(tokens[baseClassIdx]),
                 team: clean(tokens[teamIdx]),
                 splits: [],
             };

package/lib/model/competition.d.ts

@@ -6,4 +6,5 @@ export interface Competition {
     date: string;
     startTime: string;
     categories: Category[];
+    relay?: boolean;
 }

package/lib/model/runner.d.ts

@@ -13,7 +13,6 @@ export interface Runner {
     startTime: string;
     startNumber?: string;
     runOrLeg?: number;
-    baseCategory?: string;
     team?: string;
     splits: Split[];
 }

package/lib/utils/relay.d.ts

@@ -4,14 +4,6 @@ export interface Team {
     name: string;
     startNumber: number;
 }
-/**
- * Select the runners having the same base category.
- *
- * @param runners all the runners to filter
- * @param category the base category to filter by
- * @returns a filtered list of runners
- */
-export declare function selectRunnersOfCategory(runners: Runner[], category: string): Runner[];
 /**
  * Extract all unique teams from the given runners.
  *

package/lib/utils/relay.js

@@ -6,21 +6,10 @@
 // e.g. for a 3-leg relay, there will be runners with runOrLeg 1, 2 and 3
 // all runners with runOrLeg 1 belong to the first leg of their team, etc.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectRunnersOfCategory = selectRunnersOfCategory;
 exports.getTeams = getTeams;
 exports.parseRelayRanking = parseRelayRanking;
 var ranking_1 = require("./ranking");
 var time_1 = require("../time");
-/**
- * Select the runners having the same base category.
- *
- * @param runners all the runners to filter
- * @param category the base category to filter by
- * @returns a filtered list of runners
- */
-function selectRunnersOfCategory(runners, category) {
-    return runners.filter(function (runner) { return runner.baseCategory === category; });
-}
 /**
  * Extract all unique teams from the given runners.
  *
@@ -69,12 +58,12 @@ function parseRelayRanking(runners) {
             fullName: teamRunners.map(function (r) { return r.fullName; }).join(' / '),
             startTime: firstRunner.startTime,
             startNumber: startNumber,
-            baseCategory: firstRunner.baseCategory,
             team: firstRunner.team,
             splits: []
         };
         // Combine splits from all legs
         var accumulatedTime = 0;
+        var previousValid = true;
         teamRunners.forEach(function (runner) {
             runner.splits.forEach(function (split) {
                 var splitTime = (0, time_1.parseTime)(split.time);
@@ -95,9 +84,10 @@ function parseRelayRanking(runners) {
                     accumulatedTime += runnerTotalTime;
                 }
             }
+            previousValid = previousValid && (runner.time !== undefined) && (0, time_1.parseTime)(runner.time) !== undefined;
         });
         // Set the final combined time
-        combinedRunner.time = (0, time_1.formatTime)(accumulatedTime);
+        combinedRunner.time = previousValid ? (0, time_1.formatTime)(accumulatedTime) : "DSQ";
         combinedRunners.push(combinedRunner);
     });
     // Parse the ranking as usual

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rasifix/orienteering-utils",
-  "version": "2.0.64",
+  "version": "2.0.66",
   "description": "utility functions for orienteering result analyzis",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",