improve validation message when bounding boxes don't intersect natcap…

…#502
emlys · Aug 21, 2023 · 6956953 · 6956953
1 parent f837685
commit 6956953
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/natcap/invest/validation.py b/src/natcap/invest/validation.py
@@ -56,7 +56,8 @@
     'NOT_AN_INTEGER': gettext('Value "{value}" does not represent an integer'),
     'NOT_BOOLEAN': gettext("Value must be either True or False, not {value}"),
     'NO_PROJECTION': gettext('Spatial file {filepath} has no projection'),
-    'BBOX_NOT_INTERSECT': gettext("Bounding boxes do not intersect: {bboxes}"),
+    'BBOX_NOT_INTERSECT': gettext('Not all of the spatial layers overlap each '
+        'other. All bounding boxes must intersect: {bboxes}'),
     'NEED_PERMISSION': gettext('You must have {permission} access to this file'),
 }
 

diff --git a/tests/test_habitat_quality.py b/tests/test_habitat_quality.py
@@ -1934,7 +1934,7 @@ def test_habitat_quality_argspec_spatial_overlap(self):
         self.assertTrue(
             validate_result,
             "expected failed validations instead didn't get any.")
-        self.assertIn("Bounding boxes do not intersect", validate_result[0][1])
+        self.assertIn("bounding boxes must intersect", validate_result[0][1])
 
     def test_habitat_quality_argspec_missing_projection(self):
         """Habitat Quality: raise error on missing projection."""

diff --git a/workbench/src/renderer/components/SetupTab/ArgInput/index.jsx b/workbench/src/renderer/components/SetupTab/ArgInput/index.jsx
@@ -30,7 +30,8 @@ const { ipcRenderer } = window.Workbench.electron;
  * @returns {string} - the filtered and formatted part of the message
  */
 function filterSpatialOverlapFeedback(message, filepath) {
-  const newPrefix = i18n.t('Bounding box does not intersect at least one other:');
+  const newPrefix = i18n.t(
+    'Not all of the spatial layers overlap each other. Bounding box:');
   const bbox = message.split(`${filepath}:`).pop().split('|')[0];
   const bboxFormatted = bbox.split(' ').map(
     (str) => str.padEnd(22, ' ')