gov-uk-dashboards 17.1.0__tar.gz → 17.2.0__tar.gz

{gov_uk_dashboards-17.1.0/gov_uk_dashboards.egg-info → gov_uk_dashboards-17.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gov_uk_dashboards
-Version: 17.1.0
+Version: 17.2.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-17.1.0 → gov_uk_dashboards-17.2.0}/gov_uk_dashboards/components/leaflet/leaflet_choropleth_map.py

@@ -1,10 +1,14 @@
 """Leaflet choropleth map class"""
 
+from typing import Optional
 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.components.helpers.display_chart_or_table_with_header import (
+    display_chart_or_table_with_header,
+)
 from gov_uk_dashboards.formatting.number_formatting import (
     format_number_into_thousands_or_millions,
 )
@@ -18,18 +22,31 @@ class LeafletChoroplethMap:
     discrete"""
 
     # pylint: disable=too-few-public-methods
+    # pylint: disable=too-many-instance-attributes
+    # pylint: disable=too-many-arguments
+    # pylint: disable=too-many-positional-arguments
 
     def __init__(
         self,
-        get_geojson_function,
-        get_df_function,
-        hover_text_columns,
-        color_scale_is_discrete=True,
+        geojson: dict,
+        df: pl.DataFrame,
+        hover_text_columns: list[str],
+        title: str,
+        subtitle: Optional[str] = None,
+        download_chart_button_id: Optional[str] = None,
+        download_data_button_id: Optional[str] = None,
+        color_scale_is_discrete: bool = True,
+        show_tile_layer: bool = False,
     ):
-        self.geojson_data = get_geojson_function()
-        self.df = get_df_function()
+        self.geojson_data = geojson
+        self.df = df
         self.hover_text_columns = hover_text_columns
+        self.title = title
+        self.subtitle = subtitle
+        self.download_chart_button_id = download_chart_button_id
+        self.download_data_button_id = download_data_button_id
         self.color_scale_is_discrete = color_scale_is_discrete
+        self.show_tile_layer = show_tile_layer
         self._add_data_to_geojson()
 
     def get_leaflet_choropleth_map(self):
@@ -38,9 +55,9 @@ class LeafletChoroplethMap:
         Returns:
             dl.Map: A dash leaflet map chart.
         """
-        return dl.Map(
+        choropleth_map = dl.Map(
             children=[
-                dl.TileLayer(),
+                dl.TileLayer() if self.show_tile_layer else None,
                 self._get_colorbar(),
                 self._get_colorbar_title(),
                 self._get_dl_geojson(),
@@ -58,6 +75,13 @@ class LeafletChoroplethMap:
             attributionControl=False,
             style={"width": "100%", "height": "800px", "background": "white"},
         )
+        return display_chart_or_table_with_header(
+            choropleth_map,
+            self.title,
+            self.subtitle,
+            self.download_chart_button_id,
+            self.download_data_button_id,
+        )
 
     def _add_data_to_geojson(self):
         info_map = {
@@ -93,7 +117,12 @@ class LeafletChoroplethMap:
     def _get_dl_geojson(self):
         style_handle = self._get_style_handle()
         colorscale = self._get_colorscale()
-        style = {"weight": 2, "opacity": 1, "color": "white", "fillOpacity": 1}
+        style = {
+            "weight": 2,
+            "opacity": 1,
+            "color": "white",
+            "fillOpacity": 0.7 if self.show_tile_layer else 1,
+        }
         hover_style = arrow_function({"weight": 5, "color": "#666", "dashArray": ""})
         return dl.GeoJSON(
             data=self.geojson_data,

{gov_uk_dashboards-17.1.0 → gov_uk_dashboards-17.2.0/gov_uk_dashboards.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gov_uk_dashboards
-Version: 17.1.0
+Version: 17.2.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-17.1.0 → gov_uk_dashboards-17.2.0}/setup.py

@@ -10,7 +10,7 @@ setup(
     author="Department for Levelling Up, Housing and Communities",
     description="Provides access to functionality common to creating a data dashboard.",
     name="gov_uk_dashboards",
-    version="17.1.0",
+    version="17.2.0",
     long_description=long_description,
     long_description_content_type="text/markdown",
     packages=find_packages(),