This commit is contained in:
a-ill
2023-07-14 22:27:11 +03:00
parent d498ddb77f
commit 0355030b4f
46 changed files with 244 additions and 93 deletions

View File

@@ -31,10 +31,12 @@ for (let c of communes) {
}
}
export let communesMarkersLayer = L.layerGroup()
export function addMarkersCommunes(map,content) {
for (let g of communes) {
let coordinates
let text = ""
let text = "<b>Commune</b><br>"
for (let field in g) {
let fieldText = content[field] + ": "
if (field=="contact") {
@@ -62,6 +64,7 @@ export function addMarkersCommunes(map,content) {
shadowSize: [41, 41]
});
let marker = L.marker(coordinates, {icon: markerIcon})
marker.addTo(map).bindPopup(text)
marker.addTo(communesMarkersLayer).bindPopup(text)
}
communesMarkersLayer.addTo(map)
}

View File

@@ -34,10 +34,12 @@ for (let g of coops) {
}
}
export let coopsMarkersLayer = L.layerGroup()
export function addMarkersCoops(map,content) {
for (let g of coops) {
let coordinates
let text = ""
let text = "<b>Cooperative</b><br>"
for (let field in g) {
let fieldText
if (field!="logo") {
@@ -65,6 +67,7 @@ export function addMarkersCoops(map,content) {
text += fieldText + g[field] + "<br>"
}
}
L.marker(coordinates).addTo(map).bindPopup(text)
L.marker(coordinates).addTo(coopsMarkersLayer).bindPopup(text)
}
coopsMarkersLayer.addTo(map)
}

View File

@@ -47,15 +47,15 @@ for (let g of groups) {
}
}
let groupsLoaded = false
export let groupsMarkersLayer = L.layerGroup()
let groupsMarkersLayerOut = L.layerGroup()
let groupsMarkersLayerIn = L.layerGroup()
let contactGeneral =["https://discord.gg/4BUau4AZre","DiscordInviteLink"]
function addMarkerGroups(g,layer,content) {
function addMarkersToLayer(g,layer,content) {
let coordinates
let text = ""
let text = "<b>Group</b><br>"
for (let field in g) {
let fieldText = content[field] + ": "
if (field=="contact") {
@@ -85,13 +85,13 @@ function addMarkerGroups(g,layer,content) {
export function addMarkersGroups(map,content) {
for (let g of groups) {
addMarkerGroups(g,groupsMarkersLayerIn,content)
addMarkersToLayer(g,groupsMarkersLayerIn,content)
}
for (let gs of Object.values(groupsByCountry)) {
if (gs.length==1) {
let g = {...gs[0]}
g.location[0][1] = ""
addMarkerGroups(g,groupsMarkersLayerOut,content)
addMarkersToLayer(g,groupsMarkersLayerOut,content)
}
else {
let locationName = [gs[0].location[0][0],""]
@@ -114,21 +114,22 @@ export function addMarkersGroups(map,content) {
contact: contact
}
addMarkerGroups(gNew,groupsMarkersLayerOut,content)
addMarkersToLayer(gNew,groupsMarkersLayerOut,content)
}
}
groupsMarkersLayerOut.addTo(map)
groupsMarkersLayerOut.addTo(groupsMarkersLayer)
groupsMarkersLayer.addTo(map)
map.on("zoomend", () => onZoomEnd(map))
}
function onZoomEnd(map) {
let zoomLevel = map.getZoom()
if (zoomLevel==3) {
map.removeLayer(groupsMarkersLayerIn)
groupsMarkersLayerOut.addTo(map)
groupsMarkersLayer.removeLayer(groupsMarkersLayerIn)
groupsMarkersLayerOut.addTo(groupsMarkersLayer)
}
else if (zoomLevel==4) {
map.removeLayer(groupsMarkersLayerOut)
groupsMarkersLayerIn.addTo(map)
groupsMarkersLayer.removeLayer(groupsMarkersLayerOut)
groupsMarkersLayerIn.addTo(groupsMarkersLayer)
}
}

View File

@@ -20,10 +20,12 @@ for (let g of parties) {
}
}
export let partiesMarkersLayer = L.layerGroup()
export function addMarkersParties(map,content) {
for (let g of parties) {
let coordinates
let text = ""
let text = "<b>Party</b><br>"
for (let field in g) {
let fieldText
if (field!="logo") {
@@ -58,6 +60,7 @@ export function addMarkersParties(map,content) {
shadowSize: [41, 41]
});
let marker = L.marker(coordinates, {icon: markerIcon})
marker.addTo(map).bindPopup(text)
marker.addTo(partiesMarkersLayer).bindPopup(text)
}
partiesMarkersLayer.addTo(map)
}