ol 10.6.2-dev.1750922991910 → 10.6.2-dev.1751445583969

package/webgl/Helper.js

@@ -66,7 +66,7 @@ export const AttributeType = {
 /**
  * Description of an attribute in a buffer
  * @typedef {Object} AttributeDescription
- * @property {string} name Attribute name to use in shaders
+ * @property {string|null} name Attribute name to use in shaders; if null, this attribute will not be enabled and is simply used as padding in the buffers
  * @property {number} size Number of components per attributes
  * @property {AttributeType} [type] Attribute type, i.e. number of bytes used to store the value. This is
  * determined by the class of typed array which the buffer uses (eg. `Float32Array` for a `FLOAT` attribute).
@@ -1115,13 +1115,16 @@ class WebGLHelper extends Disposable {
     let offset = 0;
     for (let i = 0; i < attributes.length; i++) {
       const attr = attributes[i];
-      this.enableAttributeArray_(
-        attr.name,
-        attr.size,
-        attr.type || FLOAT,
-        stride,
-        offset,
-      );
+      // if a name is not given, simply skip this slot in the buffer
+      if (attr.name) {
+        this.enableAttributeArray_(
+          attr.name,
+          attr.size,
+          attr.type || FLOAT,
+          stride,
+          offset,
+        );
+      }
       offset += attr.size * getByteSizeFromType(attr.type);
     }
   }

package/webgl/TileGeometry.d.ts

@@ -9,9 +9,9 @@ export type TileType = import("../VectorRenderTile").default;
 declare class TileGeometry extends BaseTileRepresentation<import("../VectorRenderTile").default> {
     /**
      * @param {import("./BaseTileRepresentation.js").TileRepresentationOptions<TileType>} options The tile texture options.
-     * @param {Array<import("../render/webgl/VectorStyleRenderer.js").default>} styleRenderers Array of vector style renderers
+     * @param {import("../render/webgl/VectorStyleRenderer.js").default} styleRenderer Vector style renderer
      */
-    constructor(options: import("./BaseTileRepresentation.js").TileRepresentationOptions<TileType>, styleRenderers: Array<import("../render/webgl/VectorStyleRenderer.js").default>);
+    constructor(options: import("./BaseTileRepresentation.js").TileRepresentationOptions<TileType>, styleRenderer: import("../render/webgl/VectorStyleRenderer.js").default);
     /**
      * @private
      */
@@ -19,11 +19,11 @@ declare class TileGeometry extends BaseTileRepresentation<import("../VectorRende
     /**
      * @private
      */
-    private styleRenderers_;
+    private styleRenderer_;
     /**
-     * @type {Array<import("../render/webgl/VectorStyleRenderer.js").WebGLBuffers>}
+     * @type {import("../render/webgl/VectorStyleRenderer.js").WebGLBuffers}
      */
-    buffers: Array<import("../render/webgl/VectorStyleRenderer.js").WebGLBuffers>;
+    buffers: import("../render/webgl/VectorStyleRenderer.js").WebGLBuffers;
     /**
      * Each geometry tile also has a mask which consisted of a quad (two triangles); this mask is intended to
      * be rendered to an offscreen buffer, and be used to correctly mask tiles according to their zoom level
@@ -34,11 +34,6 @@ declare class TileGeometry extends BaseTileRepresentation<import("../VectorRende
      * @private
      */
     private generateMaskBuffer_;
-    /**
-     * Will release a set of Webgl buffers
-     * @param {import('../render/webgl/VectorStyleRenderer.js').WebGLBuffers|null} buffers Buffers
-     */
-    disposeBuffers(buffers: import("../render/webgl/VectorStyleRenderer.js").WebGLBuffers | null): void;
 }
 import BaseTileRepresentation from './BaseTileRepresentation.js';
 import WebGLArrayBuffer from './Buffer.js';

package/webgl/TileGeometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TileGeometry.d.ts","sourceRoot":"","sources":["TileGeometry.js"],"names":[],"mappings":";uBAca,OAAO,qBAAqB,EAAE,OAAO;AADlD;;GAEG;AAEH;;GAEG;AACH;IACE;;;OAGG;IACH,qBAHW,OAAO,6BAA6B,EAAE,yBAAyB,CAAC,QAAQ,CAAC,kBACzE,KAAK,CAAC,OAAO,wCAAwC,EAAE,OAAO,CAAC,EA4BzE;IAvBC;;OAEG;IACH,eAAsC;IAEtC;;OAEG;IACH,wBAAqC;IAErC;;OAEG;IACH,SAFU,KAAK,CAAC,OAAO,wCAAwC,EAAE,YAAY,CAAC,CAE7D;IAEjB;;;;OAIG;IACH,+BAAmE;IAKrE;;OAEG;IACH,4BAaC;IA4CD;;;OAGG;IACH,wBAFW,OAAO,wCAAwC,EAAE,YAAY,GAAC,IAAI,QAyB5E;CACF;mCAnIkC,6BAA6B;6BACnC,aAAa"}
+{"version":3,"file":"TileGeometry.d.ts","sourceRoot":"","sources":["TileGeometry.js"],"names":[],"mappings":";uBAca,OAAO,qBAAqB,EAAE,OAAO;AADlD;;GAEG;AAEH;;GAEG;AACH;IACE;;;OAGG;IACH,qBAHW,OAAO,6BAA6B,EAAE,yBAAyB,CAAC,QAAQ,CAAC,iBACzE,OAAO,wCAAwC,EAAE,OAAO,EA4BlE;IAvBC;;OAEG;IACH,eAAsC;IAEtC;;OAEG;IACH,uBAAmC;IAEnC;;OAEG;IACH,SAFU,OAAO,wCAAwC,EAAE,YAAY,CAEpD;IAEnB;;;;OAIG;IACH,+BAAmE;IAKrE;;OAEG;IACH,4BAaC;CAwDF;mCAnHkC,6BAA6B;6BACnC,aAAa"}

package/webgl/TileGeometry.js

@@ -21,9 +21,9 @@ import WebGLArrayBuffer from './Buffer.js';
 class TileGeometry extends BaseTileRepresentation {
   /**
    * @param {import("./BaseTileRepresentation.js").TileRepresentationOptions<TileType>} options The tile texture options.
-   * @param {Array<import("../render/webgl/VectorStyleRenderer.js").default>} styleRenderers Array of vector style renderers
+   * @param {import("../render/webgl/VectorStyleRenderer.js").default} styleRenderer Vector style renderer
    */
-  constructor(options, styleRenderers) {
+  constructor(options, styleRenderer) {
     super(options);
 
     /**
@@ -34,12 +34,12 @@ class TileGeometry extends BaseTileRepresentation {
     /**
      * @private
      */
-    this.styleRenderers_ = styleRenderers;
+    this.styleRenderer_ = styleRenderer;
 
     /**
-     * @type {Array<import("../render/webgl/VectorStyleRenderer.js").WebGLBuffers>}
+     * @type {import("../render/webgl/VectorStyleRenderer.js").WebGLBuffers}
      */
-    this.buffers = [];
+    this.buffers = null;
 
     /**
      * Each geometry tile also has a mask which consisted of a quad (two triangles); this mask is intended to
@@ -91,53 +91,37 @@ class TileGeometry extends BaseTileRepresentation {
       -tileOriginY,
     );
 
-    const generatePromises = this.styleRenderers_.map((renderer, i) =>
-      renderer.generateBuffers(this.batch_, transform).then((buffers) => {
-        this.buffers[i] = buffers;
-      }),
-    );
-    Promise.all(generatePromises).then(() => {
-      this.setReady();
-    });
+    this.styleRenderer_
+      .generateBuffers(this.batch_, transform)
+      .then((buffers) => {
+        this.buffers = buffers;
+        this.setReady();
+      });
   }
 
   /**
    * @override
    */
   disposeInternal() {
-    this.buffers.forEach((buffers) => {
-      this.disposeBuffers(buffers);
-    });
-    super.disposeInternal();
-  }
-
-  /**
-   * Will release a set of Webgl buffers
-   * @param {import('../render/webgl/VectorStyleRenderer.js').WebGLBuffers|null} buffers Buffers
-   */
-  disposeBuffers(buffers) {
-    if (!buffers) {
-      return;
-    }
-    /**
-     * @param {Array<WebGLArrayBuffer>} typeBuffers Buffers
-     */
-    const disposeBuffersOfType = (typeBuffers) => {
-      for (const buffer of typeBuffers) {
-        if (buffer) {
-          this.helper.deleteBuffer(buffer);
+    if (this.buffers) {
+      /**
+       * @param {Array<WebGLArrayBuffer>} typeBuffers Buffers
+       */
+      const disposeBuffersOfType = (typeBuffers) => {
+        for (const buffer of typeBuffers) {
+          if (buffer) {
+            this.helper.deleteBuffer(buffer);
+          }
         }
-      }
-    };
-    if (buffers.pointBuffers) {
-      disposeBuffersOfType(buffers.pointBuffers);
-    }
-    if (buffers.lineStringBuffers) {
-      disposeBuffersOfType(buffers.lineStringBuffers);
-    }
-    if (buffers.polygonBuffers) {
-      disposeBuffersOfType(buffers.polygonBuffers);
+      };
+      this.buffers.pointBuffers &&
+        disposeBuffersOfType(this.buffers.pointBuffers);
+      this.buffers.lineStringBuffers &&
+        disposeBuffersOfType(this.buffers.lineStringBuffers);
+      this.buffers.polygonBuffers &&
+        disposeBuffersOfType(this.buffers.polygonBuffers);
     }
+    super.disposeInternal();
   }
 }