ol 7.1.1-pr.14101.2 → 7.2.0

package/render/canvas/Immediate.js

@@ -26,6 +26,7 @@ import {
 } from '../canvas.js';
 import {equals} from '../../array.js';
 import {intersects} from '../../extent.js';
+import {toFixed} from '../../math.js';
 import {transform2D} from '../../geom/flat/transform.js';
 import {transformGeom2D} from '../../geom/SimpleGeometry.js';
 
@@ -83,6 +84,14 @@ class CanvasImmediateRenderer extends VectorContext {
      */
     this.transform_ = transform;
 
+    /**
+     * @private
+     * @type {number}
+     */
+    this.transformRotation_ = transform
+      ? toFixed(Math.atan2(transform[1], transform[0]), 10)
+      : 0;
+
     /**
      * @private
      * @type {number}
@@ -290,6 +299,9 @@ class CanvasImmediateRenderer extends VectorContext {
       context.globalAlpha = alpha * this.imageOpacity_;
     }
     let rotation = this.imageRotation_;
+    if (this.transformRotation_ === 0) {
+      rotation -= this.viewRotation_;
+    }
     if (this.imageRotateWithView_) {
       rotation += this.viewRotation_;
     }
@@ -375,6 +387,9 @@ class CanvasImmediateRenderer extends VectorContext {
     );
     const context = this.context_;
     let rotation = this.textRotation_;
+    if (this.transformRotation_ === 0) {
+      rotation -= this.viewRotation_;
+    }
     if (this.textRotateWithView_) {
       rotation += this.viewRotation_;
     }

package/render/canvas/hitdetect.d.ts

@@ -16,12 +16,13 @@ export function createHitDetectionImageData(size: import("../../size.js").Size,
 /**
  * @param {import("../../pixel").Pixel} pixel Pixel coordinate on the hit
  * detection canvas in css pixels.
- * @param {Array<import("../../Feature").FeatureLike>} features Features. Has to
+ * @param {Array<F>} features Features. Has to
  * match the `features` array that was passed to `createHitDetectionImageData()`.
  * @param {ImageData} imageData Hit detection image data generated by
  * `createHitDetectionImageData()`.
- * @return {Array<import("../../Feature").FeatureLike>} features Features.
+ * @return {Array<F>} Features.
+ * @template {import("../../Feature.js").FeatureLike} F
  */
-export function hitDetect(pixel: import("../../pixel").Pixel, features: Array<import("../../Feature").FeatureLike>, imageData: ImageData): Array<import("../../Feature").FeatureLike>;
+export function hitDetect<F extends import("../../Feature.js").FeatureLike>(pixel: import("../../pixel").Pixel, features: F[], imageData: ImageData): F[];
 export const HIT_DETECT_RESOLUTION: 0.5;
 //# sourceMappingURL=hitdetect.d.ts.map

package/render/canvas/hitdetect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hitdetect.d.ts","sourceRoot":"","sources":["hitdetect.js"],"names":[],"mappings":"AAaA;;;;;;;;;;;;;GAaG;AACH,kDAbW,OAAO,eAAe,EAAE,IAAI,cAC5B,MAAM,OAAO,oBAAoB,EAAE,SAAS,CAAC,YAG7C,MAAM,OAAO,kBAAkB,EAAE,WAAW,CAAC,iBAE7C,OAAO,sBAAsB,EAAE,aAAa,GAAC,SAAS,UAEtD,OAAO,iBAAiB,EAAE,MAAM,cAChC,MAAM,YACN,MAAM,GACL,SAAS,CA6HpB;AAED;;;;;;;;GAQG;AACH,iCARW,OAAO,aAAa,EAAE,KAAK,YAE3B,MAAM,OAAO,eAAe,EAAE,WAAW,CAAC,aAE1C,SAAS,GAER,MAAM,OAAO,eAAe,EAAE,WAAW,CAAC,CAwBrD;AA5KD,wCAAyC"}
+{"version":3,"file":"hitdetect.d.ts","sourceRoot":"","sources":["hitdetect.js"],"names":[],"mappings":"AAaA;;;;;;;;;;;;;GAaG;AACH,kDAbW,OAAO,eAAe,EAAE,IAAI,cAC5B,MAAM,OAAO,oBAAoB,EAAE,SAAS,CAAC,YAG7C,MAAM,OAAO,kBAAkB,EAAE,WAAW,CAAC,iBAE7C,OAAO,sBAAsB,EAAE,aAAa,GAAC,SAAS,UAEtD,OAAO,iBAAiB,EAAE,MAAM,cAChC,MAAM,YACN,MAAM,GACL,SAAS,CAuIpB;AAED;;;;;;;;;GASG;AACH,mFATW,OAAO,aAAa,EAAE,KAAK,4BAI3B,SAAS,OA4BnB;AAxLD,wCAAyC"}

package/render/canvas/hitdetect.js

@@ -4,10 +4,10 @@
 
 import CanvasImmediateRenderer from './Immediate.js';
 import {Icon} from '../../style.js';
+import {ascending} from '../../array.js';
 import {clamp} from '../../math.js';
 import {createCanvasContext2D} from '../../dom.js';
 import {intersects} from '../../extent.js';
-import {numberSafeCompareFunction} from '../../array.js';
 
 export const HIT_DETECT_RESOLUTION = 0.5;
 
@@ -64,7 +64,7 @@ export function createHitDetectionImageData(
       styles = [styles];
     }
     const index = i * indexFactor;
-    const color = '#' + ('000000' + index.toString(16)).slice(-6);
+    const color = index.toString(16).padStart(7, '#00000');
     for (let j = 0, jj = styles.length; j < jj; ++j) {
       const originalStyle = styles[j];
       const geometry = originalStyle.getGeometryFunction()(feature);
@@ -124,16 +124,26 @@ export function createHitDetectionImageData(
         byGeometryType['LineString'] = [];
         byGeometryType['Point'] = [];
       }
-      byGeometryType[geometry.getType().replace('Multi', '')].push(
-        geometry,
-        style
-      );
+      const type = geometry.getType();
+      if (type === 'GeometryCollection') {
+        const geometries =
+          /** @type {import("../../geom/GeometryCollection.js").default} */ (
+            geometry
+          ).getGeometriesArrayRecursive();
+        for (let i = 0, ii = geometries.length; i < ii; ++i) {
+          const geometry = geometries[i];
+          byGeometryType[geometry.getType().replace('Multi', '')].push(
+            geometry,
+            style
+          );
+        }
+      } else {
+        byGeometryType[type.replace('Multi', '')].push(geometry, style);
+      }
     }
   }
 
-  const zIndexKeys = Object.keys(featuresByZIndex)
-    .map(Number)
-    .sort(numberSafeCompareFunction);
+  const zIndexKeys = Object.keys(featuresByZIndex).map(Number).sort(ascending);
   for (let i = 0, ii = zIndexKeys.length; i < ii; ++i) {
     const byGeometryType = featuresByZIndex[zIndexKeys[i]];
     for (const type in byGeometryType) {
@@ -153,11 +163,12 @@ export function createHitDetectionImageData(
 /**
  * @param {import("../../pixel").Pixel} pixel Pixel coordinate on the hit
  * detection canvas in css pixels.
- * @param {Array<import("../../Feature").FeatureLike>} features Features. Has to
+ * @param {Array<F>} features Features. Has to
  * match the `features` array that was passed to `createHitDetectionImageData()`.
  * @param {ImageData} imageData Hit detection image data generated by
  * `createHitDetectionImageData()`.
- * @return {Array<import("../../Feature").FeatureLike>} features Features.
+ * @return {Array<F>} Features.
+ * @template {import("../../Feature.js").FeatureLike} F
  */
 export function hitDetect(pixel, features, imageData) {
   const resultFeatures = [];
@@ -180,5 +191,6 @@ export function hitDetect(pixel, features, imageData) {
       resultFeatures.push(features[i / indexFactor - 1]);
     }
   }
+  // @ts-ignore Features are copied from `features` to `resultFeatures` so the type should be the same
   return resultFeatures;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"BatchRenderer.d.ts","sourceRoot":"","sources":["BatchRenderer.js"],"names":[],"mappings":";;;;;;;;;UAec,MAAM;;;;;qBACG,OAAO,eAAe,EAAE,OAAO,KAAE,MAAM;;AAM9D;;;;GAIG;AACH;IACE;;;;;;OAMG;IACH,oBANW,OAAO,uBAAuB,EAAE,OAAO,UACvC,MAAM,gBACN,MAAM,kBACN,MAAM,oBACN,MAAM,eAAe,CAAC,EAiChC;IA9BC;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,iBAAqE;IAErE;;;;OAIG;IACH,sBAHU,MAAM,OAAO,uBAAuB,EAAE,oBAAoB,CAAC,CAGjD;IAEpB;;;OAGG;IACH,4BAHU,MAAM,eAAe,CAAC,CAGQ;IAG1C;;;;;;;OAOG;IACH,eALW,OAAO,yBAAyB,EAAE,aAAa,cAC/C,OAAO,WAAW,EAAE,UAAU,gBAC9B,OAAO,wBAAwB,EAAE,IAAI,kBACzB,IAAI,QAU1B;IAED;;;;;;;OAOG;IACH,cALW,OAAO,yBAAyB,EAAE,aAAa,oBAC/C,OAAO,oBAAoB,EAAE,SAAS,cACtC,OAAO,cAAc,EAAE,UAAU,WACjC,MAAM,QAgBhB;IAED;;;;;OAKG;IACH,4CAHW,OAAO,yBAAyB,EAAE,aAAa,QAKzD;IAED;;;;;;;OAOG;IACH,yBAqEC;CACF"}
+{"version":3,"file":"BatchRenderer.d.ts","sourceRoot":"","sources":["BatchRenderer.js"],"names":[],"mappings":";;;;;;;;;UAec,MAAM;;;;;qBACG,OAAO,eAAe,EAAE,OAAO,KAAE,MAAM;;AAM9D;;;;GAIG;AACH;IACE;;;;;;OAMG;IACH,oBANW,OAAO,uBAAuB,EAAE,OAAO,UACvC,MAAM,gBACN,MAAM,kBACN,MAAM,oBACN,MAAM,eAAe,CAAC,EAiChC;IA9BC;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,iBAAqE;IAErE;;;;OAIG;IACH,sBAHU,MAAM,OAAO,uBAAuB,EAAE,oBAAoB,CAAC,CAGjD;IAEpB;;;OAGG;IACH,4BAHU,MAAM,eAAe,CAAC,CAGQ;IAG1C;;;;;;;OAOG;IACH,eALW,OAAO,yBAAyB,EAAE,aAAa,cAC/C,OAAO,WAAW,EAAE,UAAU,gBAC9B,OAAO,wBAAwB,EAAE,IAAI,kBACzB,IAAI,QAU1B;IAED;;;;;;;OAOG;IACH,cALW,OAAO,yBAAyB,EAAE,aAAa,oBAC/C,OAAO,oBAAoB,EAAE,SAAS,cACtC,OAAO,cAAc,EAAE,UAAU,WACjC,MAAM,QAgBhB;IAED;;;;;OAKG;IACH,4CAHW,OAAO,yBAAyB,EAAE,aAAa,QAKzD;IAED;;;;;;;OAOG;IACH,yBAoEC;CACF"}

package/render/webgl/BatchRenderer.js

@@ -160,9 +160,8 @@ class AbstractBatchRenderer {
     const handleMessage =
       /**
        * @param {*} event Event.
-       * @this {AbstractBatchRenderer}
        */
-      function (event) {
+      (event) => {
         const received = event.data;
 
         // this is not the response to our request: skip
@@ -192,7 +191,7 @@ class AbstractBatchRenderer {
         );
 
         callback();
-      }.bind(this);
+      };
 
     this.worker_.addEventListener('message', handleMessage);
   }

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

@@ -1 +1 @@
-{"version":3,"file":"LineStringBatchRenderer.d.ts","sourceRoot":"","sources":["LineStringBatchRenderer.js"],"names":[],"mappings":";;;;yBAUU,MAAM;;;;;;;AAQhB;IAYI;;;;QAwBC;IAGH;;;;;OAKG;IACH,2CAHW,OAAO,yBAAyB,EAAE,uBAAuB,QAoDnE;CACF"}
+{"version":3,"file":"LineStringBatchRenderer.d.ts","sourceRoot":"","sources":["LineStringBatchRenderer.js"],"names":[],"mappings":";;;;yBAUU,MAAM;;;;;;;AAQhB;IAYI;;;;QAwBC;IAGH;;;;;OAKG;IACH,2CAHW,OAAO,yBAAyB,EAAE,uBAAuB,QAkDnE;CACF"}

package/render/webgl/LineStringBatchRenderer.js

@@ -77,12 +77,10 @@ class LineStringBatchRenderer extends AbstractBatchRenderer {
     }
 
     // loop on features to fill the render instructions
-    let batchEntry;
     const flatCoords = [];
     let renderIndex = 0;
-    let value;
     for (const featureUid in batch.entries) {
-      batchEntry = batch.entries[featureUid];
+      const batchEntry = batch.entries[featureUid];
       for (let i = 0, ii = batchEntry.flatCoordss.length; i < ii; i++) {
         flatCoords.length = batchEntry.flatCoordss[i].length;
         transform2D(
@@ -96,7 +94,7 @@ class LineStringBatchRenderer extends AbstractBatchRenderer {
 
         // custom attributes
         for (let k = 0, kk = this.customAttributes.length; k < kk; k++) {
-          value = this.customAttributes[k].callback(batchEntry.feature);
+          const value = this.customAttributes[k].callback(batchEntry.feature);
           batch.renderInstructions[renderIndex++] = value;
         }
 

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

@@ -1 +1 @@
-{"version":3,"file":"PointBatchRenderer.d.ts","sourceRoot":"","sources":["PointBatchRenderer.js"],"names":[],"mappings":";;;;yBAWU,MAAM;;;;;;AAOhB;IAYI;;;;QAmBC;IAGH;;;;;OAKG;IACH,2CAHW,OAAO,yBAAyB,EAAE,kBAAkB,QAsC9D;CACF"}
+{"version":3,"file":"PointBatchRenderer.d.ts","sourceRoot":"","sources":["PointBatchRenderer.js"],"names":[],"mappings":";;;;yBAWU,MAAM;;;;;;AAOhB;IAYI;;;;QAmBC;IAGH;;;;;OAKG;IACH,2CAHW,OAAO,yBAAyB,EAAE,kBAAkB,QAoC9D;CACF"}

package/render/webgl/PointBatchRenderer.js

@@ -70,12 +70,10 @@ class PointBatchRenderer extends AbstractBatchRenderer {
     }
 
     // loop on features to fill the render instructions
-    let batchEntry;
     const tmpCoords = [];
     let renderIndex = 0;
-    let value;
     for (const featureUid in batch.entries) {
-      batchEntry = batch.entries[featureUid];
+      const batchEntry = batch.entries[featureUid];
       for (let i = 0, ii = batchEntry.flatCoordss.length; i < ii; i++) {
         tmpCoords[0] = batchEntry.flatCoordss[i][0];
         tmpCoords[1] = batchEntry.flatCoordss[i][1];
@@ -86,7 +84,7 @@ class PointBatchRenderer extends AbstractBatchRenderer {
 
         // pushing custom attributes
         for (let j = 0, jj = this.customAttributes.length; j < jj; j++) {
-          value = this.customAttributes[j].callback(batchEntry.feature);
+          const value = this.customAttributes[j].callback(batchEntry.feature);
           batch.renderInstructions[renderIndex++] = value;
         }
       }

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

@@ -1 +1 @@
-{"version":3,"file":"PolygonBatchRenderer.d.ts","sourceRoot":"","sources":["PolygonBatchRenderer.js"],"names":[],"mappings":";;;;yBAUU,MAAM;;;;;AAMhB;IAYI;;;;QAcC;IAGH;;;;;OAKG;IACH,2CAHW,OAAO,yBAAyB,EAAE,oBAAoB,QAiEhE;CACF"}
+{"version":3,"file":"PolygonBatchRenderer.d.ts","sourceRoot":"","sources":["PolygonBatchRenderer.js"],"names":[],"mappings":";;;;yBAUU,MAAM;;;;;AAMhB;IAYI;;;;QAcC;IAGH;;;;;OAKG;IACH,2CAHW,OAAO,yBAAyB,EAAE,oBAAoB,QA+DhE;CACF"}

package/render/webgl/PolygonBatchRenderer.js

@@ -67,12 +67,10 @@ class PolygonBatchRenderer extends AbstractBatchRenderer {
     }
 
     // loop on features to fill the render instructions
-    let batchEntry;
     const flatCoords = [];
     let renderIndex = 0;
-    let value;
     for (const featureUid in batch.entries) {
-      batchEntry = batch.entries[featureUid];
+      const batchEntry = batch.entries[featureUid];
       for (let i = 0, ii = batchEntry.flatCoordss.length; i < ii; i++) {
         flatCoords.length = batchEntry.flatCoordss[i].length;
         transform2D(
@@ -86,7 +84,7 @@ class PolygonBatchRenderer extends AbstractBatchRenderer {
 
         // custom attributes
         for (let k = 0, kk = this.customAttributes.length; k < kk; k++) {
-          value = this.customAttributes[k].callback(batchEntry.feature);
+          const value = this.customAttributes[k].callback(batchEntry.feature);
           batch.renderInstructions[renderIndex++] = value;
         }
 

package/render.d.ts

@@ -31,9 +31,9 @@
  * The units for geometry coordinates are css pixels relative to the top left
  * corner of the canvas element.
  * ```js
- * import {toContext} from 'ol/render';
- * import Fill from 'ol/style/Fill';
- * import Polygon from 'ol/geom/Polygon';
+ * import {toContext} from 'ol/render.js';
+ * import Fill from 'ol/style/Fill.js';
+ * import Polygon from 'ol/geom/Polygon.js';
  *
  * const canvas = document.createElement('canvas');
  * const render = toContext(

package/render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["render.js"],"names":[],"mappings":"AAcA;;;;;;;;;GASG;AAEH;;;;;;GAMG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,mCALW,wBAAwB,2CAEvB,uBAAuB,CAiBlC;AAED;;;;;GAKG;AACH,wCAJW,OAAO,mBAAmB,EAAE,OAAO,GAClC,uBAAuB,CAqClC;AAED;;;;;;;GAOG;AACH,sCANW,OAAO,mBAAmB,EAAE,OAAO,SACnC,OAAO,YAAY,EAAE,KAAK,GAEzB,OAAO,YAAY,EAAE,KAAK,CAKrC;;;;;aA1Ha,wBAAwB;;;;aACxB,OAAO,cAAc,EAAE,WAAW;;;;cAClC,OAAO,0BAA0B,EAAE,OAAO;;;;gBAC1C,MAAM;;;;;gBACN,MAAM;;;;cAEN,MAAM;;;;;;;mCAQE,OAAO,cAAc,EAAE,WAAW,QAAE,OAAO,cAAc,EAAE,WAAW,KAAE,MAAM"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["render.js"],"names":[],"mappings":"AAcA;;;;;;;;;GASG;AAEH;;;;;;GAMG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,mCALW,wBAAwB,2CAEvB,uBAAuB,CAiBlC;AAED;;;;;GAKG;AACH,wCAJW,OAAO,mBAAmB,EAAE,OAAO,GAClC,uBAAuB,CAuClC;AAED;;;;;;;GAOG;AACH,sCANW,OAAO,mBAAmB,EAAE,OAAO,SACnC,OAAO,YAAY,EAAE,KAAK,GAEzB,OAAO,YAAY,EAAE,KAAK,CAKrC;;;;;aA5Ha,wBAAwB;;;;aACxB,OAAO,cAAc,EAAE,WAAW;;;;cAClC,OAAO,0BAA0B,EAAE,OAAO;;;;gBAC1C,MAAM;;;;;gBACN,MAAM;;;;cAEN,MAAM;;;;;;;mCAQE,OAAO,cAAc,EAAE,WAAW,QAAE,OAAO,cAAc,EAAE,WAAW,KAAE,MAAM"}

package/render.js

@@ -48,9 +48,9 @@ import {getTransformFromProjections, getUserProjection} from './proj.js';
  * The units for geometry coordinates are css pixels relative to the top left
  * corner of the canvas element.
  * ```js
- * import {toContext} from 'ol/render';
- * import Fill from 'ol/style/Fill';
- * import Polygon from 'ol/geom/Polygon';
+ * import {toContext} from 'ol/render.js';
+ * import Fill from 'ol/style/Fill.js';
+ * import Polygon from 'ol/geom/Polygon.js';
  *
  * const canvas = document.createElement('canvas');
  * const render = toContext(
@@ -96,7 +96,9 @@ export function getVectorContext(event) {
   }
 
   // canvas may be at a different pixel ratio than frameState.pixelRatio
-  const canvasPixelRatio = event.inversePixelTransform[0];
+  const a = event.inversePixelTransform[0];
+  const b = event.inversePixelTransform[1];
+  const canvasPixelRatio = Math.sqrt(a * a + b * b);
   const frameState = event.frameState;
   const transform = multiplyTransform(
     event.inversePixelTransform.slice(),

package/renderer/Layer.d.ts

@@ -26,10 +26,10 @@ declare class LayerRenderer<LayerType extends import("../layer/Layer.js").defaul
     /**
      * Asynchronous layer level hit detection.
      * @param {import("../pixel.js").Pixel} pixel Pixel.
-     * @return {Promise<Array<import("../Feature").default>>} Promise that resolves with
+     * @return {Promise<Array<import("../Feature").FeatureLike>>} Promise that resolves with
      * an array of features.
      */
-    getFeatures(pixel: import("../pixel.js").Pixel): Promise<Array<import("../Feature").default>>;
+    getFeatures(pixel: import("../pixel.js").Pixel): Promise<Array<import("../Feature").FeatureLike>>;
     /**
      * @param {import("../pixel.js").Pixel} pixel Pixel.
      * @return {Uint8ClampedArray|Uint8Array|Float32Array|DataView|null} Pixel data.

package/renderer/Layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["Layer.js"],"names":[],"mappings":";AAQA;;GAEG;AACH;IACE;;OAEG;IACH,mBAFW,SAAS,EAwBnB;IAnBC;;;OAGG;IACH,OAFU,OAAO,CAEA;IAEjB,eAAe;IACf,gCAAiE;IAEjE;;;OAGG;IACH,kBAFU,SAAS,CAEA;IAEnB;;OAEG;IACH,wBAFU,OAAO,gCAAgC,EAAE,OAAO,CAExB;IAGpC;;;;;OAKG;IACH,mBAJW,OAAO,aAAa,EAAE,KAAK,GAC1B,QAAQ,MAAM,OAAO,YAAY,EAAE,OAAO,CAAC,CAAC,CAKvD;IAED;;;OAGG;IACH,eAHW,OAAO,aAAa,EAAE,KAAK,GAC1B,iBAAiB,GAAC,UAAU,GAAC,YAAY,GAAC,QAAQ,GAAC,IAAI,CAIlE;IAED;;;;;OAKG;IACH,yBAHW,OAAO,WAAW,EAAE,UAAU,GAC7B,OAAO,CAIlB;IAED;;;;;;OAMG;IACH,wBAJW,OAAO,WAAW,EAAE,UAAU,UAC9B,WAAW,GACV,WAAW,CAItB;IAED;;;;;OAKG;IACH;YALkB,MAAM;gBAAS,MAAM,GAAE,OAAO,YAAY,EAAE,OAAO;;aAC1D,MAAM,QACN,OAAO,YAAY,EAAE,OAAO,GAC3B,OAAO,GAAC,IAAI,CAQvB;IAED;;;;;;;;OAQG;IACH,yCAPW,OAAO,mBAAmB,EAAE,OAAO,cACnC,OAAO,uBAAuB,EAAE,OAAO;YAChC,MAAM;gBAAS,MAAM,GAAE,OAAO,YAAY,EAAE,OAAO;;eAChD,MAAM,QAAE,OAAO,iBAAiB,EAAE,OAAO,KAAE,OAAO,CAiBtE;IACD;;;;;;;;;OASG;IACH,0CARW,OAAO,kBAAkB,EAAE,UAAU,cACrC,OAAO,WAAW,EAAE,UAAU,gBAC9B,MAAM,gHAchB;IAED;;OAEG;IACH,YAFY,SAAS,CAIpB;IAED;;;OAGG;IACH,2BAAuB;IAEvB;;;;OAIG;IACH,2BAKC;IAED;;;;;;OAMG;IACH,2BAJW,OAAO,iBAAiB,EAAE,OAAO,GAChC,OAAO,CAalB;IAED;;OAEG;IACH,0CAKC;CASF"}
+{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["Layer.js"],"names":[],"mappings":";AAQA;;GAEG;AACH;IACE;;OAEG;IACH,mBAFW,SAAS,EAwBnB;IAnBC;;;OAGG;IACH,OAFU,OAAO,CAEA;IAEjB,eAAe;IACf,gCAAiE;IAEjE;;;OAGG;IACH,kBAFU,SAAS,CAEA;IAEnB;;OAEG;IACH,wBAFU,OAAO,gCAAgC,EAAE,OAAO,CAExB;IAGpC;;;;;OAKG;IACH,mBAJW,OAAO,aAAa,EAAE,KAAK,GAC1B,QAAQ,MAAM,OAAO,YAAY,EAAE,WAAW,CAAC,CAAC,CAK3D;IAED;;;OAGG;IACH,eAHW,OAAO,aAAa,EAAE,KAAK,GAC1B,iBAAiB,GAAC,UAAU,GAAC,YAAY,GAAC,QAAQ,GAAC,IAAI,CAIlE;IAED;;;;;OAKG;IACH,yBAHW,OAAO,WAAW,EAAE,UAAU,GAC7B,OAAO,CAIlB;IAED;;;;;;OAMG;IACH,wBAJW,OAAO,WAAW,EAAE,UAAU,UAC9B,WAAW,GACV,WAAW,CAItB;IAED;;;;;OAKG;IACH;YALkB,MAAM;gBAAS,MAAM,GAAE,OAAO,YAAY,EAAE,OAAO;;aAC1D,MAAM,QACN,OAAO,YAAY,EAAE,OAAO,GAC3B,OAAO,GAAC,IAAI,CAQvB;IAED;;;;;;;;OAQG;IACH,yCAPW,OAAO,mBAAmB,EAAE,OAAO,cACnC,OAAO,uBAAuB,EAAE,OAAO;YAChC,MAAM;gBAAS,MAAM,GAAE,OAAO,YAAY,EAAE,OAAO;;eAChD,MAAM,QAAE,OAAO,iBAAiB,EAAE,OAAO,KAAE,OAAO,CAgBtE;IACD;;;;;;;;;OASG;IACH,0CARW,OAAO,kBAAkB,EAAE,UAAU,cACrC,OAAO,WAAW,EAAE,UAAU,gBAC9B,MAAM,gHAchB;IAED;;OAEG;IACH,YAFY,SAAS,CAIpB;IAED;;;OAGG;IACH,2BAAuB;IAEvB;;;;OAIG;IACH,2BAKC;IAED;;;;;;OAMG;IACH,2BAJW,OAAO,iBAAiB,EAAE,OAAO,GAChC,OAAO,CAalB;IAED;;OAEG;IACH,0CAKC;CASF"}

package/renderer/Layer.js

@@ -40,7 +40,7 @@ class LayerRenderer extends Observable {
   /**
    * Asynchronous layer level hit detection.
    * @param {import("../pixel.js").Pixel} pixel Pixel.
-   * @return {Promise<Array<import("../Feature").default>>} Promise that resolves with
+   * @return {Promise<Array<import("../Feature").FeatureLike>>} Promise that resolves with
    * an array of features.
    */
   getFeatures(pixel) {
@@ -105,12 +105,11 @@ class LayerRenderer extends Observable {
        * @param {number} zoom Zoom level.
        * @param {import("../TileRange.js").default} tileRange Tile range.
        * @return {boolean} The tile range is fully loaded.
-       * @this {LayerRenderer}
        */
-      function (zoom, tileRange) {
+      (zoom, tileRange) => {
         const callback = this.loadedTileCallback.bind(this, tiles, zoom);
         return source.forEachLoadedTile(projection, zoom, tileRange, callback);
-      }.bind(this)
+      }
     );
   }
   /**

package/renderer/canvas/Layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["Layer.js"],"names":[],"mappings":"AAqBA;;GAEG;AACH,yBAFU,MAAM,iBAAiB,CAAC,CAEL;;AAc7B;;;;GAIG;AACH;IAOI;;;OAGG;IACH,qBAFU,WAAW,CAEA;IAErB;;;OAGG;IACH,8BAFU,MAAM,CAEO;IAEvB;;;;;OAKG;IACH,yBAFU,OAAO,oBAAoB,EAAE,SAAS,CAEV;IAEtC;;;;;OAKG;IACH,0BAFU,OAAO,oBAAoB,EAAE,SAAS,CAET;IAEvC;;;;;OAKG;IACH,iCAFU,OAAO,oBAAoB,EAAE,SAAS,CAEF;IAE9C;;OAEG;IACH,SAFU,wBAAwB,CAEf;IAEnB;;OAEG;IACH,iBAFU,OAAO,CAEW;IAE5B;;;OAGG;IACH,sBAAyB;IAEzB;;;OAGG;IACH,sBAFU,OAAO,cAAc,EAAE,UAAU,GAAC,IAAI,CAE1B;IAGxB;;;;;OAKG;IACH,oBALW,iBAAiB,GAAC,gBAAgB,GAAC,gBAAgB,OACnD,MAAM,OACN,MAAM,GACL,iBAAiB,GAAC,IAAI,CAiBjC;IAED;;;OAGG;IACH,0BAHW,OAAO,cAAc,EAAE,UAAU,GAChC,MAAM,CASjB;IAED;;;;;OAKG;IACH,qBAJW,WAAW,aACX,MAAM,8CAyDhB;IAED;;;;;OAKG;IACH,iCALW,wBAAwB,cACxB,OAAO,cAAc,EAAE,UAAU,UACjC,OAAO,iBAAiB,EAAE,MAAM,QA2B1C;IAED;;;;;OAKG;IACH,6BAWC;IAED;;;;OAIG;IACH,6BAJW,wBAAwB,cACxB,OAAO,cAAc,EAAE,UAAU,QAM3C;IAED;;;;OAIG;IACH,8BAJW,wBAAwB,cACxB,OAAO,cAAc,EAAE,UAAU,QAK3C;IAED;;;;;;;;;;;OAWG;IACH,qCAVW,OAAO,qBAAqB,EAAE,UAAU,cACxC,MAAM,YACN,MAAM,cACN,MAAM,SACN,MAAM,UACN,MAAM,WACN,MAAM,GAEJ,OAAO,oBAAoB,EAAE,SAAS,CA2BlD;CASF"}
+{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["Layer.js"],"names":[],"mappings":"AAqBA;;GAEG;AACH,yBAFU,MAAM,iBAAiB,CAAC,CAEL;;AAa7B;;;;GAIG;AACH;IAOI;;;OAGG;IACH,qBAFU,WAAW,CAEA;IAErB;;;OAGG;IACH,8BAFU,MAAM,CAEO;IAEvB;;;;;OAKG;IACH,yBAFU,OAAO,oBAAoB,EAAE,SAAS,CAEV;IAEtC;;;;;OAKG;IACH,0BAFU,OAAO,oBAAoB,EAAE,SAAS,CAET;IAEvC;;;;;OAKG;IACH,iCAFU,OAAO,oBAAoB,EAAE,SAAS,CAEF;IAE9C;;OAEG;IACH,SAFU,wBAAwB,CAEf;IAEnB;;OAEG;IACH,iBAFU,OAAO,CAEW;IAE5B;;;OAGG;IACH,sBAAyB;IAEzB;;;OAGG;IACH,sBAFU,OAAO,cAAc,EAAE,UAAU,GAAC,IAAI,CAE1B;IAGxB;;;;;OAKG;IACH,oBALW,iBAAiB,GAAC,gBAAgB,GAAC,gBAAgB,OACnD,MAAM,OACN,MAAM,GACL,iBAAiB,GAAC,IAAI,CAiBjC;IAED;;;OAGG;IACH,0BAHW,OAAO,cAAc,EAAE,UAAU,GAChC,MAAM,CASjB;IAED;;;;;OAKG;IACH,qBAJW,WAAW,aACX,MAAM,8CAyDhB;IAED;;;;;OAKG;IACH,iCALW,wBAAwB,cACxB,OAAO,cAAc,EAAE,UAAU,UACjC,OAAO,iBAAiB,EAAE,MAAM,QA2B1C;IAED;;;;;OAKG;IACH,6BAWC;IAED;;;;OAIG;IACH,6BAJW,wBAAwB,cACxB,OAAO,cAAc,EAAE,UAAU,QAM3C;IAED;;;;OAIG;IACH,8BAJW,wBAAwB,cACxB,OAAO,cAAc,EAAE,UAAU,QAK3C;IAED;;;;;;;;;;;OAWG;IACH,qCAVW,OAAO,qBAAqB,EAAE,UAAU,cACxC,MAAM,YACN,MAAM,cACN,MAAM,SACN,MAAM,UACN,MAAM,WACN,MAAM,GAEJ,OAAO,oBAAoB,EAAE,SAAS,CA2BlD;CASF"}

package/renderer/canvas/Layer.js

@@ -30,10 +30,9 @@ export const canvasPool = [];
 let pixelContext = null;
 
 function createPixelContext() {
-  const canvas = document.createElement('canvas');
-  canvas.width = 1;
-  canvas.height = 1;
-  pixelContext = canvas.getContext('2d');
+  pixelContext = createCanvasContext2D(1, 1, undefined, {
+    willReadFrequently: true,
+  });
 }
 
 /**

package/renderer/canvas/TileLayer.js

@@ -12,6 +12,7 @@ import {
   makeInverse,
   toString as toTransformString,
 } from '../../transform.js';
+import {ascending} from '../../array.js';
 import {
   containsCoordinate,
   createEmpty,
@@ -25,7 +26,6 @@ import {
 } from '../../extent.js';
 import {fromUserExtent} from '../../proj.js';
 import {getUid} from '../../util.js';
-import {numberSafeCompareFunction} from '../../array.js';
 import {toSize} from '../../size.js';
 
 /**
@@ -420,7 +420,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
     this.renderedTiles.length = 0;
     /** @type {Array<number>} */
     let zs = Object.keys(tilesToDrawByZ).map(Number);
-    zs.sort(numberSafeCompareFunction);
+    zs.sort(ascending);
 
     let clips, clipZs, currentClip;
     if (

package/renderer/canvas/VectorImageLayer.d.ts

@@ -29,6 +29,12 @@ declare class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer {
      * @type {import("../../transform.js").Transform}
      */
     private renderedPixelToCoordinateTransform_;
+    /**
+     * Asynchronous layer level hit detection.
+     * @param {import("../../pixel.js").Pixel} pixel Pixel.
+     * @return {Promise<Array<import("../../Feature").default>>} Promise that resolves with an array of features.
+     */
+    getFeatures(pixel: import("../../pixel.js").Pixel): Promise<Array<import("../../Feature").default>>;
     /**
      */
     preRender(): void;

package/renderer/canvas/VectorImageLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VectorImageLayer.d.ts","sourceRoot":"","sources":["VectorImageLayer.js"],"names":[],"mappings":";AAaA;;;;GAIG;AACH;IACE;;OAEG;IACH,sEA0BC;IAvBC;;;OAGG;IACH,wBAA2D;IAE3D;;;OAGG;IACH,yBAA6C;IAE7C;;;OAGG;IACH,0CAAiD;IAEjD;;;OAGG;IACH,4CAA+C;IAsIjD;OACG;IACH,kBAAc;IAEd;OACG;IACH,mBAAe;IAEf;OACG;IACH,wBAAoB;CAmCrB"}
+{"version":3,"file":"VectorImageLayer.d.ts","sourceRoot":"","sources":["VectorImageLayer.js"],"names":[],"mappings":";AAaA;;;;GAIG;AACH;IACE;;OAEG;IACH,sEA0BC;IAvBC;;;OAGG;IACH,wBAA2D;IAE3D;;;OAGG;IACH,yBAA6C;IAE7C;;;OAGG;IACH,0CAAiD;IAEjD;;;OAGG;IACH,4CAA+C;IAWjD;;;;OAIG;IACH,mBAHW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,QAAQ,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,CAAC,CAW1D;IA0GD;OACG;IACH,kBAAc;IAEd;OACG;IACH,mBAAe;IAEf;OACG;IACH,wBAAoB;CAmCrB"}

package/renderer/canvas/VectorImageLayer.js

@@ -63,7 +63,7 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer {
    */
   getFeatures(pixel) {
     if (!this.vectorRenderer_) {
-      return new Promise((resolve) => resolve([]));
+      return Promise.resolve([]);
     }
     const vectorPixel = apply(
       this.coordinateToVectorPixelTransform_,
@@ -144,30 +144,27 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer {
         }
       );
 
-      image.addEventListener(
-        EventType.CHANGE,
-        function () {
-          if (image.getState() !== ImageState.LOADED) {
-            return;
-          }
-          this.image_ = emptyImage ? null : image;
-          const imageResolution = image.getResolution();
-          const imagePixelRatio = image.getPixelRatio();
-          const renderedResolution =
-            (imageResolution * pixelRatio) / imagePixelRatio;
-          this.renderedResolution = renderedResolution;
-          this.coordinateToVectorPixelTransform_ = compose(
-            this.coordinateToVectorPixelTransform_,
-            width / 2,
-            height / 2,
-            1 / renderedResolution,
-            -1 / renderedResolution,
-            0,
-            -viewState.center[0],
-            -viewState.center[1]
-          );
-        }.bind(this)
-      );
+      image.addEventListener(EventType.CHANGE, () => {
+        if (image.getState() !== ImageState.LOADED) {
+          return;
+        }
+        this.image_ = emptyImage ? null : image;
+        const imageResolution = image.getResolution();
+        const imagePixelRatio = image.getPixelRatio();
+        const renderedResolution =
+          (imageResolution * pixelRatio) / imagePixelRatio;
+        this.renderedResolution = renderedResolution;
+        this.coordinateToVectorPixelTransform_ = compose(
+          this.coordinateToVectorPixelTransform_,
+          width / 2,
+          height / 2,
+          1 / renderedResolution,
+          -1 / renderedResolution,
+          0,
+          -viewState.center[0],
+          -viewState.center[1]
+        );
+      });
       image.load();
     }
 

package/renderer/canvas/VectorLayer.d.ts

@@ -16,9 +16,9 @@ declare class CanvasVectorLayerRenderer extends CanvasLayerRenderer<any> {
      */
     animatingOrInteracting_: boolean;
     /**
-     * @type {ImageData}
+     * @type {ImageData|null}
      */
-    hitDetectionImageData_: ImageData;
+    hitDetectionImageData_: ImageData | null;
     /**
      * @type {Array<import("../../Feature.js").default>}
      */
@@ -101,6 +101,13 @@ declare class CanvasVectorLayerRenderer extends CanvasLayerRenderer<any> {
      * @param {import("../../Map.js").FrameState} frameState Frame state.
      */
     renderDeclutter(frameState: import("../../Map.js").FrameState): void;
+    /**
+     * Asynchronous layer level hit detection.
+     * @param {import("../../pixel.js").Pixel} pixel Pixel.
+     * @return {Promise<Array<import("../../Feature").default>>} Promise
+     * that resolves with an array of features.
+     */
+    getFeatures(pixel: import("../../pixel.js").Pixel): Promise<Array<import("../../Feature").default>>;
     /**
      * Handle changes in image style state.
      * @param {import("../../events/Event.js").default} event Image style change event.

package/renderer/canvas/VectorLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VectorLayer.d.ts","sourceRoot":"","sources":["VectorLayer.js"],"names":[],"mappings":";AA4CA;;;;GAIG;AACH;IACE;;OAEG;IACH,gFAuGC;IApGC,eAAe;IACf,qCAA2E;IAE3E;;OAEG;IACH,yBAFU,OAAO,CAEW;IAE5B;;OAEG;IACH,wBAFU,SAAS,CAEe;IAElC;;OAEG;IACH,mBAFU,MAAM,OAAO,kBAAkB,EAAE,OAAO,CAAC,CAEtB;IAE7B;;;OAGG;IACH,0BAA2B;IAE3B;;;OAGG;IACH,4BAA8B;IAE9B;;;OAGG;IACH,wBAAoC;IAEpC;;;OAGG;IACH,+BAA2C;IAE3C;;;OAGG;IACH,0BAAsB;IAEtB;;;OAGG;IACH,wBAA2B;IAE3B;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,qBAAwB;IAExB;;;OAGG;IACH,oBAFU,OAAO,CAEa;IAO9B;;;OAGG;IACH,UAFU,OAAO,CAEG;IAEpB;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,iBAAiB;IAGnB;;;;OAIG;IACH,4BAJW,aAAa,cACb,OAAO,cAAc,EAAE,UAAU,6BAiD3C;IAED,iCAWC;IAED,mCAUC;IAED;;;OAGG;IACH,4BAFW,OAAO,cAAc,EAAE,UAAU,QAY3C;IAmRD;;;;OAIG;IACH,gCAEC;IA0ND;;;;;;;;OAQG;IACH,uBARW,OAAO,kBAAkB,EAAE,OAAO,oBAClC,MAAM,UACN,OAAO,sBAAsB,EAAE,OAAO,GAAC,MAAM,OAAO,sBAAsB,EAAE,OAAO,CAAC,gBACpF,OAAO,qCAAqC,EAAE,OAAO,8HAGpD,OAAO,CAuClB;CACF"}
+{"version":3,"file":"VectorLayer.d.ts","sourceRoot":"","sources":["VectorLayer.js"],"names":[],"mappings":";AA4CA;;;;GAIG;AACH;IACE;;OAEG;IACH,gFAuGC;IApGC,eAAe;IACf,qCAA2E;IAE3E;;OAEG;IACH,yBAFU,OAAO,CAEW;IAE5B;;OAEG;IACH,wBAFU,SAAS,GAAC,IAAI,CAEU;IAElC;;OAEG;IACH,mBAFU,MAAM,OAAO,kBAAkB,EAAE,OAAO,CAAC,CAEtB;IAE7B;;;OAGG;IACH,0BAA2B;IAE3B;;;OAGG;IACH,4BAA8B;IAE9B;;;OAGG;IACH,wBAAoC;IAEpC;;;OAGG;IACH,+BAA2C;IAE3C;;;OAGG;IACH,0BAAsB;IAEtB;;;OAGG;IACH,wBAA2B;IAE3B;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,qBAAwB;IAExB;;;OAGG;IACH,oBAFU,OAAO,CAEa;IAO9B;;;OAGG;IACH,UAFU,OAAO,CAEG;IAEpB;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,iBAAiB;IAGnB;;;;OAIG;IACH,4BAJW,aAAa,cACb,OAAO,cAAc,EAAE,UAAU,6BAiD3C;IAED,iCAWC;IAED,mCAUC;IAED;;;OAGG;IACH,4BAFW,OAAO,cAAc,EAAE,UAAU,QAY3C;IAmFD;;;;;OAKG;IACH,mBAJW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,QAAQ,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,CAAC,CAyF1D;IA+FD;;;;OAIG;IACH,gCAEC;IAyND;;;;;;;;OAQG;IACH,uBARW,OAAO,kBAAkB,EAAE,OAAO,oBAClC,MAAM,UACN,OAAO,sBAAsB,EAAE,OAAO,GAAC,MAAM,OAAO,sBAAsB,EAAE,OAAO,CAAC,gBACpF,OAAO,qCAAqC,EAAE,OAAO,8HAGpD,OAAO,CAuClB;CACF"}