toolsos 0.2.7__tar.gz → 0.2.8__tar.gz

{toolsos-0.2.7 → toolsos-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: toolsos
-Version: 0.2.7
+Version: 0.2.8
 Summary: OS tools
 Author-email: OS <d.schmitz@amsterdam.nl>
 Keywords: tools,Onderzoek & Statistiek

{toolsos-0.2.7 → toolsos-0.2.8}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "toolsos"
-version = "0.2.7"
+version = "0.2.8"
 description = "OS tools"
 readme = "README.md"
 authors = [{ name = "OS", email = "d.schmitz@amsterdam.nl" }]

{toolsos-0.2.7 → toolsos-0.2.8}/src/toolsos/geo.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from typing import Any, Union
 
+import geopandas as gpd
 import requests
 
 
@@ -43,6 +44,14 @@ def get_geo_json(
     return json
 
 
+def get_geo_dataframe(
+    level: str, year: Union[int, Any], with_water: bool = False, mra: bool = False
+):
+    return gpd.read_file(
+        get_geo_json(level=level, year=year, with_water=with_water, mra=mra)
+    )
+
+
 def extract_name_code_table(geo_json: dict[str, str]) -> dict[str, str]:
     """_summary_
 

{toolsos-0.2.7 → toolsos-0.2.8}/src/toolsos/huisstijl/tables/tables.py

@@ -278,7 +278,14 @@ def get_cols_id_with_pattern(df: pd.DataFrame, pattern: str) -> list[int]:
     Returns:
         list[int]: list with column indices matching pattern
     """
-    return [idx for idx, col in enumerate(df.columns) if re.findall(pattern, col)]
+
+    if isinstance(df.columns, pd.MultiIndex):
+        # Use the lowest level in the multi-index column
+        return [
+            idx for idx, col in enumerate(df.columns) if re.findall(pattern, col[-1])
+        ]
+    else:
+        return [idx for idx, col in enumerate(df.columns) if re.findall(pattern, col)]
 
 
 def get_string_cols_ids(df: pd.DataFrame) -> list[int]:
@@ -702,6 +709,7 @@ def format_worksheet(
                 "The number of widths defined in column_widths should be equal to the number of columsn in the dataframe"
             )
         col_widths = column_widths
+
     elif (autofit_columns == "column_names") or (autofit_columns is None):
         col_widths = get_max_col_widths(df)
     elif autofit_columns == "all_data":

{toolsos-0.2.7 → toolsos-0.2.8}/src/toolsos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: toolsos
-Version: 0.2.7
+Version: 0.2.8
 Summary: OS tools
 Author-email: OS <d.schmitz@amsterdam.nl>
 Keywords: tools,Onderzoek & Statistiek