diff options
| author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2020-05-24 19:03:47 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2020-06-16 22:38:17 +0200 |
| commit | 83e530a434358935e5d864aedd4f221287aedb45 (patch) | |
| tree | 8cccec02db48811a6824053811538a64196028d0 | |
| parent | dfb3bf30a4f4c0df0f9cff2e2a4fa1c09153fba6 (diff) | |
loleaflet: writer zoom flickers
Change-Id: I9186bbae55269870fc693b65c3e90b149375eba9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95496
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Tested-by: Jenkins
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96445
| -rw-r--r-- | loleaflet/src/control/Ruler.js | 7 | ||||
| -rw-r--r-- | loleaflet/src/layer/tile/GridLayer.js | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js index a5537055e..ab6b61435 100644 --- a/loleaflet/src/control/Ruler.js +++ b/loleaflet/src/control/Ruler.js @@ -409,7 +409,12 @@ L.Control.Ruler = L.Control.extend({ var firstTileXTranslate = parseInt(firstTile.style.left) - this._map._docLayer._tileWidthPx * columnNumber; var tileContainer = mapPane.getElementsByClassName('leaflet-tile-container'); - tileContainer = tileContainer[tileContainer.length - 1]; + for (var i = 0; i < tileContainer.length; ++i) { + if (parseInt(tileContainer[i].style.zIndex) === this._map.getMaxZoom()) { + tileContainer = tileContainer[i]; + break; + } + } var tileContainerXTranslate = parseInt(tileContainer.style.transform.match(/\(([-0-9]*)/)[1]); var mapPaneXTranslate = parseInt(mapPane.style.transform.match(/\(([-0-9]*)/)[1]); diff --git a/loleaflet/src/layer/tile/GridLayer.js b/loleaflet/src/layer/tile/GridLayer.js index 850981777..91dd404e8 100644 --- a/loleaflet/src/layer/tile/GridLayer.js +++ b/loleaflet/src/layer/tile/GridLayer.js @@ -211,12 +211,7 @@ L.GridLayer = L.Layer.extend({ maxZoom = this.options.maxZoom; for (var z in this._levels) { - if (this._levels[z].el.children.length || z === zoom) { - this._levels[z].el.style.zIndex = maxZoom - Math.abs(zoom - z); - } else { - L.DomUtil.remove(this._levels[z].el); - delete this._levels[z]; - } + this._levels[z].el.style.zIndex = maxZoom - Math.abs(zoom - z); } var level = this._levels[zoom], |