From a44285a05a3986d41d6361f70b4d23222ed98442 Mon Sep 17 00:00:00 2001 From: Yannick Kuypers Date: Tue, 6 Aug 2024 13:22:19 +0200 Subject: [PATCH] #417 temp commit --- dist/commonjs/zoneerder/components/d3.d.ts | 3 ++- dist/commonjs/zoneerder/components/d3.js | 15 +++++++-------- dist/commonjs/zoneerder/components/d3.js.map | 2 +- .../components/referentielaag-autocorrectie.d.ts | 1 - .../components/referentielaag-autocorrectie.js | 4 +--- .../referentielaag-autocorrectie.js.map | 2 +- dist/commonjs/zoneerder/models/contour.d.ts | 7 ++++--- dist/native-modules/zoneerder/components/d3.d.ts | 3 ++- dist/native-modules/zoneerder/components/d3.js | 15 +++++++-------- .../native-modules/zoneerder/components/d3.js.map | 2 +- .../components/referentielaag-autocorrectie.d.ts | 1 - .../components/referentielaag-autocorrectie.js | 4 +--- .../referentielaag-autocorrectie.js.map | 2 +- dist/native-modules/zoneerder/models/contour.d.ts | 7 ++++--- src/zoneerder/components/d3.ts | 15 ++++++++------- .../components/referentielaag-autocorrectie.ts | 11 +++++------ src/zoneerder/components/referentielaag-map.html | 2 +- src/zoneerder/models/contour.ts | 12 ++++++++++-- 18 files changed, 56 insertions(+), 52 deletions(-) diff --git a/dist/commonjs/zoneerder/components/d3.d.ts b/dist/commonjs/zoneerder/components/d3.d.ts index 2521c6ae..e5574e77 100644 --- a/dist/commonjs/zoneerder/components/d3.d.ts +++ b/dist/commonjs/zoneerder/components/d3.d.ts @@ -1,3 +1,4 @@ -export declare function setupD3(container: HTMLElement, targetX: number): void; +import { Diffs } from 'zoneerder/models/contour'; +export declare function setupD3(container: HTMLElement, data: Diffs, targetX: number): void; export declare function removePoint(): void; export declare function drawNewCircle(targetX: number): void; diff --git a/dist/commonjs/zoneerder/components/d3.js b/dist/commonjs/zoneerder/components/d3.js index 2067391d..a95f014e 100644 --- a/dist/commonjs/zoneerder/components/d3.js +++ b/dist/commonjs/zoneerder/components/d3.js @@ -41,7 +41,7 @@ exports.removePoint = removePoint; exports.drawNewCircle = drawNewCircle; var d3 = require("d3"); var x, y, chartData = undefined; -function setupD3(container, targetX) { +function setupD3(container, data, targetX) { if (!container) { return; } @@ -53,22 +53,21 @@ function setupD3(container, targetX) { var marginRight = 0; var marginBottom = 30; var marginLeft = 0; - function render_area_chart() { + function render_area_chart(data) { return __awaiter(this, void 0, void 0, function () { - var response, data; + var floatedData; return __generator(this, function (_a) { - response = { 0.0: -0.0, 0.1: 0.0, 0.2: 0.0, 0.3: 0.0, 0.4: 0.0, 0.5: 0.0, 0.6: 0.0, 0.7: 0.0, 0.8: 0.0, 0.9: 0.0, 1.0: 1.7, 1.1: -7.2, 1.2: -7.2, 1.3: -7.2, 1.4: -7.2, 1.5: -7.2, 1.6: -7.2, 1.7: -7.2, 1.8: -7.2, 1.9: -7.2, 2.0: -7.2, 2.1: -7.2, 2.2: -7.2, 2.3: -7.2, 2.4: -7.2, 2.5: 8.5, 2.6: 8.5, 2.7: 8.5, 2.8: 8.5, 2.9: 8.5, 3.0: 8.5, 3.1: 8.5, 3.2: 8.5, 3.3: 8.5, 3.4: 8.5, 3.5: 8.5, 3.6: 8.5, 3.7: 8.5, 3.8: 8.5, 3.9: 8.5, 4.0: 8.5, 4.1: 8.5, 4.2: 8.5, 4.3: 8.5, 4.4: 8.5, 4.5: 8.5, 4.6: 8.5, 4.7: 8.5, 4.8: 8.5, 4.9: 8.5, 5.0: 8.5, 5.1: 8.5, 5.2: 8.5, 5.3: 8.5, 5.4: 8.5, 5.5: 8.5, 5.6: 8.5, 5.7: 8.5, 5.8: 8.5, 5.9: 8.5, 6.0: 8.5 }; - data = Object.entries(response).map(function (_a) { + floatedData = Object.entries(data).map(function (_a) { var x = _a[0], y = _a[1]; return ({ x: parseFloat(x), y: Math.abs(y) }); }); - data = data.sort(function (d1, d2) { return d1.x - d2.x; }); - render_data(data); + floatedData = floatedData.sort(function (d1, d2) { return d1.x - d2.x; }); + render_data(floatedData); return [2]; }); }); } - render_area_chart(); + render_area_chart(data); function render_data(data) { chartData = data; x = d3.scaleLinear() diff --git a/dist/commonjs/zoneerder/components/d3.js.map b/dist/commonjs/zoneerder/components/d3.js.map index 0e1ccb53..4aa0cb99 100644 --- a/dist/commonjs/zoneerder/components/d3.js.map +++ b/dist/commonjs/zoneerder/components/d3.js.map @@ -1 +1 @@ -{"version":3,"sources":["zoneerder/components/d3.ts"],"names":[],"mappings":"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","file":"d3.js","sourceRoot":"../../../../src/"} \ No newline at end of file +{"version":3,"sources":["zoneerder/components/d3.ts"],"names":[],"mappings":"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","file":"d3.js","sourceRoot":"../../../../src/"} \ No newline at end of file diff --git a/dist/commonjs/zoneerder/components/referentielaag-autocorrectie.d.ts b/dist/commonjs/zoneerder/components/referentielaag-autocorrectie.d.ts index 6f76478b..eb61f6e4 100644 --- a/dist/commonjs/zoneerder/components/referentielaag-autocorrectie.d.ts +++ b/dist/commonjs/zoneerder/components/referentielaag-autocorrectie.d.ts @@ -24,7 +24,6 @@ export declare class ReferentielaagAutocorrectie { private increment; private showHistogram; constructor(dialogService: DialogService); - bind(): void; openOpenbaarDomeinLegende(): void; onHistogramDataChanged(): Promise; relevanteAfstandChanged(nv: string, ov: string): void; diff --git a/dist/commonjs/zoneerder/components/referentielaag-autocorrectie.js b/dist/commonjs/zoneerder/components/referentielaag-autocorrectie.js index 00edec04..b61aa4d2 100644 --- a/dist/commonjs/zoneerder/components/referentielaag-autocorrectie.js +++ b/dist/commonjs/zoneerder/components/referentielaag-autocorrectie.js @@ -85,9 +85,6 @@ var ReferentielaagAutocorrectie = (function () { this.increment = 0.1; this.showHistogram = false; } - ReferentielaagAutocorrectie.prototype.bind = function () { - (0, d3_1.setupD3)(this.histogram, Number(this.relevanteAfstand)); - }; ReferentielaagAutocorrectie.prototype.openOpenbaarDomeinLegende = function () { this.dialogService .open({ @@ -110,6 +107,7 @@ var ReferentielaagAutocorrectie = (function () { return [4, this.alignGrb(this.zone, this.referentielaag.value, this.domeinstrategie.value)]; case 1: result = _c.sent(); + (0, d3_1.setupD3)(this.histogram, result.diffs, Number(this.relevanteAfstand)); this.showHistogram = true; return [3, 3]; case 2: diff --git a/dist/commonjs/zoneerder/components/referentielaag-autocorrectie.js.map b/dist/commonjs/zoneerder/components/referentielaag-autocorrectie.js.map index f0ff0e50..7fb4626d 100644 --- a/dist/commonjs/zoneerder/components/referentielaag-autocorrectie.js.map +++ b/dist/commonjs/zoneerder/components/referentielaag-autocorrectie.js.map @@ -1 +1 @@ -{"version":3,"sources":["zoneerder/components/referentielaag-autocorrectie.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAqE;AACrE,2BAA2D;AAC3D,iDAA+C;AAC/C,uDAA6C;AAC7C,6CAA8D;AAG9D;IAwCE,qCAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QApCvC,oBAAe,GAAG;YACzB;gBACE,KAAK,OAAoC;gBACzC,KAAK,EAAE,0BAA0B;aAClC;YACD,EAAE,KAAK,OAAoC;gBACzC,KAAK,EAAE,wBAAwB;aAChC;SACF,CAAC;QAEO,gBAAW,GAAG;YACrB;gBACE,KAAK,oBAAiC;gBACtC,KAAK,EAAE,uBAAuB;aAC/B;YACD,EAAE,KAAK,iBAAiC,EAAE,KAAK,EAAE,wBAAwB,EAAE;YAC3E,EAAE,KAAK,SAA8B,EAAE,KAAK,EAAE,qBAAqB,EAAE;YACrE,EAAE,KAAK,WAA0B,EAAE,KAAK,EAAE,iBAAiB,EAAE;SAC9D,CAAC;QAIM,mBAAc,GAAmB,IAAI,CAAC;QACtC,oBAAe,GAAoB;YACzC,KAAK,oBAAiC;YACtC,KAAK,EAAE,uBAAuB;SAC/B,CAAC;QACkB,qBAAgB,GAAW,KAAK,CAAC;QAC7C,QAAG,GAAG,GAAG,CAAC;QACV,QAAG,GAAG,GAAG,CAAC;QACV,aAAQ,GAAG,KAAK,CAAC;QACjB,aAAQ,GAAG,KAAK,CAAC;QACjB,cAAS,GAAG,GAAG,CAAC;QAEhB,kBAAa,GAAG,KAAK,CAAC;IAEsB,CAAC;IAErD,0CAAI,GAAJ;QACE,IAAA,YAAO,EAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,+DAAyB,GAAzB;QACE,IAAI,CAAC,aAAa;aACf,IAAI,CAAC;YACJ,SAAS,EAAE,4BAAQ,CAAC,UAAU,CAC5B,uDAAuD,CACxD;YACD,KAAK,EAAE,EAAE;SACV,CAAC;aACD,UAAU,CAAC,UAAC,QAAQ;YACnB,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC7B,CAAC;QACH,CAAC,CAAC,CAAC;IACP,CAAC;IAEK,4DAAsB,GAA5B;;;;;;;6BACM,CAAA,CAAA,MAAA,IAAI,CAAC,cAAc,0CAAE,KAAK,MAAI,MAAA,IAAI,CAAC,eAAe,0CAAE,KAAK,CAAA,CAAA,EAAzD,cAAyD;wBAG5C,WAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAA;;wBAA9F,MAAM,GAAG,SAAqF;wBAEpG,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;;;wBAE1B,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;;;;;;KAE9B;IAED,6DAAuB,GAAvB,UAAwB,EAAU,EAAE,EAAU;QAC5C,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QACD,IAAA,gBAAW,GAAE,CAAC;QACd,IAAA,kBAAa,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5B,CAAC;IA7ES;QAAT,4BAAQ;kCAAO,iBAAO;6DAAC;IACd;QAAT,4BAAQ;;iEAA0I;IA6B/H;QAAnB,8BAAU;;yEAA0C;IA/B1C,2BAA2B;QADvC,8BAAU;yCAyC0B,8BAAa;OAxCrC,2BAA2B,CA+EvC;IAAD,kCAAC;CAhFD,AAgFC,IAAA;AA/EY,kEAA2B","file":"referentielaag-autocorrectie.js","sourceRoot":"../../../../src/"} \ No newline at end of file +{"version":3,"sources":["zoneerder/components/referentielaag-autocorrectie.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAqE;AACrE,2BAA2D;AAC3D,iDAA+C;AAC/C,uDAA6C;AAC7C,6CAA8D;AAG9D;IAwCE,qCAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QApCvC,oBAAe,GAAG;YACzB;gBACE,KAAK,OAAoC;gBACzC,KAAK,EAAE,0BAA0B;aAClC;YACD,EAAE,KAAK,OAAoC;gBACzC,KAAK,EAAE,wBAAwB;aAChC;SACF,CAAC;QAEO,gBAAW,GAAG;YACrB;gBACE,KAAK,oBAAiC;gBACtC,KAAK,EAAE,uBAAuB;aAC/B;YACD,EAAE,KAAK,iBAAiC,EAAE,KAAK,EAAE,wBAAwB,EAAE;YAC3E,EAAE,KAAK,SAA8B,EAAE,KAAK,EAAE,qBAAqB,EAAE;YACrE,EAAE,KAAK,WAA0B,EAAE,KAAK,EAAE,iBAAiB,EAAE;SAC9D,CAAC;QAIM,mBAAc,GAAmB,IAAI,CAAC;QACtC,oBAAe,GAAoB;YACzC,KAAK,oBAAiC;YACtC,KAAK,EAAE,uBAAuB;SAC/B,CAAC;QACkB,qBAAgB,GAAW,KAAK,CAAC;QAC7C,QAAG,GAAG,GAAG,CAAC;QACV,QAAG,GAAG,GAAG,CAAC;QACV,aAAQ,GAAG,KAAK,CAAC;QACjB,aAAQ,GAAG,KAAK,CAAC;QACjB,cAAS,GAAG,GAAG,CAAC;QAEhB,kBAAa,GAAG,KAAK,CAAC;IAEsB,CAAC;IAErD,+DAAyB,GAAzB;QACE,IAAI,CAAC,aAAa;aACf,IAAI,CAAC;YACJ,SAAS,EAAE,4BAAQ,CAAC,UAAU,CAC5B,uDAAuD,CACxD;YACD,KAAK,EAAE,EAAE;SACV,CAAC;aACD,UAAU,CAAC,UAAC,QAAQ;YACnB,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC7B,CAAC;QACH,CAAC,CAAC,CAAC;IACP,CAAC;IAEK,4DAAsB,GAA5B;;;;;;;6BACM,CAAA,CAAA,MAAA,IAAI,CAAC,cAAc,0CAAE,KAAK,MAAI,MAAA,IAAI,CAAC,eAAe,0CAAE,KAAK,CAAA,CAAA,EAAzD,cAAyD;wBAE5C,WAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAA;;wBAA9F,MAAM,GAAG,SAAqF;wBACpG,IAAA,YAAO,EAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,EAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;wBACtE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;;;wBAE1B,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;;;;;;KAE9B;IAED,6DAAuB,GAAvB,UAAwB,EAAU,EAAE,EAAU;QAC5C,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QACD,IAAA,gBAAW,GAAE,CAAC;QACd,IAAA,kBAAa,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5B,CAAC;IAxES;QAAT,4BAAQ;kCAAO,iBAAO;6DAAC;IACd;QAAT,4BAAQ;;iEAA0I;IA6B/H;QAAnB,8BAAU;;yEAA0C;IA/B1C,2BAA2B;QADvC,8BAAU;yCAyC0B,8BAAa;OAxCrC,2BAA2B,CA0EvC;IAAD,kCAAC;CA3ED,AA2EC,IAAA;AA1EY,kEAA2B","file":"referentielaag-autocorrectie.js","sourceRoot":"../../../../src/"} \ No newline at end of file diff --git a/dist/commonjs/zoneerder/models/contour.d.ts b/dist/commonjs/zoneerder/models/contour.d.ts index 993591d7..13ee331b 100644 --- a/dist/commonjs/zoneerder/models/contour.d.ts +++ b/dist/commonjs/zoneerder/models/contour.d.ts @@ -23,12 +23,13 @@ export declare const enum StrategieEnum { Uitsluiten = "EXCLUDE" } export interface IAlignerResponse { - diffs: { - [key: string]: string; - }; + diffs: Diffs; series: { [key: string]: { [key: string]: object; }; }; } +export type Diffs = { + [key: string]: number; +}; diff --git a/dist/native-modules/zoneerder/components/d3.d.ts b/dist/native-modules/zoneerder/components/d3.d.ts index 2521c6ae..e5574e77 100644 --- a/dist/native-modules/zoneerder/components/d3.d.ts +++ b/dist/native-modules/zoneerder/components/d3.d.ts @@ -1,3 +1,4 @@ -export declare function setupD3(container: HTMLElement, targetX: number): void; +import { Diffs } from 'zoneerder/models/contour'; +export declare function setupD3(container: HTMLElement, data: Diffs, targetX: number): void; export declare function removePoint(): void; export declare function drawNewCircle(targetX: number): void; diff --git a/dist/native-modules/zoneerder/components/d3.js b/dist/native-modules/zoneerder/components/d3.js index 5c82dc41..d85874c8 100644 --- a/dist/native-modules/zoneerder/components/d3.js +++ b/dist/native-modules/zoneerder/components/d3.js @@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) { }; import * as d3 from 'd3'; var x, y, chartData = undefined; -export function setupD3(container, targetX) { +export function setupD3(container, data, targetX) { if (!container) { return; } @@ -48,22 +48,21 @@ export function setupD3(container, targetX) { var marginRight = 0; var marginBottom = 30; var marginLeft = 0; - function render_area_chart() { + function render_area_chart(data) { return __awaiter(this, void 0, void 0, function () { - var response, data; + var floatedData; return __generator(this, function (_a) { - response = { 0.0: -0.0, 0.1: 0.0, 0.2: 0.0, 0.3: 0.0, 0.4: 0.0, 0.5: 0.0, 0.6: 0.0, 0.7: 0.0, 0.8: 0.0, 0.9: 0.0, 1.0: 1.7, 1.1: -7.2, 1.2: -7.2, 1.3: -7.2, 1.4: -7.2, 1.5: -7.2, 1.6: -7.2, 1.7: -7.2, 1.8: -7.2, 1.9: -7.2, 2.0: -7.2, 2.1: -7.2, 2.2: -7.2, 2.3: -7.2, 2.4: -7.2, 2.5: 8.5, 2.6: 8.5, 2.7: 8.5, 2.8: 8.5, 2.9: 8.5, 3.0: 8.5, 3.1: 8.5, 3.2: 8.5, 3.3: 8.5, 3.4: 8.5, 3.5: 8.5, 3.6: 8.5, 3.7: 8.5, 3.8: 8.5, 3.9: 8.5, 4.0: 8.5, 4.1: 8.5, 4.2: 8.5, 4.3: 8.5, 4.4: 8.5, 4.5: 8.5, 4.6: 8.5, 4.7: 8.5, 4.8: 8.5, 4.9: 8.5, 5.0: 8.5, 5.1: 8.5, 5.2: 8.5, 5.3: 8.5, 5.4: 8.5, 5.5: 8.5, 5.6: 8.5, 5.7: 8.5, 5.8: 8.5, 5.9: 8.5, 6.0: 8.5 }; - data = Object.entries(response).map(function (_a) { + floatedData = Object.entries(data).map(function (_a) { var x = _a[0], y = _a[1]; return ({ x: parseFloat(x), y: Math.abs(y) }); }); - data = data.sort(function (d1, d2) { return d1.x - d2.x; }); - render_data(data); + floatedData = floatedData.sort(function (d1, d2) { return d1.x - d2.x; }); + render_data(floatedData); return [2]; }); }); } - render_area_chart(); + render_area_chart(data); function render_data(data) { chartData = data; x = d3.scaleLinear() diff --git a/dist/native-modules/zoneerder/components/d3.js.map b/dist/native-modules/zoneerder/components/d3.js.map index 651efa69..638c00e6 100644 --- a/dist/native-modules/zoneerder/components/d3.js.map +++ b/dist/native-modules/zoneerder/components/d3.js.map @@ -1 +1 @@ -{"version":3,"sources":["zoneerder/components/d3.ts"],"names":[],"mappings":"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","file":"d3.js","sourceRoot":"../../../../src/"} \ No newline at end of file +{"version":3,"sources":["zoneerder/components/d3.ts"],"names":[],"mappings":"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","file":"d3.js","sourceRoot":"../../../../src/"} \ No newline at end of file diff --git a/dist/native-modules/zoneerder/components/referentielaag-autocorrectie.d.ts b/dist/native-modules/zoneerder/components/referentielaag-autocorrectie.d.ts index 6f76478b..eb61f6e4 100644 --- a/dist/native-modules/zoneerder/components/referentielaag-autocorrectie.d.ts +++ b/dist/native-modules/zoneerder/components/referentielaag-autocorrectie.d.ts @@ -24,7 +24,6 @@ export declare class ReferentielaagAutocorrectie { private increment; private showHistogram; constructor(dialogService: DialogService); - bind(): void; openOpenbaarDomeinLegende(): void; onHistogramDataChanged(): Promise; relevanteAfstandChanged(nv: string, ov: string): void; diff --git a/dist/native-modules/zoneerder/components/referentielaag-autocorrectie.js b/dist/native-modules/zoneerder/components/referentielaag-autocorrectie.js index a4e4280a..3ab9f7bc 100644 --- a/dist/native-modules/zoneerder/components/referentielaag-autocorrectie.js +++ b/dist/native-modules/zoneerder/components/referentielaag-autocorrectie.js @@ -82,9 +82,6 @@ var ReferentielaagAutocorrectie = (function () { this.increment = 0.1; this.showHistogram = false; } - ReferentielaagAutocorrectie.prototype.bind = function () { - setupD3(this.histogram, Number(this.relevanteAfstand)); - }; ReferentielaagAutocorrectie.prototype.openOpenbaarDomeinLegende = function () { this.dialogService .open({ @@ -107,6 +104,7 @@ var ReferentielaagAutocorrectie = (function () { return [4, this.alignGrb(this.zone, this.referentielaag.value, this.domeinstrategie.value)]; case 1: result = _c.sent(); + setupD3(this.histogram, result.diffs, Number(this.relevanteAfstand)); this.showHistogram = true; return [3, 3]; case 2: diff --git a/dist/native-modules/zoneerder/components/referentielaag-autocorrectie.js.map b/dist/native-modules/zoneerder/components/referentielaag-autocorrectie.js.map index 844aa9bc..8ccf6f1f 100644 --- a/dist/native-modules/zoneerder/components/referentielaag-autocorrectie.js.map +++ b/dist/native-modules/zoneerder/components/referentielaag-autocorrectie.js.map @@ -1 +1 @@ -{"version":3,"sources":["zoneerder/components/referentielaag-autocorrectie.ts"],"names":[],"mappings":"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","file":"referentielaag-autocorrectie.js","sourceRoot":"../../../../src/"} \ No newline at end of file +{"version":3,"sources":["zoneerder/components/referentielaag-autocorrectie.ts"],"names":[],"mappings":"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","file":"referentielaag-autocorrectie.js","sourceRoot":"../../../../src/"} \ No newline at end of file diff --git a/dist/native-modules/zoneerder/models/contour.d.ts b/dist/native-modules/zoneerder/models/contour.d.ts index 993591d7..13ee331b 100644 --- a/dist/native-modules/zoneerder/models/contour.d.ts +++ b/dist/native-modules/zoneerder/models/contour.d.ts @@ -23,12 +23,13 @@ export declare const enum StrategieEnum { Uitsluiten = "EXCLUDE" } export interface IAlignerResponse { - diffs: { - [key: string]: string; - }; + diffs: Diffs; series: { [key: string]: { [key: string]: object; }; }; } +export type Diffs = { + [key: string]: number; +}; diff --git a/src/zoneerder/components/d3.ts b/src/zoneerder/components/d3.ts index 69633c84..7d279668 100644 --- a/src/zoneerder/components/d3.ts +++ b/src/zoneerder/components/d3.ts @@ -1,4 +1,5 @@ import * as d3 from 'd3'; +import { Diffs } from 'zoneerder/models/contour'; interface Datapoint { x: number, @@ -7,7 +8,7 @@ interface Datapoint { let x, y, chartData = undefined; -export function setupD3(container: HTMLElement, targetX: number) { +export function setupD3(container: HTMLElement, data: Diffs, targetX: number) { if (!container) { return }; container.innerHTML = ''; // Declare the chart dimensions and margins. @@ -18,14 +19,14 @@ export function setupD3(container: HTMLElement, targetX: number) { const marginBottom = 30; const marginLeft = 0; - async function render_area_chart() { - const response = {0.0: -0.0, 0.1: 0.0, 0.2: 0.0, 0.3: 0.0, 0.4: 0.0, 0.5: 0.0, 0.6: 0.0, 0.7: 0.0, 0.8: 0.0, 0.9: 0.0, 1.0: 1.7, 1.1: -7.2, 1.2: -7.2, 1.3: -7.2, 1.4: -7.2, 1.5: -7.2, 1.6: -7.2, 1.7: -7.2, 1.8: -7.2, 1.9: -7.2, 2.0: -7.2, 2.1: -7.2, 2.2: -7.2, 2.3: -7.2, 2.4: -7.2, 2.5: 8.5, 2.6: 8.5, 2.7: 8.5, 2.8: 8.5, 2.9: 8.5, 3.0: 8.5, 3.1: 8.5, 3.2: 8.5, 3.3: 8.5, 3.4: 8.5, 3.5: 8.5, 3.6: 8.5, 3.7: 8.5, 3.8: 8.5, 3.9: 8.5, 4.0: 8.5, 4.1: 8.5, 4.2: 8.5, 4.3: 8.5, 4.4: 8.5, 4.5: 8.5, 4.6: 8.5, 4.7: 8.5, 4.8: 8.5, 4.9: 8.5, 5.0: 8.5, 5.1: 8.5, 5.2: 8.5, 5.3: 8.5, 5.4: 8.5, 5.5: 8.5, 5.6: 8.5, 5.7: 8.5, 5.8: 8.5, 5.9: 8.5, 6.0: 8.5}; - let data = Object.entries(response).map(([x, y]) => ({x: parseFloat(x), y: Math.abs(y)})); - data = data.sort((d1, d2) => d1.x - d2.x); - render_data(data); + async function render_area_chart(data: Diffs) { + // const response = {0.0: -0.0, 0.1: 0.0, 0.2: 0.0, 0.3: 0.0, 0.4: 0.0, 0.5: 0.0, 0.6: 0.0, 0.7: 0.0, 0.8: 0.0, 0.9: 0.0, 1.0: 1.7, 1.1: -7.2, 1.2: -7.2, 1.3: -7.2, 1.4: -7.2, 1.5: -7.2, 1.6: -7.2, 1.7: -7.2, 1.8: -7.2, 1.9: -7.2, 2.0: -7.2, 2.1: -7.2, 2.2: -7.2, 2.3: -7.2, 2.4: -7.2, 2.5: 8.5, 2.6: 8.5, 2.7: 8.5, 2.8: 8.5, 2.9: 8.5, 3.0: 8.5, 3.1: 8.5, 3.2: 8.5, 3.3: 8.5, 3.4: 8.5, 3.5: 8.5, 3.6: 8.5, 3.7: 8.5, 3.8: 8.5, 3.9: 8.5, 4.0: 8.5, 4.1: 8.5, 4.2: 8.5, 4.3: 8.5, 4.4: 8.5, 4.5: 8.5, 4.6: 8.5, 4.7: 8.5, 4.8: 8.5, 4.9: 8.5, 5.0: 8.5, 5.1: 8.5, 5.2: 8.5, 5.3: 8.5, 5.4: 8.5, 5.5: 8.5, 5.6: 8.5, 5.7: 8.5, 5.8: 8.5, 5.9: 8.5, 6.0: 8.5}; + let floatedData = Object.entries(data).map(([x, y]) => ({x: parseFloat(x), y: Math.abs(y)})); + floatedData = floatedData.sort((d1, d2) => d1.x - d2.x); + render_data(floatedData); } - render_area_chart(); + render_area_chart(data); function render_data(data: Datapoint[]) { // Declare the x (horizontal position) scale. diff --git a/src/zoneerder/components/referentielaag-autocorrectie.ts b/src/zoneerder/components/referentielaag-autocorrectie.ts index 37ee32e3..1f7d48db 100644 --- a/src/zoneerder/components/referentielaag-autocorrectie.ts +++ b/src/zoneerder/components/referentielaag-autocorrectie.ts @@ -44,13 +44,10 @@ export class ReferentielaagAutocorrectie { private increment = 0.1; private showHistogram = false; + private histogramData: IAlignerResponse; constructor(private dialogService: DialogService) { } - bind() { - setupD3(this.histogram, Number(this.relevanteAfstand)); - } - openOpenbaarDomeinLegende() { this.dialogService .open({ @@ -68,8 +65,8 @@ export class ReferentielaagAutocorrectie { async onHistogramDataChanged() { if (this.referentielaag?.value && this.domeinstrategie?.value) { // API Call en histogram data ophalen. - const result = await this.alignGrb(this.zone, this.referentielaag.value, this.domeinstrategie.value); - + this.histogramData = await this.alignGrb(this.zone, this.referentielaag.value, this.domeinstrategie.value); + setupD3(this.histogram, this.histogramData.diffs , Number(this.relevanteAfstand)); this.showHistogram = true; } else { this.showHistogram = false; @@ -80,6 +77,8 @@ export class ReferentielaagAutocorrectie { if (!ov || ov === nv) { return; } + let seriesValues = Object.entries(this.histogramData.series).map(([x, y]) => ({x: parseFloat(x), y: y})); + // (seriesValues.find((value) => value.x === Number(nv)).y).result; removePoint(); drawNewCircle(Number(nv)); } diff --git a/src/zoneerder/components/referentielaag-map.html b/src/zoneerder/components/referentielaag-map.html index 6388cbd8..515d35d2 100644 --- a/src/zoneerder/components/referentielaag-map.html +++ b/src/zoneerder/components/referentielaag-map.html @@ -6,5 +6,5 @@
- + diff --git a/src/zoneerder/models/contour.ts b/src/zoneerder/models/contour.ts index 6ef3ab1e..16b1f3b3 100644 --- a/src/zoneerder/models/contour.ts +++ b/src/zoneerder/models/contour.ts @@ -35,6 +35,14 @@ export const enum StrategieEnum { } export interface IAlignerResponse { - diffs: { [key: string]: string}; - series: { [key: string]: { [key: string]: object } }; + diffs: Diffs; + series: { [key: string]: { [key: string]: ISeriesValue } }; +} + +export type Diffs = { [key: string]: number }; + +export interface ISeriesValue { + result: Contour; + result_diff_min: Contour; + result_diff_plus: Contour; } \ No newline at end of file