diff --git a/package.json b/package.json index 466e0f89d6..43805ff4d1 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "pixelmatch": "^4.0.2", "pngjs": "^3.3.3", "proj4": "2.5.0", - "puppeteer": "~1.11.0", + "puppeteer": "~1.13.0", "serve-static": "^1.13.2", "shx": "^0.3.2", "sinon": "^7.2.3", diff --git a/rendering/cases/icon-symbol-svg/expected.png b/rendering/cases/icon-symbol-svg/expected.png index a0da6fe76e..c73c938cae 100644 Binary files a/rendering/cases/icon-symbol-svg/expected.png and b/rendering/cases/icon-symbol-svg/expected.png differ diff --git a/rendering/cases/layer-vectortile-rotate-vector/expected.png b/rendering/cases/layer-vectortile-rotate-vector/expected.png index 971d1a369f..a8e50e0216 100644 Binary files a/rendering/cases/layer-vectortile-rotate-vector/expected.png and b/rendering/cases/layer-vectortile-rotate-vector/expected.png differ diff --git a/rendering/cases/layer-vectortile-rotate/expected.png b/rendering/cases/layer-vectortile-rotate/expected.png index f44c304975..012048bac7 100644 Binary files a/rendering/cases/layer-vectortile-rotate/expected.png and b/rendering/cases/layer-vectortile-rotate/expected.png differ diff --git a/rendering/cases/layer-vectortile-simple/expected.png b/rendering/cases/layer-vectortile-simple/expected.png index 7cbc9118ec..0e8c66c7ec 100644 Binary files a/rendering/cases/layer-vectortile-simple/expected.png and b/rendering/cases/layer-vectortile-simple/expected.png differ diff --git a/rendering/cases/linestring-style-css-filter/expected.png b/rendering/cases/linestring-style-css-filter/expected.png index c2d039de8b..7d80e50d05 100644 Binary files a/rendering/cases/linestring-style-css-filter/expected.png and b/rendering/cases/linestring-style-css-filter/expected.png differ diff --git a/rendering/cases/linestring-style/expected.png b/rendering/cases/linestring-style/expected.png index 68797650fc..1efa6b94be 100644 Binary files a/rendering/cases/linestring-style/expected.png and b/rendering/cases/linestring-style/expected.png differ diff --git a/src/ol/control/ScaleLine.js b/src/ol/control/ScaleLine.js index f7d349f21a..57902cb09c 100644 --- a/src/ol/control/ScaleLine.js +++ b/src/ol/control/ScaleLine.js @@ -260,10 +260,11 @@ class ScaleLine extends Control { let i = 3 * Math.floor( Math.log(this.minWidth_ * pointResolution) / Math.log(10)); - let count, width; + let count, width, decimalCount; while (true) { - count = LEADING_DIGITS[((i % 3) + 3) % 3] * - Math.pow(10, Math.floor(i / 3)); + decimalCount = Math.floor(i / 3); + const decimal = Math.pow(10, decimalCount); + count = LEADING_DIGITS[((i % 3) + 3) % 3] * decimal; width = Math.round(count / pointResolution); if (isNaN(width)) { this.element.style.display = 'none'; @@ -274,12 +275,11 @@ class ScaleLine extends Control { } ++i; } - let html; if (this.scaleBar_) { html = this.createScaleBar(width, count, suffix); } else { - html = count + ' ' + suffix; + html = count.toFixed(decimalCount < 0 ? -decimalCount : 0) + ' ' + suffix; } if (this.renderedHTML_ != html) {