remove insertable marker logic for now

This commit is contained in:
vcoppe
2024-04-25 14:52:24 +02:00
parent 08ad971de5
commit e5d2ca0574
3 changed files with 2 additions and 50 deletions

View File

@@ -13,7 +13,6 @@
"chart.js": "^4.4.2",
"clsx": "^2.1.0",
"gpx": "file:../gpx",
"kdbush": "^4.0.2",
"lucide-svelte": "^0.365.0",
"mapbox-gl": "^3.2.0",
"sortablejs": "^1.15.2",
@@ -57,6 +56,7 @@
"ts-node": "^10.9.2"
},
"devDependencies": {
"@types/geojson": "^7946.0.14",
"@types/jest": "^29.5.12",
"@types/node": "^20.12.7",
"jest": "^29.7.0",

View File

@@ -46,7 +46,6 @@
"chart.js": "^4.4.2",
"clsx": "^2.1.0",
"gpx": "file:../gpx",
"kdbush": "^4.0.2",
"lucide-svelte": "^0.365.0",
"mapbox-gl": "^3.2.0",
"sortablejs": "^1.15.2",

View File

@@ -8,10 +8,9 @@
import { CircleHelp } from 'lucide-svelte';
import { map, selectedFiles, applyToFile } from '$lib/stores';
import { AnchorPointHierarchy, getMarker, route } from './Routing';
import { AnchorPointHierarchy, route } from './Routing';
import { onDestroy } from 'svelte';
import mapboxgl from 'mapbox-gl';
import KDBush from 'kdbush';
import type { GPXFile } from 'gpx';
@@ -36,7 +35,6 @@
let anchorPointHierarchy: AnchorPointHierarchy | null = null;
let markers: mapboxgl.Marker[] = [];
let file: GPXFile | null = null;
let kdbush: KDBush | null = null;
function toggleMarkersForZoomLevelAndBounds() {
if ($map) {
@@ -68,34 +66,6 @@
}
}
let insertableMarker: mapboxgl.Marker | null = null;
function moveInsertableMarker(e: mapboxgl.MapMouseEvent) {
if (insertableMarker && kdbush && $map) {
let bounds = $map.getBounds();
let latLngDistance = Math.max(
Math.abs(bounds.getNorth() - bounds.getSouth()),
Math.abs(bounds.getEast() - bounds.getWest())
);
if (kdbush.within(e.lngLat.lng, e.lngLat.lat, latLngDistance / 200).length > 0) {
insertableMarker.setLngLat(e.lngLat);
} else {
insertableMarker.remove();
insertableMarker = null;
$map.off('mousemove', moveInsertableMarker);
}
}
}
function showInsertableMarker(e: mapboxgl.MapMouseEvent) {
if ($map && !insertableMarker) {
insertableMarker = getMarker({
lon: e.lngLat.lng,
lat: e.lngLat.lat
});
insertableMarker.addTo($map);
$map.on('mousemove', moveInsertableMarker);
}
}
function clean() {
markers.forEach((marker) => {
marker.remove();
@@ -105,14 +75,7 @@
$map.off('zoom', toggleMarkersForZoomLevelAndBounds);
$map.off('move', toggleMarkersForZoomLevelAndBounds);
$map.off('click', extendFile);
if (file) {
$map.off('mouseover', file._data.layerId, showInsertableMarker);
}
if (insertableMarker) {
insertableMarker.remove();
}
}
kdbush = null;
}
$: if ($selectedFiles.size == 1) {
@@ -143,18 +106,8 @@
$map.on('zoom', toggleMarkersForZoomLevelAndBounds);
$map.on('move', toggleMarkersForZoomLevelAndBounds);
$map.on('click', extendFile);
$map.on('mouseover', file._data.layerId, showInsertableMarker);
let points = file.getTrackPoints();
start = performance.now();
kdbush = new KDBush(points.length);
for (let i = 0; i < points.length; i++) {
kdbush.add(points[i].getLongitude(), points[i].getLatitude());
}
kdbush.finish();
end = performance.now();
console.log('Time to create kdbush: ' + (end - start) + 'ms');
}
onDestroy(() => {