@rasifix/orienteering-utils 2.0.67 → 2.0.69

package/lib/utils/ranking.d.ts

@@ -76,6 +76,7 @@ export interface RankingInfo {
     idealBehind?: number;
 }
 export interface SplitInfo extends RankingInfo {
+    idealSplit: number;
     performanceIndex?: number;
 }
 export declare function parseRanking(runners: Runner[]): Ranking;

package/lib/utils/ranking.js

@@ -29,19 +29,28 @@ function assignLegInfoToSplits(runners, legs) {
             .forEach(function (split) {
             var leg = legs[split.legCode];
             if (!leg) {
-                throw "leg with code " + split.leg + " not defined!";
+                throw "leg with code " + split.legCode + " not defined!";
             }
             split.legCode = leg.code;
             var legRunner = leg.runners.find(function (r) { return r.id === runner.id; });
             if (legRunner) {
+                split.leg.idealSplit = leg.idealSplit;
                 split.leg.idealBehind = leg.idealSplit && legRunner.split - leg.idealSplit;
                 split.leg.behind = legRunner.splitBehind;
                 split.leg.rank = legRunner.splitRank;
                 split.performanceIndex = legRunner.performanceIndex;
             }
-            split.weight = leg.weight;
+            else {
+                console.warn("runner ", runner.fullName, " not found in leg ", leg.code);
+            }
         });
         runner.errorTime = (0, analyzis_1.errorTime)(runner, { thresholdRelative: 1.2, thresholdAbsolute: 10 });
+        var idealTime = runner.splits.reduce(function (sum, split) {
+            return sum + (split.leg.idealSplit || 0);
+        }, 0);
+        runner.splits.forEach(function (split) {
+            split.weight = split.leg.idealSplit / idealTime;
+        });
     });
 }
 function rank(runners) {
@@ -82,22 +91,17 @@ function parseRanking(runners) {
     var rankingRunners = defineRunners(runners);
     // prepare auxiliary data about the legs needed to calculate ideal times, weights, ...
     var legs = defineLegs(rankingRunners);
-    // calculate the ideal time [s]
-    var idealTime = Object.keys(legs)
-        .map(function (code) { return legs[code].idealSplit; })
-        .filter(function (time) { return time !== undefined; })
-        .reduce(sum, 0);
     // each leg's weight is calculated regarding as a ratio of the ideal split time to the ideal time
-    Object.keys(legs).forEach(function (code) {
-        var leg = legs[code];
-        if (leg.idealSplit && idealTime > 0) {
-            leg.weight = leg.idealSplit / idealTime;
-        }
-        if (!leg.weight || isNaN(leg.weight)) {
-            console.warn("invalid weight for leg ", code, leg.idealSplit, idealTime);
-        }
-    });
-    // now assing the leg information (such as idealTime, weight, ...) to the individual splits of the runners
+    /*Object.keys(legs).forEach((code) => {
+      let leg = legs[code];
+      if (leg.idealSplit && idealTime > 0) {
+        leg.weight = leg.idealSplit / idealTime;
+      }
+      if (!leg.weight || isNaN(leg.weight)) {
+        console.warn("invalid weight for leg ", code, leg.idealSplit, idealTime);
+      }
+    });*/
+    // now assing the leg information (such as idealTime, ...) to the individual splits of the runners
     assignLegInfoToSplits(rankingRunners, legs);
     rankingRunners.forEach(function (runner) {
         var behind = 0;
@@ -162,9 +166,11 @@ function parseRanking(runners) {
         memo.set(pos, result);
         return result;
     };
+    // now calculate the split ranks and behinds for each split of each runner
     rankingRunners.forEach(function (runner) {
         runner.splits.forEach(function (split) {
-            var times = timesAtPosition(split.position)
+            var tap = timesAtPosition(split.position);
+            var times = tap
                 .filter(function (entry) { return entry.time && entry.time > 0; })
                 .map(function (entry) {
                 return { id: entry.id, time: entry.time };
@@ -173,8 +179,8 @@ function parseRanking(runners) {
             if (!split.position || isNaN(split.position)) {
                 return;
             }
-            if (!times || times.length === 0) {
-                console.warn("no times at position ", split.position, split.weight, " for runner ", runner.fullName, runner.time, times.length);
+            if (times.length === 0) {
+                console.warn("no times at position ", split.position, " for runner ", runner.team || runner.fullName, runner.time, times.length);
                 return;
             }
             var rank = 1;
@@ -324,7 +330,8 @@ function defineRunnerLegSplit(split, idx, runner) {
         leg: {
             rank: undefined,
             behind: 0,
-            idealBehind: undefined
+            idealBehind: undefined,
+            idealSplit: 0
         },
         overall: {
             rank: undefined,
@@ -367,7 +374,6 @@ function defineLegs(runners) {
     }, {});
     runners.forEach(function (runner) {
         runner.splits
-            //.filter((s) => validTime(s.time))
             .forEach(function (split, idx) {
             var from = idx === 0 ? "St" : runner.splits[idx - 1].code;
             var to = split.code;
@@ -407,6 +413,7 @@ function defineLegProperties(legs) {
         });
         // calculate the ideal time: take up to 5 fastest on that leg
         var selected = leg.runners
+            .filter(function (runner) { return runner.split > 0; })
             .slice(0, Math.min(leg.runners.length, 5))
             .map(function (runner) { return runner.split; });
         // only if there are valid splits for this leg

package/lib/utils/relay.js

@@ -56,6 +56,7 @@ function parseRelayRanking(runners) {
             id: firstRunner.id,
             category: firstRunner.category,
             fullName: teamRunners.map(function (r) { return r.fullName; }).join(' / '),
+            club: teamRunners.filter(function (r) { return r.club && r.club.trim().length > 0; }).map(function (r) { return r.club; }).join(' / '),
             startTime: firstRunner.startTime,
             startNumber: startNumber,
             team: firstRunner.team,

package/package.json

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