fix for validate tool attempting to check topology on feature classes…

… in CMU feature dataset

Scripts/GeMS_ValidateDatabase.py

@@ -85,16 +85,16 @@
 from osgeo import ogr
 
 # for debugging
-from importlib import reload
+# from importlib import reload
 
 # reload(guf)
 # reload(tp)
-reload(gdef)
+# reload(gdef)
 
 # values dictionary gets sent to report_template.jinja errors_template.jinja
 val = {}
 
-version_string = "GeMS_ValidateDatabase.py, version of 9/28/2023"
+version_string = "GeMS_ValidateDatabase.py, version of 10/18/2023"
 val["version_string"] = version_string
 val["datetime"] = time.asctime(time.localtime(time.time()))
 
@@ -215,11 +215,14 @@ def rule2_1(db_dict, is_gpkg):
         k
         for k, v in db_dict.items()
         if v["gems_equivalent"] in gdef.required_geologic_map_feature_classes
-        and not "crosssection" in v["feature_dataset"].lower()
-        and not "cmu" in v["feature_dataset"].lower()
+        and not any(
+            n in v["feature_dataset"].lower()
+            for n in ("correlationofmapunits", "cmu", "crosssection")
+        )
     ]
     # find_topology_pairs returns [GeologicMap feature dataset(if gdb), fd_tag_name, mapunitpolys, contactsandfaults]
     possible_pairs = tp.find_topology_pairs(fcs, is_gpkg, db_dict)
+    print(possible_pairs)
     if possible_pairs:
         # check each tagged name pair in the case of no feature dataset (pair[0])
         for pair in possible_pairs:

Scripts/GeMS_utilityFunctions.py

@@ -346,6 +346,7 @@ def gdb_object_dict(gdb_path):
                 if (
                     any(n in k.lower() for n in (a.lower(), camel_to_snake(a)))
                     and gdef.shape_dict[a] in v["concat_type"]
+                    and not "cmu" in a.lower()
                 ):
                     # set the gems_equivalent key to the GeMS CamelCase name
                     v["gems_equivalent"] = a