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

toolsos/geo.py

@@ -1,7 +1,10 @@
 from __future__ import annotations
 
+from pathlib import Path
 from typing import Any, Union
 
+import geopandas as gpd
+import pandas as pd
 import requests
 
 
@@ -43,6 +46,38 @@ def get_geo_json(
     return json
 
 
+def get_geo_dataframe(
+    level: str,
+    year: Union[int, Any],
+    with_water: bool = False,
+    mra: bool = False,
+    from_crs=4326,
+    to_crs=28992,
+):
+
+    gdf = gpd.GeoDataFrame.from_features(
+        get_geo_json(level=level, year=year, with_water=with_water, mra=mra)
+    )
+
+    gdf = gdf.set_crs(from_crs).to_crs(to_crs)
+
+    return gdf
+
+
+def merge_data_to_gdf(
+    data: str, gdf: gpd.GeoDataFrame, key_data: str = "code", key_gdf: str = "code"
+) -> gpd.GeoDataFrame:
+    p = Path(data)
+    if p.suffix == ".csv":
+        df = pd.read_csv(data)
+    elif p.suffix in [".xlsx", ".xls"]:
+        df = pd.read_excel(data)
+    else:
+        raise ValueError(f"File type not supported: {p.suffix}")
+
+    return gdf.merge(df, how="left", left_on=key_data, right_on=key_gdf)
+
+
 def extract_name_code_table(geo_json: dict[str, str]) -> dict[str, str]:
     """_summary_
 

toolsos/helpers.py

@@ -24,16 +24,29 @@ def os_cut(
     start_label: str = "lager dan",
     end_label: str = "en hoger",
     add_edge: Optional[int] = None,
-    sep: str = " - ",
+    sep: str = " tot ",
+    na_value: Optional[str] = None,
+    unit: Optional[str] = None,
 ) -> pd.Series:
     # Add non_overlap to left edge/boundary
     if not add_edge:
         add_edge = 0
 
-    start_l = [f"{start_label} {bins[1]}"]
+    if not unit:
+        unit = ""
+
+    start_l = [f"{start_label} {bins[1]}{unit}"]
     inbetween_labels = [
-        f"{bins[i] + add_edge}{sep}{bins[i+1]}" for i in range(1, len(bins) - 2)
+        f"{bins[i] + add_edge}{unit}{sep}{bins[i+1]}{unit}"
+        for i in range(1, len(bins) - 2)
     ]
-    end_l = [f"{bins[-2]} {end_label}"]
+    end_l = [f"{bins[-2]}{unit} {end_label}"]
+
+    labels = start_l + inbetween_labels + end_l
+
+    categorized = pd.cut(x, bins=bins, labels=labels, include_lowest=True)  # type: ignore
+
+    if na_value:
+        categorized = categorized.cat.add_categories(na_value).fillna(na_value)
 
-    return pd.cut(x, bins=bins, labels=start_l + inbetween_labels + end_l)  # type: ignore
+    return categorized

toolsos/huisstijl/maps/choropleth.py

@@ -0,0 +1,72 @@
+from typing import Any, Iterable, Optional
+
+import geopandas as gpd
+import matplotlib.pyplot as plt
+from matplotlib.colors import ListedColormap
+from matplotlib.patches import Patch
+
+
+def plot_choropleth(
+    gdf: gpd.GeoDataFrame,
+    column: str,
+    colors: Iterable[str],
+    column_label: Optional[str] = False,
+    column_label_kwargs: Any = None,
+    legend_title: Optional[str] = None,
+    edgecolor: str = "grey",
+    figsize: tuple[int, int] = (10, 8),
+    bbox_to_anchor: tuple[int, int] = (-0.05, 0),
+):
+    # plotten
+    fig, ax = plt.subplots(figsize=figsize)
+
+    gdf.plot(
+        column=column,
+        cmap=ListedColormap(colors),
+        ax=ax,
+        categorical=True,
+        edgecolor=edgecolor,
+        linewidth=0.2,
+    )
+
+    labels = gdf["categorieen"].cat.categories
+
+    if not column_label_kwargs:
+        column_label_kwargs = {}
+
+    if column_label:
+        for x, y, label in zip(
+            gdf.geometry.representative_point().x,
+            gdf.geometry.representative_point().y,
+            gdf[column_label],
+        ):
+            ax.annotate(
+                label,
+                xy=(x, y),
+                xytext=(0, 0),
+                textcoords="offset points",
+                **column_label_kwargs,
+            )
+
+    # Create custom legend using the 'colors' and 'labels' variables, with a grey border
+    legend_elements = [
+        Patch(facecolor=color, label=label, edgecolor="#b0b0b0")
+        for color, label in zip(colors, labels)
+    ]
+
+    # Move the legend to the bottom left outside the plot
+    ax.legend(
+        handles=legend_elements,
+        bbox_to_anchor=bbox_to_anchor,
+        loc="lower left",
+        title=legend_title,
+        frameon=False,
+    )
+
+    # lat/lon uit
+    ax.set_axis_off()
+
+    # laten zien
+    plt.tight_layout()
+
+    return fig, ax

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.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: toolsos
-Version: 0.2.7
+Version: 0.3.0
 Summary: OS tools
 Author-email: OS <d.schmitz@amsterdam.nl>
 Keywords: tools,Onderzoek & Statistiek
@@ -26,6 +26,7 @@ Requires-Dist: pyreadstat; extra == "all"
 Requires-Dist: pyyaml; extra == "all"
 Requires-Dist: requests; extra == "all"
 Requires-Dist: sqlalchemy; extra == "all"
+Requires-Dist: geopandas; extra == "all"
 
 # Tools Onderzoek & Statistiek
 

{toolsos-0.2.7.dist-info → toolsos-0.3.0.dist-info}/RECORD

@@ -2,8 +2,8 @@ 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/helpers.py,sha256=VeOl-fLgePCbjEmAQdVmYe7z8OE1pISeDDuP1t5QSxM,997
+toolsos/geo.py,sha256=YM877U6s7PVKi1kySQrENDbJxR1_bOnK3tyid0uszj0,3484
+toolsos/helpers.py,sha256=U4MNRj8pz2iKOTMOzuRg-PdgIBBb21sedWYDWfstvWU,1319
 toolsos/polars_helpers.py,sha256=P3RHLQFeDL7-9U_Q1n4ma_NSkdYAiker4pnc57uluHw,770
 toolsos/database/database_connection.py,sha256=HCP8H_-iE2BOOQDp9v1HOgfUSX45XS-aqw7Nzf8drAU,4359
 toolsos/database/database_transfer.py,sha256=1ghq5VEtKyOdCKdM45uOyrZSoXMuWsdC35R3WNuFvdU,1827
@@ -16,11 +16,12 @@ toolsos/huisstijl/graphs/linegraph.py,sha256=dMUarRe31SXaY78OCXLy-PgnU8LlVJ9KkzK
 toolsos/huisstijl/graphs/piegraph.py,sha256=aEFiEM-9QuhBOjKHSXVuE5bTh-8uucq4FP6O8Vk1vZI,703
 toolsos/huisstijl/graphs/styler.py,sha256=-uZ7pjY1G39XvmaGHQd31gPRxjxmJGhYZk8xhy2JUWc,6623
 toolsos/huisstijl/maps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+toolsos/huisstijl/maps/choropleth.py,sha256=HbcXeeSNryGDT6vzCC7v1r6cYb-rQ7q5HqqpQo4PaUE,1899
 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.3.0.dist-info/METADATA,sha256=zhUnPEX1TH0w6IWFuPCBZdDLSur9OsFUSt1nh1--tRA,2725
+toolsos-0.3.0.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
+toolsos-0.3.0.dist-info/top_level.txt,sha256=2ClEjUBbtfDQ8oPwvWRy1Sz2nrkLCXlg0mHaMdCWia0,8
+toolsos-0.3.0.dist-info/RECORD,,

{toolsos-0.2.7.dist-info → toolsos-0.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.1)
 Root-Is-Purelib: true
 Tag: py3-none-any