toolsos 0.2.7__py3-none-any.whl → 0.2.8__py3-none-any.whl

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/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.dist-info → toolsos-0.2.8.dist-info}/METADATA

@@ -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.dist-info → toolsos-0.2.8.dist-info}/RECORD

@@ -2,7 +2,7 @@ toolsos/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolsos/cbs_tools.py,sha256=361cogk0aIU4D4BKHaa7YSOBh64t5C3zrHlqtWx0iIc,3465
 toolsos/create_tables.py,sha256=43FHK3EERjumBtnGhngIdtthZzcc_Qi37lJ1MgATzBg,908
 toolsos/download.py,sha256=88hehmPL5m5d1nrcJjltuh4xrCItF5EYHaZdHOcSt-g,2652
-toolsos/geo.py,sha256=w0Bt0JJEILEjKtmKw97rHkVixkgbATS-uAQUV6WCHfQ,2598
+toolsos/geo.py,sha256=AUPwGCsIjS_JktiyK4D8LQUq1y-kXx_PUMWzScgkBc8,2851
 toolsos/helpers.py,sha256=VeOl-fLgePCbjEmAQdVmYe7z8OE1pISeDDuP1t5QSxM,997
 toolsos/polars_helpers.py,sha256=P3RHLQFeDL7-9U_Q1n4ma_NSkdYAiker4pnc57uluHw,770
 toolsos/database/database_connection.py,sha256=HCP8H_-iE2BOOQDp9v1HOgfUSX45XS-aqw7Nzf8drAU,4359
@@ -19,8 +19,8 @@ toolsos/huisstijl/maps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 toolsos/huisstijl/tables/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolsos/huisstijl/tables/table_helpers.py,sha256=jsQ6lw93sxtGJGrUn8X2_LyA2vYYnytngpUI5A_wpWQ,2037
 toolsos/huisstijl/tables/table_styles.py,sha256=oYU6GJcfqlKpZof5PUjPsA7woJ3Tew78CHPyT0_jY6w,1343
-toolsos/huisstijl/tables/tables.py,sha256=w_8_KJhKDOxaLHouOYRG0pupgEqxy0qtty1DWD3rYc0,24488
-toolsos-0.2.7.dist-info/METADATA,sha256=CzVk1Oi9ZEDuXdIEVssMaX8sAL-d77ij8qz2o1BwmgM,2683
-toolsos-0.2.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-toolsos-0.2.7.dist-info/top_level.txt,sha256=2ClEjUBbtfDQ8oPwvWRy1Sz2nrkLCXlg0mHaMdCWia0,8
-toolsos-0.2.7.dist-info/RECORD,,
+toolsos/huisstijl/tables/tables.py,sha256=yeHiZd4EuOoeb_CeRE74xM1r1j6gCMNM1-I3Lpd2tyQ,24728
+toolsos-0.2.8.dist-info/METADATA,sha256=1copLfCg6pko0yR08KsSLxsVKiXmxS6iLEV-oMghV7I,2683
+toolsos-0.2.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+toolsos-0.2.8.dist-info/top_level.txt,sha256=2ClEjUBbtfDQ8oPwvWRy1Sz2nrkLCXlg0mHaMdCWia0,8
+toolsos-0.2.8.dist-info/RECORD,,