ol 10.3.2-dev.1735646205796 → 10.3.2-dev.1736174878428

package/layer/WebGLTile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebGLTile.d.ts","sourceRoot":"","sources":["WebGLTile.js"],"names":[],"mappings":";yBAmBa,OAAO,uBAAuB,EAAE,OAAO,CAAC,OAAO,gBAAgB,EAAE,OAAO,GAAC,OAAO,iBAAiB,EAAE,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wIA+C/E,OAAO,cAAc,EAAE,MAAM,QAAE,MAAM,KAAE,KAAK,CAAC,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAiBnF,MAAM;;;;oBACN,MAAM;;;;;;;;;;qBAEN,KAAK,CAAC,OAAO,4BAA4B,EAAE,OAAO,CAAC;;AAyLjE;;;;;;;;;;;;GAYG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAyCjB;IA/BC;;;OAGG;IACH,iBAA+B;IAE/B;;;OAGG;IACH,wBAA2B;IAE3B;;;OAGG;IACH,4BAA8B;IAE9B;;;OAGG;IACH,eAAmB;IAEnB;;;OAGG;IACH,wBAAkD;IAKpD;;;;;OAKG;IACH,mBAJW,OAAO,cAAc,EAAE,MAAM,cAC7B,MAAM,GACL,KAAK,CAAC,UAAU,CAAC,CAW5B;IAED;;;OAGG;IACH,4BAHY,UAAU,CAKrB;IAWD;;OAEG;IACH,4BAkBC;IAED;;;OAGG;IACH,4BAMC;IAED;;OAEG;IACH,wDAUC;IAED;;;;OAIG;IACH,0BAJW,OAAO,QAAQ,EAAE,UAAU,WAC3B,KAAK,CAAC,UAAU,CAAC,GAChB,WAAW,CAYtB;IAED;;;;;;OAMG;IACH,4BANY,OAAO,WAAW,EAAE,UAAU,OAAA,UAC/B,WAAW,GAEV,WAAW,CAuCtB;IAED;;;;;;;OAOG;IACH,gBAFW,KAAK,QAgBf;IAED;;;;OAIG;IACH;;aAGC;CACF;mCA9eM,gCAAgC;0BAEb,eAAe"}
+{"version":3,"file":"WebGLTile.d.ts","sourceRoot":"","sources":["WebGLTile.js"],"names":[],"mappings":";yBAmBa,OAAO,uBAAuB,EAAE,OAAO,CAAC,OAAO,gBAAgB,EAAE,OAAO,GAAC,OAAO,iBAAiB,EAAE,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wIA+C/E,OAAO,cAAc,EAAE,MAAM,QAAE,MAAM,KAAE,KAAK,CAAC,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAiBnF,MAAM;;;;oBACN,MAAM;;;;;;;;;;qBAEN,KAAK,CAAC,OAAO,4BAA4B,EAAE,OAAO,CAAC;;AAyLjE;;;;;;;;;;;;GAYG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA0CjB;IAhCC;;;OAGG;IACH,iBAA+B;IAE/B;;;OAGG;IACH,wBAA2B;IAE3B;;;OAGG;IACH,4BAA8B;IAE9B;;;OAGG;IACH,eAAmB;IAEnB;;;OAGG;IACH,wBAAkD;IAMpD;;;;;OAKG;IACH,mBAJW,OAAO,cAAc,EAAE,MAAM,cAC7B,MAAM,GACL,KAAK,CAAC,UAAU,CAAC,CAW5B;IAED;;;OAGG;IACH,4BAHY,UAAU,CAKrB;IAWD;;OAEG;IACH,4BAkBC;IAED;;;OAGG;IACH,4BAMC;IAED;;OAEG;IACH,wDAUC;IAED;;;;OAIG;IACH,0BAJW,OAAO,QAAQ,EAAE,UAAU,WAC3B,KAAK,CAAC,UAAU,CAAC,GAChB,WAAW,CAYtB;IAED;;;;;;OAMG;IACH,4BANY,OAAO,WAAW,EAAE,UAAU,OAAA,UAC/B,WAAW,GAEV,WAAW,CAuCtB;IAED;;;;;;;OAOG;IACH,gBAFW,KAAK,QAgBf;IAED;;;;OAIG;IACH;;aAGC;CACF;mCA/eM,gCAAgC;0BAEb,eAAe"}

package/layer/WebGLTile.js

@@ -324,6 +324,7 @@ class WebGLTileLayer extends BaseTileLayer {
      */
     this.styleVariables_ = this.style_.variables || {};
 
+    this.handleSourceUpdate_();
     this.addChangeListener(LayerProperty.SOURCE, this.handleSourceUpdate_);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "10.3.2-dev.1735646205796",
+  "version": "10.3.2-dev.1736174878428",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/renderer/webgl/PointsLayer.d.ts

@@ -1,4 +1,6 @@
 export default WebGLPointsLayerRenderer;
+export type Point = import("../../geom/Point.js").default;
+export type PointFeature = import("../../Feature").default<Point>;
 /**
  * A description of a custom attribute to be passed on to the GPU, with a value different
  * for each feature.
@@ -12,7 +14,7 @@ export type CustomAttribute = {
      * This callback computes the numerical value of the
      * attribute for a given feature (properties are available as 2nd arg for quicker access).
      */
-    callback: (arg0: import("../../Feature").default, arg1: {
+    callback: (arg0: PointFeature, arg1: {
         [x: string]: any;
     }) => number;
 };
@@ -24,7 +26,7 @@ export type FeatureCacheItem = {
     /**
      * Feature
      */
-    feature: import("../../Feature").default;
+    feature: PointFeature;
     /**
      * Feature properties
      */
@@ -32,9 +34,9 @@ export type FeatureCacheItem = {
         [x: string]: any;
     };
     /**
-     * Feature geometry
+     * Point coordinates
      */
-    geometry: import("../../geom").Geometry;
+    flatCoordinates: import("../../coordinate.js").Coordinate;
 };
 export type Options = {
     /**
@@ -73,19 +75,21 @@ export type Options = {
      */
     postProcesses?: import("./Layer.js").PostProcessesOptions[] | undefined;
 };
+/** @typedef {import("../../geom/Point.js").default} Point */
+/** @typedef {import("../../Feature").default<Point>} PointFeature */
 /**
  * @typedef {Object} CustomAttribute A description of a custom attribute to be passed on to the GPU, with a value different
  * for each feature.
  * @property {string} name Attribute name.
- * @property {function(import("../../Feature").default, Object<string, *>):number} callback This callback computes the numerical value of the
+ * @property {function(PointFeature, Object<string, *>):number} callback This callback computes the numerical value of the
  * attribute for a given feature (properties are available as 2nd arg for quicker access).
  */
 /**
  * @typedef {Object} FeatureCacheItem Object that holds a reference to a feature, its geometry and properties. Used to optimize
  * rebuildBuffers by accessing these objects quicker.
- * @property {import("../../Feature").default} feature Feature
+ * @property {PointFeature} feature Feature
  * @property {Object<string, *>} properties Feature properties
- * @property {import("../../geom").Geometry} geometry Feature geometry
+ * @property {import("../../coordinate.js").Coordinate} flatCoordinates Point coordinates
  */
 /**
  * @typedef {Object} Options

package/renderer/webgl/PointsLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PointsLayer.d.ts","sourceRoot":"","sources":["PointsLayer.js"],"names":[],"mappings":";;;;;;;;;UA+Bc,MAAM;;;;;cACN,CAAS,IAA+B,EAA/B,OAAO,eAAe,EAAE,OAAO,EAAE,IAAiB,EAAjB;YAAO,MAAM,GAAE,GAAC;KAAC,KAAE,MAAM;;;;;;;;;;aAOnE,OAAO,eAAe,EAAE,OAAO;;;;;;;;;;cAE/B,OAAO,YAAY,EAAE,QAAQ;;;;;;;;;;;;;;;;;;kBAW7B,MAAM;;;;oBACN,MAAM;;;;;;;;;;;;;;;;;AAzBpB;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8DG;AACH;IACE;;;OAGG;IACH,mBAHW,OAAO,sBAAsB,EAAE,OAAO,WACtC,OAAO,EAoOjB;IAxNC;;OAEG;IACH,wBAAyB;IAEzB;;OAEG;IACH,wBAAuE;IACvE;;OAEG;IACH,uBAGC;IAED;;OAEG;IACH,sBAAyC;IAEzC;;OAEG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,iBAAa;IAEb;;;OAGG;IACH,6BAA+D;IAY/D;;;;OAIG;IACH,YAFU,KAAK,CAAC,OAAO,uBAAuB,EAAE,oBAAoB,CAAC,CAapE;IAgBD,oCAAoE;IAEpE;;OAEG;IACH,wBAAoC;IAEpC;;;;;;OAMG;IACH,0BAAkD;IAElD;;;;OAIG;IACH,yBAAyC;IAEzC;;;OAGG;IACH,+BAA+C;IAE/C;;;OAGG;IACH,4BAA8C;IAE9C;;;OAGG;IACH,yBAAqB;IAErB;;;;OAIG;IACH,mBAAmB;IAEnB;;OAEG;IACH,gBAAkC;IAgClC;;;;OAIG;IACH,sBAAuB;IAEvB;;;;OAIG;IACH,sBAAsB;IAGtB;;OAEG;IACH,0BAyBC;IAiCH;;;OAGG;IACH,kCAQC;IAED;;;OAGG;IACH,oCAOC;IAED;;;OAGG;IACH,mCAIC;IAED;;OAEG;IACH,kCAGC;IAED;;;;;OAKG;IACH,iCAJW,OAAO,cAAc,EAAE,UAAU,GAChC,WAAW,CA6BtB;IA8CD;;;;OAIG;IACH,wBAgFC;IA8CD;;;;;;;OAOG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,mBACjC,OAAO,cACP,MAAM,YACN,MAAM,cACN,MAAM,QAgChB;IAeD,wBAAoB;CACrB;+BArpB8B,YAAY"}
+{"version":3,"file":"PointsLayer.d.ts","sourceRoot":"","sources":["PointsLayer.js"],"names":[],"mappings":";oBA4Bc,OAAO,qBAAqB,EAAE,OAAO;2BACrC,OAAO,eAAe,EAAE,OAAO,CAAC,KAAK,CAAC;;;;;;;;;UAKtC,MAAM;;;;;cACN,CAAS,IAAY,EAAZ,YAAY,EAAE,IAAiB,EAAjB;YAAO,MAAM,GAAE,GAAC;KAAC,KAAE,MAAM;;;;;;;;;;aAOhD,YAAY;;;;;;;;;;qBAEZ,OAAO,qBAAqB,EAAE,UAAU;;;;;;;;;;;;;;;;;;kBAWxC,MAAM;;;;oBACN,MAAM;;;;;;;;;;;;;;;;;AA5BpB,6DAA6D;AAC7D,qEAAqE;AAErE;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8DG;AACH;IACE;;;OAGG;IACH,mBAHW,OAAO,sBAAsB,EAAE,OAAO,WACtC,OAAO,EAyOjB;IA7NC;;OAEG;IACH,wBAAyB;IAEzB;;OAEG;IACH,wBAAuE;IACvE;;OAEG;IACH,uBAGC;IAED;;OAEG;IACH,sBAAyC;IAEzC;;OAEG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,iBAAa;IAEb;;;OAGG;IACH,6BAA+D;IAY/D;;;;OAIG;IACH,YAFU,KAAK,CAAC,OAAO,uBAAuB,EAAE,oBAAoB,CAAC,CAapE;IAgBD,oCAAoE;IAEpE;;OAEG;IACH,wBAAoC;IAEpC;;;;;;OAMG;IACH,0BAAkD;IAElD;;;;OAIG;IACH,yBAAyC;IAEzC;;;OAGG;IACH,+BAA+C;IAE/C;;;OAGG;IACH,4BAA8C;IAE9C;;;OAGG;IACH,yBAAqB;IAErB;;;;OAIG;IACH,mBAAmB;IAEnB;;OAEG;IACH,gBAAkC;IAgClC;;;;OAIG;IACH,sBAAuB;IAEvB;;;;OAIG;IACH,sBAAsB;IAKtB;;OAEG;IACH,0BAyBC;IAoCH;;;OAGG;IACH,kCAWC;IAED;;;OAGG;IACH,oCAyBC;IAED;;;OAGG;IACH,mCAOC;IAED;;OAEG;IACH,kCAGC;IAED;;;;;OAKG;IACH,iCAJW,OAAO,cAAc,EAAE,UAAU,GAChC,WAAW,CA6BtB;IA8CD;;;;OAIG;IACH,wBAwEC;IA8CD;;;;;;;OAOG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,mBACjC,OAAO,cACP,MAAM,YACN,MAAM,cACN,MAAM,QAgChB;IAeD,wBAAoB;CACrB;+BA7qB8B,YAAY"}

package/renderer/webgl/PointsLayer.js

@@ -26,20 +26,23 @@ import {create as createWebGLWorker} from '../../worker/webgl.js';
 import WebGLLayerRenderer from './Layer.js';
 import {getWorldParameters} from './worldUtil.js';
 
+/** @typedef {import("../../geom/Point.js").default} Point */
+/** @typedef {import("../../Feature").default<Point>} PointFeature */
+
 /**
  * @typedef {Object} CustomAttribute A description of a custom attribute to be passed on to the GPU, with a value different
  * for each feature.
  * @property {string} name Attribute name.
- * @property {function(import("../../Feature").default, Object<string, *>):number} callback This callback computes the numerical value of the
+ * @property {function(PointFeature, Object<string, *>):number} callback This callback computes the numerical value of the
  * attribute for a given feature (properties are available as 2nd arg for quicker access).
  */
 
 /**
  * @typedef {Object} FeatureCacheItem Object that holds a reference to a feature, its geometry and properties. Used to optimize
  * rebuildBuffers by accessing these objects quicker.
- * @property {import("../../Feature").default} feature Feature
+ * @property {PointFeature} feature Feature
  * @property {Object<string, *>} properties Feature properties
- * @property {import("../../geom").Geometry} geometry Feature geometry
+ * @property {import("../../coordinate.js").Coordinate} flatCoordinates Point coordinates
  */
 
 /**
@@ -314,7 +317,9 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
      */
     this.featureCount_ = 0;
 
-    const source = this.getLayer().getSource();
+    const source = /** @type {import("../../source/Vector.js").default} */ (
+      this.getLayer().getSource()
+    );
     /**
      * @private
      */
@@ -345,12 +350,15 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
       ),
     ];
     source.forEachFeature((feature) => {
-      this.featureCache_[getUid(feature)] = {
-        feature: feature,
-        properties: feature.getProperties(),
-        geometry: feature.getGeometry(),
-      };
-      this.featureCount_++;
+      const geometry = feature.getGeometry();
+      if (geometry && geometry.getType() === 'Point') {
+        this.featureCache_[getUid(feature)] = {
+          feature: /** @type {PointFeature} */ (feature),
+          properties: feature.getProperties(),
+          flatCoordinates: /** @type {Point} */ (geometry).getFlatCoordinates(),
+        };
+        this.featureCount_++;
+      }
     });
   }
 
@@ -382,12 +390,15 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
    */
   handleSourceFeatureAdded_(event) {
     const feature = event.feature;
-    this.featureCache_[getUid(feature)] = {
-      feature: feature,
-      properties: feature.getProperties(),
-      geometry: feature.getGeometry(),
-    };
-    this.featureCount_++;
+    const geometry = feature.getGeometry();
+    if (geometry && geometry.getType() === 'Point') {
+      this.featureCache_[getUid(feature)] = {
+        feature: /** @type {PointFeature} */ (feature),
+        properties: feature.getProperties(),
+        flatCoordinates: /** @type {Point} */ (geometry).getFlatCoordinates(),
+      };
+      this.featureCount_++;
+    }
   }
 
   /**
@@ -396,11 +407,29 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
    */
   handleSourceFeatureChanged_(event) {
     const feature = event.feature;
-    this.featureCache_[getUid(feature)] = {
-      feature: feature,
-      properties: feature.getProperties(),
-      geometry: feature.getGeometry(),
-    };
+    const featureUid = getUid(feature);
+    const item = this.featureCache_[featureUid];
+    const geometry = feature.getGeometry();
+    if (item) {
+      if (geometry && geometry.getType() === 'Point') {
+        item.properties = feature.getProperties();
+        item.flatCoordinates = /** @type {Point} */ (
+          geometry
+        ).getFlatCoordinates();
+      } else {
+        delete this.featureCache_[featureUid];
+        this.featureCount_--;
+      }
+    } else {
+      if (geometry && geometry.getType() === 'Point') {
+        this.featureCache_[featureUid] = {
+          feature: /** @type {PointFeature} */ (feature),
+          properties: feature.getProperties(),
+          flatCoordinates: /** @type {Point} */ (geometry).getFlatCoordinates(),
+        };
+        this.featureCount_++;
+      }
+    }
   }
 
   /**
@@ -409,8 +438,11 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
    */
   handleSourceFeatureDelete_(event) {
     const feature = event.feature;
-    delete this.featureCache_[getUid(feature)];
-    this.featureCount_--;
+    const featureUid = getUid(feature);
+    if (featureUid in this.featureCache_) {
+      delete this.featureCache_[featureUid];
+      this.featureCount_--;
+    }
   }
 
   /**
@@ -515,51 +547,44 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
     const singleInstructionLength =
       baseInstructionLength + this.customAttributes.length;
     const totalSize = singleInstructionLength * this.featureCount_;
-    if (
-      !this.renderInstructions_ ||
-      this.renderInstructions_.length !== totalSize
-    ) {
-      this.renderInstructions_ = new Float32Array(totalSize);
-    }
+    const renderInstructions =
+      this.renderInstructions_ && this.renderInstructions_.length === totalSize
+        ? this.renderInstructions_
+        : new Float32Array(totalSize);
+    this.renderInstructions_ = null;
 
-    // loop on features to fill the buffer
-    let featureCache, geometry;
-    const tmpCoords = [];
+    // loop over features to fill the buffer
+    /** @type {import('../../coordinate.js').Coordinate} */
+    let tmpCoords = [];
+    /** @type {Array<number>} */
     const tmpColor = [];
     let idx = -1;
+    const projection = frameState.viewState.projection;
     for (const featureUid in this.featureCache_) {
-      featureCache = this.featureCache_[featureUid];
-      geometry = /** @type {import("../../geom").Point} */ (
-        featureCache.geometry
-      );
-      if (!geometry || geometry.getType() !== 'Point') {
-        continue;
-      }
+      const featureCache = this.featureCache_[featureUid];
       if (userProjection) {
-        const userCoords = fromUserCoordinate(
-          geometry.getFlatCoordinates(),
-          frameState.viewState.projection,
+        tmpCoords = fromUserCoordinate(
+          featureCache.flatCoordinates,
+          projection,
         );
-        tmpCoords[0] = userCoords[0];
-        tmpCoords[1] = userCoords[1];
       } else {
-        tmpCoords[0] = geometry.getFlatCoordinates()[0];
-        tmpCoords[1] = geometry.getFlatCoordinates()[1];
+        tmpCoords[0] = featureCache.flatCoordinates[0];
+        tmpCoords[1] = featureCache.flatCoordinates[1];
       }
       applyTransform(projectionTransform, tmpCoords);
 
-      this.renderInstructions_[++idx] = tmpCoords[0];
-      this.renderInstructions_[++idx] = tmpCoords[1];
+      renderInstructions[++idx] = tmpCoords[0];
+      renderInstructions[++idx] = tmpCoords[1];
 
       // for hit detection, the feature uid is saved in the opacity value
       // and the index of the opacity value is encoded in the color values
       if (this.hitDetectionEnabled_) {
         const hitColor = colorEncodeId(idx + 5, tmpColor);
-        this.renderInstructions_[++idx] = hitColor[0];
-        this.renderInstructions_[++idx] = hitColor[1];
-        this.renderInstructions_[++idx] = hitColor[2];
-        this.renderInstructions_[++idx] = hitColor[3];
-        this.renderInstructions_[++idx] = Number(featureUid);
+        renderInstructions[++idx] = hitColor[0];
+        renderInstructions[++idx] = hitColor[1];
+        renderInstructions[++idx] = hitColor[2];
+        renderInstructions[++idx] = hitColor[3];
+        renderInstructions[++idx] = Number(featureUid);
       }
 
       // pushing custom attributes
@@ -568,7 +593,7 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
           featureCache.feature,
           featureCache.properties,
         );
-        this.renderInstructions_[++idx] = value;
+        renderInstructions[++idx] = value;
       }
     }
 
@@ -576,14 +601,13 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
     const message = {
       id: ++this.lastSentId,
       type: WebGLWorkerMessageType.GENERATE_POINT_BUFFERS,
-      renderInstructions: this.renderInstructions_.buffer,
+      renderInstructions: renderInstructions.buffer,
       customAttributesSize: singleInstructionLength - 2,
     };
     // additional properties will be sent back as-is by the worker
     message['projectionTransform'] = projectionTransform;
     this.ready = false;
-    this.worker_.postMessage(message, [this.renderInstructions_.buffer]);
-    this.renderInstructions_ = null;
+    this.worker_.postMessage(message, [renderInstructions.buffer]);
   }
 
   /**

package/util.js

@@ -33,4 +33,4 @@ export function getUid(obj) {
  * OpenLayers version.
  * @type {string}
  */
-export const VERSION = '10.3.2-dev.1735646205796';
+export const VERSION = '10.3.2-dev.1736174878428';