|
461 | 461 | {
|
462 | 462 | name: "Total offenses",
|
463 | 463 | type: "criminal offenses",
|
464 |
| - v2Getter: (data) => data.personalstats.crimes.offenses.total, |
| 464 | + v2Getter: crimesStats( |
| 465 | + (data) => data.personalstats.crimes.total, |
| 466 | + (data) => data.personalstats.crimes.offenses.total |
| 467 | + ), |
465 | 468 | v1Getter: (data) => data.personalstats.criminaloffenses,
|
466 | 469 | },
|
467 | 470 | {
|
468 | 471 | name: "Counterfeiting",
|
469 | 472 | type: "criminal offenses",
|
470 |
| - v2Getter: (data) => data.personalstats.crimes.offenses.counterfeiting, |
| 473 | + v2Getter: crimesStats( |
| 474 | + () => 0, |
| 475 | + (data) => data.personalstats.crimes.offenses.counterfeiting |
| 476 | + ), |
471 | 477 | v1Getter: (data) => data.personalstats.counterfeiting,
|
472 | 478 | },
|
473 | 479 | {
|
474 | 480 | name: "Cybercrime",
|
475 | 481 | type: "criminal offenses",
|
476 |
| - v2Getter: (data) => data.personalstats.crimes.offenses.cybercrime, |
| 482 | + v2Getter: crimesStats( |
| 483 | + () => 0, |
| 484 | + (data) => data.personalstats.crimes.offenses.cybercrime |
| 485 | + ), |
477 | 486 | v1Getter: (data) => data.personalstats.cybercrime,
|
478 | 487 | },
|
479 | 488 | {
|
480 | 489 | name: "Extortion",
|
481 | 490 | type: "criminal offenses",
|
482 |
| - v2Getter: (data) => data.personalstats.crimes.offenses.extortion, |
| 491 | + v2Getter: crimesStats( |
| 492 | + () => 0, |
| 493 | + (data) => data.personalstats.crimes.offenses.extortion |
| 494 | + ), |
483 | 495 | v1Getter: (data) => data.personalstats.extortion,
|
484 | 496 | },
|
485 | 497 | {
|
486 | 498 | name: "Illegal production",
|
487 | 499 | type: "criminal offenses",
|
488 |
| - v2Getter: (data) => data.personalstats.crimes.offenses.illegal_production, |
| 500 | + v2Getter: crimesStats( |
| 501 | + () => 0, |
| 502 | + (data) => data.personalstats.crimes.offenses.illegal_production |
| 503 | + ), |
489 | 504 | v1Getter: (data) => data.personalstats.illegalproduction,
|
490 | 505 | },
|
491 | 506 | {
|
492 | 507 | name: "Illicit services",
|
493 | 508 | type: "criminal offenses",
|
494 |
| - v2Getter: (data) => data.personalstats.crimes.offenses.illicit_services, |
| 509 | + v2Getter: crimesStats( |
| 510 | + () => 0, |
| 511 | + (data) => data.personalstats.crimes.offenses.illicit_services |
| 512 | + ), |
495 | 513 | v1Getter: (data) => data.personalstats.illicitservices,
|
496 | 514 | },
|
497 | 515 | {
|
498 | 516 | name: "Theft",
|
499 | 517 | type: "criminal offenses",
|
500 |
| - v2Getter: (data) => data.personalstats.crimes.offenses.theft, |
| 518 | + v2Getter: crimesStats( |
| 519 | + () => 0, |
| 520 | + (data) => data.personalstats.crimes.offenses.theft |
| 521 | + ), |
501 | 522 | v1Getter: (data) => data.personalstats.theft,
|
502 | 523 | },
|
503 | 524 | {
|
504 | 525 | name: "Vandalism",
|
505 | 526 | type: "criminal offenses",
|
506 |
| - v2Getter: (data) => data.personalstats.crimes.offenses.vandalism, |
| 527 | + v2Getter: crimesStats( |
| 528 | + () => 0, |
| 529 | + (data) => data.personalstats.crimes.offenses.vandalism |
| 530 | + ), |
507 | 531 | v1Getter: (data) => data.personalstats.vandalism,
|
508 | 532 | },
|
509 | 533 | {
|
510 | 534 | name: "Organized crimes",
|
511 | 535 | type: "criminal offenses",
|
512 |
| - v2Getter: (data) => data.personalstats.crimes.offenses.organized_crimes, |
| 536 | + v2Getter: crimesStats( |
| 537 | + (data) => data.personalstats.crimes.organized_crimes, |
| 538 | + (data) => data.personalstats.crimes.offenses.organized_crimes |
| 539 | + ), |
513 | 540 | v1Getter: (data) => data.personalstats.organisedcrimes,
|
514 | 541 | },
|
515 | 542 |
|
|
1148 | 1175 | .map((stat) => {
|
1149 | 1176 | const them = stat.v2Getter(data);
|
1150 | 1177 | const you = stat.v1Getter(userdata);
|
1151 |
| - if (isNaN(them) || isNaN(you)) return false; |
| 1178 | + if (isNaN(them) || isNaN(you)) { |
| 1179 | + console.log("DKK stat", stat, them, you); |
| 1180 | + return false; |
| 1181 | + } |
1152 | 1182 |
|
1153 | 1183 | const row = {
|
1154 | 1184 | stat: stat.name,
|
|
1605 | 1635 | function removeBox() {
|
1606 | 1636 | removeContainer("User Information");
|
1607 | 1637 | }
|
| 1638 | + |
| 1639 | + function crimesStats(c1Getter, c2Getter) { |
| 1640 | + return (data) => { |
| 1641 | + const cVersion = data.personalstats.crimes.version; |
| 1642 | + if (cVersion === "v1") return c1Getter(data); |
| 1643 | + else if (cVersion === "v2") return c2Getter(data); |
| 1644 | + else throw new Error(`Unsupported crimes version '${cVersion}'!`); |
| 1645 | + }; |
| 1646 | + } |
1608 | 1647 | })();
|
0 commit comments