Refactor map2model wrapper as topology functions

Author: rabii-chaarani

map2loop/map2model_wrapper.py

@@ -1360,11 +1360,10 @@ def calculate_bounding_box_and_projection(self):
     def export_wkt_format_files(self):
         """
         Save out the geology and fault GeoDataFrames in WKT format
-        This is used by map2model
+        This is used by topology
         """
-        # TODO: - Move away from tab seperators entirely (topology and map2model)
-
-        self.map2model_tmp_path = pathlib.Path(tempfile.mkdtemp())
+        # TODO: - Move away from tab seperators entirely (topology)
+        self.topology_tmp_path = pathlib.Path(tempfile.mkdtemp())
 
         # Check geology data status and export to a WKT format file
         self.load_map_data(Datatype.GEOLOGY)
@@ -1398,7 +1397,7 @@ def export_wkt_format_files(self):
             geology["ROCKTYPE1"] = geology["ROCKTYPE1"].replace("", "None")
             geology["ROCKTYPE2"] = geology["ROCKTYPE2"].replace("", "None")
             geology.to_csv(
-                pathlib.Path(self.map2model_tmp_path) / "geology_wkt.csv", sep="\t", index=False
+                pathlib.Path(self.topology_tmp_path) / "geology_wkt.csv", sep="\t", index=False
             )
 
         # Check faults data status and export to a WKT format file
@@ -1413,7 +1412,7 @@ def export_wkt_format_files(self):
             faults = self.get_map_data(Datatype.FAULT).copy()
             faults.rename(columns={"geometry": "WKT"}, inplace=True)
             faults.to_csv(
-                pathlib.Path(self.map2model_tmp_path) / "faults_wkt.csv", sep="\t", index=False
+                pathlib.Path(self.topology_tmp_path) / "faults_wkt.csv", sep="\t", index=False
             )
 
     @beartype.beartype

map2loop/mapdata.py

@@ -10,7 +10,7 @@
 from .sorter import Sorter, SorterAgeBased, SorterAlpha, SorterUseNetworkX, SorterUseHint
 from .stratigraphic_column import StratigraphicColumn
 from .deformation_history import DeformationHistory
-from .map2model_wrapper import Map2ModelWrapper
+from .topology import run_topology, calculate_unit_unit_relationships
 from .data_checks import validate_config_dictionary
 
 # external imports
@@ -47,8 +47,8 @@ class Project(object):
         The name of the loop project file used in this project
     map_data: MapData
         The structure that holds all map and dtm data
-    map2model: Map2ModelWrapper
-        A wrapper around the map2model module that extracts unit and fault adjacency
+    topology_results: dict
+        A dictionary storing results from the topology process
     stratigraphic_column: StratigraphicColumn
         The structure that holds the unit information and ordering
     deformation_history: DeformationHistory
@@ -143,7 +143,7 @@ def __init__(
         self.throw_calculator = ThrowCalculatorAlpha()
         self.fault_orientation = FaultOrientationNearest()
         self.map_data = MapData(verbose_level=verbose_level)
-        self.map2model = Map2ModelWrapper(self.map_data)
+        self.topology_results = None
         self.stratigraphic_column = StratigraphicColumn()
         self.deformation_history = DeformationHistory(project=self)
         self.loop_filename = loop_project_filename
@@ -583,7 +583,7 @@ def calculate_stratigraphic_order(self, take_best=False):
             columns = [
                 sorter.sort(
                     self.stratigraphic_column.stratigraphicUnits,
-                    self.map2model.get_unit_unit_relationships(),
+                    calculate_unit_unit_relationships(self.map_data),
                     self.map_data.contacts,
                     self.map_data,
                 )
@@ -613,7 +613,7 @@ def calculate_stratigraphic_order(self, take_best=False):
             logger.info(f'Calculating stratigraphic column using sorter {self.sorter.sorter_label}')
             self.stratigraphic_column.column = self.sorter.sort(
                 self.stratigraphic_column.stratigraphicUnits,
-                self.map2model.get_unit_unit_relationships(),
+                calculate_unit_unit_relationships(self.map_data),
                 self.map_data.contacts,
                 self.map_data,
             )
@@ -802,7 +802,7 @@ def run_all(self, user_defined_stratigraphic_column=None, take_best=False):
         # Calculate the stratigraphic column
         if issubclass(type(user_defined_stratigraphic_column), list):
             self.stratigraphic_column.column = user_defined_stratigraphic_column
-            self.map2model.run()  # if we use a user defined stratigraphic column, we still need to calculate the results of map2model
+            self.topology_results = run_topology(self.map_data)
         else:
             if user_defined_stratigraphic_column is not None:
                 logger.warning(
@@ -1050,9 +1050,9 @@ def save_into_projectfile(self):
         observations["dipPolarity"] = self.structure_samples["OVERTURNED"]
         LPF.Set(self.loop_filename, "stratigraphicObservations", data=observations)
 
-        if self.map2model.fault_fault_relationships is not None:
+        if self.topology_results and self.topology_results.get("fault_fault_relationships") is not None:
             ff_relationships = self.deformation_history.get_fault_relationships_with_ids(
-                self.map2model.fault_fault_relationships
+                self.topology_results["fault_fault_relationships"]
             )
             relationships = numpy.zeros(len(ff_relationships), LPF.eventRelationshipType)