Merge pull request #66 from MiraGeoscience/GEOPY-1817

GEOPY-1817: Check that utf-8 characters are supported

las_geoh5/import_directories/driver.py

@@ -58,7 +58,9 @@ def import_las_directory(dh_group: DrillholeGroup, basepath: str | Path):
     for prop in property_group_folders:
         lasfiles = []
         for file in [k for k in prop.iterdir() if k.suffix == ".las"]:
-            lasfiles.append(lasio.read(file, mnemonic_case="preserve"))
+            lasfiles.append(
+                lasio.read(file, mnemonic_case="preserve", encoding="utf-8")
+            )
         print(f"Importing property group data from to '{prop.name}'")
         las_to_drillhole(
             lasfiles,

las_geoh5/import_las.py

@@ -531,4 +531,4 @@ def lasio_read(file):
     """
 
     _patch_lasio_reader()
-    return lasio.read(file, mnemonic_case="preserve")
+    return lasio.read(file, mnemonic_case="preserve", encoding="utf-8")

tests/import_las_test.py

@@ -59,6 +59,36 @@
 ]
 
 
+def test_encoding(tmp_path: Path):
+    with Workspace.create(tmp_path / "test.geoh5") as workspace:
+        dh_group = DrillholeGroup.create(workspace, name="dh_group")
+
+    lasfile = generate_lasfile(
+        well="dh1é",
+        collar={"UTMX": 0.0, "UTMY": 0.0, "ELEV": 10.0},
+        depths=np.arange(0, 11, 1),
+        properties={"my_property": np.zeros(11)},
+    )
+    lasfiles = [write_lasfile(tmp_path, lasfile)]
+    filepath = write_import_params_file(
+        tmp_path / "import_las_files.ui.json",
+        dh_group,
+        "my_property_group",
+        lasfiles,
+        (
+            "UTMX",
+            "UTMY",
+            "ELEV",
+        ),
+    )
+
+    module = importlib.import_module("las_geoh5.import_files.driver")
+    module.run(filepath)
+
+    with workspace.open(mode="r"):
+        assert workspace.get_entity("dh1é")[0] is not None
+
+
 def test_import_las_new_drillholes(tmp_path: Path):
     with Workspace.create(tmp_path / "test.geoh5") as workspace:
         dh_group = DrillholeGroup.create(workspace, name="dh_group")