Merge remote-tracking branch 'origin/main' into feat/issue-819-pixel-time-series

# Conflicts:
#	apps/geolibre-desktop/src/components/layout/DesktopShell.tsx

Author: giswqs

apps/geolibre-desktop/package.json

@@ -50,6 +50,7 @@
     "@tauri-apps/plugin-opener": "^2.5.4",
     "apache-arrow": "^17.0.0",
     "dompurify": "^3.4.10",
+    "exifr": "^7.1.3",
     "fflate": "^0.8.3",
     "gdal3.js": "^2.8.1",
     "i18next": "^25.10.10",
@@ -67,11 +68,11 @@
     "maplibre-gl-geo-editor": "^0.9.1",
     "maplibre-gl-geoagent": "^0.4.4",
     "maplibre-gl-lidar": "^0.16.2",
-    "maplibre-gl-splat": "^0.2.8",
     "maplibre-gl-nasa-earthdata": "^0.1.4",
     "maplibre-gl-national-map": "^0.1.1",
     "maplibre-gl-planetary-computer": "^0.3.0",
     "maplibre-gl-raster": "^0.6.3",
+    "maplibre-gl-splat": "^0.2.8",
     "maplibre-gl-streetview": "^0.7.0",
     "maplibre-gl-swipe": "^0.9.1",
     "maplibre-gl-time-slider": "^1.1.0",

apps/geolibre-desktop/src/components/layout/AddDataDialog.tsx

@@ -18,6 +18,7 @@ import { DelimitedTextSource } from "./add-data/sources/DelimitedTextSource";
 import { GeoRssSource } from "./add-data/sources/GeoRssSource";
 import { GpxSource } from "./add-data/sources/GpxSource";
 import { MbtilesSource } from "./add-data/sources/MbtilesSource";
+import { PhotosSource } from "./add-data/sources/PhotosSource";
 import { PostgresSource } from "./add-data/sources/PostgresSource";
 import { VideoSource } from "./add-data/sources/VideoSource";
 import { WfsSource } from "./add-data/sources/WfsSource";
@@ -64,6 +65,8 @@ function renderSource(
       return <GeoRssSource />;
     case "delimited-text":
       return <DelimitedTextSource />;
+    case "photos":
+      return <PhotosSource />;
     case "mbtiles":
       return <MbtilesSource />;
     case "arcgis":

apps/geolibre-desktop/src/components/layout/DesktopShell.tsx

@@ -42,12 +42,18 @@ import {
 } from "react";
 import {
   isTauri,
+  loadDroppedPhotoFiles,
+  loadDroppedPhotoPaths,
   loadDroppedRasterFiles,
   loadDroppedRasterPaths,
   loadDroppedVectorFiles,
   loadDroppedVectorPaths,
   type DroppedRaster,
 } from "../../lib/tauri-io";
+import {
+  isPhotoDropFileName,
+  type GeotaggedPhotoResult,
+} from "../../lib/geotagged-photos";
 import type { LargeVectorDataset } from "../../lib/duckdb-vector-guard";
 import i18n from "../../i18n";
 import {
@@ -63,6 +69,7 @@ import {
   createAppAPI,
   getPluginManager,
   useExternalPluginsReady,
+  useSwipeSplitViewExclusivity,
 } from "../../hooks/usePlugins";
 import { registerMbtilesProtocol } from "../../lib/mbtiles";
 import { hasReverseGeocodeConsent } from "../../lib/reverse-geocode-consent";
@@ -81,6 +88,7 @@ import { CollaborateDialog } from "./CollaborateDialog";
 import { useCollaboration } from "../../hooks/useCollaboration";
 import { MapModeBanner } from "./MapModeBanner";
 import { PixelTimeSeriesControl } from "./PixelTimeSeriesControl";
+import { MapContextMenu } from "./MapContextMenu";
 import { MapGrid } from "./MapGrid";
 import { RemoteCursorsOverlay } from "./RemoteCursorsOverlay";
 import { useCommandBridge } from "../../hooks/useCommandBridge";
@@ -529,6 +537,9 @@ export function DesktopShell({
   const [diagnosticsOpen, setDiagnosticsOpen] = useState(false);
   const diagnostics = useDiagnosticsSnapshot();
   const externalPluginsReady = useExternalPluginsReady(mapControllerRef);
+  // Keep Layer Swipe and split view mutually exclusive (#844): entering a
+  // multi-pane grid turns the swipe slider off.
+  useSwipeSplitViewExclusivity(mapControllerRef);
   // Live-collaboration session. Owned here (rather than in TopToolbar) so both
   // the Collaborate dialog and the on-canvas status badge share one socket, and
   // so the dialog stays mounted in toolbar-hidden layouts.
@@ -903,6 +914,32 @@ export function DesktopShell({
     [addGeoJsonLayer],
   );
 
+  const addDroppedPhotos = useCallback(
+    (result: GeotaggedPhotoResult | null): number => {
+      if (!result || result.located === 0) return 0;
+      const layerId = addGeoJsonLayer(
+        t("addData.photos.defaultName"),
+        result.featureCollection,
+      );
+      const layer = useAppStore
+        .getState()
+        .layers.find((existing) => existing.id === layerId);
+      if (layer) mapControllerRef.current?.fitLayer(layer);
+      // Report skipped (no-GPS) photos too, mirroring the Add Data dialog's
+      // summary, so a partially-skipped drop isn't silent.
+      const summary = t("addData.photos.addedSummary", {
+        count: result.located,
+      });
+      const skippedNote =
+        result.skipped > 0
+          ? ` ${t("addData.photos.skippedNote", { count: result.skipped })}`
+          : "";
+      setDropMessage(summary + skippedNote);
+      return result.located;
+    },
+    [addGeoJsonLayer, t],
+  );
+
   const addDroppedRasters = useCallback(
     async (rasters: DroppedRaster[]): Promise<number> => {
       if (!rasters.length) return 0;
@@ -1054,19 +1091,37 @@ export function DesktopShell({
               }
             }
 
-            if (otherPaths.length > 0) {
+            // Geotagged photos become their own point layer; TIFF stays on the
+            // raster path. Handle them before the vector/raster pipeline so a
+            // dropped .jpg isn't routed to the DuckDB vector loader.
+            const photoResult = await loadDroppedPhotoPaths(otherPaths);
+            const photoCount = addDroppedPhotos(photoResult);
+            // Surface a clear message when every dropped photo lacked GPS, so
+            // the drop doesn't complete silently.
+            if (photoResult && photoCount === 0 && photoResult.total > 0) {
+              setDropError(
+                t("addData.photos.errorNoGps", { count: photoResult.total }),
+              );
+            }
+            const restPaths = otherPaths.filter(
+              (path) => !isPhotoDropFileName(path),
+            );
+
+            if (restPaths.length > 0) {
               const rasterCount = await addDroppedRasters(
-                await loadDroppedRasterPaths(otherPaths),
+                await loadDroppedRasterPaths(restPaths),
               );
-              const importedLayers = await loadDroppedVectorPaths(otherPaths, {
+              const importedLayers = await loadDroppedVectorPaths(restPaths, {
                 onLargeDataset: confirmLargeVectorDataset,
               });
               // See the browser handler: skip finishDrop's empty-input error
-              // when PBF files were present (even if rejected/failed).
+              // when PBF or photo files were present (even if rejected/failed).
+              // See the browser handler: suppress the empty-input error when
+              // photos were present so it can't clobber the GPS error above.
               if (
                 importedLayers.length > 0 ||
                 rasterCount > 0 ||
-                pbfPaths.length === 0
+                (pbfPaths.length === 0 && photoResult === null)
               ) {
                 finishDrop(importedLayers, rasterCount);
               }
@@ -1098,7 +1153,11 @@ export function DesktopShell({
       disposed = true;
       unlisten?.();
     };
-  }, [clearDropMessageLater, finishDrop, addDroppedRasters, addGeoJsonLayer]);
+  }, [clearDropMessageLater,
+    finishDrop,
+    addDroppedRasters,
+    addDroppedPhotos,
+    addGeoJsonLayer]);
 
   const handleDragEnter = useCallback((event: DragEvent<HTMLDivElement>) => {
     if (!hasDroppedFiles(event)) return;
@@ -1185,22 +1244,42 @@ export function DesktopShell({
           );
         }
 
-        if (otherFiles.length > 0) {
+        // Geotagged photos (JPEG/PNG/WebP/HEIC) become a single point layer of
+        // their own; TIFF is left to the raster path. Handle them before the
+        // vector/raster pipeline so a .jpg isn't sent to the DuckDB vector
+        // loader (which would fail).
+        const photoResult = await loadDroppedPhotoFiles(otherFiles);
+        const photoCount = addDroppedPhotos(photoResult);
+        // Surface a clear message when every dropped photo lacked GPS, so the
+        // drop doesn't complete silently.
+        if (photoResult && photoCount === 0 && photoResult.total > 0) {
+          setDropError(
+            t("addData.photos.errorNoGps", { count: photoResult.total }),
+          );
+        }
+        const restFiles = otherFiles.filter(
+          (file) => !isPhotoDropFileName(file.name),
+        );
+
+        if (restFiles.length > 0) {
           const rasterCount = await addDroppedRasters(
-            loadDroppedRasterFiles(otherFiles),
+            loadDroppedRasterFiles(restFiles),
           );
-          const importedLayers = await loadDroppedVectorFiles(otherFiles, {
+          const importedLayers = await loadDroppedVectorFiles(restFiles, {
             onLargeDataset: confirmLargeVectorDataset,
           });
           // Call finishDrop (which reports success or throws the empty-input
           // error) only when the other files produced something, or when the
-          // drop contained no PBF files at all. If PBF files were present —
+          // drop contained no PBF/photo files at all. If those were present —
           // even if they were all rejected or failed — its empty-input error
-          // would wrongly clobber the PBF outcome.
+          // would wrongly clobber their outcome.
+          // Suppress finishDrop's empty-input error whenever photos were
+          // present (photoResult !== null) — even if all lacked GPS — so its
+          // generic message can't clobber the specific GPS error set above.
           if (
             importedLayers.length > 0 ||
             rasterCount > 0 ||
-            pbfFiles.length === 0
+            (pbfFiles.length === 0 && photoResult === null)
           ) {
             finishDrop(importedLayers, rasterCount);
           }
@@ -1214,7 +1293,11 @@ export function DesktopShell({
         clearDropMessageLater();
       }
     },
-    [clearDropMessageLater, finishDrop, addDroppedRasters, addGeoJsonLayer],
+    [clearDropMessageLater,
+    finishDrop,
+    addDroppedRasters,
+    addDroppedPhotos,
+    addGeoJsonLayer],
   );
 
   const startLayerPanelResize = useCallback(
@@ -1565,6 +1648,10 @@ export function DesktopShell({
                 onControllerReady={handleMapControllerReady}
               />
               <RemoteCursorsOverlay mapControllerRef={mapControllerRef} />
+              <MapContextMenu
+                mapControllerRef={mapControllerRef}
+                mapReadyGeneration={mapReadyGeneration}
+              />
               <BoundsRestrictionIndicator />
               {/* Isolate the collaboration badge in its own boundary: it renders
                   over the map, so a fault here must never take down the map