From 933a6297bb0cad35026f9e3e1f8ea2a4738059c2 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Fri, 28 Jun 2019 10:58:21 +0200 Subject: [PATCH] Remove unused hasFeatureAtCoordinate from ol/renderer/Layer --- src/ol/renderer/Layer.js | 9 --------- src/ol/renderer/webgl/Layer.js | 8 -------- test/spec/ol/renderer/webgl/pointslayer.test.js | 6 ++---- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/src/ol/renderer/Layer.js b/src/ol/renderer/Layer.js index cde8519918..9c0187c1e7 100644 --- a/src/ol/renderer/Layer.js +++ b/src/ol/renderer/Layer.js @@ -132,15 +132,6 @@ class LayerRenderer extends Observable { } } - /** - * @param {import("../coordinate.js").Coordinate} coordinate Coordinate. - * @param {import("../PluggableMap.js").FrameState} frameState Frame state. - * @return {boolean} Is there a feature at the given coordinate? - */ - hasFeatureAtCoordinate(coordinate, frameState) { - return false; - } - /** * Load the image if not already loaded, and register the image change * listener if needed. diff --git a/src/ol/renderer/webgl/Layer.js b/src/ol/renderer/webgl/Layer.js index 1f32ccf5b6..c8e6cbbc20 100644 --- a/src/ol/renderer/webgl/Layer.js +++ b/src/ol/renderer/webgl/Layer.js @@ -3,7 +3,6 @@ */ import LayerRenderer from '../Layer.js'; import WebGLHelper from '../../webgl/Helper.js'; -import {TRUE} from '../../functions.js'; /** @@ -83,13 +82,6 @@ class WebGLLayerRenderer extends LayerRenderer { return this.helper.getShaderCompileErrors(); } - /** - * @inheritDoc - */ - hasFeatureAtCoordinate(coordinate, frameState) { - const feature = this.forEachFeatureAtCoordinate(coordinate, frameState, 0, TRUE, null); - return feature !== undefined; - } } diff --git a/test/spec/ol/renderer/webgl/pointslayer.test.js b/test/spec/ol/renderer/webgl/pointslayer.test.js index 1f0361851a..7d67294960 100644 --- a/test/spec/ol/renderer/webgl/pointslayer.test.js +++ b/test/spec/ol/renderer/webgl/pointslayer.test.js @@ -147,7 +147,7 @@ describe('ol.renderer.webgl.PointsLayer', function() { }); }); - describe('#forEachFeatureAtCoordinate and #hasFeatureAtCoordinate', function() { + describe('#forEachFeatureAtCoordinate', function() { let layer, renderer, feature; beforeEach(function() { @@ -181,7 +181,7 @@ describe('ol.renderer.webgl.PointsLayer', function() { viewHints: [], coordinateToPixelTransform: transform }; - let found, hit; + let found; const cb = function(feature) { found = feature; }; @@ -196,9 +196,7 @@ describe('ol.renderer.webgl.PointsLayer', function() { function checkHit(x, y, expected) { found = null; renderer.forEachFeatureAtCoordinate([x, y], frameState, 0, cb, null); - hit = renderer.hasFeatureAtCoordinate([x, y], frameState); expect(found).to.be(expected ? feature : null); - expect(hit).to.eql(expected); } checkHit(0, 0, true);