CalvinBackup/deflock
1
0
Fork 0
mirror of https://github.com/FoggedLens/deflock.git synced 2026-02-12 15:02:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

use FOV always if possible, since we're clustering now

Browse Source
This commit is contained in:
Will Freeman
2024-12-24 17:17:19 -08:00
parent 5e88647c54
commit 27487e2bf9
1 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
webapp/src/components/LeafletMap.vue
View File

@@ -54,7 +54,7 @@ onMounted(() => {
});
function initializeMap() {
map = L.map('map', { zoomControl: false }).setView(props.center, props.zoom);
map = L.map('map', { zoomControl: false, maxZoom: 18 /* max for OSM tiles */ }).setView(props.center, props.zoom);
registerEvents();
registerWatchers();
@@ -188,6 +188,9 @@ function populateMap() {
disableClusteringAtZoom: 16, // showFov threshold
removeOutsideVisibleBounds: true,
maxClusterRadius: 60,
zoomToBoundsOnClick: true,
spiderfyOnEveryZoom: false,
spiderfyOnMaxZoom: false,
});
circlesLayer = L.featureGroup();
@@ -196,7 +199,7 @@ function populateMap() {
let marker: L.CircleMarker | L.Marker;
if (showFov && hasPlottableOrientation(orientationDegrees)) {
if (hasPlottableOrientation(orientationDegrees)) {
marker = makeSVGMarker(alpr);
} else {
marker = makeCircleMarker(alpr);
@@ -219,18 +222,6 @@ function registerEvents() {
});
}
/**
* Returns true if the zoom level has crossed the threshold for switching map markers.
* Standard circles are shown until a zoom level of 16 is reached, at which point
* the map switches to showing the field of view for each camera.
* @param oldZoom old zoom level
* @param newZoom new zoom level
* @param threshold the zoom level threshold
*/
function hasCrossedZoomThreshold(oldZoom: number, newZoom: number, threshold: number) {
return (oldZoom < threshold && newZoom >= threshold) || (oldZoom >= threshold && newZoom < threshold);
}
function registerWatchers() {
watch(() => props.center, (newCenter: any, oldCenter: any) => {
if (newCenter.lat !== oldCenter.lat || newCenter.lng !== oldCenter.lng) {
@@ -238,15 +229,6 @@ function registerWatchers() {
}
});
watch(() => props.zoom, (newZoom, oldZoom) => {
if (newZoom !== oldZoom) {
map.setZoom(newZoom);
if (hasCrossedZoomThreshold(oldZoom, newZoom, 16)) {
populateMap();
}
}
});
watch(() => props.currentLocation, (newLocation, oldLocation) => {
console.log("current location watcher triggered!");
renderCurrentLocation();