Merge pull request #2958 from bcgov/batch_geo_unclosed_rings

geo validation for batch update
bcgov · Nov 2, 2023 · 6d11435 · 6d11435
2 parents 2b56e0f + e33996d
commit 6d11435
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/api/src/utils/batch/validation/spatial-validation.ts b/api/src/utils/batch/validation/spatial-validation.ts
@@ -88,7 +88,14 @@ export const autofillFromPostGIS = async (input: string, inputArea?: number): Pr
       area: res.rows[0]['area'],
       geog: res.rows[0]['geog']
     };
-  } finally {
+
+  }
+  catch(e) {
+
+    console.log('error in autofillFromPostGIS', e)
+    throw new Error('Error validating geometry in the database' + e.message );
+
+  }finally {
     connection.release();
   }
 };

diff --git a/api/src/utils/batch/validation/validation.ts b/api/src/utils/batch/validation/validation.ts
@@ -303,6 +303,8 @@ async function _validateCell(
       //@todo validate length
       break;
     case 'WKT':
+      try {
+
       // validate if not polygon first to avoid WKT autofill and subsequent crashes
       const shape = data.split(' (')[0];
       if (shape !== 'POLYGON' && shape !== 'MULTIPOLYGON' && !template.key.includes('temp')) {
@@ -384,6 +386,15 @@ async function _validateCell(
           messageTitle: `Area cannot be larger than ${lookupAreaLimit(template.subtype)}`
         });
       }
+    }
+    catch(e)
+    {
+      result.validationMessages.push({
+        severity: 'error',
+        messageTitle: 'Unhandled geometry error for cell',
+        messageDetail: e.message || e.messageDetail || e
+      });
+    }
 
       break;
     case 'tristate':