@rasifix/orienteering-utils 2.0.63 → 2.0.65

package/lib/formats/picoevents.js

@@ -39,12 +39,19 @@ var PicoeventsFormat = /** @class */ (function () {
         var townIdx = header.indexOf("[TOWN]");
         var clubIdx = header.indexOf("[CLUB]");
         var runtimeNetIdx = header.indexOf("[RUNTIMENET]");
+        var startNumIdx = header.indexOf("[STARTNUM]");
+        var runOrLegIdx = header.indexOf("[RUNORLEG]");
+        var baseClassIdx = header.indexOf("[BASECLASS]");
+        var teamIdx = header.indexOf("[GROUPNAME]");
         lines.forEach(function (line, idx) {
             var tokens = parseCSVLine(line);
             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;
             }
@@ -74,6 +81,9 @@ var PicoeventsFormat = /** @class */ (function () {
                 club: clean(tokens[clubIdx]),
                 time: (0, time_1.formatTime)(parseInt(tokens[runtimeNetIdx])),
                 startTime: (0, time_1.formatTime)(startTime),
+                startNumber: clean(tokens[startNumIdx]),
+                runOrLeg: tokens[runOrLegIdx] ? parseInt(tokens[runOrLegIdx]) : undefined,
+                team: clean(tokens[teamIdx]),
                 splits: [],
             };
             for (var i = termIdx + 3; i < tokens.length - 2; i += 2) {
@@ -88,10 +98,7 @@ var PicoeventsFormat = /** @class */ (function () {
         return result;
     };
     PicoeventsFormat.prototype.serialize = function (event) {
-        var result = "BasicData,".concat(event.id, ",\"").concat(event.name, "\",").concat(event.date, ",").concat(event.startTime, ",,,\"").concat(event.map, "\",\n");
-        result += "EXTCLASS=[DATATYPE],[SORTKEY],[ACTITEM],[NOFITEMS],[POINTER],[POSSPLITS],[RUNORLEG],[CLASSSORT],[BASECLASS],[FULLCLASS],[SUBSTCLASS],[COURSE],[MULTIHEATNUM],[REGTIME],[ISCLIQUE],[FAMILYNAME],[FIRSTNAME],[YOB],[SEX],[SEXLOC],[ZIP],[TOWN],[REGION],[COUNTRY],[FEDNR],[CLUB],[CLUBID],[NATION],[NATIONCODE],[IOFID],[RANKING],[GROUPNAME],[GROUPCLUB],[FOREIGNKEY],[REFPERS],[REFHEAT],[REFGRP],[REFEXT],[CARDHASDATA],[CARDNUM],[CARDNUMORIG],[RFID],[STARTNUM],[CLASSSTA],[COMBINATION],[DATEH0],[TIMEPREC],[STARTTIMELIST],[STARTTIMEGATE],[STARTTIMELATE],[STARTFULLPREC],[FINISHFULLPREC],[STARTPRECADJ],[FINISHPRECADJ],[RUNTIMEEFF],[RUNTIMENET],[RANKNET],[BEHINDNET],[PENALTY],[CREDIT],[NEUTRAL],[POINTS],[TIMEUSERMOD],[CARDUSERMOD],[RESPERSIDX],[RESCARDIDX],[IOFRESSTATTEXT],[INFOALL],[INFOMAND],[NOTCLASSTEXT],[RANKTEXT],[RESULTTEXT],[BEHINDTEXT],[PENCRENEUTTEXT],[SCHEDULED],[STARTED],[FINISHED],[SLIADDTEXT],[RESADDTEXT],[RENMERGINFO],[LIVEOFFSET],[LIVEINVALID1],[LIVEINVALID2],[LIVEINVALID3],[LEGMASSSTART],[LEGMAXTIMELIMIT],[LEGMAXTIMENCLA],[RELAYSTARTTIME],[RELCUMRUNTIMEEFF],[RELCUMRUNTIMENET],[RELCUMRANKNET],[RELCUMBEHINDNET],[RELCUMRANKTEXT],[RELCUMRESULTTEXT],[RELCUMBEHINDTEXT],[RELCUMPERSRESIDX],[RELCUMIOFSTATTEXT],[RELCUMINFOALL],[RELCUMINFOMAND],[RELCUMNOTCLATEXT],[RELCUMMASTAFLAG],[RELCUMSTARTED],[RELCUMFINISHED],[RELCUMORDERRES],[RELCUMSPARE2],[RELCUMSPARE3],[EXCLUDED],[NEGRUNTIME],[CLASSOKNOTREADY],[RESULTINVALID],[DOPSTATOK],[SLIORDER],[SORTORDERRES],[SUBSECRUNTIMENET],[STARTTIMEEXT],[FINISHTIMEEXT],[RUNTIMENETFULLPREC],[IMPORTGROUPID],[IMPORTUSER],[HIDETIME],[PAID],[RESERVE8],[RESERVE7],[RESERVE6],[RESERVE5],[RESERVE4],[LASTUPDATE],[MISSLISTCODE],[EXTRALISTCODE],[EXTRALISTTIME],[RADIOLISTCODE],[NOFSPLITS],[NOFSPLITPARAMS],[SPLITTYPE],[SPLITSTATUS],[TERM]\n";
-        // FIXME: implement serialization of runners
-        return result;
+        throw new Error("format does not implement serialization");
     };
     PicoeventsFormat.prototype.check = function (text) {
         return text.startsWith("BasicData,");

package/lib/index.d.ts

@@ -1,6 +1,7 @@
 import * as formats from './formats';
 import * as ranking from './utils/ranking';
+import * as relay from './utils/relay';
 import * as model from './model';
 import { Format } from './format';
 import { formatTime, parseTime } from './time';
-export { formats, ranking, model, Format, formatTime, parseTime };
+export { formats, ranking, relay, model, Format, formatTime, parseTime };

package/lib/index.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseTime = exports.formatTime = exports.model = exports.ranking = exports.formats = void 0;
+exports.parseTime = exports.formatTime = exports.model = exports.relay = exports.ranking = exports.formats = void 0;
 var formats = require("./formats");
 exports.formats = formats;
 var ranking = require("./utils/ranking");
 exports.ranking = ranking;
+var relay = require("./utils/relay");
+exports.relay = relay;
 var model = require("./model");
 exports.model = model;
 var time_1 = require("./time");

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

@@ -11,6 +11,9 @@ export interface Runner {
     club?: string;
     time?: string;
     startTime: string;
+    startNumber?: string;
+    runOrLeg?: number;
+    team?: string;
     splits: Split[];
 }
 export declare enum Sex {

package/lib/utils/relay.d.ts

@@ -0,0 +1,21 @@
+import { Runner } from "../model";
+import { Ranking } from "./ranking";
+export interface Team {
+    name: string;
+    startNumber: number;
+}
+/**
+ * Extract all unique teams from the given runners.
+ *
+ * @param runners the runners to extract teams from
+ * @returns a list of unique teams with their name and start number
+ */
+export declare function getTeams(runners: Runner[]): Team[];
+/**
+ * Create a ranking for a relay event from the given runners. The runners must
+ * belong to the same base category.
+ *
+ * @param runners the runners to create a ranking from
+ * @returns a ranking for the relay event
+ */
+export declare function parseRelayRanking(runners: Runner[]): Ranking;

package/lib/utils/relay.js

@@ -0,0 +1,93 @@
+"use strict";
+// I need functions to process relay data
+// in case of relay the event returns Runners with startNumber, runOrLeg, baseCategory, team
+// runners of the same team have the same baseCategory and same startNumber
+// runOrLeg indicates which leg of the relay the runner is running
+// 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.getTeams = getTeams;
+exports.parseRelayRanking = parseRelayRanking;
+var ranking_1 = require("./ranking");
+var time_1 = require("../time");
+/**
+ * Extract all unique teams from the given runners.
+ *
+ * @param runners the runners to extract teams from
+ * @returns a list of unique teams with their name and start number
+ */
+function getTeams(runners) {
+    var teams = new Set();
+    runners.forEach(function (runner) {
+        if (runner.team && runner.team.trim().length > 0) {
+            teams.add({
+                name: runner.team,
+                startNumber: runner.startNumber ? parseInt(runner.startNumber) : 0
+            });
+        }
+    });
+    return Array.from(teams);
+}
+/**
+ * Create a ranking for a relay event from the given runners. The runners must
+ * belong to the same base category.
+ *
+ * @param runners the runners to create a ranking from
+ * @returns a ranking for the relay event
+ */
+function parseRelayRanking(runners) {
+    // Group runners by team (startNumber)
+    var teamMap = new Map();
+    runners.forEach(function (runner) {
+        var team = runner.startNumber || '';
+        if (!teamMap.has(team)) {
+            teamMap.set(team, []);
+        }
+        teamMap.get(team).push(runner);
+    });
+    // Create combined runners for each team
+    var combinedRunners = [];
+    teamMap.forEach(function (teamRunners, startNumber) {
+        // Sort runners by runOrLeg to ensure correct order
+        teamRunners.sort(function (a, b) { return (a.runOrLeg || 0) - (b.runOrLeg || 0); });
+        // Start with the first leg runner as the base
+        var firstRunner = teamRunners[0];
+        var combinedRunner = {
+            id: firstRunner.id,
+            category: firstRunner.category,
+            fullName: teamRunners.map(function (r) { return r.fullName; }).join(' / '),
+            startTime: firstRunner.startTime,
+            startNumber: startNumber,
+            team: firstRunner.team,
+            splits: []
+        };
+        // Combine splits from all legs
+        var accumulatedTime = 0;
+        teamRunners.forEach(function (runner) {
+            runner.splits.forEach(function (split) {
+                var splitTime = (0, time_1.parseTime)(split.time);
+                if (splitTime !== undefined && splitTime > 0) {
+                    // Accumulate time from previous legs
+                    var adjustedTime = splitTime + accumulatedTime;
+                    // Add the adjusted split
+                    combinedRunner.splits.push({
+                        code: split.code,
+                        time: (0, time_1.formatTime)(adjustedTime)
+                    });
+                }
+            });
+            // Accumulate the total time of this leg for the next leg
+            if (runner.time) {
+                var runnerTotalTime = (0, time_1.parseTime)(runner.time);
+                if (runnerTotalTime !== undefined && runnerTotalTime > 0) {
+                    accumulatedTime += runnerTotalTime;
+                }
+            }
+        });
+        // Set the final combined time
+        combinedRunner.time = (0, time_1.formatTime)(accumulatedTime);
+        combinedRunners.push(combinedRunner);
+    });
+    // Parse the ranking as usual
+    return (0, ranking_1.parseRanking)(combinedRunners);
+}

package/package.json

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