fix(fix-129): Library should not stop calculation if data is not corr…

…ectly set
jzck · Oct 17, 2024 · 5a0daec · 5a0daec
1 parent e42c03b
commit 5a0daec
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/src/3.4_pont_thermique.js b/src/3.4_pont_thermique.js
@@ -19,19 +19,28 @@ function tv_k(di, de, du, pc_id, enveloppe) {
     if (desc.match(/(.+) \/ (.+)/)) {
       desc_1 = desc.match(/(.+) \/ (.+)/)[1];
       desc_2 = desc.match(/(.+) \/ (.+)/)[2];
-    } else if (desc.match(/(.+)-(.+)/)[1]) {
+    } else if (desc.match(/(.+)-(.+)/)) {
       desc_1 = desc.match(/(.+)-(.+)/)[1];
       desc_2 = desc.match(/(.+)-(.+)/)[2];
     } else {
       console.error(`BUG: description '${desc}' non reconnue pour le pont thermique...`);
       return;
     }
 
-    de.reference_1 = mur_list.find(
+    let ptMur = mur_list.find(
       (mur) =>
         mur.donnee_entree.description.includes(desc_1) ||
         mur.donnee_entree.description.includes(desc_2)
-    ).donnee_entree.reference;
+    );
+    if (ptMur) {
+      de.reference_1 = ptMur.donnee_entree.reference;
+    } else {
+      console.error(
+        `BUG: descriptions '${desc_1}' ou '${desc_2}' du pont thermique non reconnue dans les descriptions des murs`
+      );
+      return;
+    }
+
     let list_2;
     switch (type_liaison) {
       case 'refend / mur':
@@ -49,11 +58,19 @@ function tv_k(di, de, du, pc_id, enveloppe) {
         break;
     }
     if (list_2) {
-      de.reference_2 = list_2.find(
+      ptMur = list_2.find(
         (men) =>
           men.donnee_entree.description.includes(desc_2) ||
           men.donnee_entree.description.includes(desc_1)
-      ).donnee_entree.reference;
+      );
+      if (ptMur) {
+        de.reference_2 = ptMur.donnee_entree.reference;
+      } else {
+        console.error(
+          `BUG: descriptions '${desc_1}' ou '${desc_2}' du pont thermique non reconnue dans '${type_liaison}'`
+        );
+        return;
+      }
     }
   }
 
@@ -95,6 +112,10 @@ function tv_k(di, de, du, pc_id, enveloppe) {
           plancher.donnee_entree.reference === de.reference_1 ||
           plancher.donnee_entree.reference === de.reference_2
       );
+      if (!plancher) {
+        console.error('Did not find plancher reference:', de.reference_1, de.reference_2);
+        return;
+      }
       const isolation_plancher = requestInput(
         plancher.donnee_entree,
         plancher.donnee_utilisateur,

diff --git a/src/engine.js b/src/engine.js
@@ -36,9 +36,15 @@ export function calcul_3cl(dpe) {
   if (logement.enveloppe === undefined) {
     console.warn('vide: logement.enveloppe');
     return null;
-  } else if (logement.enveloppe.mur_collection === undefined) {
+  } else if (!logement.enveloppe.mur_collection) {
     console.warn('vide: logement.enveloppe.mur_collection');
     return null;
+  } else if (!logement.enveloppe.plancher_haut_collection) {
+    console.warn('vide: logement.enveloppe.plancher_haut_collection');
+    return null;
+  } else if (!logement.enveloppe.plancher_bas_collection) {
+    console.warn('vide: logement.enveloppe.plancher_bas_collection');
+    return null;
   }
 
   add_references(logement.enveloppe);