ol 10.6.2-dev.1750922991910 → 10.6.2-dev.1751277211647

package/layer/WebGLVectorTile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebGLVectorTile.d.ts","sourceRoot":"","sources":["WebGLVectorTile.js"],"names":[],"mappings":";;;;iCAOa,CAAC,IACD,CAAC,SAAS,OAAO,qBAAqB,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,OAAO,eAAe,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK;oBAItD,oBAAoB,SAA9E,OAAQ,yBAAyB,EAAE,OAAO,CAAC,WAAW,CAAE,mDACjB,WAAW,SAAlD,OAAQ,eAAe,EAAE,WAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAqBpC,OAAO,kBAAkB,EAAE,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA5BtD;;;GAGG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAEH;;;;;;;;;;;;;;GAcG;AACH,mCAJuE,oBAAoB,SAA9E,OAAQ,yBAAyB,EAAE,OAAO,CAAC,WAAW,CAAE,mDACjB,WAAW,SAAlD,OAAQ,eAAe,EAAE,WAAY;IAIhD;;OAEG;IACH,sBAFW,OAAO,CAAC,oBAAoB,EAAE,WAAW,CAAC,EAsBpD;IAfC;;;OAGG;IACH,wBAA8C;IAE9C;;OAEG;IACH,eAA2B;IAE3B;;OAEG;IACH,8BAA0D;IAc5D;;;OAGG;IACH,gCAFW,OAAO,kBAAkB,EAAE,cAAc,QAKnD;IAED;;;OAGG;IACH,gBAFW,OAAO,kBAAkB,EAAE,aAAa,QAMlD;CACF;yCAlHwC,sCAAsC;0BACrD,eAAe"}
+{"version":3,"file":"WebGLVectorTile.d.ts","sourceRoot":"","sources":["WebGLVectorTile.js"],"names":[],"mappings":";;;;iCAOa,CAAC,IACD,CAAC,SAAS,OAAO,qBAAqB,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,OAAO,eAAe,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK;oBAItD,oBAAoB,SAA9E,OAAQ,yBAAyB,EAAE,OAAO,CAAC,WAAW,CAAE,mDACjB,WAAW,SAAlD,OAAQ,eAAe,EAAE,WAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAqBpC,OAAO,kBAAkB,EAAE,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA5BtD;;;GAGG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAEH;;;;;;;;;;;;;;GAcG;AACH,mCAJuE,oBAAoB,SAA9E,OAAQ,yBAAyB,EAAE,OAAO,CAAC,WAAW,CAAE,mDACjB,WAAW,SAAlD,OAAQ,eAAe,EAAE,WAAY;IAIhD;;OAEG;IACH,sBAFW,OAAO,CAAC,oBAAoB,EAAE,WAAW,CAAC,EAsBpD;IAfC;;;OAGG;IACH,wBAA8C;IAE9C;;OAEG;IACH,eAA2B;IAE3B;;OAEG;IACH,8BAA0D;IAe5D;;;OAGG;IACH,gCAFW,OAAO,kBAAkB,EAAE,cAAc,QAKnD;IAED;;;OAGG;IACH,gBAFW,OAAO,kBAAkB,EAAE,aAAa,QAMlD;CACF;yCAnHwC,sCAAsC;0BACrD,eAAe"}

package/layer/WebGLVectorTile.js

@@ -94,6 +94,7 @@ class WebGLVectorTileLayer extends BaseTileLayer {
       style: this.style_,
       variables: this.styleVariables_,
       disableHitDetection: this.hitDetectionDisabled_,
+      cacheSize: this.getCacheSize(),
     });
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "10.6.2-dev.1750922991910",
+  "version": "10.6.2-dev.1751277211647",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/render/webgl/VectorStyleRenderer.d.ts

@@ -1,3 +1,10 @@
+/**
+ * Breaks down a vector style into an array of prebuilt shader builders with attributes and uniforms
+ * @param {FlatStyleLike|StyleShaders|Array<StyleShaders>} style Vector style
+ * @param {import('../../style/flat.js').StyleVariables} variables Style variables
+ * @return {Array<StyleShaders>} Array of style shaders
+ */
+export function convertStyleToShaders(style: FlatStyleLike | StyleShaders | Array<StyleShaders>, variables: import("../../style/flat.js").StyleVariables): Array<StyleShaders>;
 /**
  * Names of attributes made available to the vertex shader.
  * Please note: changing these *will* break custom shaders!
@@ -82,36 +89,42 @@ export type ShaderProgram = {
      */
     fragment: string;
 };
-export type AsShaders = {
+export type StyleShaders = import("./style.js").StyleParseResult;
+export type FlatStyleLike = import("../../style/flat.js").FlatStyleLike;
+export type FlatStyle = import("../../style/flat.js").FlatStyle;
+export type FlatStyleRule = import("../../style/flat.js").Rule;
+export type SubRenderPass = {
+    /**
+     * Vertex shader
+     */
+    vertexShader: string;
     /**
-     * Shader builder with the appropriate presets.
+     * Fragment shader
      */
-    builder: import("./ShaderBuilder.js").ShaderBuilder;
+    fragmentShader: string;
     /**
-     * Custom attributes made available in the vertex shaders.
-     * Default shaders rely on the attributes in {@link Attributes}.
+     * Attributes description
      */
-    attributes?: {
-        [x: string]: AttributeDefinition;
-    } | undefined;
+    attributesDesc: Array<import("../../webgl/Helper.js").AttributeDescription>;
     /**
-     * Additional uniforms usable in shaders.
+     * Program; this has to be recreated if the helper is lost/changed
      */
-    uniforms?: {
-        [x: string]: import("../../webgl/Helper.js").UniformValue;
-    } | undefined;
+    program?: WebGLProgram | undefined;
 };
-export type AsRule = {
+export type RenderPass = {
     /**
-     * Style
+     * Fill render pass; undefined if no fill in pass
      */
-    style: import("../../style/flat.js").FlatStyle;
+    fillRenderPass?: SubRenderPass | undefined;
     /**
-     * Filter
+     * Stroke render pass; undefined if no stroke in pass
      */
-    filter?: import("../../expr/expression.js").EncodedExpression | undefined;
+    strokeRenderPass?: SubRenderPass | undefined;
+    /**
+     * Symbol render pass; undefined if no symbol in pass
+     */
+    symbolRenderPass?: SubRenderPass | undefined;
 };
-export type VectorStyle = AsRule | AsShaders;
 /**
  * @typedef {Object} AttributeDefinition A description of a custom attribute to be passed on to the GPU, with a value different
  * for each feature.
@@ -143,43 +156,49 @@ export type VectorStyle = AsRule | AsShaders;
  * @property {string} fragment Fragment shader source
  */
 /**
- * @typedef {Object} AsShaders
- * @property {import("./ShaderBuilder.js").ShaderBuilder} builder Shader builder with the appropriate presets.
- * @property {AttributeDefinitions} [attributes] Custom attributes made available in the vertex shaders.
- * Default shaders rely on the attributes in {@link Attributes}.
- * @property {UniformDefinitions} [uniforms] Additional uniforms usable in shaders.
+ * @typedef {import('./style.js').StyleParseResult} StyleShaders
+ */
+/**
+ * @typedef {import('../../style/flat.js').FlatStyleLike} FlatStyleLike
  */
 /**
- * @typedef {Object} AsRule
- * @property {import('../../style/flat.js').FlatStyle} style Style
- * @property {import("../../expr/expression.js").EncodedExpression} [filter] Filter
+ * @typedef {import('../../style/flat.js').FlatStyle} FlatStyle
  */
 /**
- * @typedef {AsRule|AsShaders} VectorStyle
+ * @typedef {import('../../style/flat.js').Rule} FlatStyleRule
+ */
+/**
+ * @typedef {Object} SubRenderPass
+ * @property {string} vertexShader Vertex shader
+ * @property {string} fragmentShader Fragment shader
+ * @property {Array<import('../../webgl/Helper.js').AttributeDescription>} attributesDesc Attributes description
+ * @property {WebGLProgram} [program] Program; this has to be recreated if the helper is lost/changed
+ */
+/**
+ * @typedef {Object} RenderPass
+ * @property {SubRenderPass} [fillRenderPass] Fill render pass; undefined if no fill in pass
+ * @property {SubRenderPass} [strokeRenderPass] Stroke render pass; undefined if no stroke in pass
+ * @property {SubRenderPass} [symbolRenderPass] Symbol render pass; undefined if no symbol in pass
  */
 /**
  * @classdesc This class is responsible for:
- * 1. generate WebGL buffers according to a provided style, using a MixedGeometryBatch as input
+ * 1. generating WebGL buffers according to a provided style, using a MixedGeometryBatch as input
  * 2. rendering geometries contained in said buffers
  *
- * A layer renderer will typically maintain several of these in order to have several styles rendered separately.
- *
- * A VectorStyleRenderer instance can be created either from a literal style or from shaders using either
- * `VectorStyleRenderer.fromStyle` or `VectorStyleRenderer.fromShaders`. The shaders should not be provided explicitly
- * but instead as a preconfigured ShaderBuilder instance.
+ * A VectorStyleRenderer instance can be created either from a literal style or from shaders.
+ * The shaders should not be provided explicitly but instead as a preconfigured ShaderBuilder instance.
  *
  * The `generateBuffers` method returns a promise resolving to WebGL buffers that are intended to be rendered by the
  * same renderer.
  */
 declare class VectorStyleRenderer {
     /**
-     * @param {VectorStyle} styleOrShaders Literal style or custom shaders
+     * @param {FlatStyleLike|StyleShaders|Array<StyleShaders>} styles Vector styles expressed as flat styles, flat style rules or style shaders
      * @param {import('../../style/flat.js').StyleVariables} variables Style variables
      * @param {import('../../webgl/Helper.js').default} helper Helper
      * @param {boolean} [enableHitDetection] Whether to enable the hit detection (needs compatible shader)
-     * @param {import("../../expr/expression.js").ExpressionValue} [filter] Optional filter expression
      */
-    constructor(styleOrShaders: VectorStyle, variables: import("../../style/flat.js").StyleVariables, helper: import("../../webgl/Helper.js").default, enableHitDetection?: boolean, filter?: import("../../expr/expression.js").ExpressionValue);
+    constructor(styles: FlatStyleLike | StyleShaders | Array<StyleShaders>, variables: import("../../style/flat.js").StyleVariables, helper: import("../../webgl/Helper.js").default, enableHitDetection?: boolean);
     /**
      * @private
      * @type {import('../../webgl/Helper.js').default}
@@ -190,94 +209,28 @@ declare class VectorStyleRenderer {
      */
     private hitDetectionEnabled_;
     /**
-     * @private
-     * @type {WebGLProgram}
-     */
-    private fillProgram_;
-    /**
-     * @private
-     * @type {WebGLProgram}
-     */
-    private strokeProgram_;
-    /**
-     * @private
-     * @type {WebGLProgram}
-     */
-    private symbolProgram_;
-    /**
-     * @type {boolean}
-     * @private
-     */
-    private hasFill_;
-    /**
-     * @private
-     */
-    private fillVertexShader_;
-    /**
-     * @private
-     */
-    private fillFragmentShader_;
-    /**
-     * @type {boolean}
-     * @private
-     */
-    private hasStroke_;
-    /**
-     * @private
-     */
-    private strokeVertexShader_;
-    /**
+     * @type {Array<StyleShaders>}
      * @private
      */
-    private strokeFragmentShader_;
-    /**
-     * @type {boolean}
-     * @private
-     */
-    private hasSymbol_;
-    /**
-     * @private
-     */
-    private symbolVertexShader_;
-    /**
-     * @private
-     */
-    private symbolFragmentShader_;
-    /**
-     * @type {function(import('../../Feature.js').FeatureLike): boolean}
-     * @private
-     */
-    private featureFilter_;
+    private styleShaders;
     /**
+     * @type {AttributeDefinitions}
      * @private
      */
     private customAttributes_;
     /**
+     @type {UniformDefinitions}
      * @private
      */
     private uniforms_;
     /**
-     * @type {Array<import('../../webgl/Helper.js').AttributeDescription>}
-     * @private
-     */
-    private polygonAttributesDesc_;
-    /**
-     * @type {Array<import('../../webgl/Helper.js').AttributeDescription>}
-     * @private
-     */
-    private lineStringAttributesDesc_;
-    /**
-     * @type {Array<import('../../webgl/Helper.js').AttributeDescription>}
-     * @private
-     */
-    private pointAttributesDesc_;
-    /**
-     * Will apply the style filter when generating geometry batches (if it can be evaluated outside a map context)
-     * @param {import("../../expr/expression.js").ExpressionValue} filter Style filter
-     * @return {function(import('../../Feature.js').FeatureLike): boolean} Feature filter
+     * @type {Array<RenderPass>}
      * @private
      */
-    private computeFeatureFilter;
+    private renderPasses_;
+    hasFill_: boolean;
+    hasStroke_: boolean;
+    hasSymbol_: boolean;
     /**
      * @param {import('./MixedGeometryBatch.js').default} geometryBatch Geometry batch
      * @param {import("../../transform.js").Transform} transform Transform to apply to coordinates

package/render/webgl/VectorStyleRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VectorStyleRenderer.d.ts","sourceRoot":"","sources":["VectorStyleRenderer.js"],"names":[],"mappings":";;;;yBAyCU,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;cAmBF,CAAS,IAAwD,EAAnD,OAAO,yBAAyB,EAAE,iBAAiB,EAAE,IAAmC,EAAnC,OAAO,eAAe,EAAE,WAAW,KAAE,MAAM,GAAC,KAAK,CAAC,MAAM,CAAC;;;;;;;;;;;;oBAW5H,KAAK,CAAC,gBAAgB,CAAC;;;;uBACvB,KAAK,CAAC,gBAAgB,CAAC;;;;kBACvB,KAAK,CAAC,gBAAgB,CAAC;;;;6BACvB,OAAO,oBAAoB,EAAE,SAAS;;;;;;yBAKtC,YAAY,GAAC,IAAI;;;;4BACjB,YAAY,GAAC,IAAI;;;;uBACjB,YAAY,GAAC,IAAI;;;;;;;;;YAKjB,MAAM;;;;cACN,MAAM;;;;;;aAKN,OAAO,oBAAoB,EAAE,aAAa;;;;;;;;;;;;;;;;;;;WAQ1C,OAAO,qBAAqB,EAAE,SAAS;;;;;;0BAKxC,MAAM,GAAC,SAAS;AAlD7B;;;;;;;GAOG;AAEH;;;GAGG;AAEH;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;;;GAIG;AAEH;;;;;;GAMG;AAEH;;;;GAIG;AAEH;;GAEG;AAEH;;;;;;;;;;;;;GAaG;AACH;IACE;;;;;;OAMG;IACH,4BANW,WAAW,aACX,OAAO,qBAAqB,EAAE,cAAc,UAC5C,OAAO,uBAAuB,EAAE,OAAO,uBACvC,OAAO,WACP,OAAO,0BAA0B,EAAE,eAAe,EAiN5D;IA9MC;;;OAGG;IACH,gBAAY;IAEZ;;OAEG;IACH,6BAAgD;IAkBhD;;;OAGG;IACH,qBAAiB;IAEjB;;;OAGG;IACH,uBAAmB;IAEnB;;;OAGG;IACH,uBAAmB;IAEnB;;;OAGG;IACH,iBAAyD;IAEvD;;OAEG;IACH,0BAAgE;IAChE;;OAEG;IACH,4BAAoE;IAGtE;;;OAGG;IACH,mBAA6D;IAE3D;;OAEG;IACH,4BAAoE;IACpE;;OAEG;IACH,8BAAwE;IAG1E;;;OAGG;IACH,mBAA6D;IAE3D;;OAEG;IACH,4BAAoE;IACpE;;OAEG;IACH,8BAAwE;IAG1E;;;OAGG;IACH,uBAA0B;IAgB1B;;OAEG;IACH,0BAIC;IACD;;OAEG;IACH,kBAAmC;IASnC;;;OAGG;IACH,+BAOC;IACD;;;OAGG;IACH,kCAqCC;IACD;;;OAGG;IACH,6BAYC;IAKH;;;;;OAKG;IACH,6BAgCC;IAED;;;;OAIG;IACH,+BAJW,OAAO,yBAAyB,EAAE,OAAO,aACzC,OAAO,oBAAoB,EAAE,SAAS,GACrC,OAAO,CAAC,YAAY,GAAC,IAAI,CAAC,CA4CrC;IAED;;;;;OAKG;IACH,oCA+BC;IAED;;;;;;OAMG;IACH,gCAwEC;IAED;;;;;OAKG;IACH,gBAJW,YAAY,cACZ,OAAO,cAAc,EAAE,UAAU,qBACjC,MAAY,IAAI,QA8B1B;IAED;;;;;;;;OAQG;IACH,wBAkBC;IAED;;;OAGG;IACH,kBAHW,OAAO,uBAAuB,EAAE,OAAO,YACvC,YAAY,QAuCtB;CACF;6BAloB4B,uBAAuB"}
+{"version":3,"file":"VectorStyleRenderer.d.ts","sourceRoot":"","sources":["VectorStyleRenderer.js"],"names":[],"mappings":"AAmkBA;;;;;GAKG;AACH,6CAJW,aAAa,GAAC,YAAY,GAAC,KAAK,CAAC,YAAY,CAAC,aAC9C,OAAO,qBAAqB,EAAE,cAAc,GAC3C,KAAK,CAAC,YAAY,CAAC,CAuD9B;;;;;yBA3lBS,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;cAmBF,CAAS,IAAwD,EAAnD,OAAO,yBAAyB,EAAE,iBAAiB,EAAE,IAAmC,EAAnC,OAAO,eAAe,EAAE,WAAW,KAAE,MAAM,GAAC,KAAK,CAAC,MAAM,CAAC;;;;;;;;;;;;oBAW5H,KAAK,CAAC,gBAAgB,CAAC;;;;uBACvB,KAAK,CAAC,gBAAgB,CAAC;;;;kBACvB,KAAK,CAAC,gBAAgB,CAAC;;;;6BACvB,OAAO,oBAAoB,EAAE,SAAS;;;;;;yBAKtC,YAAY,GAAC,IAAI;;;;4BACjB,YAAY,GAAC,IAAI;;;;uBACjB,YAAY,GAAC,IAAI;;;;;;;;;YAKjB,MAAM;;;;cACN,MAAM;;2BAIP,OAAO,YAAY,EAAE,gBAAgB;4BAIrC,OAAO,qBAAqB,EAAE,aAAa;wBAG3C,OAAO,qBAAqB,EAAE,SAAS;4BAGvC,OAAO,qBAAqB,EAAE,IAAI;;;;;kBAKjC,MAAM;;;;oBACN,MAAM;;;;oBACN,KAAK,CAAC,OAAO,uBAAuB,EAAE,oBAAoB,CAAC;;;;;;;;;;;;;;;;;;;;AArDzE;;;;;;;GAOG;AAEH;;;GAGG;AAEH;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;;;GAIG;AAEH;;GAEG;AAEH;;GAEG;AACH;;GAEG;AACH;;GAEG;AAEH;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACH;IACE;;;;;OAKG;IACH,oBALW,aAAa,GAAC,YAAY,GAAC,KAAK,CAAC,YAAY,CAAC,aAC9C,OAAO,qBAAqB,EAAE,cAAc,UAC5C,OAAO,uBAAuB,EAAE,OAAO,uBACvC,OAAO,EAwKjB;IArKC;;;OAGG;IACH,gBAAY;IAEZ;;OAEG;IACH,6BAAgD;IAEhD;;;OAGG;IACH,qBAA4D;IAE5D;;;OAGG;IACH,0BAA2B;IAE3B;;;OAGG;IACH,kBAAmB;IAgCnB;;;OAGG;IACH,sBA8FE;IAEF,kBAAsE;IACtE,oBAA0E;IAC1E,oBAA0E;IAM5E;;;;OAIG;IACH,+BAJW,OAAO,yBAAyB,EAAE,OAAO,aACzC,OAAO,oBAAoB,EAAE,SAAS,GACrC,OAAO,CAAC,YAAY,GAAC,IAAI,CAAC,CAwCrC;IAED;;;;;OAKG;IACH,oCA+BC;IAED;;;;;;OAMG;IACH,gCAwEC;IAED;;;;;OAKG;IACH,gBAJW,YAAY,cACZ,OAAO,cAAc,EAAE,UAAU,qBACjC,MAAY,IAAI,QAgC1B;IAED;;;;;;;;OAQG;IACH,wBAkBC;IAED;;;OAGG;IACH,kBAHW,OAAO,uBAAuB,EAAE,OAAO,YACvC,YAAY,QAyCtB;CACF;6BAxjB4B,uBAAuB"}