mirror of
https://github.com/Crosstalk-Solutions/project-nomad.git
synced 2026-04-04 07:46:16 +02:00
Add distance scale bar and user-placed location pins to the offline maps viewer. - Scale bar (bottom-left) shows distance reference that updates with zoom level - Click anywhere on map to place a named pin with color selection (6 colors) - Collapsible "Saved Locations" panel lists all pins with fly-to navigation - Full dark mode support for popups and panel via CSS overrides - New `map_markers` table with future-proofed columns for routing (marker_type, route_id, route_order, notes) to avoid a migration when routes are added later - CRUD endpoints: GET/POST /api/maps/markers, PATCH/DELETE /api/maps/markers/:id - VineJS validation on create/update - MapMarker Lucid model Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
194 lines
6.6 KiB
TypeScript
194 lines
6.6 KiB
TypeScript
import Map, {
|
|
FullscreenControl,
|
|
NavigationControl,
|
|
ScaleControl,
|
|
Marker,
|
|
Popup,
|
|
MapProvider,
|
|
} from 'react-map-gl/maplibre'
|
|
import type { MapRef, MapLayerMouseEvent } from 'react-map-gl/maplibre'
|
|
import maplibregl from 'maplibre-gl'
|
|
import 'maplibre-gl/dist/maplibre-gl.css'
|
|
import { Protocol } from 'pmtiles'
|
|
import { useEffect, useRef, useState, useCallback } from 'react'
|
|
import { useMapMarkers, PIN_COLORS } from '~/hooks/useMapMarkers'
|
|
import type { PinColorId } from '~/hooks/useMapMarkers'
|
|
import MarkerPin from './MarkerPin'
|
|
import MarkerPanel from './MarkerPanel'
|
|
|
|
export default function MapComponent() {
|
|
const mapRef = useRef<MapRef>(null)
|
|
const { markers, addMarker, deleteMarker } = useMapMarkers()
|
|
const [placingMarker, setPlacingMarker] = useState<{ lng: number; lat: number } | null>(null)
|
|
const [markerName, setMarkerName] = useState('')
|
|
const [markerColor, setMarkerColor] = useState<PinColorId>('orange')
|
|
const [selectedMarkerId, setSelectedMarkerId] = useState<number | null>(null)
|
|
|
|
// Add the PMTiles protocol to maplibre-gl
|
|
useEffect(() => {
|
|
let protocol = new Protocol()
|
|
maplibregl.addProtocol('pmtiles', protocol.tile)
|
|
return () => {
|
|
maplibregl.removeProtocol('pmtiles')
|
|
}
|
|
}, [])
|
|
|
|
const handleMapClick = useCallback((e: MapLayerMouseEvent) => {
|
|
setPlacingMarker({ lng: e.lngLat.lng, lat: e.lngLat.lat })
|
|
setMarkerName('')
|
|
setMarkerColor('orange')
|
|
setSelectedMarkerId(null)
|
|
}, [])
|
|
|
|
const handleSaveMarker = useCallback(() => {
|
|
if (placingMarker && markerName.trim()) {
|
|
addMarker(markerName.trim(), placingMarker.lng, placingMarker.lat, markerColor)
|
|
setPlacingMarker(null)
|
|
setMarkerName('')
|
|
setMarkerColor('orange')
|
|
}
|
|
}, [placingMarker, markerName, markerColor, addMarker])
|
|
|
|
const handleFlyTo = useCallback((longitude: number, latitude: number) => {
|
|
mapRef.current?.flyTo({ center: [longitude, latitude], zoom: 12, duration: 1500 })
|
|
}, [])
|
|
|
|
const handleDeleteMarker = useCallback(
|
|
(id: number) => {
|
|
if (selectedMarkerId === id) setSelectedMarkerId(null)
|
|
deleteMarker(id)
|
|
},
|
|
[selectedMarkerId, deleteMarker]
|
|
)
|
|
|
|
const selectedMarker = selectedMarkerId ? markers.find((m) => m.id === selectedMarkerId) : null
|
|
|
|
return (
|
|
<MapProvider>
|
|
<Map
|
|
ref={mapRef}
|
|
reuseMaps
|
|
style={{
|
|
width: '100%',
|
|
height: '100vh',
|
|
}}
|
|
mapStyle={`${window.location.protocol}//${window.location.hostname}:${window.location.port}/api/maps/styles`}
|
|
mapLib={maplibregl}
|
|
initialViewState={{
|
|
longitude: -101,
|
|
latitude: 40,
|
|
zoom: 3.5,
|
|
}}
|
|
onClick={handleMapClick}
|
|
>
|
|
<NavigationControl style={{ marginTop: '110px', marginRight: '36px' }} />
|
|
<FullscreenControl style={{ marginTop: '30px', marginRight: '36px' }} />
|
|
<ScaleControl position="bottom-left" maxWidth={150} unit="imperial" />
|
|
|
|
{/* Existing markers */}
|
|
{markers.map((marker) => (
|
|
<Marker
|
|
key={marker.id}
|
|
longitude={marker.longitude}
|
|
latitude={marker.latitude}
|
|
anchor="bottom"
|
|
onClick={(e) => {
|
|
e.originalEvent.stopPropagation()
|
|
setSelectedMarkerId(marker.id === selectedMarkerId ? null : marker.id)
|
|
setPlacingMarker(null)
|
|
}}
|
|
>
|
|
<MarkerPin
|
|
color={PIN_COLORS.find((c) => c.id === marker.color)?.hex}
|
|
active={marker.id === selectedMarkerId}
|
|
/>
|
|
</Marker>
|
|
))}
|
|
|
|
{/* Popup for selected marker */}
|
|
{selectedMarker && (
|
|
<Popup
|
|
longitude={selectedMarker.longitude}
|
|
latitude={selectedMarker.latitude}
|
|
anchor="bottom"
|
|
offset={[0, -36] as [number, number]}
|
|
onClose={() => setSelectedMarkerId(null)}
|
|
closeOnClick={false}
|
|
>
|
|
<div className="text-sm font-medium">{selectedMarker.name}</div>
|
|
</Popup>
|
|
)}
|
|
|
|
{/* Popup for placing a new marker */}
|
|
{placingMarker && (
|
|
<Popup
|
|
longitude={placingMarker.lng}
|
|
latitude={placingMarker.lat}
|
|
anchor="bottom"
|
|
onClose={() => setPlacingMarker(null)}
|
|
closeOnClick={false}
|
|
>
|
|
<div className="p-1">
|
|
<input
|
|
autoFocus
|
|
type="text"
|
|
placeholder="Name this location"
|
|
value={markerName}
|
|
onChange={(e) => setMarkerName(e.target.value)}
|
|
onKeyDown={(e) => {
|
|
if (e.key === 'Enter') handleSaveMarker()
|
|
if (e.key === 'Escape') setPlacingMarker(null)
|
|
}}
|
|
className="block w-full rounded border border-gray-300 px-2 py-1 text-sm placeholder:text-gray-400 focus:outline-none focus:border-gray-500"
|
|
/>
|
|
<div className="mt-1.5 flex gap-1 items-center">
|
|
{PIN_COLORS.map((c) => (
|
|
<button
|
|
key={c.id}
|
|
onClick={() => setMarkerColor(c.id)}
|
|
title={c.label}
|
|
className="rounded-full p-0.5 transition-transform"
|
|
style={{
|
|
outline: markerColor === c.id ? `2px solid ${c.hex}` : '2px solid transparent',
|
|
outlineOffset: '1px',
|
|
}}
|
|
>
|
|
<div
|
|
className="w-4 h-4 rounded-full"
|
|
style={{ backgroundColor: c.hex }}
|
|
/>
|
|
</button>
|
|
))}
|
|
</div>
|
|
<div className="mt-1.5 flex gap-1.5 justify-end">
|
|
<button
|
|
onClick={() => setPlacingMarker(null)}
|
|
className="text-xs text-gray-500 hover:text-gray-700 px-2 py-1 rounded transition-colors"
|
|
>
|
|
Cancel
|
|
</button>
|
|
<button
|
|
onClick={handleSaveMarker}
|
|
disabled={!markerName.trim()}
|
|
className="text-xs bg-[#424420] text-white rounded px-2.5 py-1 hover:bg-[#525530] disabled:opacity-40 transition-colors"
|
|
>
|
|
Save
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</Popup>
|
|
)}
|
|
</Map>
|
|
|
|
{/* Marker panel overlay */}
|
|
<MarkerPanel
|
|
markers={markers}
|
|
onDelete={handleDeleteMarker}
|
|
onFlyTo={handleFlyTo}
|
|
onSelect={setSelectedMarkerId}
|
|
selectedMarkerId={selectedMarkerId}
|
|
/>
|
|
</MapProvider>
|
|
)
|
|
}
|