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

Merge pull request #9548 from ahocevar/italic-labels

Browse Source 
Avoid cut off labels for italic fonts
This commit is contained in:
Andreas Hocevar
2019-05-15 16:58:17 +02:00
committed by GitHub
parent 61d753c803 2e31f716ed
commit 56ec6b093e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ol/render/canvas/Executor.js
View File

@@ -193,9 +193,10 @@ class Executor extends Disposable {
const width = measureTextWidths(textState.font, lines, widths); const width = measureTextWidths(textState.font, lines, widths);
const lineHeight = measureTextHeight(textState.font); const lineHeight = measureTextHeight(textState.font);
const height = lineHeight * numLines; const height = lineHeight * numLines;
const renderWidth = (width + strokeWidth); const renderWidth = width + strokeWidth;
const context = createCanvasContext2D( const context = createCanvasContext2D(
Math.ceil(renderWidth * scale), // make canvas 2 pixels wider to account for italic text width measurement errors
Math.ceil((renderWidth + 2) * scale),
Math.ceil((height + strokeWidth) * scale)); Math.ceil((height + strokeWidth) * scale));
label = context.canvas; label = context.canvas;
labelCache.set(key, label); labelCache.set(key, label);
@@ -220,7 +221,7 @@ class Executor extends Disposable {
context.textBaseline = 'middle'; context.textBaseline = 'middle';
context.textAlign = 'center'; context.textAlign = 'center';
const leftRight = (0.5 - align); const leftRight = (0.5 - align);
const x = align * label.width / scale + leftRight * strokeWidth; const x = align * renderWidth + leftRight * strokeWidth;
let i; let i;
if (strokeKey) { if (strokeKey) {
for (i = 0; i < numLines; ++i) { for (i = 0; i < numLines; ++i) {
@@ -471,7 +472,9 @@ class Executor extends Disposable {
const baseline = TEXT_ALIGN[textState.textBaseline || defaultTextBaseline]; const baseline = TEXT_ALIGN[textState.textBaseline || defaultTextBaseline];
const strokeWidth = strokeState && strokeState.lineWidth ? strokeState.lineWidth : 0; const strokeWidth = strokeState && strokeState.lineWidth ? strokeState.lineWidth : 0;
const anchorX = align * label.width / pixelRatio + 2 * (0.5 - align) * strokeWidth; // Remove the 2 pixels we added in getTextImage() for the anchor
const width = label.width / pixelRatio - 2 * textState.scale;
const anchorX = align * width + 2 * (0.5 - align) * strokeWidth;
const anchorY = baseline * label.height / pixelRatio + 2 * (0.5 - baseline) * strokeWidth; const anchorY = baseline * label.height / pixelRatio + 2 * (0.5 - baseline) * strokeWidth;
return { return {