Merge branch 'next' into release/3.9.0

Author: Les Moffat

CHANGELOG.md

@@ -11,14 +11,16 @@
  - `ImageViewer.fitImageBounds(bounds)` fits the viewer to `bounds`.
  - `ImageViewerMarker` class added. `ImageViewer`can now have markers positioned in image pixels.
  - `ImageViewer` now has the `getCanvas` method to retrieve the `HTMLCanvasElement`used by the viewer.
- - Exports `ImageMarkerEvents` type
+ - Exports `ImageMarkerEvents` type.
+ - Configs passed to `setSpace` and `setHalo` are now validated ahead fo time.
 
 
 ### 🐛 Bug Fixes
 
 - Fixes a bug where `map.getProjection()` did not return a value when default projection was used
 - Fixes a bug where "Style Not Done Loading" error is thrown when an Image is used in conjunction with Spacebox.
 - Fixes a bug where switching between remote styles causes flickering in Halo.
+- Fixes a bug where Webgl would throw a texture error when two maps are rendered on the page due to a race condition loading images.
 
 ### ⚙️ Others
 - Right to left text is now opt-out. `rtlTextPlugin` can be passed in the constructor options to opt-out of installing the RTL text-plugin or install a different RTL text-plugin. Without this option the behaviour will remain the same.

src/Map.ts

@@ -568,7 +568,7 @@ export class Map extends maplibregl.Map {
         this.setStyle(MapStyle.STREETS);
         warning += `Loading default MapTiler Cloud style "${MapStyle.STREETS.getDefaultVariant().getId()}" as a fallback.`;
       } else {
-        warning += "Leaving the style as is.";
+        warning += " Leaving the style as is.";
       }
       console.warn(warning);
     };
@@ -1207,17 +1207,21 @@ export class Map extends maplibregl.Map {
         return;
       }
 
-      const targetBeforeLayer = this.getLayersOrder()[0];
-      if (this.space) {
-        this.setSpaceFromStyle({ style: styleSpec });
-      } else {
-        this.initSpace({ before: targetBeforeLayer, spec: styleSpec.metadata?.maptiler?.space });
-      }
+      try {
+        const targetBeforeLayer = this.getLayersOrder()[0];
+        if (this.space) {
+          this.setSpaceFromStyle({ style: styleSpec });
+        } else {
+          this.initSpace({ before: targetBeforeLayer, spec: styleSpec.metadata?.maptiler?.space });
+        }
 
-      if (this.halo) {
-        this.setHaloFromStyle({ style: styleSpec });
-      } else {
-        this.initHalo({ before: targetBeforeLayer, spec: styleSpec.metadata?.maptiler?.halo });
+        if (this.halo) {
+          this.setHaloFromStyle({ style: styleSpec });
+        } else {
+          this.initHalo({ before: targetBeforeLayer, spec: styleSpec.metadata?.maptiler?.halo });
+        }
+      } catch (e) {
+        console.error(e);
       }
     };
 
@@ -1255,7 +1259,9 @@ export class Map extends maplibregl.Map {
       // we have no way of knowing if the style is loaded or not
       // which will fail internally if the style is not loaded correctly
       handleStyleLoad();
-    } catch {}
+    } catch (e) {
+      console.error(e);
+    }
 
     return this;
   }

src/custom-layers/CubemapLayer/CubemapLayer.ts

@@ -276,8 +276,12 @@ class CubemapLayer implements CustomLayerInterface {
    */
   public onRemove(_map: MapSDK, gl: WebGLRenderingContext | WebGL2RenderingContext) {
     if (this.cubemap) {
+      if (this.texture) {
+        gl.deleteTexture(this.texture);
+      }
       gl.deleteProgram(this.cubemap.shaderProgram);
       gl.deleteBuffer(this.cubemap.positionBuffer);
+      this.texture = undefined;
     }
   }
 

src/custom-layers/CubemapLayer/loadCubemapTexture.ts

@@ -1,20 +1,22 @@
 import { CubemapFaceNames, CubemapFaces } from "./types";
 
+type WebGLCtx = WebGLRenderingContext | WebGL2RenderingContext;
+
 interface LoadCubemapTextureOptions {
-  gl: WebGLRenderingContext | WebGL2RenderingContext;
+  gl: WebGLCtx;
   faces?: CubemapFaces;
   onReady: (texture: WebGLTexture, images?: HTMLImageElement[]) => void;
   forceRefresh?: boolean;
 }
 
 /**
  * Stores the result of the last successful execution of {@link loadCubemapTexture}.
- * @type {WebGLTexture | undefined}
+ * @type {Map<WebGLCtx, WebGLTexture>}
  * @private
  */
-let memoizedTexture: WebGLTexture | undefined = undefined;
+const memoizedTextures = new Map<WebGLCtx, WebGLTexture>();
 
-let memoizedImages: HTMLImageElement[] | undefined = undefined;
+const memoizedImages = new Map<WebGLCtx, HTMLImageElement[]>();
 /**
  * Stores the stringified content of the 'faces' object from the last successful execution.
  * Used for memoization by {@link loadCubemapTexture}.
@@ -61,14 +63,15 @@ interface ImageLoadingPromiseReturnValue {
  * });
  */
 export function loadCubemapTexture({ gl, faces, onReady, forceRefresh }: LoadCubemapTextureOptions) {
-  if (memoizedTexture && !forceRefresh && facesKey === JSON.stringify(faces)) {
-    onReady(memoizedTexture, memoizedImages);
+  if (memoizedTextures.get(gl) && !forceRefresh && facesKey === JSON.stringify(faces)) {
+    onReady(memoizedTextures.get(gl)!, memoizedImages.get(gl)!);
+    return;
   }
 
   facesKey = JSON.stringify(faces);
 
-  const texture = memoizedTexture ?? gl.createTexture();
-  gl.bindTexture(gl.TEXTURE_CUBE_MAP, texture);
+  const texture = memoizedTextures.get(gl) ?? gl.createTexture();
+  // gl.bindTexture(gl.TEXTURE_CUBE_MAP, texture);
 
   if (!faces) {
     console.warn("[CubemapLayer][loadCubemapTexture]: Faces are null");
@@ -150,8 +153,8 @@ export function loadCubemapTexture({ gl, faces, onReady, forceRefresh }: LoadCub
 
       onReady(texture, imageElements);
 
-      memoizedImages = imageElements;
-      memoizedTexture = texture;
+      memoizedImages.set(gl, imageElements);
+      memoizedTextures.set(gl, texture);
     })
     .catch((error) => {
       console.error(`[CubemapLayer][loadCubemapTexture]: Error loading cubemap texture`, error);

src/custom-layers/RadialGradientLayer/RadialGradientLayer.ts

@@ -130,6 +130,12 @@ export class RadialGradientLayer implements CustomLayerInterface {
       this.gradient = defaultConstructorOptions;
       return;
     }
+    const errors = validateHaloSpecification(gradient);
+    if (errors.length > 0) {
+      throw new Error(`[RadialGradientLayer]: Invalid Halo specification:
+ - ${errors.join("\n - ")}
+    `);
+    }
 
     this.gradient = {
       ...defaultConstructorOptions,
@@ -351,13 +357,11 @@ export class RadialGradientLayer implements CustomLayerInterface {
 
     await this.animateOut();
 
-    if (!validateHaloSpecification(gradient)) {
-      this.gradient.scale = defaultConstructorOptions.scale;
-      this.gradient.stops = [
-        [0, "transparent"],
-        [1, "transparent"],
-      ];
-      return;
+    const errors = validateHaloSpecification(gradient);
+    if (errors.length > 0) {
+      throw new Error(`[RadialGradientLayer]: Invalid Halo specification:
+ - ${errors.join("\n - ")}
+    `);
     }
 
     if (gradient === true) {
@@ -386,24 +390,39 @@ export class RadialGradientLayer implements CustomLayerInterface {
   }
 }
 
-export function validateHaloSpecification(halo: RadialGradientLayerConstructorOptions | boolean): boolean {
+const validKeys = ["scale", "stops"];
+
+export function validateHaloSpecification(halo: RadialGradientLayerConstructorOptions | boolean): Array<string> {
+  const errors: string[] = [];
+
   if (typeof halo === "boolean") {
-    return true;
+    return [];
+  }
+
+  try {
+    const additionalKeys = Object.keys(halo).filter((key) => !validKeys.includes(key));
+    if (additionalKeys.length > 0) {
+      errors.push(`Properties ${additionalKeys.map((key) => `\`${key}\``).join(", ")} are not supported.`);
+    }
+  } catch {
+    errors.push("Halo specification is not an object.");
   }
 
   if (typeof halo.scale !== "number") {
-    return false;
+    errors.push("Halo `scale` property is not a number.");
   }
 
   // this is testing external data so we need to check
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   if (!halo.stops || halo.stops.length === 0) {
-    return false;
+    errors.push("Halo `stops` property is not an array.");
   }
 
-  if (halo.stops.some((stop) => typeof stop[0] !== "number" || typeof stop[1] !== "string")) {
-    return false;
+  // this is testing external data so we need to check
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+  if (halo.stops?.some((stop) => typeof stop[0] !== "number" || typeof stop[1] !== "string")) {
+    errors.push("Halo `stops` property is not an array of [number, string]");
   }
 
-  return true;
+  return errors;
 }