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

Merge pull request #13955 from mike-000/immediate-icons

Browse Source 
Do not apply #12467 change to Icons
This commit is contained in:
Andreas Hocevar
2022-08-12 13:05:33 +02:00
committed by GitHub
parent dd1edc37ca 8bbeb31cfb
commit 3e707d4ded
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ol/render/canvas/Immediate.js
View File

@@ -1041,19 +1041,24 @@ class CanvasImmediateRenderer extends VectorContext {
this.image_ = null;
return;
}
const imagePixelRatio = imageStyle.getPixelRatio(this.pixelRatio_);
const imageAnchor = imageStyle.getAnchor();
const imageOrigin = imageStyle.getOrigin();
this.image_ = imageStyle.getImage(this.pixelRatio_);
this.imageAnchorX_ = imageAnchor[0] * this.pixelRatio_;
this.imageAnchorY_ = imageAnchor[1] * this.pixelRatio_;
this.imageHeight_ = imageSize[1] * this.pixelRatio_;
this.imageAnchorX_ = imageAnchor[0] * imagePixelRatio;
this.imageAnchorY_ = imageAnchor[1] * imagePixelRatio;
this.imageHeight_ = imageSize[1] * imagePixelRatio;
this.imageOpacity_ = imageStyle.getOpacity();
this.imageOriginX_ = imageOrigin[0];
this.imageOriginY_ = imageOrigin[1];
this.imageRotateWithView_ = imageStyle.getRotateWithView();
this.imageRotation_ = imageStyle.getRotation();
this.imageScale_ = imageStyle.getScaleArray();
this.imageWidth_ = imageSize[0] * this.pixelRatio_;
const imageScale = imageStyle.getScaleArray();
this.imageScale_ = [
(imageScale[0] * this.pixelRatio_) / imagePixelRatio,
(imageScale[1] * this.pixelRatio_) / imagePixelRatio,
];
this.imageWidth_ = imageSize[0] * imagePixelRatio;
}
/**

2
test/rendering/cases/immediate-pixel-ratio/main.js
View File

@@ -69,8 +69,8 @@ new Map({
view: new View({
center: [256 / 2, -256 / 2],
resolution: 1,
devicePixelRatio: 2,
}),
pixelRatio: 2,
});
render();