almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-04-29 03:42:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feat: add {layer} as popup variable (aka extended properties)

Browse source 
fix #2007
This commit is contained in:
Yohan Boniface 2024-07-22 10:41:46 +02:00
parent 852d826dcd
commit d54843bbe2
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
umap/static/umap/js/umap.features.js
View file

@ -602,6 +602,7 @@ U.FeatureMixin = {
if (locale) properties.locale = locale
if (L.lang) properties.lang = L.lang
properties.rank = this.getRank() + 1
properties.layer = this.datalayer.getName()
if (this._map && this.hasGeom()) {
center = this.getCenter()
properties.lat = center.lat

25
umap/tests/integration/test_view_marker.py
View file

@ -79,3 +79,28 @@ def test_should_open_popup_panel_on_click(live_server, map, page, bootstrap):
# Close popup
page.locator("#map").click()
expect(panel).to_be_hidden()
def test_extended_properties_in_popup(live_server, map, page, bootstrap):
map.settings["properties"]["popupContentTemplate"] = """
Rank: {rank}
Locale: {locale}
Lang: {lang}
Lat: {lat}
Lon: {lon}
Zoom: {zoom}
Layer: {layer}
"""
map.save()
page.goto(f"{live_server.url}{map.get_absolute_url()}")
expect(page.locator(".umap-icon-active")).to_be_hidden()
page.locator(".leaflet-marker-icon").click()
expect(page.locator(".umap-icon-active")).to_be_visible()
expect(page.locator(".leaflet-popup-content-wrapper")).to_be_visible()
expect(page.get_by_text("Rank: 1")).to_be_visible()
expect(page.get_by_text("Locale: en")).to_be_visible()
expect(page.get_by_text("Lang: en")).to_be_visible()
expect(page.get_by_text("Lat: 48.5529")).to_be_visible()
expect(page.get_by_text("Lon: 14.6889")).to_be_visible()
expect(page.get_by_text("Zoom: 7")).to_be_visible()
expect(page.get_by_text("Layer: test datalayer")).to_be_visible()