From b8867a3e0d94b6f0691330764c41bbdf4b124200 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Wed, 9 Sep 2020 14:52:10 +0200
Subject: [PATCH] Fix #270 - PAB verification: make minimum slot width
mandatory
---
spec/verificateur/verificateur.spec.ts | 8 +++++---
src/verification/espece.ts | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/spec/verificateur/verificateur.spec.ts b/spec/verificateur/verificateur.spec.ts
index 7901fe64..385366ad 100644
--- a/spec/verificateur/verificateur.spec.ts
+++ b/spec/verificateur/verificateur.spec.ts
@@ -542,9 +542,11 @@ describe("vérificateur de franchissement −", () => {
// les 2 premières modalités devraient tiquer sur HMin seulement (pas de jet de surface)
for (let i = 0; i < 2; i++) {
const r = esp.result.resultElements[i]
- expect(r.log.messages.length).toBe(1); // DHMaxS, BMin, PMinS, LMinS, HMin
+ expect(r.log.messages.length).toBe(2); // DHMaxS, BMin, PMinS, LMinS, HMin
expect(r.log.messages[0].code).toBe(MessageCode.ERROR_VERIF_MISSING_CRITERION);
expect(r.log.messages[0].extraVar.var_criterion).toBe("HMin");
+ expect(r.log.messages[1].code).toBe(MessageCode.ERROR_VERIF_MISSING_CRITERION);
+ expect(r.log.messages[1].extraVar.var_criterion).toBe("BMin");
}
// les 2 dernières modalités devraient tiquer sur HMin, DHMaxS, BMin, PMinS, LMinS, HMin
for (let i = 2; i < 4; i++) {
@@ -553,9 +555,9 @@ describe("vérificateur de franchissement −", () => {
expect(r.log.messages[0].code).toBe(MessageCode.ERROR_VERIF_MISSING_CRITERION);
expect(r.log.messages[0].extraVar.var_criterion).toBe("HMin");
expect(r.log.messages[1].code).toBe(MessageCode.ERROR_VERIF_MISSING_CRITERION);
- expect(r.log.messages[1].extraVar.var_criterion).toBe("DHMaxS");
+ expect(r.log.messages[1].extraVar.var_criterion).toBe("BMin");
expect(r.log.messages[2].code).toBe(MessageCode.ERROR_VERIF_MISSING_CRITERION);
- expect(r.log.messages[2].extraVar.var_criterion).toBe("BMin");
+ expect(r.log.messages[2].extraVar.var_criterion).toBe("DHMaxS");
expect(r.log.messages[3].code).toBe(MessageCode.ERROR_VERIF_MISSING_CRITERION);
expect(r.log.messages[3].extraVar.var_criterion).toBe("PMinS");
expect(r.log.messages[4].code).toBe(MessageCode.ERROR_VERIF_MISSING_CRITERION);
diff --git a/src/verification/espece.ts b/src/verification/espece.ts
index 24178f21..f6f91780 100644
--- a/src/verification/espece.ts
+++ b/src/verification/espece.ts
@@ -422,9 +422,9 @@ export class Espece extends Nub implements Observer {
hasAtLeastOneDivingJet = hasAtLeastOneDivingJet || this.hasJet(passB.downWall, StructureJetType.PLONGEANT);
let cpRetPAB: Result;
- let criteriaToCheck: string[] = [ /* "PVMaxPrec", "PVMaxLim", */ "HMin" ];
+ let criteriaToCheck: string[] = [ /* "PVMaxPrec", "PVMaxLim", */ "HMin", "BMin" ];
if (hasAtLeastOneSurfaceJet) {
- criteriaToCheck = criteriaToCheck.concat([ "DHMaxS", "BMin", "PMinS", "LMinS" ]);
+ criteriaToCheck = criteriaToCheck.concat([ "DHMaxS", "PMinS", "LMinS" ]);
}
if (hasAtLeastOneDivingJet && this.divingJetSupported === DivingJetSupport.SUPPORTED) {
criteriaToCheck = criteriaToCheck.concat([ "DHMaxP", "PMinP", "LMinP" ]);
--
GitLab