ol 7.3.0 → 7.3.1-dev

package/webgl/TileGeometry.d.ts

@@ -0,0 +1,29 @@
+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 {Array<import("../render/webgl/VectorStyleRenderer.js").default>} styleRenderers Array of vector style renderers
+     */
+    constructor(options: import("./BaseTileRepresentation.js").TileRepresentationOptions<TileType>, styleRenderers: Array<import("../render/webgl/VectorStyleRenderer.js").default>);
+    /**
+     * @private
+     */
+    private batch_;
+    /**
+     * @private
+     */
+    private styleRenderers_;
+    /**
+     * @type {Array<import("../render/webgl/VectorStyleRenderer.js").WebGLBuffers>}
+     */
+    buffers: Array<import("../render/webgl/VectorStyleRenderer.js").WebGLBuffers>;
+}
+import BaseTileRepresentation from './BaseTileRepresentation.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":";uBAYa,OAAO,qBAAqB,EAAE,OAAO;AADlD;;GAEG;AAEH;;GAEG;AACH;IACE;;;OAGG;IACH,qBAHW,OAAO,6BAA6B,EAAE,yBAAyB,CAAC,QAAQ,CAAC,kBACzE,MAAM,OAAO,wCAAwC,EAAE,OAAO,CAAC,EAqBzE;IAhBC;;OAEG;IACH,eAAsC;IAEtC;;OAEG;IACH,wBAAqC;IAErC;;OAEG;IACH,SAFU,MAAM,OAAO,wCAAwC,EAAE,YAAY,CAAC,CAE7D;CA+BpB;mCAlEkC,6BAA6B"}

package/webgl/TileGeometry.js

@@ -0,0 +1,73 @@
+/**
+ * @module ol/webgl/TileGeometry
+ */
+
+import BaseTileRepresentation from './BaseTileRepresentation.js';
+import MixedGeometryBatch from '../render/webgl/MixedGeometryBatch.js';
+import {
+  create as createTransform,
+  translate as translateTransform,
+} from '../transform.js';
+
+/**
+ * @typedef {import("../VectorRenderTile").default} TileType
+ */
+
+/**
+ * @extends {BaseTileRepresentation<TileType>}
+ */
+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
+   */
+  constructor(options, styleRenderers) {
+    super(options);
+
+    /**
+     * @private
+     */
+    this.batch_ = new MixedGeometryBatch();
+
+    /**
+     * @private
+     */
+    this.styleRenderers_ = styleRenderers;
+
+    /**
+     * @type {Array<import("../render/webgl/VectorStyleRenderer.js").WebGLBuffers>}
+     */
+    this.buffers = [];
+
+    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];
+    const transform = translateTransform(
+      createTransform(),
+      -tileOriginX,
+      -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();
+    });
+  }
+}
+
+export default TileGeometry;

package/webgl/TileTexture.d.ts

@@ -1,76 +1,33 @@
 export default TileTexture;
 export type TileType = import("../DataTile.js").default | ImageTile | ReprojTile;
-export type Options = {
-    /**
-     * The tile.
-     */
-    tile: TileType;
-    /**
-     * Tile grid.
-     */
-    grid: import("../tilegrid/TileGrid.js").default;
-    /**
-     * WebGL helper.
-     */
-    helper: import("../webgl/Helper.js").default;
-    /**
-     * The size in pixels of the gutter around image tiles to ignore.
-     */
-    gutter?: number | undefined;
-};
 /**
  * @typedef {import("../DataTile.js").default|ImageTile|ReprojTile} TileType
  */
 /**
- * @typedef {Object} Options
- * @property {TileType} tile The tile.
- * @property {import("../tilegrid/TileGrid.js").default} grid Tile grid.
- * @property {import("../webgl/Helper.js").default} helper WebGL helper.
- * @property {number} [gutter=0] The size in pixels of the gutter around image tiles to ignore.
+ * @extends {BaseTileRepresentation<TileType>}
  */
-declare class TileTexture extends EventTarget {
-    /**
-     * @param {Options} options The tile texture options.
-     */
-    constructor(options: Options);
+declare class TileTexture extends BaseTileRepresentation<TileType> {
     /**
-     * @type {TileType}
+     * @param {import("./BaseTileRepresentation.js").TileRepresentationOptions<TileType>} options The tile texture options.
      */
-    tile: TileType;
+    constructor(options: import("./BaseTileRepresentation.js").TileRepresentationOptions<TileType>);
     /**
      * @type {Array<WebGLTexture>}
      */
     textures: Array<WebGLTexture>;
-    handleTileChange_(): void;
     /**
      * @type {import("../size.js").Size}
      * @private
      */
     private renderSize_;
-    /**
-     * @type {number}
-     * @private
-     */
-    private gutter_;
     /**
      * @type {number}
      */
     bandCount: number;
-    /**
-     * @type {import("../webgl/Helper.js").default}
-     * @private
-     */
-    private helper_;
     /**
      * @type {WebGLArrayBuffer}
      */
     coords: WebGLArrayBuffer;
-    /**
-     * @param {TileType} tile Tile.
-     */
-    setTile(tile: TileType): void;
-    loaded: boolean | undefined;
-    uploadTile_(): void;
     /**
      * @param {import("../DataTile.js").ImageLike} image The image.
      * @param {number} renderCol The column index (in rendered tile space).
@@ -96,8 +53,8 @@ declare class TileTexture extends EventTarget {
      */
     getPixelData(renderCol: number, renderRow: number): import("../DataTile.js").ArrayLike | null;
 }
-import ImageTile from "../ImageTile.js";
-import ReprojTile from "../reproj/Tile.js";
-import EventTarget from "../events/Target.js";
-import WebGLArrayBuffer from "./Buffer.js";
+import ImageTile from '../ImageTile.js';
+import ReprojTile from '../reproj/Tile.js';
+import BaseTileRepresentation from './BaseTileRepresentation.js';
+import WebGLArrayBuffer from './Buffer.js';
 //# sourceMappingURL=TileTexture.d.ts.map

package/webgl/TileTexture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TileTexture.d.ts","sourceRoot":"","sources":["TileTexture.js"],"names":[],"mappings":";uBAoIa,OAAO,gBAAgB,EAAE,OAAO,GAAC,SAAS,GAAC,UAAU;;;;;UAKpD,QAAQ;;;;UACR,OAAO,yBAAyB,EAAE,OAAO;;;;YACzC,OAAO,oBAAoB,EAAE,OAAO;;;;;;AARlD;;GAEG;AAEH;;;;;;GAMG;AAEH;IACE;;OAEG;IACH,qBAFW,OAAO,EA4DjB;IAvDC;;OAEG;IACH,MAFU,QAAQ,CAET;IAET;;OAEG;IACH,UAFU,MAAM,YAAY,CAAC,CAEX;IA8KpB,0BAMC;IAjLC;;;OAGG;IACH,oBAEC;IAED;;;OAGG;IACH,gBAAkC;IAElC;;OAEG;IACH,WAFU,MAAM,CAEI;IAEpB;;;OAGG;IACH,gBAA6B;IAe7B;;OAEG;IACH,QAFU,gBAAgB,CAEN;IAKtB;;OAEG;IACH,cAFW,QAAQ,QAsBlB;IAbG,4BAAkD;IAetD,oBAkGC;IAmBD;;;;;;OAMG;IACH,2BAgCC;IAED;;;;;;;OAOG;IACH,2BA0BC;IAED;;;;;OAKG;IACH,wBAJW,MAAM,aACN,MAAM,GACL,OAAO,gBAAgB,EAAE,SAAS,GAAC,IAAI,CAuBlD;CACF"}
+{"version":3,"file":"TileTexture.d.ts","sourceRoot":"","sources":["TileTexture.js"],"names":[],"mappings":";uBAmIa,OAAO,gBAAgB,EAAE,OAAO,GAAC,SAAS,GAAC,UAAU;AADlE;;GAEG;AAEH;;GAEG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,6BAA6B,EAAE,yBAAyB,CAAC,QAAQ,CAAC,EA0CnF;IArCC;;OAEG;IACH,UAFU,MAAM,YAAY,CAAC,CAEX;IAElB;;;OAGG;IACH,oBAEC;IAED;;OAEG;IACH,WAFU,MAAM,CAEI;IAepB;;OAEG;IACH,QAFU,gBAAgB,CAEN;IAwHtB;;;;;;OAMG;IACH,2BAgCC;IAED;;;;;;;OAOG;IACH,2BA0BC;IAED;;;;;OAKG;IACH,wBAJW,MAAM,aACN,MAAM,GACL,OAAO,gBAAgB,EAAE,SAAS,GAAC,IAAI,CAuBlD;CACF;sBA5YqB,iBAAiB;uBAChB,mBAAmB;mCAJP,6BAA6B;6BAKnC,aAAa"}

package/webgl/TileTexture.js

@@ -2,12 +2,11 @@
  * @module ol/webgl/TileTexture
  */
 
+import BaseTileRepresentation from './BaseTileRepresentation.js';
 import DataTile, {asArrayLike, asImageLike} from '../DataTile.js';
-import EventTarget from '../events/Target.js';
 import EventType from '../events/EventType.js';
 import ImageTile from '../ImageTile.js';
 import ReprojTile from '../reproj/Tile.js';
-import TileState from '../TileState.js';
 import WebGLArrayBuffer from './Buffer.js';
 import {ARRAY_BUFFER, STATIC_DRAW} from '../webgl.js';
 import {createCanvasContext2D} from '../dom.js';
@@ -134,30 +133,19 @@ function createPixelContext() {
  */
 
 /**
- * @typedef {Object} Options
- * @property {TileType} tile The tile.
- * @property {import("../tilegrid/TileGrid.js").default} grid Tile grid.
- * @property {import("../webgl/Helper.js").default} helper WebGL helper.
- * @property {number} [gutter=0] The size in pixels of the gutter around image tiles to ignore.
+ * @extends {BaseTileRepresentation<TileType>}
  */
-
-class TileTexture extends EventTarget {
+class TileTexture extends BaseTileRepresentation {
   /**
-   * @param {Options} options The tile texture options.
+   * @param {import("./BaseTileRepresentation.js").TileRepresentationOptions<TileType>} options The tile texture options.
    */
   constructor(options) {
-    super();
-
-    /**
-     * @type {TileType}
-     */
-    this.tile;
+    super(options);
 
     /**
      * @type {Array<WebGLTexture>}
      */
     this.textures = [];
-    this.handleTileChange_ = this.handleTileChange_.bind(this);
 
     /**
      * @type {import("../size.js").Size}
@@ -167,23 +155,11 @@ class TileTexture extends EventTarget {
       options.grid.getTileSize(options.tile.tileCoord[0])
     );
 
-    /**
-     * @type {number}
-     * @private
-     */
-    this.gutter_ = options.gutter || 0;
-
     /**
      * @type {number}
      */
     this.bandCount = NaN;
 
-    /**
-     * @type {import("../webgl/Helper.js").default}
-     * @private
-     */
-    this.helper_ = options.helper;
-
     const coords = new WebGLArrayBuffer(ARRAY_BUFFER, STATIC_DRAW);
     coords.fromArray([
       0, // P0
@@ -205,36 +181,13 @@ class TileTexture extends EventTarget {
     this.setTile(options.tile);
   }
 
-  /**
-   * @param {TileType} tile Tile.
-   */
-  setTile(tile) {
-    if (tile !== this.tile) {
-      if (this.tile) {
-        this.tile.removeEventListener(EventType.CHANGE, this.handleTileChange_);
-      }
-      this.tile = tile;
-      this.textures.length = 0;
-      this.loaded = tile.getState() === TileState.LOADED;
-      if (this.loaded) {
-        this.uploadTile_();
-      } else {
-        if (tile instanceof ImageTile) {
-          const image = tile.getImage();
-          if (image instanceof Image && !image.crossOrigin) {
-            image.crossOrigin = 'anonymous';
-          }
-        }
-        tile.addEventListener(EventType.CHANGE, this.handleTileChange_);
-      }
-    }
-  }
-
-  uploadTile_() {
+  uploadTile() {
     const helper = this.helper_;
     const gl = helper.getGL();
     const tile = this.tile;
 
+    this.textures.length = 0;
+
     /**
      * @type {import("../DataTile.js").Data}
      */
@@ -252,6 +205,7 @@ class TileTexture extends EventTarget {
       this.textures.push(texture);
       this.bandCount = 4;
       uploadImageTexture(gl, texture, image, tile.interpolate);
+      this.setReady();
       return;
     }
 
@@ -282,6 +236,7 @@ class TileTexture extends EventTarget {
         this.bandCount,
         tile.interpolate
       );
+      this.setReady();
       return;
     }
 
@@ -328,14 +283,8 @@ class TileTexture extends EventTarget {
         tile.interpolate
       );
     }
-  }
 
-  handleTileChange_() {
-    if (this.tile.getState() === TileState.LOADED) {
-      this.loaded = true;
-      this.uploadTile_();
-      this.dispatchEvent(EventType.CHANGE);
-    }
+    this.setReady();
   }
 
   disposeInternal() {

package/webgl/styleparser.d.ts

@@ -0,0 +1,61 @@
+/**
+ * @param {import('../style/literal.js').SymbolType} type Symbol type
+ * @param {string} sizeExpressionGlsl Size expression
+ * @return {string} The GLSL opacity function
+ */
+export function getSymbolOpacityGlslFunction(type: import('../style/literal.js').SymbolType, sizeExpressionGlsl: string): string;
+/**
+ * Packs all components of a color into a two-floats array
+ * @param {import("../color.js").Color|string} color Color as array of numbers or string
+ * @return {Array<number>} Vec2 array containing the color in compressed form
+ */
+export function packColor(color: import("../color.js").Color | string): Array<number>;
+/**
+ * @typedef {Object} StyleParseResult
+ * @property {ShaderBuilder} builder Shader builder pre-configured according to a given style
+ * @property {boolean} hasSymbol Has a symbol style defined
+ * @property {boolean} hasStroke Has a stroke style defined
+ * @property {boolean} hasFill Has a fill style defined
+ * @property {import("../render/webgl/VectorStyleRenderer.js").UniformDefinitions} uniforms Uniform definitions
+ * @property {import("../render/webgl/VectorStyleRenderer.js").AttributeDefinitions} attributes Attribute definitions
+ */
+/**
+ * Parses a {@link import("../style/literal").LiteralStyle} object and returns a {@link ShaderBuilder}
+ * object that has been configured according to the given style, as well as `attributes` and `uniforms`
+ * arrays to be fed to the `WebGLPointsRenderer` class.
+ *
+ * Also returns `uniforms` and `attributes` properties as expected by the
+ * {@link module:ol/renderer/webgl/PointsLayer~WebGLPointsLayerRenderer}.
+ *
+ * @param {import("../style/literal").LiteralStyle} style Literal style.
+ * @return {StyleParseResult} Result containing shader params, attributes and uniforms.
+ */
+export function parseLiteralStyle(style: import("../style/literal").LiteralStyle): StyleParseResult;
+export type StyleParseResult = {
+    /**
+     * Shader builder pre-configured according to a given style
+     */
+    builder: ShaderBuilder;
+    /**
+     * Has a symbol style defined
+     */
+    hasSymbol: boolean;
+    /**
+     * Has a stroke style defined
+     */
+    hasStroke: boolean;
+    /**
+     * Has a fill style defined
+     */
+    hasFill: boolean;
+    /**
+     * Uniform definitions
+     */
+    uniforms: import("../render/webgl/VectorStyleRenderer.js").UniformDefinitions;
+    /**
+     * Attribute definitions
+     */
+    attributes: import("../render/webgl/VectorStyleRenderer.js").AttributeDefinitions;
+};
+import { ShaderBuilder } from './ShaderBuilder.js';
+//# sourceMappingURL=styleparser.d.ts.map

package/webgl/styleparser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"styleparser.d.ts","sourceRoot":"","sources":["styleparser.js"],"names":[],"mappings":"AAaA;;;;GAIG;AACH,mDAJW,OAAO,qBAAqB,EAAE,UAAU,sBACxC,MAAM,GACL,MAAM,CAiBjB;AAED;;;;GAIG;AACH,iCAHW,OAAO,aAAa,EAAE,KAAK,GAAC,MAAM,GACjC,MAAM,MAAM,CAAC,CASxB;AA4LD;;;;;;;;GAQG;AAEH;;;;;;;;;;GAUG;AACH,yCAHW,OAAO,kBAAkB,EAAE,YAAY,GACtC,gBAAgB,CAuJ3B;;;;;aAxKa,aAAa;;;;eACb,OAAO;;;;eACP,OAAO;;;;aACP,OAAO;;;;cACP,OAAO,wCAAwC,EAAE,kBAAkB;;;;gBACnE,OAAO,wCAAwC,EAAE,oBAAoB;;8BA9OvD,oBAAoB"}