Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hit detect symbols with declutterMode: 'none' #15812

Merged
merged 1 commit into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/ol/render/canvas/Executor.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ import {transform2D} from '../../geom/flat/transform.js';

/**
* @template T
* @typedef {function(import("../../Feature.js").FeatureLike, import("../../geom/SimpleGeometry.js").default): T} FeatureCallback
* @typedef {function(import("../../Feature.js").FeatureLike, import("../../geom/SimpleGeometry.js").default, import("../../style/Style.js").DeclutterMode): T} FeatureCallback
*/

/**
Expand Down Expand Up @@ -1155,7 +1155,11 @@ class Executor {
feature = /** @type {import("../../Feature.js").FeatureLike} */ (
instruction[1]
);
const result = featureCallback(feature, currentGeometry);
const result = featureCallback(
feature,
currentGeometry,
declutterMode,
);
if (result) {
return result;
}
Expand Down
4 changes: 3 additions & 1 deletion src/ol/render/canvas/ExecutorGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,9 +255,10 @@ class ExecutorGroup {
/**
* @param {import("../../Feature.js").FeatureLike} feature Feature.
* @param {import("../../geom/SimpleGeometry.js").default} geometry Geometry.
* @param {import('../../style/Style.js').DeclutterMode} declutterMode Declutter mode.
* @return {T|undefined} Callback result.
*/
function featureCallback(feature, geometry) {
function featureCallback(feature, geometry, declutterMode) {
const imageData = context.getImageData(
0,
0,
Expand All @@ -268,6 +269,7 @@ class ExecutorGroup {
if (imageData[indexes[i]] > 0) {
if (
!declutteredFeatures ||
declutterMode === 'none' ||
(builderType !== 'Image' && builderType !== 'Text') ||
declutteredFeatures.includes(feature)
) {
Expand Down
47 changes: 47 additions & 0 deletions test/browser/spec/ol/renderer/canvas/vectortilelayer.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import VectorTileLayer from '../../../../../../src/ol/layer/VectorTile.js';
import VectorTileSource from '../../../../../../src/ol/source/VectorTile.js';
import View from '../../../../../../src/ol/View.js';
import XYZ from '../../../../../../src/ol/source/XYZ.js';
import {Circle, Fill} from '../../../../../../src/ol/style.js';
import {VOID} from '../../../../../../src/ol/functions.js';
import {checkedFonts} from '../../../../../../src/ol/render/canvas.js';
import {create} from '../../../../../../src/ol/transform.js';
Expand Down Expand Up @@ -756,5 +757,51 @@ describe('ol/renderer/canvas/VectorTileLayer', function () {
done();
});
});

it('detects symbols with `declutterMode: "none"`', (done) => {
const target = document.createElement('div');
target.style.width = '100px';
target.style.height = '100px';
document.body.appendChild(target);
const extent = [
1824704.739223726, 6141868.096770482, 1827150.7241288517,
6144314.081675608,
];
const source = new VectorTileSource({
format: new MVT(),
url: 'spec/ol/data/14-8938-5680.vector.pbf',
minZoom: 14,
maxZoom: 14,
});
const layer = new VectorTileLayer({
declutter: true,
extent: extent,
source: source,
style: new Style({
image: new Circle({
declutterMode: 'none',
radius: 5,
fill: new Fill({color: 'red'}),
}),
}),
});
const map = new Map({
target: target,
layers: [layer],
view: new View({
center: getCenter(extent),
zoom: 14,
}),
});
map.once('rendercomplete', () => {
setTimeout(() => {
map.setTarget(null);
document.body.removeChild(target);
}, 0);
const features = map.getFeaturesAtPixel([11, 75]);
expect(features).to.have.length(1);
done();
});
});
});
});