ol 7.3.1-dev.1680098251703 → 7.3.1-dev.1680173927805

package/webgl/Helper.js

@@ -857,8 +857,8 @@ class WebGLHelper extends Disposable {
     gl.deleteShader(vertexShader);
 
     if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
-      const message = `GL program linking failed: ${gl.getShaderInfoLog(
-        vertexShader
+      const message = `GL program linking failed: ${gl.getProgramInfoLog(
+        program
       )}`;
       throw new Error(message);
     }
@@ -897,8 +897,8 @@ class WebGLHelper extends Disposable {
   }
 
   /**
-   * Modifies the given transform to apply the rotation/translation/scaling of the given frame state.
-   * The resulting transform can be used to convert world space coordinates to view coordinates.
+   * Sets the given transform to apply the rotation/translation/scaling of the given frame state.
+   * The resulting transform can be used to convert world space coordinates to view coordinates in the [-1, 1] range.
    * @param {import("../Map.js").FrameState} frameState Frame state.
    * @param {import("../transform").Transform} transform Transform to update.
    * @return {import("../transform").Transform} The updated transform object.
@@ -908,8 +908,6 @@ class WebGLHelper extends Disposable {
     const rotation = frameState.viewState.rotation;
     const resolution = frameState.viewState.resolution;
     const center = frameState.viewState.center;
-
-    resetTransform(transform);
     composeTransform(
       transform,
       0,

package/webgl/TileGeometry.d.ts

@@ -0,0 +1,37 @@
+export default TileGeometry;
+export type TileType = import("../VectorRenderTile").default;
+/**
+ * @typedef {import("../VectorRenderTile").default} TileType
+ */
+/**
+ * @extends {BaseTileRepresentation<TileType>}
+ */
+declare class TileGeometry extends BaseTileRepresentation<import("../VectorRenderTile").default> {
+    /**
+     * @param {import("./BaseTileRepresentation.js").TileRepresentationOptions<TileType>} options The tile texture options.
+     * @param {import("../render/webgl/PolygonBatchRenderer.js").default} polygonRenderer Polygon renderer
+     * @param {import("../render/webgl/LineStringBatchRenderer.js").default} lineStringRenderer Linestring renderer
+     * @param {import("../render/webgl/PointBatchRenderer.js").default} pointRenderer Point renderer
+     */
+    constructor(options: import("./BaseTileRepresentation.js").TileRepresentationOptions<TileType>, polygonRenderer: import("../render/webgl/PolygonBatchRenderer.js").default, lineStringRenderer: import("../render/webgl/LineStringBatchRenderer.js").default, pointRenderer: import("../render/webgl/PointBatchRenderer.js").default);
+    batch: MixedGeometryBatch;
+    /**
+     * @private
+     */
+    private polygonRenderer_;
+    /**
+     * @private
+     */
+    private lineStringRenderer_;
+    /**
+     * @private
+     */
+    private pointRenderer_;
+    /**
+     * @private
+     */
+    private renderInstructionsTransform_;
+}
+import BaseTileRepresentation from './BaseTileRepresentation.js';
+import MixedGeometryBatch from '../render/webgl/MixedGeometryBatch.js';
+//# sourceMappingURL=TileGeometry.d.ts.map

package/webgl/TileGeometry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TileGeometry.d.ts","sourceRoot":"","sources":["TileGeometry.js"],"names":[],"mappings":";uBAaa,OAAO,qBAAqB,EAAE,OAAO;AADlD;;GAEG;AAEH;;GAEG;AACH;IAGE;;;;;OAKG;IACH,qBALW,OAAO,6BAA6B,EAAE,yBAAyB,CAAC,QAAQ,CAAC,mBACzE,OAAO,yCAAyC,EAAE,OAAO,sBACzD,OAAO,4CAA4C,EAAE,OAAO,iBAC5D,OAAO,uCAAuC,EAAE,OAAO,EAuBjE;IA7BD,0BAAiC;IAU/B;;OAEG;IACH,yBAAuC;IACvC;;OAEG;IACH,4BAA6C;IAC7C;;OAEG;IACH,uBAAmC;IAEnC;;OAEG;IACH,qCAAqD;CAyDxD;mCAnGkC,6BAA6B;+BACjC,uCAAuC"}

package/webgl/TileGeometry.js

@@ -0,0 +1,106 @@
+/**
+ * @module ol/webgl/TileGeometry
+ */
+
+import BaseTileRepresentation from './BaseTileRepresentation.js';
+import MixedGeometryBatch from '../render/webgl/MixedGeometryBatch.js';
+import {
+  create as createTransform,
+  reset as resetTransform,
+  translate as translateTransform,
+} from '../transform.js';
+
+/**
+ * @typedef {import("../VectorRenderTile").default} TileType
+ */
+
+/**
+ * @extends {BaseTileRepresentation<TileType>}
+ */
+class TileGeometry extends BaseTileRepresentation {
+  batch = new MixedGeometryBatch();
+
+  /**
+   * @param {import("./BaseTileRepresentation.js").TileRepresentationOptions<TileType>} options The tile texture options.
+   * @param {import("../render/webgl/PolygonBatchRenderer.js").default} polygonRenderer Polygon renderer
+   * @param {import("../render/webgl/LineStringBatchRenderer.js").default} lineStringRenderer Linestring renderer
+   * @param {import("../render/webgl/PointBatchRenderer.js").default} pointRenderer Point renderer
+   */
+  constructor(options, polygonRenderer, lineStringRenderer, pointRenderer) {
+    super(options);
+    /**
+     * @private
+     */
+    this.polygonRenderer_ = polygonRenderer;
+    /**
+     * @private
+     */
+    this.lineStringRenderer_ = lineStringRenderer;
+    /**
+     * @private
+     */
+    this.pointRenderer_ = pointRenderer;
+
+    /**
+     * @private
+     */
+    this.renderInstructionsTransform_ = createTransform();
+
+    this.setTile(options.tile);
+  }
+
+  uploadTile_() {
+    this.batch.clear();
+    const sourceTiles = this.tile.getSourceTiles();
+    const features = sourceTiles.reduce(
+      (accumulator, sourceTile) => accumulator.concat(sourceTile.getFeatures()),
+      []
+    );
+    this.batch.addFeatures(features);
+
+    const tileOriginX = sourceTiles[0].extent[0];
+    const tileOriginY = sourceTiles[0].extent[1];
+    resetTransform(this.renderInstructionsTransform_);
+    translateTransform(
+      this.renderInstructionsTransform_,
+      -tileOriginX,
+      -tileOriginY
+    );
+
+    let remaining = 3;
+    const rebuildCb = () => {
+      remaining--;
+      if (remaining === 0) {
+        this.setReady();
+      }
+    };
+
+    // split geometry processing into separate tasks to avoid blocking the UI thread
+    setTimeout(() => {
+      this.polygonRenderer_.rebuild(
+        this.batch.polygonBatch,
+        this.renderInstructionsTransform_,
+        'Polygon',
+        rebuildCb
+      );
+    });
+    setTimeout(() => {
+      this.lineStringRenderer_.rebuild(
+        this.batch.lineStringBatch,
+        this.renderInstructionsTransform_,
+        'LineString',
+        rebuildCb
+      );
+    });
+    setTimeout(() => {
+      this.pointRenderer_.rebuild(
+        this.batch.pointBatch,
+        this.renderInstructionsTransform_,
+        'Point',
+        rebuildCb
+      );
+    });
+  }
+}
+
+export default TileGeometry;