mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-21 11:36:05 +00:00
fix(maps): draw with Leaflet wherever WebGL2 is missing
MapLibre 6 and Mapbox GL 3 both throw out of their Map constructor without WebGL2. Every place that builds a GL map now asks one helper first, components/Map/glSupport.ts, and a browser without WebGL2 gets the Leaflet map with the user's tiles instead of a map that fails to start: - the trip map (MapViewAuto) and the journey maps (JourneyMapAuto) pick their renderer through useGlRenderer, which folds in the Mapbox token rule they each had; - the settings preview, desktop and phone, shows the Leaflet preview through useMapSettingsForm and says why under it; - the tour planner keeps the 2D map when 3D is asked for and says that 3D needs WebGL2; - the PDF route map and the Leaflet vector basemap already fell back and now report a GPU failure too. Behind the probe, buildGlMap wraps each constructor (MapViewGL, JourneyMapGL, the settings preview, the terrain map, the PDF map). A GPU that claims WebGL2 and still refuses the context is reported through utils/webgl, which turns the answer to no and tells every mounted map, so they switch to Leaflet without a reload; any other error is still thrown. Two new strings, map.webgl2.fallback and map.webgl2.terrain, in all 27 locales.
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
/**
|
||||
* Whether this browser will hand MapLibre a WebGL2 context.
|
||||
* Whether this browser will hand a GL map a WebGL2 context. MapLibre 6 and
|
||||
* Mapbox GL 3 both ask for webgl2 and nothing else.
|
||||
*
|
||||
* The default basemap has been a vector style since 4.1.0, and maplibre-gl builds
|
||||
* its GL context inside the Map constructor: no context, no map, and the throw
|
||||
@@ -28,7 +29,39 @@ export function hasWebGL(): boolean {
|
||||
return probed
|
||||
}
|
||||
|
||||
/** Test seam. Nothing in the app clears this: the answer cannot change mid-session. */
|
||||
const listeners = new Set<() => void>()
|
||||
let failures = 0
|
||||
|
||||
/**
|
||||
* A GL map that failed to build although the probe said yes: a GPU that offers
|
||||
* WebGL2 and then cannot create the context, or a context budget that ran out.
|
||||
* From here on the answer is no, and every map that asked is told, so it can
|
||||
* redraw itself without WebGL instead of waiting for the next page load.
|
||||
*/
|
||||
export function reportWebGLFailure(): void {
|
||||
if (probed === false) return
|
||||
probed = false
|
||||
failures++
|
||||
for (const listener of listeners) listener()
|
||||
}
|
||||
|
||||
/** For useSyncExternalStore: tells a map when reportWebGLFailure changed the answer. */
|
||||
export function subscribeWebGL(listener: () => void): () => void {
|
||||
listeners.add(listener)
|
||||
return () => {
|
||||
listeners.delete(listener)
|
||||
}
|
||||
}
|
||||
|
||||
/** For useSyncExternalStore: changes each time reportWebGLFailure turned the answer to no. */
|
||||
export function webGLFailures(): number {
|
||||
return failures
|
||||
}
|
||||
|
||||
/**
|
||||
* Test seam. The app never clears this, it only turns it to no through
|
||||
* reportWebGLFailure: a browser does not gain WebGL2 mid-session.
|
||||
*/
|
||||
export function resetWebGLProbe(): void {
|
||||
probed = null
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user