From 806f3fecd60b75841945a883f3a477d339530736 Mon Sep 17 00:00:00 2001
From: Carl Higgs <carlhiggs@gmail.com>
Date: Wed, 19 Jun 2024 16:02:41 +1000
Subject: [PATCH] made updates to address #453

---
 process/subprocesses/ghsci.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/process/subprocesses/ghsci.py b/process/subprocesses/ghsci.py
index 7da9568e..b405bbc1 100644
--- a/process/subprocesses/ghsci.py
+++ b/process/subprocesses/ghsci.py
@@ -491,8 +491,12 @@ def _region_dictionary_setup(self, folder_path):
             'urban_region',
             data_path,
         )
-        if r['urban_region'] is None:
-            return None
+        if r['urban_region']['data_dir'].startswith('Not required'):
+            r['urban_query'] = None
+            if r['study_region_boundary']['data'] == 'urban_query':
+                sys.exit(
+                    'Study region has been configured to use the "urban_query" parameter, but urban region data does not appear to have been defined.',
+                )
         r['buffered_urban_study_region'] = buffered_urban_study_region
         r['db'] = codename.lower()
         r['dbComment'] = (
@@ -574,6 +578,8 @@ def _region_data_setup(
                 region = region_config['codename']
             else:
                 region = self.codename
+            if data not in region_config:
+                region_config[data] = None
             if isinstance(region_config[data], str):
                 if data not in datasets or datasets[data] is None:
                     print(
@@ -592,9 +598,7 @@ def _region_data_setup(
                     return None
                 data_dictionary = datasets[data][region_config[data]].copy()
             else:
-                if data == 'urban_region' and (
-                    data not in region_config or region_config[data] is None
-                ):
+                if data == 'urban_region' and region_config[data] is None:
                     urban_region_checks = [
                         self.config['study_region_boundary'][
                             'ghsl_urban_intersection'
@@ -634,13 +638,15 @@ def _region_data_setup(
                     f"{region}.yml error: The 'data_dir' entry for {data} does not appear to have been defined.  This parameter is required for analysis of {region}, and is used to locate a required dataset cross-referenced in {region}.yml.  Please check the configured settings before proceeding.",
                 )
                 return None
-            if data_path is not None:
+            if data_path is not None and not data_dictionary[
+                'data_dir'
+            ].startswith('Not required'):
                 data_dictionary['data_dir'] = (
                     f"{data_path}/{data_dictionary['data_dir']}"
                 )
             return data_dictionary
         except Exception as e:
-            sys.exit(e)
+            sys.exit(f'Data Check error with {data}: {e}')
 
     def _population_data_setup(self, r):
         r['population'] = self._region_data_setup(r, 'population', data_path)