Fix: viewportScale

This commit is contained in:
surunzi
2018-01-11 17:26:15 +08:00
parent 2ee0cec69a
commit 4750728630
2 changed files with 14 additions and 4 deletions

View File

@@ -5,7 +5,7 @@
* ```
*/
_('meta clamp trim each map');
_('meta clamp trim each map isNaN');
function exports()
{
@@ -31,5 +31,10 @@ function exports()
if (key === 'minimum-scale') minScale = +val;
});
return clamp(initialScale, minScale, maxScale);
let ret = clamp(initialScale, minScale, maxScale);
// Some will use ';' to be the separator, need to avoid the wrong result.
if (isNaN(ret)) return 1;
return ret;
}

View File

@@ -6829,7 +6829,7 @@ export var viewportScale = _.viewportScale = (function ()
*/
/* dependencies
* meta clamp trim each map
* meta clamp trim each map isNaN
*/
function exports()
@@ -6856,7 +6856,12 @@ export var viewportScale = _.viewportScale = (function ()
if (key === 'minimum-scale') minScale = +val;
});
return clamp(initialScale, minScale, maxScale);
let ret = clamp(initialScale, minScale, maxScale);
// Some will use ';' to be the separator, need to avoid the wrong result.
if (isNaN(ret)) return 1;
return ret;
}
return exports;