Skip to content

Store a leaflet map instance on a DOM element so other plugins can write on the same map #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
etjones wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Store a leaflet map instance on a DOM element so other plugins can write on the same map #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions datasette_cluster_map/static/datasette-cluster-map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ document.addEventListener("DOMContentLoaded", () => {
document.head.appendChild(stylesheet2);
// Leaflet needs to be loaded before Leaflet.clustermap
import(datasette.leaflet.JAVASCRIPT_URL).then(() => {
import(datasette.cluster_map.MARKERCLUSTER_URL).then(hasLoaded);
import(datasette.cluster_map.MARKERCLUSTER_URL).then(hasLoaded);
});
};
loadDependencies(() => addClusterMap(latitudeColumn, longitudeColumn));
Expand Down Expand Up @@ -121,8 +121,8 @@ const clusterMapMarkerContent = (row) => {
if (popup.image) {
html.push(
'<img style="max-width: 100%" src="' +
clusterMapEscapeHTML(popup.image) +
'"'
clusterMapEscapeHTML(popup.image) +
'"'
);
if (popup.alt) {
html.push(' alt="' + clusterMapEscapeHTML(popup.alt) + '"');
Expand All @@ -132,8 +132,8 @@ const clusterMapMarkerContent = (row) => {
if (popup.description) {
html.push(
'<p style="text-decoration: none; color: black;">' +
clusterMapEscapeHTML(popup.description) +
"</p>"
clusterMapEscapeHTML(popup.description) +
"</p>"
);
}
if (popup.link) {
Expand Down Expand Up @@ -228,10 +228,9 @@ const addClusterMap = (latitudeColumn, longitudeColumn) => {
}
let total = data.count || data.filtered_table_rows_count;
if (next_url) {
percent = ` (${
Math.round((count / total) * 100 * 100) /
percent = ` (${Math.round((count / total) * 100 * 100) /
100
}%)`;
}%)`;
// Add a control to either continue loading or pause
button = document.createElement("button");
button.classList.add("cluster-map-button");
Expand Down Expand Up @@ -277,15 +276,20 @@ const addClusterMap = (latitudeColumn, longitudeColumn) => {
el.style.width = "100%";
el.style.height = "500px";
let tiles = L.tileLayer(
window.DATASETTE_CLUSTER_MAP_TILE_LAYER,
window.DATASETTE_CLUSTER_MAP_TILE_LAYER_OPTIONS
),
window.DATASETTE_CLUSTER_MAP_TILE_LAYER,
window.DATASETTE_CLUSTER_MAP_TILE_LAYER_OPTIONS
),
latlng = L.latLng(0, 0);
let map = L.map(el, {
//center: latlng,
zoom: 13,
layers: [tiles],
});

// Store the map instance on the element it's attached to.
// Other plugins can then draw on the same map if needed.
el.datasetteClusterMap = map;

const container = window.DATASETTE_CLUSTER_MAP_CONTAINER;
if (container && document.querySelector(container)) {
document.querySelector(container).appendChild(el);
Expand Down
10 changes: 9 additions & 1 deletion tests/test_playwright.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from playwright import sync_api
except ImportError:
sync_api = None
import pytest
import nest_asyncio

nest_asyncio.apply()
Expand All @@ -26,3 +25,12 @@ def test_markers_are_displayed(ds_server, table, page):
page.goto(ds_server + "/data/" + table)
# There should be two leaflet-marker-icons
sync_api.expect(page.locator(".leaflet-marker-icon")).to_have_count(2)


def test_map_instance_stored(ds_server, page):
page.goto(ds_server + "/data/lat_lng")
# Wait for the map container to appear
container = page.wait_for_selector(".leaflet-container")
# Confirm that the datasetteClusterMap property exists on the leaflet map element
has_trait = container.evaluate("el => 'datasetteClusterMap' in el")
assert has_trait, "Element does not have datasetteClusterMap property"