Skip to content

Fix/remove map2model #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lachlangrose merged 5 commits into from
Jun 5, 2025
Merged

Fix/remove map2model #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b1e5df
fix: remove calls to map2model
Jun 5, 2025
078a366
fix: remove m2m from deps
Jun 5, 2025
b955c5d
style: style fixes by ruff and autoformatting by black
lachlangrose Jun 5, 2025
628c352
remove map2model import
Jun 5, 2025
3380817
Merge branch 'fix/remove-map2model' of github.com:Loop3D/map2loop int…
Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ geopandas
shapely
networkx
owslib
map2model
loopprojectfile==0.2.2
beartype
pytest
Expand Down
228 changes: 13 additions & 215 deletions map2loop/map2model_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@
from .m2l_enums import VerboseLevel

# external imports
import map2model
import pandas
import numpy
import geopandas as gpd
import pandas as pd
import numpy as np
import os
import re

from .logging import getLogger

Expand Down Expand Up @@ -37,7 +32,7 @@ class Map2ModelWrapper:
"""

def __init__(
self, map_data, mode: str = 'geopandas', verbose_level: VerboseLevel = VerboseLevel.NONE
self, map_data, *, verbose_level: VerboseLevel = VerboseLevel.NONE
):
"""
The initialiser for the map2model wrapper
Expand All @@ -48,7 +43,6 @@ def __init__(
verbose_level (VerboseLevel, optional):
How much console output is sent. Defaults to VerboseLevel.ALL.
"""
self.mode = mode
self.sorted_units = None
self._fault_fault_relationships = None
self._unit_fault_relationships = None
Expand All @@ -60,28 +54,22 @@ def __init__(
@property
def fault_fault_relationships(self):
if self._fault_fault_relationships is None:
if self.mode == 'geopandas':
self._calculate_fault_fault_relationships()
else:
self.run()
self._calculate_fault_fault_relationships()

return self._fault_fault_relationships

@property
def unit_fault_relationships(self):
if self._unit_fault_relationships is None:
if self.mode == 'geopandas':
self._calculate_fault_unit_relationships()
else:
self.run()
self._calculate_fault_unit_relationships()

return self._unit_fault_relationships

@property
def unit_unit_relationships(self):
if self._unit_unit_relationships is None:
if self.mode == 'geopandas':
self._calculate_unit_unit_relationships()
else:
self.run()
self._calculate_unit_unit_relationships()

return self._unit_unit_relationships

def reset(self):
Expand All @@ -101,12 +89,8 @@ def get_sorted_units(self):
Returns:
list: The map2model stratigraphic column estimate
"""
if self.mode == 'geopandas':
raise NotImplementedError("This method is not implemented")
else:
if self.sorted_units is None:
self.run()
return self.sorted_units
raise NotImplementedError("This method is not implemented")


def get_fault_fault_relationships(self):
"""
Expand Down Expand Up @@ -199,194 +183,8 @@ def run(self, verbose_level: VerboseLevel = None):
verbose_level (VerboseLevel, optional):
How much console output is sent. Defaults to None (which uses the wrapper attribute).
"""
if self.mode == 'geopandas':

self.get_fault_fault_relationships()
self.get_unit_fault_relationships()
self.get_unit_unit_relationships()
return
else:

if verbose_level is None:
verbose_level = self.verbose_level
logger.info("Exporting map data for map2model")
self.map_data.export_wkt_format_files()
logger.info("Running map2model...")

map2model_code_map = {
"o": "ID", # FIELD_COORDINATES
"f": "FEATURE", # FIELD_FAULT_ID
"u": "CODE", # FIELD_POLYGON_LEVEL1_NAME
"g": "GROUP", # FIELD_POLYGON_LEVEL2_NAME
"min": "MIN_AGE", # FIELD_POLYGON_MIN_AGE
"max": "MAX_AGE", # FIELD_POLYGON_MAX_AGE
"c": "UNITNAME", # FIELD_POLYGON_CODE
"ds": "DESCRIPTION", # FIELD_POLYGON_DESCRIPTION
"r1": "ROCKTYPE1", # FIELD_POLYGON_ROCKTYPE1
"r2": "ROCKTYPE2", # FIELD_POLYGON_ROCKTYPE2
"msc": "", # FIELD_SITE_CODE
"mst": "", # FIELD_SITE_TYPE
"mscm": "", # FIELD_SITE_COMMO
"fold": self.map_data.config.fold_config["fold_text"], # FAULT_AXIAL_FEATURE_NAME
"sill": self.map_data.config.geology_config["sill_text"], # SILL_STRING
"intrusive": self.map_data.config.geology_config[
"intrusive_text"
], # IGNEOUS_STRING
"volcanic": self.map_data.config.geology_config["volcanic_text"], # VOLCANIC_STRING
"deposit_dist": 100, # deposit_dist
}
logger.info(f"map2model params: {map2model_code_map}")
# TODO: Simplify. Note: this is external so have to match fix to map2model module
logger.info(os.path.join(self.map_data.map2model_tmp_path, "map2model_data"))
logger.info(
os.path.join(self.map_data.map2model_tmp_path, "map2model_data", "geology_wkt.csv")
)
logger.info(
os.path.join(self.map_data.map2model_tmp_path, "map2model_data", "faults_wkt.csv")
)
logger.info(self.map_data.get_bounding_box())
logger.info(map2model_code_map)
logger.info(verbose_level == VerboseLevel.NONE)

run_log = map2model.run(
os.path.join(self.map_data.map2model_tmp_path),
os.path.join(self.map_data.map2model_tmp_path, "geology_wkt.csv"),
os.path.join(self.map_data.map2model_tmp_path, "faults_wkt.csv"),
"",
self.map_data.get_bounding_box(),
map2model_code_map,
verbose_level == VerboseLevel.NONE,
"None",
)
# Parse fault intersections
out = []
fault_fault_intersection_filename = os.path.join(
self.map_data.map2model_tmp_path, 'fault-fault-intersection.txt'
)
logger.info(f"Reading fault-fault intersections from {fault_fault_intersection_filename}")
if (
os.path.isfile(fault_fault_intersection_filename)
and os.path.getsize(fault_fault_intersection_filename) > 0
):
df = pandas.read_csv(fault_fault_intersection_filename, delimiter="{", header=None)
df[1] = list(df[1].str.replace("}", "", regex=False))
df[1] = [re.findall("\(.*?\)", i) for i in df[1]] # Valid escape for regex
df[0] = list(df[0].str.replace("^[0-9]*, ", "", regex=True))
df[0] = list(df[0].str.replace(", ", "", regex=False))

# df[0] = "Fault_" + df[0] #removed 7/10/24 as it seems to break the merge in
relations = df[1]
for j in range(len(relations)):
relations[j] = [i.strip("()").replace(" ", "").split(",") for i in relations[j]]
df[1] = relations

for _, row in df.iterrows():
for i in numpy.arange(len(row[1])):

out += [[row[0], row[1][i][0], row[1][i][1], float(row[1][i][2])]]

else:
logger.warning(
f"Fault-fault intersections file {fault_fault_intersection_filename} not found"
)
logger.info("Parsing map2model output")
logger.info(run_log)

logger.info("map2model complete")

# Parse units sorted
units_sorted = pandas.read_csv(
os.path.join(self.map_data.map2model_tmp_path, "units_sorted.txt"),
header=None,
sep=' ',
)
if units_sorted.shape == 0:
self.sorted_units = []
else:
self.sorted_units = list(units_sorted[5])

# Parse fault intersections
out = []
fault_fault_intersection_filename = os.path.join(
self.map_data.map2model_tmp_path, "fault-fault-intersection.txt"
)
logger.info(
f"Reading fault-fault intersections from {fault_fault_intersection_filename}"
)
if (
os.path.isfile(fault_fault_intersection_filename)
and os.path.getsize(fault_fault_intersection_filename) > 0
):
df = pandas.read_csv(fault_fault_intersection_filename, delimiter="{", header=None)
df[1] = list(df[1].str.replace("}", "", regex=False))
df[1] = [re.findall("\(.*?\)", i) for i in df[1]] # Valid escape for regex
df[0] = list(df[0].str.replace("^[0-9]*, ", "", regex=True))
df[0] = list(df[0].str.replace(", ", "", regex=False))
# df[0] = "Fault_" + df[0] #removed 7/10/24 as it seems to break the merge in
relations = df[1]
for j in range(len(relations)):
relations[j] = [i.strip("()").replace(" ", "").split(",") for i in relations[j]]
df[1] = relations

for _, row in df.iterrows():
for i in numpy.arange(len(row[1])):
out += [[row[0], row[1][i][0], row[1][i][1], float(row[1][i][2])]]

else:
logger.warning(
f"Fault-fault intersections file {fault_fault_intersection_filename} not found"
)

df_out = pandas.DataFrame(columns=["Fault1", "Fault2", "Type", "Angle"], data=out)
logger.info('Fault intersections')
logger.info(df_out.to_string())
self.fault_fault_relationships = df_out

# Parse unit fault relationships
out = []
unit_fault_intersection_filename = os.path.join(
self.map_data.map2model_tmp_path, "unit-fault-intersection.txt"
)
if (
os.path.isfile(unit_fault_intersection_filename)
and os.path.getsize(unit_fault_intersection_filename) > 0
):
df = pandas.read_csv(unit_fault_intersection_filename, header=None, sep='{')
df[1] = list(df[1].str.replace("}", "", regex=False))
df[1] = df[1].astype(str).str.split(", ")
df[0] = list(df[0].str.replace("^[0-9]*, ", "", regex=True))
df[0] = list(df[0].str.replace(", ", "", regex=False))

for _, row in df.iterrows():
for i in numpy.arange(len(row[1])):
out += [[row[0], "Fault_" + row[1][i]]]

df_out = pandas.DataFrame(columns=["Unit", "Fault"], data=out)
self.unit_fault_relationships = df_out

# Parse unit unit relationships
units = []
links = []
graph_filename = os.path.join(
self.map_data.map2model_tmp_path, "graph_all_None.gml.txt"
)
if os.path.isfile(graph_filename) and os.path.getsize(graph_filename) > 0:
with open(
os.path.join(self.map_data.map2model_tmp_path, "graph_all_None.gml.txt")
) as file:
contents = file.read()
segments = contents.split("\n\n")
for line in segments[0].split("\n"):
units += [line.split(" ")]
for line in segments[1].split("\n")[:-1]:
links += [line.split(" ")]

df = pandas.DataFrame(columns=["index", "unit"], data=units)
df.set_index("index", inplace=True)
out = []
for row in links:
out += [[int(row[0]), df["unit"][row[0]], int(row[1]), df["unit"][row[1]]]]
df_out = pandas.DataFrame(
columns=["Index1", "UnitName1", "Index2", "UnitName2"], data=out
)
self.unit_unit_relationships = df_out
self.get_fault_fault_relationships()
self.get_unit_fault_relationships()
self.get_unit_unit_relationships()

Loading