ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove decluttering for a fresh start

Browse Source
This commit is contained in:
Andreas Hocevar
2020-09-18 23:31:20 +02:00
parent 740e11f1fa
commit 7a5e0db59f
18 changed files with 108 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ol/render/canvas/ImageBuilder.js
View File

@@ -14,12 +14,6 @@ class CanvasImageBuilder extends CanvasBuilder {
constructor(tolerance, maxExtent, resolution, pixelRatio) {
super(tolerance, maxExtent, resolution, pixelRatio);
/**
* @private
* @type {import("../canvas.js").DeclutterGroups}
*/
this.declutterGroups_ = null;
/**
* @private
* @type {HTMLCanvasElement|HTMLVideoElement|HTMLImageElement}
@@ -120,7 +114,6 @@ class CanvasImageBuilder extends CanvasBuilder {
// Remaining arguments to DRAW_IMAGE are in alphabetical order
this.anchorX_ * this.imagePixelRatio_,
this.anchorY_ * this.imagePixelRatio_,
this.declutterGroups_,
Math.ceil(this.height_ * this.imagePixelRatio_),
this.opacity_,
this.originX_,
@@ -141,7 +134,6 @@ class CanvasImageBuilder extends CanvasBuilder {
// Remaining arguments to DRAW_IMAGE are in alphabetical order
this.anchorX_,
this.anchorY_,
this.declutterGroups_,
this.height_,
this.opacity_,
this.originX_,
@@ -175,7 +167,6 @@ class CanvasImageBuilder extends CanvasBuilder {
// Remaining arguments to DRAW_IMAGE are in alphabetical order
this.anchorX_ * this.imagePixelRatio_,
this.anchorY_ * this.imagePixelRatio_,
this.declutterGroups_,
Math.ceil(this.height_ * this.imagePixelRatio_),
this.opacity_,
this.originX_,
@@ -196,7 +187,6 @@ class CanvasImageBuilder extends CanvasBuilder {
// Remaining arguments to DRAW_IMAGE are in alphabetical order
this.anchorX_,
this.anchorY_,
this.declutterGroups_,
this.height_,
this.opacity_,
this.originX_,
@@ -233,9 +223,8 @@ class CanvasImageBuilder extends CanvasBuilder {
/**
* @param {import("../../style/Image.js").default} imageStyle Image style.
* @param {import("../canvas.js").DeclutterGroup} declutterGroups Declutter.
*/
setImageStyle(imageStyle, declutterGroups) {
setImageStyle(imageStyle) {
const anchor = imageStyle.getAnchor();
const size = imageStyle.getSize();
const hitDetectionImage = imageStyle.getHitDetectionImage();
@@ -244,7 +233,6 @@ class CanvasImageBuilder extends CanvasBuilder {
this.imagePixelRatio_ = imageStyle.getPixelRatio(this.pixelRatio);
this.anchorX_ = anchor[0];
this.anchorY_ = anchor[1];
this.declutterGroups_ = declutterGroups;
this.hitDetectionImage_ = hitDetectionImage;
this.image_ = image;
this.height_ = size[1];