@rasifix/orienteering-utils 2.0.6 → 2.0.7

package/lib/model/index.d.ts

@@ -1,6 +1,5 @@
 import { Category } from './category';
 import { Competition } from './competition';
-import { Ranking, Leg, RankingEntry, RunnerInfo } from './ranking';
 import { Runner, Sex } from './runner';
 import { Split } from './split';
-export { Category, Competition, Ranking, Leg, RankingEntry, RunnerInfo, Runner, Sex, Split };
+export { Category, Competition, Runner, Sex, Split };

package/lib/model/ranking.d.ts

@@ -1,22 +1,3 @@
-export interface Ranking {
-    runners: {
-        [key: string]: RunnerInfo;
-    };
-    legs: {
-        [key: string]: Leg;
-    };
-    ranking: RankingEntry[];
-}
-export interface Leg {
-    from: string;
-    to: string;
-    ranking: RankingEntry[];
-}
-export interface RankingEntry {
-    rank: number;
-    time: string;
-    runnerRef: string;
-}
 export interface RunnerInfo {
     fullName: string;
     club: string;

package/lib/utils/ranking.d.ts

@@ -28,6 +28,11 @@ export interface RunnerLegEntry {
     leg?: string;
     position?: number;
 }
+export interface Ranking {
+    courses: Course[];
+    runners: RankingRunner[];
+    legs: RunnerLeg[];
+}
 interface RankingRunner {
     id: string;
     rank?: number;
@@ -49,6 +54,16 @@ interface RankingSplit {
     position: number;
     weight: number | undefined;
 }
+export interface Leg {
+    from: string;
+    to: string;
+    ranking: RankingEntry[];
+}
+export interface RankingEntry {
+    rank: number;
+    time: string;
+    runnerRef: string;
+}
 interface RankingInfo {
     rank?: number;
     behind?: number;
@@ -57,15 +72,5 @@ interface RankingInfo {
 interface SplitInfo extends RankingInfo {
     performanceIndex?: number;
 }
-export declare function parseRanking(runners: Runner[]): {
-    courses: Course[];
-    runners: RankingRunner[];
-    legs: {
-        code: string;
-        spread: [number, number];
-        idealSplit: number;
-        fastestSplit: number;
-        weight: number;
-    }[];
-};
+export declare function parseRanking(runners: Runner[]): Ranking;
 export {};

package/lib/utils/ranking.js

@@ -69,7 +69,6 @@ function parseRanking(runners) {
         .map(function (code) { return legs[code].idealSplit; })
         .filter(function (time) { return time !== undefined; })
         .reduce(sum);
-    console.log("ideal time: ", idealTime);
     // 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];
@@ -177,14 +176,12 @@ function parseRanking(runners) {
     });
     // calculate the overall rank
     rank(rankingRunners);
-    console.log(rankingRunners[0].fullName, rankingRunners[0].splits[rankingRunners[0].splits.length - 1]);
     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);
         var max = leg.runners.filter(function (runner) { return !isNaN(runner.split) && runner.split !== undefined; }).map(function (runner) { return runner.split; }).reduce(function (max, split) { return Math.max(max, split - ideal); }, Number.MIN_VALUE);
         leg.spread = [min, max];
     });
-    console.log("leg runner", legs[Object.keys(legs)[1]].runners[1]);
     return {
         courses: courses,
         runners: rankingRunners,
@@ -194,6 +191,7 @@ function parseRanking(runners) {
             idealSplit: leg.idealSplit,
             fastestSplit: leg.fastestSplit,
             weight: leg.weight,
+            runners: leg.runners
         }); }),
     };
 }

package/package.json

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