From c154e476dfe712698822cb56fa74129af432a91c Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Tue, 6 Aug 2019 17:30:04 +0200
Subject: [PATCH] Fix bug in CourbeRemous
---
spec/remous/remous_rect_trapezes_pentefaible.spec.ts | 1 -
src/remous/remous.ts | 2 --
src/util/resultelement.ts | 4 ++++
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/spec/remous/remous_rect_trapezes_pentefaible.spec.ts b/spec/remous/remous_rect_trapezes_pentefaible.spec.ts
index 0c430d0d..4a5cf34c 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 7203ecb2..d6d370dd 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 9ae17e0d..a23c0305 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];
+ }
}
}
--
GitLab