Fixed bug of forEachFeatureAtPixel for TileLayer

Author: EmilZhou

src/renderer/canvas/IntermediateCanvas.js

@@ -4,11 +4,12 @@
 import {scale as scaleCoordinate} from 'ol/coordinate.js';
 import {createCanvasContext2D} from 'ol/dom.js';
 import {containsExtent, intersects} from 'ol/extent.js';
-import {VOID} from 'ol/functions.js';
+import CanvasLayerRenderer from './Layer.js';
 import {create as createTransform, apply as applyTransform} from 'ol/transform.js';
-import CanvasLayerRenderer from './Layer';
-
 
+/**
+ * @abstract
+ */
 class IntermediateCanvasRenderer extends CanvasLayerRenderer {
 
   /**
@@ -82,32 +83,16 @@ class IntermediateCanvasRenderer extends CanvasLayerRenderer {
    * @abstract
    * @return {HTMLCanvasElement|HTMLVideoElement|HTMLImageElement} Canvas.
    */
-  getImage() {}
+  getImage() {
+    return abstract();
+  }
 
   /**
    * @abstract
    * @return {!import("../../transform.js").Transform} Image transform.
    */
-  getImageTransform() {}
-
-  /**
-   * @inheritDoc
-   */
-  forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback, thisArg) {
-    const layer = this.getLayer();
-    const source = layer.getSource();
-    const resolution = frameState.viewState.resolution;
-    const rotation = frameState.viewState.rotation;
-    const skippedFeatureUids = frameState.skippedFeatureUids;
-    return source.forEachFeatureAtCoordinate(
-      coordinate, resolution, rotation, hitTolerance, skippedFeatureUids,
-      /**
-       * @param {import("../../Feature.js").FeatureLike} feature Feature.
-       * @return {?} Callback result.
-       */
-      function(feature) {
-        return callback.call(thisArg, feature, layer);
-      });
+  getImageTransform() {
+    return abstract();
   }
 
   /**
@@ -118,27 +103,21 @@ class IntermediateCanvasRenderer extends CanvasLayerRenderer {
       return undefined;
     }
 
-    if (this.getLayer().getSource().forEachFeatureAtCoordinate !== VOID) {
-      // for ImageCanvas sources use the original hit-detection logic,
-      // so that for example also transparent polygons are detected
-      return super.forEachLayerAtCoordinate(arguments);
-    } else {
-      const pixel = applyTransform(this.coordinateToCanvasPixelTransform, coordinate.slice());
-      scaleCoordinate(pixel, frameState.viewState.resolution / this.renderedResolution);
+    const pixel = applyTransform(this.coordinateToCanvasPixelTransform, coordinate.slice());
+    scaleCoordinate(pixel, frameState.viewState.resolution / this.renderedResolution);
 
-      if (!this.hitCanvasContext_) {
-        this.hitCanvasContext_ = createCanvasContext2D(1, 1);
-      }
+    if (!this.hitCanvasContext_) {
+      this.hitCanvasContext_ = createCanvasContext2D(1, 1);
+    }
 
-      this.hitCanvasContext_.clearRect(0, 0, 1, 1);
-      this.hitCanvasContext_.drawImage(this.getImage(), pixel[0], pixel[1], 1, 1, 0, 0, 1, 1);
+    this.hitCanvasContext_.clearRect(0, 0, 1, 1);
+    this.hitCanvasContext_.drawImage(this.getImage(), pixel[0], pixel[1], 1, 1, 0, 0, 1, 1);
 
-      const imageData = this.hitCanvasContext_.getImageData(0, 0, 1, 1).data;
-      if (imageData[3] > 0) {
-        return callback.call(thisArg, this.getLayer(), imageData);
-      } else {
-        return undefined;
-      }
+    const imageData = this.hitCanvasContext_.getImageData(0, 0, 1, 1).data;
+    if (imageData[3] > 0) {
+      return callback.call(thisArg, this.getLayer(), imageData);
+    } else {
+      return undefined;
     }
   }
 }