Skip to content

Fix/regex support #199

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 2 commits into from
Jun 5, 2025
Merged

Fix/regex support #199

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad0289f
fix: support multiple search terms for faults
rabii-chaarani Jun 5, 2025
c6d0b7a
fix: fold filtering to support multiple search terms
rabii-chaarani 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
25 changes: 20 additions & 5 deletions map2loop/mapdata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,9 +995,17 @@ 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"])]
# Check if the string contains commas indicating multiple substrings
if ',' in config["fault_text"]:
import re
fault_text = config["fault_text"].split(',')
search_terms = [term.strip().strip("'").strip('"') for term in fault_text]
escaped_terms = [re.escape(term) for term in search_terms]
# Combine the escaped terms using the pipe '|' symbol for alternation
fault_text_pattern = '|'.join(escaped_terms)
faults = faults[faults["FEATURE"].astype(str).str.contains(fault_text_pattern, case=False, regex=True, na=False)]
if self.verbose_level > VerboseLevel.NONE:
if len(faults) < len(self.raw_data[Datatype.GEOLOGY]) and len(faults) == 0:
msg = f"Fault map reduced to 0 faults as structtype_column ({config['structtype_column']}) does not contains as row with fault_text \"{config['fault_text']}\""
Expand Down Expand Up @@ -1132,9 +1140,16 @@ def parse_fold_map(self) -> tuple:
folds[config["structtype_column"]] = self.raw_data[Datatype.FOLD][
config["structtype_column"]
]
folds = folds[
folds[config["structtype_column"]].astype(str).str.contains(config["fold_text"])
]
if ',' in config["fold_text"]:
import re
fold_text = config["fold_text"].split(',')
search_terms = [term.strip().strip("'").strip('"') for term in fold_text]
escaped_terms = [re.escape(term) for term in search_terms]
# Combine the escaped terms using the pipe '|' symbol for alternation
fold_text_pattern = '|'.join(escaped_terms)
folds = folds[
folds[config["structtype_column"]].astype(str).str.contains(fold_text_pattern, case=False, regex=True, na=False)
]
if self.verbose_level > VerboseLevel.NONE:
if len(folds) < len(self.raw_data[Datatype.GEOLOGY]) and len(folds) == 0:
msg = f"Fold map reduced to 0 folds as structtype_column ({config['structtype_column']}) does not contains any row with fold_text \"{config['fold_text']}\""
Expand Down
Loading