fix: update tests and minor indents

Author: AngRodrigues

map2loop/data_checks.py

@@ -292,19 +292,20 @@ def check_fault_fields_validity(mapdata) -> Tuple[bool, str]:
                     f"Datatype FAULT: Column '{structtype_column}' contains NaN, empty, or blank values. Processing might not work as expected."
                 )
 
-        # Check if "fault_text" is defined and contained in the column
-        fault_text = config.get("fault_text", None)
-        if not fault_text:
-            logger.error(
-                "Datatype FAULT: 'fault_text' is not defined in the configuration, but it is required to filter faults."
-            )
-            return (True, "Datatype FAULT: 'fault_text' is not defined in the configuration.")
+    # Check if "fault_text" is defined and contained in the column
+    fault_text = config.get("fault_text", None)
+
+    # Check if the structtype_column exists in the fault_data
+    if structtype_column not in fault_data.columns:
+        logger.warning(
+            f"Datatype FAULT: The column '{structtype_column}' is not present in the fault data."
+        )
 
+    else:
         if not fault_data[structtype_column].str.contains(fault_text).any():
             logger.error(
-                f"Datatype FAULT: The 'fault_text' value '{fault_text}' is not found in column '{structtype_column}'. Ensure it is correctly defined at least for one row"
+                f"Datatype FAULT: The 'fault_text' value '{fault_text}' is not found in column '{structtype_column}'. Project might end up with no faults"
             )
-            return (True, f"Datatype FAULT: The 'fault_text' value '{fault_text}' is not found in column '{structtype_column}'.")
 
     #checks on name column
     name_column = config.get("name_column")

map2loop/mapdata.py

@@ -911,7 +911,6 @@ def parse_fault_map(self) -> tuple:
         Returns:
             tuple: A tuple of (bool: success/fail, str: failure message)
         """
-
         # Create a new geodataframe
         faults = geopandas.GeoDataFrame(self.raw_data[Datatype.FAULT]["geometry"])
 
@@ -920,6 +919,7 @@ def parse_fault_map(self) -> tuple:
 
         # update minimum fault length either with the value from the config or calculate it
         if self.minimum_fault_length < 0:
+            logger.info("Calculating minimum fault length")
             self.minimum_fault_length = calculate_minimum_fault_length(
                 bbox=self.bounding_box, area_percentage=0.05
             )
@@ -928,7 +928,7 @@ def parse_fault_map(self) -> tuple:
         # crop
         faults = faults.loc[faults.geometry.length >= self.minimum_fault_length]
 
-        if config["structtype_column"] in self.raw_data[Datatype.FAULT]:
+        if config["structtype_column"] in self.raw_data[Datatype.FAULT]:               
             faults["FEATURE"] = self.raw_data[Datatype.FAULT][config["structtype_column"]]
             faults = faults[faults["FEATURE"].astype(str).str.contains(config["fault_text"])]
             if self.verbose_level > VerboseLevel.NONE:
@@ -962,6 +962,7 @@ def parse_fault_map(self) -> tuple:
         else:
             logger.info("None of the fault ignore codes exist in the original fault data.")
             pass
+            
 
         # parse dip column
         if config["dip_column"] in self.raw_data[Datatype.FAULT]:

tests/mapdata/test_input_data_geology.py

@@ -2,6 +2,7 @@
 import geopandas as gpd
 import shapely.geometry
 from map2loop.mapdata import MapData
+from map2loop.data_checks import check_geology_fields_validity
 
 # Datatype Enum
 class Datatype:
@@ -196,6 +197,6 @@ def test_check_geology_fields_validity(geology_data, expected_validity, expected
     map_data.raw_data[Datatype.GEOLOGY] = geology_gdf
 
     # Test the check_geology_fields_validity function
-    validity_check, message = map_data.check_geology_fields_validity()
+    validity_check, message = check_geology_fields_validity(map_data)
     assert validity_check == expected_validity
     assert message == expected_message

tests/mapdata/test_input_data_structure.py

@@ -2,6 +2,7 @@
 import geopandas as gpd
 import shapely.geometry
 from map2loop.mapdata import MapData
+from map2loop.data_checks import check_structure_fields_validity
 
 # Datatype Enum
 class Datatype:
@@ -130,6 +131,6 @@ def test_check_structure_fields_validity(structure_data, expected_validity, expe
     map_data.raw_data[Datatype.STRUCTURE] = structure_gdf
 
     # Test the check_structure_fields_validity function
-    validity_check, message = map_data.check_structure_fields_validity()
+    validity_check, message = check_structure_fields_validity(map_data)
     assert validity_check == expected_validity
     assert message == expected_message