diff --git a/spec/remous/remous_rect_trapezes_pentefaible.spec.ts b/spec/remous/remous_rect_trapezes_pentefaible.spec.ts index 0c430d0dc749462076f4336be97c88dc27ddc648..4a5cf34c704c92d9190bc6ce6c2c41823d8d6852 100644 --- a/spec/remous/remous_rect_trapezes_pentefaible.spec.ts +++ b/spec/remous/remous_rect_trapezes_pentefaible.spec.ts @@ -639,7 +639,6 @@ describe("Class Remous / section rectangulaire :", () => { compareLog(res.globalLog, expLog); }); - // désactivé suite au changement de format de résultat it("faible pente, pas de fluvial, torrentiel tronqué, calcul Hs", () => { const prms = new ParamsSectionRectang(undefined, // tirant d'eau 2.5, // largeur de fond diff --git a/src/remous/remous.ts b/src/remous/remous.ts index 7203ecb286ea65a3813ae77ebd4bc1f96de9bfc9..d6d370dd30ad7c3b5f7f9cc1f9a7c431f4362177 100644 --- a/src/remous/remous.ts +++ b/src/remous/remous.ts @@ -481,8 +481,6 @@ export class CourbeRemous extends SectionNub { } // Calcul de la variable à calculer - - const tRes: { [key: number]: number } = {}; if (valACal) { for (const re of res.resultElements) { const rY = re.vCalc; diff --git a/src/util/resultelement.ts b/src/util/resultelement.ts index 9ae17e0dd22b54a5cd321936afed0157b23b9382..a23c030568dfb6d15495c5e50bc5aa42699f3da5 100644 --- a/src/util/resultelement.ts +++ b/src/util/resultelement.ts @@ -39,6 +39,10 @@ export class ResultElement { } else if (v !== undefined) { // assuming key-value map this._values = v; + // assuming 1st value is vCalc + if (Object.keys(v).length > 0) { + this._vCalcSymbol = Object.keys(v)[0]; + } } }