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

Merge pull request #7345 from ahocevar/line-width

Browse Source 
Handle different lineWidth scaling in Safari
This commit is contained in:
Andreas Hocevar
2017-10-11 08:56:34 +02:00
committed by GitHub
parent b81952f142 d0092ecd18
commit dcf38c22e2
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/render/canvas/textreplay.js
View File

@@ -327,7 +327,7 @@ ol.render.canvas.TextReplay.prototype.getImage_ = function(text, fill, stroke) {
context.font = textState.font; context.font = textState.font;
if (stroke) { if (stroke) {
context.strokeStyle = strokeState.strokeStyle; context.strokeStyle = strokeState.strokeStyle;
context.lineWidth = strokeWidth * pixelRatio; context.lineWidth = strokeWidth * (ol.has.SAFARI ? pixelRatio : 1);
context.lineCap = strokeState.lineCap; context.lineCap = strokeState.lineCap;
context.lineJoin = strokeState.lineJoin; context.lineJoin = strokeState.lineJoin;
context.miterLimit = strokeState.miterLimit; context.miterLimit = strokeState.miterLimit;

BIN
test/rendering/ol/style/expected/text-canvas-hidpi.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

7
test/rendering/ol/style/text.test.js
View File

@@ -18,14 +18,15 @@ describe('ol.rendering.style.Text', function() {
var map, vectorSource; var map, vectorSource;
function createMap(renderer, opt_pixelRatio) { function createMap(renderer, opt_pixelRatio) {
var pixelRatio = opt_pixelRatio || 1;
vectorSource = new ol.source.Vector(); vectorSource = new ol.source.Vector();
var vectorLayer = new ol.layer.Vector({ var vectorLayer = new ol.layer.Vector({
source: vectorSource source: vectorSource
}); });
map = new ol.Map({ map = new ol.Map({
pixelRatio: opt_pixelRatio || 1, pixelRatio: pixelRatio,
target: createMapDiv(200, 200), target: createMapDiv(200 / pixelRatio, 200 / pixelRatio),
renderer: renderer, renderer: renderer,
layers: [vectorLayer], layers: [vectorLayer],
view: new ol.View({ view: new ol.View({
@@ -157,7 +158,7 @@ describe('ol.rendering.style.Text', function() {
it('renders correct stroke with pixelRatio != 1', function(done) { it('renders correct stroke with pixelRatio != 1', function(done) {
createMap('canvas', 2); createMap('canvas', 2);
createFeatures(); createFeatures();
expectResemble(map, 'rendering/ol/style/expected/text-canvas-hidpi.png', IMAGE_TOLERANCE, done); expectResemble(map, 'rendering/ol/style/expected/text-canvas-hidpi.png', 2.8, done);
}); });
it('renders multiline text with alignment options', function(done) { it('renders multiline text with alignment options', function(done) {