@rasifix/orienteering-utils 2.0.2 → 2.0.5

package/lib/formats/kraemer.js

@@ -77,8 +77,6 @@ var KraemerFormater = /** @class */ (function () {
             var runner = {
                 id: lineObj["Melde Id"],
                 category: categoryName,
-                firstName: runnerFirstname,
-                name: runnerName,
                 fullName: [runnerFirstname, runnerName].join(" "),
                 yearOfBirth: lineObj["Jg"],
                 club: (strip(lineObj["Abk"]) + " " + strip(lineObj["Club"])).trim(),

package/lib/formats/oware.js

@@ -26,11 +26,9 @@ function parseRunner(row, category, id) {
         }
     }
     return {
-        id: id,
+        id: "" + id,
         category: category,
         rank: row[0] ? parseInt(row[0]) : undefined,
-        firstName: row[2],
-        name: row[1],
         fullName: [row[2], row[1]].join(" "),
         yearOfBirth: row[3],
         club: row[8],

package/lib/formats/solv.js

@@ -51,13 +51,10 @@ var SolvFormat = /** @class */ (function () {
                 };
                 categories[categoryName] = category;
             }
-            var name = tokens[5].split(" ");
             var runner = {
-                id: idx,
+                id: "" + idx,
                 category: categoryName,
                 rank: tokens[4] ? parseInt(tokens[4]) : undefined,
-                firstName: name[0],
-                name: name.slice(1).join(" "),
                 fullName: tokens[5],
                 yearOfBirth: tokens[6],
                 city: tokens[7],

package/lib/index.d.ts

@@ -1,2 +1,3 @@
 import * as formats from './formats';
-export { formats };
+import * as ranking from './utils/ranking';
+export { formats, ranking };

package/lib/index.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formats = void 0;
+exports.ranking = exports.formats = void 0;
 var formats = require("./formats");
 exports.formats = formats;
+var ranking = require("./utils/ranking");
+exports.ranking = ranking;

package/lib/model/ranking.js

@@ -1,52 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var sample = {
-    runners: {
-        "22": {
-            fullName: "Hans Dobeli",
-            club: "OLG Hopp Hopp",
-            city: "Witzwil",
-            category: "HB",
-            startTime: "01:33:00",
-            course: ["St", "31", "32", "33", "Zi"]
-        },
-        "23": {
-            fullName: "Fritz Berger",
-            club: "OLV Chapf",
-            city: "Langnau",
-            category: "HB",
-            startTime: "00:55:00",
-            course: ["St", "31", "32", "33", "Zi"]
-        }
-    },
-    legs: {
-        "St-31": {
-            from: "St",
-            to: "31",
-            ranking: [
-                {
-                    rank: 1,
-                    time: "02:33",
-                    runnerRef: "22"
-                },
-                {
-                    rank: 2,
-                    time: "08:02",
-                    runnerRef: "23"
-                }
-            ]
-        }
-    },
-    ranking: [
-        {
-            rank: 1,
-            runnerRef: "22",
-            time: "38:22"
-        },
-        {
-            rank: 2,
-            runnerRef: "23",
-            time: "46:44"
-        }
-    ]
-};

package/lib/model/runner.d.ts

@@ -1,10 +1,8 @@
 import { Split } from "./split";
 export interface Runner {
-    id: number;
+    id: string;
     category: string;
     rank?: number;
-    name: string;
-    firstName: string;
     fullName: string;
     yearOfBirth?: string;
     sex?: Sex;

package/lib/utils/anonymizer.js

@@ -44,16 +44,14 @@ function randInt(from, to) {
 function anonymize(competition) {
     competition.categories.forEach(function (category) {
         category.runners.forEach(function (runner) {
-            runner.name = random(names);
             if (!runner.sex || runner.sex === 'f') {
-                runner.firstName = random(firstNames.f);
+                runner.fullName = random(firstNames.f) + ' ' + random(names);
                 runner.sex = runner_1.Sex.female;
             }
             else {
-                runner.firstName = random(firstNames.m);
+                runner.fullName = random(firstNames.m) + ' ' + random(names);
                 runner.sex = runner_1.Sex.male;
             }
-            runner.fullName = runner.firstName + ' ' + runner.name;
             runner.city = random(cities);
             runner.club = random(clubs.prefixes) + ' ' + random(clubs.names);
             runner.yearOfBirth = '' + randInt(1925, 2010);

package/lib/utils/ranking.d.ts

@@ -1,7 +1,7 @@
 import { Runner } from "../model/runner";
 export interface Course {
     code: string;
-    runners: number[];
+    runners: string[];
 }
 export interface RunnerLegs {
     [key: string]: RunnerLeg;
@@ -15,7 +15,7 @@ export interface RunnerLeg {
     weight?: number;
 }
 export interface RunnerLegEntry {
-    id: number;
+    id: string;
     fullName: string;
     time: number;
     split: number;
@@ -29,7 +29,7 @@ export interface RunnerLegEntry {
     position?: number;
 }
 interface RankingRunner {
-    id: number;
+    id: string;
     rank?: number;
     fullName: string;
     time?: string;

package/package.json

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