[Libreoffice-commits] online.git: loleaflet/src

[Tor Lillqvist]

 loleaflet/src/map/Map.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 72dfbc95943d68d717ba2338e4211673bfa223ba
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jul 6 20:06:16 2018 +0300

    Our zoom step factor is 1.2, not 2 as in upstream
    
    This change makes the zooming animation of the document while doing a
    pinch gesture (closing and/or opening) match the finger movement much
    better.
    
    (But sure, there is till lots of weird jumping around after finishing
    the pinch gesture.)
    
    Change-Id: I9d5affe653c1a0ebaebced54629bc9e8d9de5854
    Reviewed-on: https://gerrit.libreoffice.org/57089
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 609153900..f18ae861a 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -603,7 +603,7 @@ L.Map = L.Evented.extend({
 
 	getScaleZoom: function (scale, fromZoom) {
 		fromZoom = fromZoom === undefined ? this._zoom : fromZoom;
-		return fromZoom + (Math.log(scale) / Math.LN2);
+		return fromZoom + (Math.log(scale) / Math.log(1.2));
 	},