gov-uk-dashboards 16.2.0__py3-none-any.whl → 17.1.0__py3-none-any.whl

gov_uk_dashboards/assets/custom_map_style_functions.js

@@ -0,0 +1,44 @@
+window.myNamespace = Object.assign({}, window.myNamespace, {  
+    mapColorScaleFunctions: {  
+        continuousColorScale: function(feature, context) {
+            const {
+                colorscale,
+                colorProp,
+                style,
+                min,
+                max
+            } = context.hideout;
+            const value = feature.properties[colorProp];
+            const colors = Array.from(colorscale); // defensive copy
+            if (value === null || value === undefined) {
+                return {
+                    ...style,
+                    fillColor: "#b1b4b6"
+                };
+            }
+            // Normalize value to 0-1
+            const t = (value - min) / (max - min);
+
+            // Helper: interpolate between two hex colors
+            function interpolateColor(color1, color2, t) {
+                const c1 = parseInt(color1.slice(1), 16);
+                const c2 = parseInt(color2.slice(1), 16);
+                const r = Math.round(((c2 >> 16) - (c1 >> 16)) * t + (c1 >> 16));
+                const g = Math.round((((c2 >> 8) & 0xFF) - ((c1 >> 8) & 0xFF)) * t + ((c1 >> 8) & 0xFF));
+                const b = Math.round(((c2 & 0xFF) - (c1 & 0xFF)) * t + (c1 & 0xFF));
+                return `rgb(${r},${g},${b})`;
+            }
+
+            // Find segment and interpolate
+            const n = colors.length - 1;
+            const idx = Math.min(Math.floor(t * n), n - 1);
+            const local_t = (t * n) - idx;
+            const fillColor = interpolateColor(colors[idx], colors[idx + 1], local_t);
+
+            return {
+                ...style,
+                fillColor: fillColor
+            };
+        }
+    }
+});

gov_uk_dashboards/components/dash/__init__.py

@@ -68,7 +68,6 @@ from .card import card, empty_card
 from .card_full_width import card_full_width
 from .apply_and_reset_filters_buttons import apply_and_reset_filters_buttons
 from .download_button import download_button
-from .download_button import download_button_with_icon
 from .collapsible_panel import collapsible_panel
 from .dashboard_container import dashboard_container
 from .details import details

gov_uk_dashboards/components/dash/download_button.py

@@ -2,6 +2,8 @@
 import warnings
 from dash import html
 
+from gov_uk_dashboards.constants import DOWNLOAD_BUTTON_CLASSES
+
 
 def download_button(button_text: str, button_id: str = "download-button"):
     """
@@ -13,7 +15,7 @@ def download_button(button_text: str, button_id: str = "download-button"):
     """
     warnings.warn(
         "Note there is an alternative function to download_button() called "
-        "download_button_with_icon() which includes a download icon and improved styling.",
+        "create_download_button_with_icon() which includes a download icon and improved styling.",
         Warning,
         stacklevel=2,
     )
@@ -32,31 +34,33 @@ def download_button(button_text: str, button_id: str = "download-button"):
     )
 
 
-def download_button_with_icon(button_text: str, button_id: str = "download-button"):
-    """
-    Return a download button styled with additional classes and an SVG icon,
-    aligned to the right.
+def create_download_button_with_icon(
+    button_text: str, button_id_name: str
+) -> html.Button:
+    """Create a download button with icon, aligned to the left.
 
-    Args:
-    button_text (str): The text to display on the button.
-    button_id (str, Optional): ID for the button, defaults to "download-button".
+    Parameters:
+    - button_id_name (str): A unique identifier for the button.
+
+    Returns:
+    - html.Button: Download button.
     """
-    classes = (
-        "govuk-button govuk-button--primary "
-        "govuk-!-margin-bottom-0 govuk-!-margin-top-4 "
-        "flex w-auto items-center gap-2 print:hidden"
-    )
-    return html.Div(
+    download_type = button_text.lower().replace(" ", "-")
+    return html.Button(
         [
-            html.Button(
-                [html.Div("", className="download-icon"), button_text],
-                id=button_id,
-                n_clicks=0,
-                className=classes,
-                type="submit",
-                style={"display": "flex", "alignItems": "center", "gap": "8px"},
-            ),
+            html.Div("", className="download-icon"),
+            button_text,
         ],
-        className="govuk-button-group",
-        style={"float": "right"},
+        id={
+            "download-type": download_type,
+            "name": button_id_name,
+        },
+        n_clicks=0,
+        className=DOWNLOAD_BUTTON_CLASSES,
+        type="submit",
+        style={
+            "display": "flex",
+            "alignItems": "center",
+            "gap": "8px",
+        },
     )

gov_uk_dashboards/components/helpers/display_chart_or_table_with_header.py

@@ -3,11 +3,8 @@
 from dash import html
 from dash.development.base_component import Component
 
-from gov_uk_dashboards.components.dash.create_download_chart_button import (
-    create_download_chart_button,
-)
-from gov_uk_dashboards.components.dash.create_download_data_button import (
-    create_download_data_button,
+from gov_uk_dashboards.components.dash.download_button import (
+    create_download_button_with_icon,
 )
 from gov_uk_dashboards.components.dash.heading import HeadingSizes
 
@@ -36,11 +33,6 @@ def display_chart_or_table_with_header(
         [
             html.Div(
                 [
-                    (
-                        create_download_chart_button(button_id_name=download_button_id)
-                        if download_button_id
-                        else None
-                    ),
                     html.Div(
                         [
                             html.H2(
@@ -61,20 +53,23 @@ def display_chart_or_table_with_header(
             html.Div(
                 (
                     [
-                        html.H3(
-                            "Download this data",
-                            className=HeadingSizes.SMALL,
-                            style={
-                                **{"color": "black", "margin": "0px 0px 5px"},
-                                **{"padding-top": "20px"},
-                            },
-                        ),
-                        create_download_data_button(
-                            button_id_name=download_data_button_id
+                        html.Div(
+                            [
+                                create_download_button_with_icon(
+                                    "Download chart", download_button_id
+                                )
+                                if download_button_id
+                                else [],
+                                create_download_button_with_icon(
+                                    "Download data", download_data_button_id
+                                )
+                                if download_data_button_id
+                                else [],
+                            ],
+                            className="govuk-button-group",
+                            style={"padding-top": "20px"},
                         ),
                     ]
-                    if download_data_button_id
-                    else []
                 ),
             ),
         ],

gov_uk_dashboards/components/helpers/get_chart_for_download.py

@@ -0,0 +1,21 @@
+"""get_chart_for_download"""
+from gov_uk_dashboards.constants import MAIN_TITLE, SUBTITLE
+
+
+def get_chart_for_download(self, fig):
+    """Returns a fig with title and subtitle for download as png"""
+    main_title = self.title_data[MAIN_TITLE]
+    subtitle = self.title_data[SUBTITLE]
+
+    fig.update_layout(
+        title={
+            "text": f"<b><span style='color: black; margin: 0px 0px 5px'>{main_title}</span></b>",
+            "x": 0.01,
+            "xanchor": "left",
+        },
+        title_subtitle={
+            "text": f"<b><span style='color: black; margin: 0px 0px 5px'>{subtitle}</span></b>"
+        },
+        margin={"t": 100},
+    )
+    return fig

gov_uk_dashboards/components/leaflet/leaflet_choropleth_map.py

@@ -0,0 +1,174 @@
+"""Leaflet choropleth map class"""
+
+from dash_extensions.javascript import arrow_function, Namespace
+import dash_leaflet as dl
+from dash import html
+import polars as pl
+
+from gov_uk_dashboards.formatting.number_formatting import (
+    format_number_into_thousands_or_millions,
+)
+
+
+class LeafletChoroplethMap:
+    """Class for  generating leaflet choropleth map charts.
+    Note: dataframe_function must contain columns: 'Region', 'Area_Code',
+    column_to_plot, hover_text_columns
+    If color_scale_is_discrete is false, colour scale will be continuous, otherwise it will be
+    discrete"""
+
+    # pylint: disable=too-few-public-methods
+
+    def __init__(
+        self,
+        get_geojson_function,
+        get_df_function,
+        hover_text_columns,
+        color_scale_is_discrete=True,
+    ):
+        self.geojson_data = get_geojson_function()
+        self.df = get_df_function()
+        self.hover_text_columns = hover_text_columns
+        self.color_scale_is_discrete = color_scale_is_discrete
+        self._add_data_to_geojson()
+
+    def get_leaflet_choropleth_map(self):
+        """Creates and returns leaflet choropleth map chart for display on application.
+
+        Returns:
+            dl.Map: A dash leaflet map chart.
+        """
+        return dl.Map(
+            children=[
+                dl.TileLayer(),
+                self._get_colorbar(),
+                self._get_colorbar_title(),
+                self._get_dl_geojson(),
+            ],
+            center=[54.5, -2.5],  # Centered on the UK
+            zoom=6.5,
+            minZoom=6.5,
+            maxZoom=6.5,
+            maxBounds=[[49.8, -10], [55.9, 1.8]],
+            scrollWheelZoom=False,  # Disable zooming via mouse scroll
+            dragging=False,  # Optional: prevent dragging too if you want
+            zoomControl=False,  # Hide the zoom buttons (+/-)
+            doubleClickZoom=False,  # Prevent double click zoom
+            touchZoom=False,  # Prevent pinch zoom
+            attributionControl=False,
+            style={"width": "100%", "height": "800px", "background": "white"},
+        )
+
+    def _add_data_to_geojson(self):
+        info_map = {
+            row["Area_Code"]: {
+                "value": row["Value"],
+                "region": row["Region"],
+                **{col: row[col] for col in self.hover_text_columns},
+            }
+            for row in self.df.iter_rows(named=True)
+        }
+
+        for feature in self.geojson_data["features"]:
+            region_code = feature["properties"]["geo_id"]
+            info = info_map.get(region_code)
+            if info:
+
+                feature["properties"]["density"] = info["value"]
+                feature["properties"]["region"] = info["region"]
+
+                tooltip_parts = [f"<b>{info['region']}</b>"]
+                if info["value"] is None:
+                    tooltip_parts.append("<br>No data available")
+                else:
+                    for col in self.hover_text_columns:
+                        tooltip_parts.append(f"<br>{col}: {info[col]}")
+
+                feature["properties"]["tooltip"] = "".join(tooltip_parts)
+            else:
+                feature["properties"]["density"] = None
+                feature["properties"]["region"] = "Unknown"
+                feature["properties"]["tooltip"] = "No data available"
+
+    def _get_dl_geojson(self):
+        style_handle = self._get_style_handle()
+        colorscale = self._get_colorscale()
+        style = {"weight": 2, "opacity": 1, "color": "white", "fillOpacity": 1}
+        hover_style = arrow_function({"weight": 5, "color": "#666", "dashArray": ""})
+        return dl.GeoJSON(
+            data=self.geojson_data,
+            id="geojson",
+            zoomToBounds=True,
+            zoomToBoundsOnClick=True,
+            style=style_handle,
+            hoverStyle=hover_style,
+            hideout={
+                "colorscale": colorscale,  # Use hex strings
+                "style": style,
+                "colorProp": "density",
+                "min": self.df["Value"].min(),
+                "max": self.df["Value"].max(),
+            },
+        )
+
+    def _get_style_handle(self):
+        ns = Namespace("myNamespace", "mapColorScaleFunctions")
+        if self.color_scale_is_discrete:
+            return ""
+        return ns("continuousColorScale")
+
+    def _get_colorscale(self):
+        if self.color_scale_is_discrete:
+            return ""
+        return ["#B0F2BC", "#257D98"]
+
+    def _get_colorbar(self):
+        min_value = self.df.select(pl.min("Value")).item()
+        colorbar_min = min(min_value, 0)
+        max_value = self.df.select(pl.max("Value")).item()
+        mid_value = (colorbar_min + max_value) / 2
+        quarter_value = (colorbar_min + max_value) / 4
+        three_quarter_value = 3 * (colorbar_min + max_value) / 4
+        tick_values = [
+            colorbar_min,
+            quarter_value,
+            mid_value,
+            three_quarter_value,
+            max_value,
+        ]
+        tick_text = [
+            format_number_into_thousands_or_millions(x) for x in tick_values
+        ]  # Optional, for formatting
+
+        return dl.Colorbar(
+            colorscale=self._get_colorscale(),
+            width=20,
+            height=200,
+            min=colorbar_min,
+            max=max_value,
+            position="topleft",
+            style={
+                "backgroundColor": "white",
+                "padding": "5px",
+                "borderRadius": "4px",
+                "marginTop": "100px",
+            },
+            tickValues=tick_values,
+            tickText=tick_text,  # Optional, makes labels look cleaner
+        )
+
+    def _get_colorbar_title(self):
+        return html.Div(
+            self.hover_text_columns[0],
+            style={
+                "position": "absolute",
+                "bottom": "700px",  # Adjusted to place above the colorbar
+                "left": "10px",  # Align with the left side of the colorbar
+                "background": "white",
+                "padding": "2px 6px",
+                "borderRadius": "5px",
+                "fontWeight": "bold",
+                "fontSize": "14px",
+                "zIndex": "999",  # Ensure it appears above map elements
+            },
+        )

gov_uk_dashboards/components/plotly/stacked_barchart.py

@@ -7,6 +7,9 @@ import polars as pl
 
 import plotly.graph_objects as go
 
+from gov_uk_dashboards.components.helpers.get_chart_for_download import (
+    get_chart_for_download,
+)
 from gov_uk_dashboards.constants import (
     CHART_LABEL_FONT_SIZE,
     CUSTOM_DATA,
@@ -117,6 +120,10 @@ class StackedBarChart:
             self.download_data_button_id,
         )
 
+    def get_stacked_bar_chart_for_download(self):
+        """Return fig with title and subtitle for download as png"""
+        return get_chart_for_download(self, self.create_stacked_bar_chart())
+
     def create_stacked_bar_chart(
         self,
     ):

gov_uk_dashboards/components/plotly/time_series_chart.py

@@ -30,6 +30,9 @@ from gov_uk_dashboards.components.helpers.plotting_helper_functions import (
     get_legend_configuration,
     get_rgba_from_hex_colour_and_alpha,
 )
+from gov_uk_dashboards.components.helpers.get_chart_for_download import (
+    get_chart_for_download,
+)
 from gov_uk_dashboards.components.helpers.update_layout_bgcolor_margin import (
     update_layout_bgcolor_margin,
 )
@@ -129,6 +132,10 @@ class TimeSeriesChart:
             self.download_data_button_id,
         )
 
+    def get_time_series_chart_for_download(self):
+        """Return fig with title and subtitle for download as png"""
+        return get_chart_for_download(self, self.create_time_series_chart())
+
     def create_time_series_chart(
         self,
     ):

gov_uk_dashboards/constants.py

@@ -18,3 +18,9 @@ UNIT_SIZE = "Unit size"
 DEFAULT_COLOURSCALE = "tealgrn"
 
 LEGEND_SPACING = "\u00A0" * 5
+
+DOWNLOAD_BUTTON_CLASSES = (
+    "govuk-button govuk-button--primary "
+    "govuk-!-margin-bottom-0 govuk-!-margin-top-4 "
+    "flex w-auto items-center gap-2 print:hidden"
+)

gov_uk_dashboards/formatting/number_formatting.py

@@ -0,0 +1,24 @@
+"""Functions to add formatting to number values"""
+
+
+def format_number_into_thousands_or_millions(
+    number: int, thousand_decimal_places: int = 0
+) -> str:
+    """Format number into thousands or millions, eg. 1,500 becomes 1.5k & 1,234,567 becomes 1.235m
+
+    Args:
+        number (int): Integer to format.
+        thousand_decimal_places (int or str): The number of decimal places to display for
+            1_000<=number<1_000_000. Defaults to 0. If "default" is passed, number is simply
+            divided by 1_000.
+    """
+    if number >= 1_000_000:
+        formatted_number = f"{number / 1_000_000:.3f}m"
+    elif number >= 1_000:
+        if thousand_decimal_places == "default":
+            formatted_number = f"{number / 1_000}k"
+        else:
+            formatted_number = f"{number / 1_000:.{thousand_decimal_places}f}k"
+    else:
+        formatted_number = str(number)
+    return formatted_number

gov_uk_dashboards/lib/download_functions/convert_fig_to_image_and_download.py

@@ -0,0 +1,16 @@
+"""convert_fig_to_image_and_download"""
+
+import plotly.graph_objects as go
+import plotly.io as pio
+from dash import dcc
+
+
+def convert_fig_to_image_and_download(fig: go.Figure, name: str):
+    """Converts a given Plotly figure to a PNG image and returns a Dash component
+    for downloading the image.
+    """
+    fig.update_layout(margin={"t": 150, "b": 100, "l": 100, "r": 50})
+
+    filename = f"{name}-chart.png"
+    img_bytes = pio.to_image(fig, format="png", width=1600, height=800)
+    return dcc.send_bytes(img_bytes, filename)

gov_uk_dashboards/lib/download_functions/download_csv_with_headers.py

@@ -0,0 +1,114 @@
+"""download_csv_with_headers"""
+import io
+import polars as pl
+from dash import dcc
+from gov_uk_dashboards.lib.datetime_functions.datetime_functions import (
+    get_todays_date_for_downloaded_csv,
+)
+
+
+def download_csv_with_headers(
+    list_of_df_title_subtitle_dicts: list[dict[str, str]],
+    name: str,
+    sensitivity_label: str,
+    additional_text: list[str] = None,
+):  # pylint: disable=too-many-locals
+    """Adds a header above multiple dataframes,
+    separates them with blank rows, and downloads as CSV.
+
+    Args:
+        list_of_df_title_subtitle_dicts (list[dict[]]): List of dictionaries containing keys: "df",
+        "title" and "subtitle"
+        name (str): Filename for CSV.
+        sensitivity_label (str): Sensitivity label. Str or None.
+        additional_text (list[str]): Additional text to inlcude in headers after data downloaded.
+            Str or None.
+    """
+
+    csv_buffer = io.StringIO()
+
+    column_list = list(list_of_df_title_subtitle_dicts[0]["df"].columns)
+    column_dict = {column_name: column_name for column_name in column_list}
+    blank_dict = {
+        f"{i}": None
+        for i in range(
+            _get_number_of_max_columns_from_all_dfs(list_of_df_title_subtitle_dicts)
+            - len(column_list)
+        )
+    }  # range is missing columns in first df compared to max columns across all dfs
+
+    subtitle = list_of_df_title_subtitle_dicts[0]["subtitle"]
+
+    header_data = [
+        {column_list[0]: "Date downloaded: " + get_todays_date_for_downloaded_csv()},
+        *(
+            [{column_list[0]: text} for text in additional_text]
+            + [{column_list[0]: None}]
+            if additional_text is not None
+            else []
+        ),
+        {column_list[0]: list_of_df_title_subtitle_dicts[0]["title"]},
+        *(
+            [{column_list[0]: subtitle}] if subtitle is not None else []
+        ),  # Uses unpacking (*) to add the subtitle row if subtitle is not None. If subtitle is
+        # None, it unpacks an empty list, effectively skipping the row.
+        {column_list[0]: None},  # Blank row
+        {**column_dict, **blank_dict},
+    ]
+
+    if sensitivity_label:
+        header_data = [{column_list[0]: sensitivity_label}] + header_data
+
+    pl.DataFrame(header_data).write_csv(csv_buffer, include_header=False)
+
+    for i, data in enumerate(list_of_df_title_subtitle_dicts):
+        df = data["df"]
+        title = data["title"]
+        subtitle = data["subtitle"]
+
+        if i > 0 and title is not None:
+            column_dict = {column_name: column_name for column_name in list(df.columns)}
+            header_data = [
+                {column_list[0]: title},
+                *(
+                    [{column_list[0]: subtitle}] if subtitle is not None else []
+                ),  # Uses unpacking (*) to add the subtitle row if subtitle is not None. If
+                # subtitle is None, it unpacks an empty list, effectively skipping the row.
+                {column_list[0]: None},  # Blank row
+            ]
+            pl.DataFrame(header_data).write_csv(csv_buffer, include_header=False)
+        df.write_csv(csv_buffer, include_header=i > 0)
+
+        if i < len(list_of_df_title_subtitle_dicts) - 1:
+            blank_row = pl.DataFrame({df.columns[0]: [None]})
+            blank_row.write_csv(csv_buffer, include_header=False)
+
+    csv_buffer.seek(0)
+    csv_data = (
+        "\ufeff" + csv_buffer.getvalue()
+    )  # Adding \ufeff ensures the correct character encoding is detected for £
+
+    return dcc.send_string(csv_data, f"{name}.csv")
+
+
+def _get_number_of_max_columns_from_all_dfs(list_of_df_title_subtitle_dicts):
+    max_columns = 0
+    index_of_max_cols = -1
+
+    for idx, dic in enumerate(list_of_df_title_subtitle_dicts):
+        # Get the DataFrame
+        df = dic["df"]
+
+        # Get the number of columns
+        num_columns = df.shape[1]
+
+        # Update if this DataFrame has more columns
+        if num_columns > max_columns:
+            max_columns = num_columns
+            index_of_max_cols = idx
+
+    max_columns = len(
+        list(list_of_df_title_subtitle_dicts[index_of_max_cols]["df"].columns)
+    )
+
+    return max_columns

{gov_uk_dashboards-16.2.0.dist-info → gov_uk_dashboards-17.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gov_uk_dashboards
-Version: 16.2.0
+Version: 17.1.0
 Summary: Provides access to functionality common to creating a data dashboard.
 Author: Department for Levelling Up, Housing and Communities
 Description-Content-Type: text/markdown

{gov_uk_dashboards-16.2.0.dist-info → gov_uk_dashboards-17.1.0.dist-info}/RECORD

@@ -1,12 +1,13 @@
 gov_uk_dashboards/__init__.py,sha256=4y4hozrL4hzRUna8b22UQwtkZcvvCgeXsAtA6AJww8g,1299
 gov_uk_dashboards/axes.py,sha256=Oh8zyWzxwZWq8bQl-vJoXwTANZ7ACZiYPmIXlM62Fvk,712
 gov_uk_dashboards/colours.py,sha256=MezFI_3hgEuZ7f8F5TdtgaQO00B3G7ylRTCVq3SlSF4,2371
-gov_uk_dashboards/constants.py,sha256=kGM1gSoViFfYAYvVXg52fFqXvZ1Df5wEsamZMh0_h6w,511
+gov_uk_dashboards/constants.py,sha256=O_JyW1XlNg_mHwmT2xfup6mOtfd9x44ky5APReFfOqo,686
 gov_uk_dashboards/symbols.py,sha256=6_lq8yl1l7sGUlOY29wip_PXeUUoM53_fakKY1omVwY,424
 gov_uk_dashboards/template.html,sha256=uFAki9bEpcei5dP_NZYP8dsxpxXpNIDQPn7ezsE7VXc,498
 gov_uk_dashboards/template.py,sha256=WNVkAW3LCNoUHcxQ1kiUPkGCKIan5DgZQaAA_ZbE5WA,534
 gov_uk_dashboards/assets/__init__.py,sha256=SwV4sjjMQmuZXloVcvf2H86XFiAd8xhPLJvaSMC2MQE,101
 gov_uk_dashboards/assets/attach-event-to-dash.js,sha256=mbea5TaxEnjMN-MebR3J0hVjOb1B27-zXwWw9ZYqBBw,562
+gov_uk_dashboards/assets/custom_map_style_functions.js,sha256=1-jnhguDEn7-BnleGbSTB-dlaSO-6hPF-JL0d5EUnhU,1689
 gov_uk_dashboards/assets/dashboard.css,sha256=exnujRlse2xHOeuE_TAs84gITv5YMRzKJKEeSjoXO6U,202134
 gov_uk_dashboards/assets/get_assets_folder.py,sha256=ozYOmuO2r36vaTdWMU5cBuskl47RHBp8z9KIO06BXBM,171
 gov_uk_dashboards/assets/govuk-frontend-3.14.0.min.js,sha256=kKi_r2hAqumi2pKM43W8NKpR2UtksUww9lSQOjkOmMI,34806
@@ -34,7 +35,7 @@ gov_uk_dashboards/assets/images/oflog/how_to_5_viewing_tables.png,sha256=kC36T6T
 gov_uk_dashboards/assets/topojson/usa_110m.json,sha256=yX3AZ1tGULJmVFyWwMkb19WdZShJbvpa97uYvldMvTk,49104
 gov_uk_dashboards/assets/topojson/world_110m.json,sha256=11kV6qMchw32uXLJ5buGkQGXgl8z3P73QPOy9oz_6EM,136642
 gov_uk_dashboards/components/__init__.py,sha256=19fr4E5-FkG_rXAPwRc2Gh60ncgc7Ho1WdrMV5x9frw,187
-gov_uk_dashboards/components/dash/__init__.py,sha256=4msokzkqoNze17TC5FM1GeyLSKNmgFyO6Yn744qEyxM,4885
+gov_uk_dashboards/components/dash/__init__.py,sha256=0Sunv0rmcn-LevR17i90Qr542BLek3EZwmiP_uaJJHA,4830
 gov_uk_dashboards/components/dash/apply_and_reset_filters_buttons.py,sha256=I7VoKOS_zIYdQvDP3SkAOntDMxZSQKCxnY80173EVz8,673
 gov_uk_dashboards/components/dash/banners.py,sha256=TDHdJQSb7mCqtmM6ylSnVh_Qpd2Aec1jSR8RfsjqQoE,958
 gov_uk_dashboards/components/dash/card.py,sha256=aErz9h536nYvpp9LZsFHo_Rn5rRXXfyGh358VcLksaE,420
@@ -42,11 +43,9 @@ gov_uk_dashboards/components/dash/card_full_width.py,sha256=ItwNgb5YQ1n6Fznvy_ng
 gov_uk_dashboards/components/dash/collapsible_panel.py,sha256=WrC5IFzM9mNavPfeSpBvMvYQfrmfhpTPCG1Ay70Jtw8,1191
 gov_uk_dashboards/components/dash/comparison_la_filter_button.py,sha256=mhtmYVyToabuYzal00cB07YfKSx_wjDfjB8W-IKDXPc,670
 gov_uk_dashboards/components/dash/context_banner.py,sha256=2o44AzS0pTYTY0r3OVbKW7dJg2lA1J8PW4RCeGQ15gg,1010
-gov_uk_dashboards/components/dash/create_download_chart_button.py,sha256=yb3TbMHxQmC7XFojwnZMBMpwMal9NUcT4LNt9ZccU6Q,711
-gov_uk_dashboards/components/dash/create_download_data_button.py,sha256=ng57WLkA5wyfrLTrO05VJ6LmC_gwgODQEYpMj-v-wO8,714
 gov_uk_dashboards/components/dash/dashboard_container.py,sha256=KC2isR0NShxUYCl_pzDEAS4WK5pFrLMp4m2We3AqiwM,512
 gov_uk_dashboards/components/dash/details.py,sha256=-Rgat95pCnU3fF4O0MkyymzMQPCZhRvuq0U0a5gHZBU,1106
-gov_uk_dashboards/components/dash/download_button.py,sha256=8jGAadB3f_wVYWz5wIkObh0Q4NeFESM6kNRUYx0TIRs,1882
+gov_uk_dashboards/components/dash/download_button.py,sha256=PpvZMmf0R7qI5_xZgPve7JDCVONC07KrLJg8IpXoyCE,1781
 gov_uk_dashboards/components/dash/filter_panel.py,sha256=lQZYc5g7xUOpHfLWpPXiBKkIRKXoFb1p9NhJgS21tNo,1996
 gov_uk_dashboards/components/dash/footer.py,sha256=RnJKN1YTP88GuJ4e7ci2T-jDqIe0-jDuHAQ8OhSCK50,3155
 gov_uk_dashboards/components/dash/graph.py,sha256=bd49W5sVyhtWd4lNBfQST1RyLNlTLA0KRxS7jTgVMwE,886
@@ -70,16 +69,19 @@ gov_uk_dashboards/components/dash/visualisation_commentary.py,sha256=jBy8qy2DWYq
 gov_uk_dashboards/components/dash/visualisation_title.py,sha256=xXHsyVRIGkngBXCuhv8z0PmZLOeicjpMvmTbA5HhRvQ,561
 gov_uk_dashboards/components/dash/warning_text.py,sha256=31XvPUINt2QsWIaaMnqEvn23G-MpzWbDvGnzYcXIyAY,1622
 gov_uk_dashboards/components/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gov_uk_dashboards/components/helpers/display_chart_or_table_with_header.py,sha256=7Z52uZGrs15Q31OJjztnF0iqA5VRUrfJB_nPy6aZMMc,3060
+gov_uk_dashboards/components/helpers/display_chart_or_table_with_header.py,sha256=4Kh_qaFZUqQrS08Bb7j9T-ltSVjLtI_EOnpXY-uMvVc,2918
 gov_uk_dashboards/components/helpers/generate_dash_graph_from_figure.py,sha256=sdhC6Mjfw6kqs1MDRDoMuOt8dNS9Bl1WEoJX9S5AssA,1813
+gov_uk_dashboards/components/helpers/get_chart_for_download.py,sha256=RS5SR2tCQPTkBpWaIr2mb98Yn6vAimBnAXpRhMx0kB4,669
 gov_uk_dashboards/components/helpers/plotting_helper_functions.py,sha256=moD2tse2FqTBW2rOHOvZCL9BIlmDbyvU5233yFFu_aI,1635
 gov_uk_dashboards/components/helpers/update_layout_bgcolor_margin.py,sha256=i7Nwp0CxFpkyQeR8KfOBVMBkzctG7hMpWI2OzgxB2jY,740
+gov_uk_dashboards/components/leaflet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+gov_uk_dashboards/components/leaflet/leaflet_choropleth_map.py,sha256=4ysc-FxRKGPSkNuJBDtjlEOGthC7EuIliaillqX2GeI,6221
 gov_uk_dashboards/components/plotly/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gov_uk_dashboards/components/plotly/captioned_figure.py,sha256=T0sbtGTiJ79FXxVdPb__hqISuyTc3Dl11cKhgcuW-5U,2804
 gov_uk_dashboards/components/plotly/choropleth_map.py,sha256=U9RmS3MZGloQAt9HoSYh3Xad205DDfZOjz91ZD_ydbI,9849
 gov_uk_dashboards/components/plotly/enums.py,sha256=ebHiFQljA7O4HJxKoslqlNXcAjUZi1askpTSwxKEcYQ,850
-gov_uk_dashboards/components/plotly/stacked_barchart.py,sha256=_81WlxelE5Gxozj80uYRIkQJLyv2i6xZr2T0g3db4ks,12229
-gov_uk_dashboards/components/plotly/time_series_chart.py,sha256=Z8p4oQ6ohiv7qaIVC6oDUEdVteryvIr7YuzQL0RpYyU,22701
+gov_uk_dashboards/components/plotly/stacked_barchart.py,sha256=-pFwY3vhjQrLR_innzbs4d-vqWSXE_eJS-ceP5wo_SI,12530
+gov_uk_dashboards/components/plotly/time_series_chart.py,sha256=QD9HjXLjNIBA-NBZQUSL3TyIAvRGrBzwnYrRboROECg,23002
 gov_uk_dashboards/figures/__init__.py,sha256=_snQeNlM81nNKERl4gg9ScH2HYbtwaBjl8yQonccx34,712
 gov_uk_dashboards/figures/chart_data.py,sha256=fEsNkQFzXKIQ0h7aLBWq3J1qAxHbxvJeKU23JrVodVc,757
 gov_uk_dashboards/figures/line_chart.py,sha256=rEB51_z9cPl7BcT94iA6ZsZXzecnVCnGpQWW_9SNGUY,2813
@@ -89,6 +91,7 @@ gov_uk_dashboards/figures/styles/__init__.py,sha256=wVa8BU0TvXnanksOUVWN4utFKW4O
 gov_uk_dashboards/figures/styles/line_style.py,sha256=sXc9pGrAVxFrxqXSTsrw0hEgyhmhMOLhqhwx93J-PtI,559
 gov_uk_dashboards/formatting/__init__.py,sha256=bQk9_OEubUhuTRQjXUs4ZItgSY7yyDpwQcLauxf11Tk,460
 gov_uk_dashboards/formatting/human_readable.py,sha256=e-ROPS7oFLHCV58MXBIhLsZQut-F-bAYz0TOz33gX2M,1844
+gov_uk_dashboards/formatting/number_formatting.py,sha256=9LVqKqx0mMQyv8XLI_im1pdASZDJxRjzRWtRN-g6kPs,913
 gov_uk_dashboards/formatting/round_and_add_prefix_and_suffix.py,sha256=_DboRfdvwb9Y62H9LFDFJ0ju4626z-_oFuwagRgyZDY,1456
 gov_uk_dashboards/formatting/rounding.py,sha256=Em1yri_j18IYHbZ64d3bhVKX-XEllRSM9FzAUo1o6fU,968
 gov_uk_dashboards/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -100,8 +103,11 @@ gov_uk_dashboards/lib/dap/dap_deployment.py,sha256=ZXixeOAtRNjMsPdGKLwwLNamlo0mi
 gov_uk_dashboards/lib/dap/get_dataframe_from_cds.py,sha256=OiusRCgYnkBjK_GZgYLGzNrxOGizYt8CgThiWRCVKK0,3921
 gov_uk_dashboards/lib/datetime_functions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gov_uk_dashboards/lib/datetime_functions/datetime_functions.py,sha256=BQgr8I_vFNYwLi-fE4YC6jZ5PpbPea2rnD_2a_lw0YE,12209
-gov_uk_dashboards-16.2.0.dist-info/licenses/LICENSE,sha256=GDiD7Y2Gx7JucPV1JfVySJeah-qiSyBPdpJ6RHCEHTc,1126
-gov_uk_dashboards-16.2.0.dist-info/METADATA,sha256=XWp4ZyTku_CZxzeDiuTCSLoaKUYREIvZO6olgDyxhZA,5917
-gov_uk_dashboards-16.2.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-gov_uk_dashboards-16.2.0.dist-info/top_level.txt,sha256=gPaN1P3-H3Rgi2me6tt-fX_cxo19CZfA4PjlZPjGRpo,18
-gov_uk_dashboards-16.2.0.dist-info/RECORD,,
+gov_uk_dashboards/lib/download_functions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+gov_uk_dashboards/lib/download_functions/convert_fig_to_image_and_download.py,sha256=JYDpWObBsiKG5Rtk2ElOTgHwfIR0cRmVocr8RlTfPZQ,534
+gov_uk_dashboards/lib/download_functions/download_csv_with_headers.py,sha256=h50ejODCjoz9z-yqDt6nsE6jN6XxJN1DWH66CjLJiCk,4155
+gov_uk_dashboards-17.1.0.dist-info/licenses/LICENSE,sha256=GDiD7Y2Gx7JucPV1JfVySJeah-qiSyBPdpJ6RHCEHTc,1126
+gov_uk_dashboards-17.1.0.dist-info/METADATA,sha256=6wQUDbkJ1690nFpTKm5XfCPwIDhvWGgXONm6bI8xoA8,5917
+gov_uk_dashboards-17.1.0.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+gov_uk_dashboards-17.1.0.dist-info/top_level.txt,sha256=gPaN1P3-H3Rgi2me6tt-fX_cxo19CZfA4PjlZPjGRpo,18
+gov_uk_dashboards-17.1.0.dist-info/RECORD,,

{gov_uk_dashboards-16.2.0.dist-info → gov_uk_dashboards-17.1.0.dist-info}/WHEEL

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

gov_uk_dashboards/components/dash/create_download_chart_button.py

@@ -1,25 +0,0 @@
-"""create_download_chart_button"""
-
-from dash import html
-from gov_uk_dashboards.components.dash import download_button_with_icon
-
-
-def create_download_chart_button(button_id_name: str) -> html.Div:
-    """Create a download button for charts, aligned to the right.
-
-    Parameters:
-    - button_id_name (str): A unique identifier for the button.
-
-    Returns:
-    - html.Div: A Div element containing a download button.
-    """
-    return html.Div(
-        download_button_with_icon(
-            button_text="Download chart",
-            button_id={
-                "download-type": "download-chart",
-                "name": button_id_name,
-            },
-        ),
-        style={"textAlign": "right"},
-    )

gov_uk_dashboards/components/dash/create_download_data_button.py

@@ -1,25 +0,0 @@
-"""create_download_data_button"""
-
-from dash import html
-from gov_uk_dashboards.components.dash import download_button_with_icon
-
-
-def create_download_data_button(button_id_name: str) -> html.Div:
-    """Create a download button for data, aligned to the right.
-
-    Parameters:
-    - button_id_name (str): A unique identifier for the button.
-
-    Returns:
-    - html.Div: A Div element containing a download button.
-    """
-    return html.Div(
-        download_button_with_icon(
-            button_text=".csv",
-            button_id={
-                "download-type": "download-data",
-                "name": button_id_name,
-            },
-        ),
-        style={"float": "left", "margin-top": "-20px"},
-    )