Merge pull request #25 from Ingenjorsarbete-For-Klimatet/hotfix/groun…

…d-base

Hotfix/ground base

src/lantmateriet/geometry.py

@@ -1,4 +1,5 @@
 """Geometry module."""
+
 from copy import deepcopy
 from multiprocessing import Pool
 from os import path

src/lantmateriet/ground.py

@@ -1,4 +1,5 @@
 """Ground module."""
+
 import geopandas as gpd
 import pandas as pd
 from lantmateriet.geometry import Geometry
@@ -53,12 +54,16 @@ def process(
         df_processed = self._process(
             self.item_type, self.layer, self.dissolve, set_area, set_length
         )
-        df_processed["Sverige"] = pd.concat(
-            [
-                v[~v["objekttyp"].isin(self.config.ground_water)]
-                for _, v in df_processed.items()
-            ]
-        ).dissolve()
+        df_processed["Sverige"] = (
+            pd.concat(
+                [
+                    v  # v[~v["objekttyp"].isin(self.config.ground_water)]
+                    for _, v in df_processed.items()
+                ]
+            )
+            .dissolve()
+            .explode(index_parts=False)
+        )
         df_processed["Sverige"] = self._set_area(df_processed["Sverige"])
         df_processed["Sverige"] = self._set_length(df_processed["Sverige"])
         df_processed["Sverige"]["objekttyp"] = "Sverige"

src/lantmateriet/utils.py

@@ -1,4 +1,5 @@
 """Utils module."""
+
 import logging
 import time
 from functools import wraps

tests/integration/test_integration_communication.py

@@ -1,4 +1,5 @@
 """Communication integration tests."""
+
 import geopandas as gpd
 import pandas as pd
 from geopandas import testing

tests/integration/test_integration_construction.py

@@ -1,4 +1,5 @@
 """Construction integration tests."""
+
 import geopandas as gpd
 import pandas as pd
 from geopandas import testing

tests/integration/test_integration_ground.py

@@ -1,4 +1,5 @@
 """Ground integration tests."""
+
 import geopandas as gpd
 import pandas as pd
 from geopandas import testing

tests/unit/test_unit_communication.py

@@ -1,4 +1,5 @@
 """Communication unit tests."""
+
 from unittest.mock import patch
 
 import geopandas as gpd

tests/unit/test_unit_construction.py

@@ -1,4 +1,5 @@
 """Construction unit tests."""
+
 from unittest.mock import patch
 
 import geopandas as gpd

tests/unit/test_unit_geometry.py

@@ -1,4 +1,5 @@
 """Geometry unit tests."""
+
 from copy import deepcopy
 from unittest.mock import call, patch
 

tests/unit/test_unit_ground.py

@@ -1,4 +1,5 @@
 """Ground unit tests."""
+
 from unittest.mock import patch
 
 import geopandas as gpd