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

fix: clicking feature in the browser would not open popup in cluster

Browse source 
fix #2127
This commit is contained in:
Yohan Boniface 2024-09-11 14:54:54 +02:00
parent bdcbd09064
commit f232bf476c
3 changed files with 57 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
umap/static/umap/js/modules/browser.js
View file

@ -45,7 +45,7 @@ export default class Browser {
Icon.setContrast(icon, colorBox, symbol, bgcolor)
}
const viewFeature = (e) => {
feature.zoomTo({ ...e, callback: feature.view })
feature.zoomTo({ ...e, callback: () => feature.view() })
}
DomEvent.on(zoom_to, 'click', viewFeature)
DomEvent.on(title, 'click', viewFeature)

6
umap/static/umap/js/modules/data/features.js
View file

@ -439,7 +439,7 @@ class Feature {
zoomTo({ easing, latlng, callback } = {}) {
if (easing === undefined) easing = this.map.getOption('easing')
if (callback) this.map.once('moveend', callback.call(this))
if (callback) this.map.once('moveend', callback.bind(this))
if (easing) {
this.map.flyTo(this.center, this.getBestZoom())
} else {
@ -663,9 +663,9 @@ export class Point extends Feature {
}
zoomTo(event) {
if (this.datalayer.isClustered() && !this._icon) {
if (this.datalayer.isClustered() && !this.ui._icon) {
// callback is mandatory for zoomToShowLayer
this.datalayer.layer.zoomToShowLayer(this, event.callback || (() => {}))
this.datalayer.layer.zoomToShowLayer(this.ui, event.callback || (() => {}))
} else {
super.zoomTo(event)
}

53
umap/tests/integration/test_cluster.py Normal file
View file

@ -0,0 +1,53 @@
import pytest
from playwright.sync_api import expect
from ..base import DataLayerFactory
pytestmark = pytest.mark.django_db
DATALAYER_DATA = {
"type": "FeatureCollection",
"_umap_options": {
"name": "Calque 1",
"type": "Cluster",
"cluster": {},
"browsable": True,
"inCaption": True,
"displayOnLoad": True,
},
"features": [
{
"type": "Feature",
"properties": {"name": "one point in france"},
"geometry": {"type": "Point", "coordinates": [3.339844, 46.920255]},
},
{
"type": "Feature",
"properties": {
"name": "one another point in france in same position",
"description": "can you see me ?",
},
"geometry": {"type": "Point", "coordinates": [3.339844, 46.920255]},
},
{
"type": "Feature",
"properties": {
"name": "again one another point",
"description": "and me ?",
},
"geometry": {"type": "Point", "coordinates": [3.34, 46.1]},
},
],
}
def test_can_open_feature_on_browser_click(live_server, page, map):
map.settings["properties"]["onLoadPanel"] = "databrowser"
map.save()
DataLayerFactory(map=map, data=DATALAYER_DATA)
page.goto(f"{live_server.url}{map.get_absolute_url()}#7/46.920/3.340")
page.get_by_text("one another point in france in same position").click()
expect(page.get_by_text("can you see me ?")).to_be_visible()
page.get_by_text("again one another point").click()
expect(page.get_by_text("and me ?")).to_be_visible()