From ebaf9c888945cb1d021d188ec8495e2b27eb6b52 Mon Sep 17 00:00:00 2001 From: Stefan Kuethe Date: Sat, 1 Jun 2024 12:51:25 +0200 Subject: [PATCH] Rename 'tooltip_template' to tooltip in py --- docs/examples/deckgl_layer/airports_app.py | 2 +- docs/examples/deckgl_layer/app.py | 3 +-- docs/examples/deckgl_layer/app_update_layer.py | 2 +- .../deckgl_layer/mixing_deck_and_maplibre_layers.py | 2 +- maplibre/map.py | 9 ++++----- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/docs/examples/deckgl_layer/airports_app.py b/docs/examples/deckgl_layer/airports_app.py index 2bee28c0..c04a56c4 100644 --- a/docs/examples/deckgl_layer/airports_app.py +++ b/docs/examples/deckgl_layer/airports_app.py @@ -51,7 +51,7 @@ m.add_deck_layers( [deck_geojson_layer, deck_arc_layer], - tooltip_template={ + tooltip={ "airports": "{{ &properties.name }}", "arcs": "gps_code: {{ properties.gps_code }}", }, diff --git a/docs/examples/deckgl_layer/app.py b/docs/examples/deckgl_layer/app.py index 2a307d30..1c41c738 100644 --- a/docs/examples/deckgl_layer/app.py +++ b/docs/examples/deckgl_layer/app.py @@ -5,7 +5,6 @@ from maplibre import Map, MapOptions, render_maplibregl from maplibre.basemaps import Carto from maplibre.ui import use_deckgl - # from shiny import reactive from shiny.express import input, render, ui @@ -33,7 +32,7 @@ "pickable": True, } -m.add_deck_layers([deck_grid_layer], tooltip_template="Number of points: {{ count }}") +m.add_deck_layers([deck_grid_layer], tooltip="Number of points: {{ count }}") # Shiny Express use_deckgl() diff --git a/docs/examples/deckgl_layer/app_update_layer.py b/docs/examples/deckgl_layer/app_update_layer.py index 6acdad9d..e2dfda01 100644 --- a/docs/examples/deckgl_layer/app_update_layer.py +++ b/docs/examples/deckgl_layer/app_update_layer.py @@ -39,7 +39,7 @@ def deck_grid_layer(cell_size: int = DEFAULT_CELL_SIZE): } -m.add_deck_layers([deck_grid_layer()], tooltip_template="Number of points: {{ count }}") +m.add_deck_layers([deck_grid_layer()], tooltip="Number of points: {{ count }}") # Shiny Express use_deckgl() diff --git a/docs/examples/deckgl_layer/mixing_deck_and_maplibre_layers.py b/docs/examples/deckgl_layer/mixing_deck_and_maplibre_layers.py index b4248166..3babb132 100644 --- a/docs/examples/deckgl_layer/mixing_deck_and_maplibre_layers.py +++ b/docs/examples/deckgl_layer/mixing_deck_and_maplibre_layers.py @@ -53,7 +53,7 @@ m.add_tooltip("circles", "name") m.add_deck_layers( [deck_arc_layer], - tooltip_template={ + tooltip={ "arcs": "gps_code: {{ properties.gps_code }}", }, ) diff --git a/maplibre/map.py b/maplibre/map.py index 8433a00e..45809451 100644 --- a/maplibre/map.py +++ b/maplibre/map.py @@ -274,16 +274,15 @@ def to_html(self, title: str = "My Awesome Map", **kwargs) -> str: ) return output - def add_deck_layers( - self, layers: list[dict], tooltip_template: str | dict = None - ) -> None: + def add_deck_layers(self, layers: list[dict], tooltip: str | dict = None) -> None: """Add Deck.GL layers to the layer stack Args: layers (list[dict]): A list of dictionaries containing the Deck.GL layers to be added. - tooltip_template (str | dict): ... + tooltip (str | dict): Either a single mustache template string applied to all layers + or a dictionary where keys are layer ids and values are mustache template strings. """ - self.add_call("addDeckOverlay", layers, tooltip_template) + self.add_call("addDeckOverlay", layers, tooltip) def set_deck_layers(self, layers: list[dict]): """Update Deck.GL layers