mirror of
https://github.com/gpxstudio/gpx.studio.git
synced 2025-09-02 08:42:31 +00:00
remove insertable marker logic for now
This commit is contained in:
2
website/package-lock.json
generated
2
website/package-lock.json
generated
@@ -13,7 +13,6 @@
|
|||||||
"chart.js": "^4.4.2",
|
"chart.js": "^4.4.2",
|
||||||
"clsx": "^2.1.0",
|
"clsx": "^2.1.0",
|
||||||
"gpx": "file:../gpx",
|
"gpx": "file:../gpx",
|
||||||
"kdbush": "^4.0.2",
|
|
||||||
"lucide-svelte": "^0.365.0",
|
"lucide-svelte": "^0.365.0",
|
||||||
"mapbox-gl": "^3.2.0",
|
"mapbox-gl": "^3.2.0",
|
||||||
"sortablejs": "^1.15.2",
|
"sortablejs": "^1.15.2",
|
||||||
@@ -57,6 +56,7 @@
|
|||||||
"ts-node": "^10.9.2"
|
"ts-node": "^10.9.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@types/geojson": "^7946.0.14",
|
||||||
"@types/jest": "^29.5.12",
|
"@types/jest": "^29.5.12",
|
||||||
"@types/node": "^20.12.7",
|
"@types/node": "^20.12.7",
|
||||||
"jest": "^29.7.0",
|
"jest": "^29.7.0",
|
||||||
|
@@ -46,7 +46,6 @@
|
|||||||
"chart.js": "^4.4.2",
|
"chart.js": "^4.4.2",
|
||||||
"clsx": "^2.1.0",
|
"clsx": "^2.1.0",
|
||||||
"gpx": "file:../gpx",
|
"gpx": "file:../gpx",
|
||||||
"kdbush": "^4.0.2",
|
|
||||||
"lucide-svelte": "^0.365.0",
|
"lucide-svelte": "^0.365.0",
|
||||||
"mapbox-gl": "^3.2.0",
|
"mapbox-gl": "^3.2.0",
|
||||||
"sortablejs": "^1.15.2",
|
"sortablejs": "^1.15.2",
|
||||||
|
@@ -8,10 +8,9 @@
|
|||||||
import { CircleHelp } from 'lucide-svelte';
|
import { CircleHelp } from 'lucide-svelte';
|
||||||
|
|
||||||
import { map, selectedFiles, applyToFile } from '$lib/stores';
|
import { map, selectedFiles, applyToFile } from '$lib/stores';
|
||||||
import { AnchorPointHierarchy, getMarker, route } from './Routing';
|
import { AnchorPointHierarchy, route } from './Routing';
|
||||||
import { onDestroy } from 'svelte';
|
import { onDestroy } from 'svelte';
|
||||||
import mapboxgl from 'mapbox-gl';
|
import mapboxgl from 'mapbox-gl';
|
||||||
import KDBush from 'kdbush';
|
|
||||||
|
|
||||||
import type { GPXFile } from 'gpx';
|
import type { GPXFile } from 'gpx';
|
||||||
|
|
||||||
@@ -36,7 +35,6 @@
|
|||||||
let anchorPointHierarchy: AnchorPointHierarchy | null = null;
|
let anchorPointHierarchy: AnchorPointHierarchy | null = null;
|
||||||
let markers: mapboxgl.Marker[] = [];
|
let markers: mapboxgl.Marker[] = [];
|
||||||
let file: GPXFile | null = null;
|
let file: GPXFile | null = null;
|
||||||
let kdbush: KDBush | null = null;
|
|
||||||
|
|
||||||
function toggleMarkersForZoomLevelAndBounds() {
|
function toggleMarkersForZoomLevelAndBounds() {
|
||||||
if ($map) {
|
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() {
|
function clean() {
|
||||||
markers.forEach((marker) => {
|
markers.forEach((marker) => {
|
||||||
marker.remove();
|
marker.remove();
|
||||||
@@ -105,14 +75,7 @@
|
|||||||
$map.off('zoom', toggleMarkersForZoomLevelAndBounds);
|
$map.off('zoom', toggleMarkersForZoomLevelAndBounds);
|
||||||
$map.off('move', toggleMarkersForZoomLevelAndBounds);
|
$map.off('move', toggleMarkersForZoomLevelAndBounds);
|
||||||
$map.off('click', extendFile);
|
$map.off('click', extendFile);
|
||||||
if (file) {
|
|
||||||
$map.off('mouseover', file._data.layerId, showInsertableMarker);
|
|
||||||
}
|
|
||||||
if (insertableMarker) {
|
|
||||||
insertableMarker.remove();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
kdbush = null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$: if ($selectedFiles.size == 1) {
|
$: if ($selectedFiles.size == 1) {
|
||||||
@@ -143,18 +106,8 @@
|
|||||||
$map.on('zoom', toggleMarkersForZoomLevelAndBounds);
|
$map.on('zoom', toggleMarkersForZoomLevelAndBounds);
|
||||||
$map.on('move', toggleMarkersForZoomLevelAndBounds);
|
$map.on('move', toggleMarkersForZoomLevelAndBounds);
|
||||||
$map.on('click', extendFile);
|
$map.on('click', extendFile);
|
||||||
$map.on('mouseover', file._data.layerId, showInsertableMarker);
|
|
||||||
|
|
||||||
let points = file.getTrackPoints();
|
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(() => {
|
onDestroy(() => {
|
||||||
|
Reference in New Issue
Block a user