diff --git a/src/lib/prediction.ts b/src/lib/prediction.ts
index 2dc4da5..afd31cc 100644
--- a/src/lib/prediction.ts
+++ b/src/lib/prediction.ts
@@ -1,6 +1,5 @@
import { writable } from "svelte/store";
-import type { LatLngExpression } from "leaflet";
-import L from "leaflet";
+import type { LatLngExpression } from "./types";
import { getCsrfToken } from "./auth";
import type { PredictionStage, RawPrediction, Prediction, Point } from "./types";
@@ -129,7 +128,7 @@ export function parsePrediction(prediction: PredictionStage[]): Prediction {
if (lon > 180.0) {
lon -= 360.0;
}
- launch.latlng = L.latLng([launchObj.latitude, lon, launchObj.altitude]);
+ launch.latlng = { lat: launchObj.latitude, lng: lon, alt: launchObj.altitude };
launch.datetime = new Date(launchObj.datetime);
const burstObj = descent[0];
@@ -137,7 +136,7 @@ export function parsePrediction(prediction: PredictionStage[]): Prediction {
if (lon > 180.0) {
lon -= 360.0;
}
- burst.latlng = L.latLng([burstObj.latitude, lon, burstObj.altitude]);
+ burst.latlng = { lat: burstObj.latitude, lng: lon, alt: burstObj.altitude };
burst.datetime = new Date(burstObj.datetime);
const landingObj = descent[descent.length - 1];
@@ -145,7 +144,7 @@ export function parsePrediction(prediction: PredictionStage[]): Prediction {
if (lon > 180.0) {
lon -= 360.0;
}
- landing.latlng = L.latLng([landingObj.latitude, lon, landingObj.altitude]);
+ landing.latlng = { lat: landingObj.latitude, lng: lon, alt: landingObj.altitude };
landing.datetime = new Date(landingObj.datetime);
const profile = prediction[1].stage === "descent" ? "standard_profile" : "float_profile";
diff --git a/src/lib/telemetry.ts b/src/lib/telemetry.ts
index b320f74..384493b 100644
--- a/src/lib/telemetry.ts
+++ b/src/lib/telemetry.ts
@@ -1,5 +1,4 @@
import { writable } from "svelte/store"
-import L from "leaflet";
import type { TelemetryPoint, Telemetry } from "./types";
@@ -11,7 +10,7 @@ export function parseTelemetry(telemetry: TelemetryPoint[]): Telemetry {
]);
const launch = {
- latlng: L.latLng(telemetry[0].latitude, telemetry[0].longitude),
+ latlng: { lat: telemetry[0].latitude, lng: telemetry[0].longitude },
datetime: new Date(telemetry[0].datetime)
};
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 45aeb5b..969c7ee 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -1,4 +1,10 @@
-import type { LatLngExpression, LatLngLiteral } from "leaflet";
+// Define coordinate types (previously from Leaflet)
+export type LatLngTuple = [number, number];
+export interface LatLngLiteral {
+ lat: number;
+ lng: number;
+}
+export type LatLngExpression = LatLngTuple | LatLngLiteral;
export const PROFILE_MAP = {
"Обычный": "standard_profile",
diff --git a/src/routes/predict/+page.svelte b/src/routes/predict/+page.svelte
index 703db34..d27d365 100644
--- a/src/routes/predict/+page.svelte
+++ b/src/routes/predict/+page.svelte
@@ -10,7 +10,6 @@
import { PredictionStore } from "$lib/stores";
import { addToast, removeToast } from "$lib/components/Toast.svelte";
import ToastContainer from '$lib/components/Toast.svelte';
- import L, { point } from "leaflet";
let map: Map | null = null;
let panelContainer: PanelContainer | null = null;
@@ -30,8 +29,13 @@
if (panelContainer) {
let element = panelContainer.getElement();
if (!element) return;
- L.DomEvent.disableClickPropagation(element);
- L.DomEvent.disableScrollPropagation(element);
+
+ // Disable click and scroll propagation to prevent map interaction
+ element.addEventListener('click', (e) => e.stopPropagation());
+ element.addEventListener('dblclick', (e) => e.stopPropagation());
+ element.addEventListener('mousedown', (e) => e.stopPropagation());
+ element.addEventListener('touchstart', (e) => e.stopPropagation());
+ element.addEventListener('wheel', (e) => e.stopPropagation());
}
});
diff --git a/static/css/custom.css b/static/css/custom.css
index bbba238..5c83f9d 100644
--- a/static/css/custom.css
+++ b/static/css/custom.css
@@ -86,25 +86,17 @@
z-index: 1001;
}
-.leaflet-bar {
+/* MapLibre control styles */
+.maplibregl-ctrl-group {
border: var(--bs-border-width) var(--bs-border-style) var(--bs-border-color) !important;
border-radius: var(--bs-border-radius) !important;
}
-.leaflet-tooltip-top::before {
+.maplibregl-popup-tip {
border-top-color: var(--bs-border-color) !important;
}
-.leaflet-tooltip-bottom::before {
- border-bottom-color: var(--bs-border-color) !important;
-}
-.leaflet-tooltip-left::before {
- border-left-color: var(--bs-border-color) !important;
-}
-.leaflet-tooltip-right::before {
- border-right-color: var(--bs-border-color) !important;
-}
-.leaflet-tooltip {
+.maplibregl-popup-content {
background-color: var(--bs-body-bg) !important;
border: var(--bs-border-width) var(--bs-border-style) var(--bs-border-color) !important;
border-radius: var(--bs-border-radius) !important;
@@ -112,6 +104,10 @@
box-shadow: none !important;
}
+.maplibregl-popup-close-button {
+ color: var(--bs-body-color);
+}
+
.modal-backdrop {
opacity: var(--bs-backdrop-opacity) !important;
}