@rasifix/orienteering-utils 2.0.59 → 2.0.61

package/lib/formats/picoevents.js

@@ -29,7 +29,7 @@ var PicoeventsFormat = /** @class */ (function () {
         };
         var header = lines.splice(0, 1)[0].split(",");
         var sortKeyIdx = header.indexOf("[SORTKEY]");
-        var statusIdx = header.indexOf("[IOFRESSTATTEXT]");
+        var statusIdx = header.indexOf("[RESPERSIDX]");
         var startTimeIdx = header.indexOf("[STARTFULLPREC]");
         var noOfSplitsIdx = header.indexOf("[NOFSPLITS]");
         var termIdx = header.indexOf("[TERM]");
@@ -61,7 +61,7 @@ var PicoeventsFormat = /** @class */ (function () {
                 result.categories.push(category);
             }
             var status = tokens[statusIdx];
-            if (status !== "OK") {
+            if (status !== "5" && status !== "2") {
                 return;
             }
             var startTime = parseInt(tokens[startTimeIdx]);

package/lib/utils/ranking.d.ts

@@ -36,6 +36,7 @@ export interface Ranking {
 export interface RankingRunner {
     id: string;
     category: string;
+    course?: string;
     rank?: number;
     fullName: string;
     time?: string;

package/lib/utils/ranking.js

@@ -197,6 +197,42 @@ function parseRanking(runners) {
     });
     // calculate the overall rank
     rank(rankingRunners);
+    // assign course property
+    var runnerToCourse = new Map();
+    courses.forEach(function (course) {
+        course.runners.forEach(function (runnerId) {
+            runnerToCourse.set(runnerId, course.code);
+        });
+    });
+    var categoryGroups = new Map();
+    rankingRunners.forEach(function (runner) {
+        if (!categoryGroups.has(runner.category)) {
+            categoryGroups.set(runner.category, []);
+        }
+        categoryGroups.get(runner.category).push(runner);
+    });
+    categoryGroups.forEach(function (runnersInCat, category) {
+        var courseCodes = new Set();
+        runnersInCat.forEach(function (runner) {
+            var courseCode = runnerToCourse.get(runner.id);
+            if (courseCode) {
+                courseCodes.add(courseCode);
+            }
+        });
+        if (courseCodes.size > 1) {
+            var sortedCourses = Array.from(courseCodes).sort();
+            var courseMap_1 = new Map();
+            sortedCourses.forEach(function (code, index) {
+                courseMap_1.set(code, category + String.fromCharCode(65 + index)); // A, B, C...
+            });
+            runnersInCat.forEach(function (runner) {
+                var courseCode = runnerToCourse.get(runner.id);
+                if (courseCode) {
+                    runner.course = courseMap_1.get(courseCode);
+                }
+            });
+        }
+    });
     Object.values(legs).forEach(function (leg) {
         var ideal = leg.idealSplit;
         var min = leg.runners.filter(function (runner) { return !isNaN(runner.split) && runner.split !== undefined; }).map(function (runner) { return runner.split; }).reduce(function (min, split) { return Math.min(min, split - ideal); }, Number.MAX_VALUE);
@@ -237,6 +273,7 @@ function defineCourses(runners) {
             courses[course].runners.push(runner.id);
         }
     });
+    console.log("defined courses: ", Object.keys(courses));
     return Object.keys(courses).map(function (key) { return courses[key]; });
 }
 function defineRunners(runners) {

package/package.json

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