toolsos 0.2.6__tar.gz → 0.2.8__tar.gz

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

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

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

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

{toolsos-0.2.6 → 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
 
 
@@ -17,15 +18,20 @@ def get_geo_json(
     Returns:
         dict[str, str]: geo json containg of the desired level and year
     """
-    base_url = "https://gitlab.com/os-amsterdam/datavisualisatie-onderzoek-en-statistiek/-/raw/main/public/geo/"
+    base_url = "https://gitlab.com/os-amsterdam/datavisualisatie-onderzoek-en-statistiek/-/raw/main/public/geo"
+
+    if level not in ["buurten", "wijken", "gebieden", "stadsdelen"]:
+        raise ValueError(
+            "level should be 'buurten', 'wijken', 'gebieden' or 'stadsdelen'"
+        )
 
     if mra:
         level = f"{level}-mra"
-        base_url = f"{base_url}mra/"
+        base_url = f"{base_url}/mra"
     else:
-        base_url = f"{base_url}amsterdam/"
+        base_url = f"{base_url}/amsterdam"
 
-    if (year <= 2020) & ~mra:
+    if (year <= 2020) and not mra:
         year = "2015-2020"
 
     if with_water:
@@ -33,11 +39,19 @@ def get_geo_json(
     else:
         url = f"{base_url}/{year}/{level}-{year}-zw-geo.json"
 
-    print(url)
     json = requests.get(url).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.6 → toolsos-0.2.8}/src/toolsos/huisstijl/tables/tables.py

@@ -1,6 +1,7 @@
 import functools
 import json
 import re
+import warnings
 from itertools import groupby
 from typing import Any, Callable, Dict
 
@@ -277,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]:
@@ -502,7 +510,8 @@ def write_table(
     blue_border: bool | None = True,
     blue_border_row_ids: int | list[int] | None = None,
     number_format: str = "0.0",
-    autofit_columns: str | None = "column_names",
+    autofit_columns: str | None = None,
+    column_widths: list[int] | None = None,
     min_column_width: int | None = None,
     col_filter: bool | None = False,
     style: str = "old",
@@ -542,6 +551,7 @@ def write_table(
             blue_border_row_ids=blue_border_row_ids,
             number_format=number_format,
             autofit_columns=autofit_columns,
+            column_widths=column_widths,
             min_column_width=min_column_width,
             col_filter=col_filter,
             combine_multiindex=combine_multiindex,
@@ -590,7 +600,8 @@ def format_worksheet(
     blue_border: bool | None = True,
     blue_border_row_ids: int | list[int] | None = None,
     number_format: str = "0.0",
-    autofit_columns: str | None = "column_names",
+    autofit_columns: str | None = None,
+    column_widths: list[int] | None = None,
     min_column_width: int | None = None,
     col_filter: bool | None = False,
     combine_multiindex: bool | int = False,
@@ -692,7 +703,14 @@ def format_worksheet(
     if combine_multiindex:
         cells_to_merge = get_cells_to_merge(df)
 
-    if autofit_columns == "column_names":
+    if column_widths:
+        if len(arr[0]) != len(column_widths):
+            raise Warning(
+                "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":
         col_widths = get_max_col_widths(arr)

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

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

{toolsos-0.2.6 → toolsos-0.2.8}/src/toolsos.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ src/toolsos/huisstijl/graphs/graph_styles.py
 src/toolsos/huisstijl/graphs/linegraph.py
 src/toolsos/huisstijl/graphs/piegraph.py
 src/toolsos/huisstijl/graphs/styler.py
+src/toolsos/huisstijl/maps/__init__.py
 src/toolsos/huisstijl/tables/__init__.py
 src/toolsos/huisstijl/tables/table_helpers.py
 src/toolsos/huisstijl/tables/table_styles.py