Merge branch 'main' into fix/multi-zipfile

MIERUNE · Aug 9, 2024 · 6aa0721 · 6aa0721
2 parents 13ca882 + c00f09b
commit 6aa0721
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 26 deletions.
diff --git a/Pipfile b/Pipfile
@@ -10,6 +10,7 @@ isort = "*"
 
 [packages]
 numpy = ">=1.20.1"
+gdal = "==3.9.1"
 
 [requires]
 python_version = "3.9"
diff --git a/src/convert_fgd_dem/dem.py b/src/convert_fgd_dem/dem.py
@@ -190,36 +190,38 @@ def get_xml_content(self, xml_path):
         try:
             tree = et.parse(xml_path)
             root = tree.getroot()
+
             mesh_code = int(root.find("dataset:DEM//dataset:mesh", name_space).text)
-        except et.ParseError:
-            raise DemInputXmlException("Incorrect XML file.")
 
-        raw_metadata = {
-            "mesh_code": mesh_code,
-            "lower_corner": root.find(
-                "dataset:DEM//dataset:coverage//gml:boundedBy//gml:Envelope//gml:lowerCorner",
-                name_space,
-            ).text,
-            "upper_corner": root.find(
-                "dataset:DEM//dataset:coverage//gml:boundedBy//gml:Envelope//gml:upperCorner",
-                name_space,
-            ).text,
-            "grid_length": root.find(
-                "dataset:DEM//dataset:coverage//gml:gridDomain//gml:Grid//gml:high",
+            raw_metadata = {
+                "mesh_code": mesh_code,
+                "lower_corner": root.find(
+                    "dataset:DEM//dataset:coverage//gml:boundedBy//gml:Envelope//gml:lowerCorner",
+                    name_space,
+                ).text,
+                "upper_corner": root.find(
+                    "dataset:DEM//dataset:coverage//gml:boundedBy//gml:Envelope//gml:upperCorner",
+                    name_space,
+                ).text,
+                "grid_length": root.find(
+                    "dataset:DEM//dataset:coverage//gml:gridDomain//gml:Grid//gml:high",
+                    name_space,
+                ).text,
+                "start_point": root.find(
+                    "dataset:DEM//dataset:coverage//gml:coverageFunction//gml:GridFunction//gml:startPoint",
+                    name_space,
+                ).text,
+            }
+
+            meta_data = self._format_metadata(raw_metadata)
+
+            tuple_list = root.find(
+                "dataset:DEM//dataset:coverage//gml:rangeSet//gml:DataBlock//gml:tupleList",
                 name_space,
-            ).text,
-            "start_point": root.find(
-                "dataset:DEM//dataset:coverage//gml:coverageFunction//gml:GridFunction//gml:startPoint",
-                name_space,
-            ).text,
-        }
+            ).text
 
-        meta_data = self._format_metadata(raw_metadata)
-
-        tuple_list = root.find(
-            "dataset:DEM//dataset:coverage//gml:rangeSet//gml:DataBlock//gml:tupleList",
-            name_space,
-        ).text
+        except Exception:
+            raise DemInputXmlException("Incorrect XML file.")
 
         # Create an array list like [352.25,354.15...]
         if tuple_list.startswith("\n"):