mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-21 03:26:07 +00:00
feat(map): never leave an offline map grey, whatever the basemap
Offline, a Mapbox map, another OpenFreeMap style or a raster template the device cannot serve now switches to the stored OpenFreeMap basemap, light or dark with the colour scheme, keeping every marker, route and track, with a small Offline map pill. It switches back once the connection returns. "Prepare for offline" stores that basemap's region for every trip, whatever the provider, and both styles' sprites and glyphs, including the scripts a trip in East or South Asia labels its places in. The vector prefetch keeps to OpenFreeMap's download rules (four requests at a time, 50 MB per run), raster tiles are no longer prefetched from OpenStreetMap's own servers, which their policy forbids, nor inside the iOS app, which has no service worker to serve them.
This commit is contained in:
@@ -100,6 +100,8 @@ const NO_DAYS: Day[] = []
|
||||
/** The GL renderer: the shared map contract plus the engine it is bound to. */
|
||||
interface Props extends MapViewProps {
|
||||
glProvider?: GlMapProvider
|
||||
/** Draws this style instead of the user's: the offline basemap (offlineBasemap.ts). */
|
||||
styleOverride?: string
|
||||
/**
|
||||
* The GL engine, injected instead of imported. Both SDKs used to be pulled in
|
||||
* statically here, so a single 2.8 MB chunk carried mapbox-gl and maplibre-gl
|
||||
@@ -482,6 +484,7 @@ export function MapViewGL({
|
||||
onRemoveVia,
|
||||
onViewportChange,
|
||||
glProvider = 'mapbox-gl',
|
||||
styleOverride,
|
||||
gl,
|
||||
onMapReady,
|
||||
...assistant
|
||||
@@ -506,7 +509,7 @@ export function MapViewGL({
|
||||
const showEndpointLabels = useSettingsStore(s => s.settings.map_booking_labels) === true
|
||||
const mapLang = useSettingsStore(s => s.settings.language)
|
||||
const isMapLibre = glProvider === 'maplibre-gl'
|
||||
const glStyle = styleForActiveProvider(glProvider, rawMapboxStyle, rawMaplibreStyle)
|
||||
const glStyle = styleOverride ?? styleForActiveProvider(glProvider, rawMapboxStyle, rawMaplibreStyle)
|
||||
const enableMapbox3d = !isMapLibre && mapbox3d
|
||||
const [mapReady, setMapReady] = useState(false)
|
||||
const [readyMap, setReadyMap] = useState<FerrataGlMap | null>(null) // the ready map, read without touching mapRef
|
||||
|
||||
Reference in New Issue
Block a user