Fix ol.tilegrid.TileGrid#getZForResolution

This fixes a bug in ol.tilegrid.TileGrid#getZForResolution where this function doesn't take minZoom and maxZoom into account when selecting a zoom level for a resolution.

Fixes #2780.
This commit is contained in:
Éric Lemoine
2015-03-23 18:02:44 +01:00
parent 8813eb0112
commit 79748c6f0c

View File

@@ -3,6 +3,7 @@ goog.provide('ol.tilegrid.TileGrid');
goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.functions');
goog.require('goog.math');
goog.require('ol');
goog.require('ol.Coordinate');
goog.require('ol.TileCoord');
@@ -393,7 +394,8 @@ ol.tilegrid.TileGrid.prototype.getTileSize = function(z) {
* @return {number} Z.
*/
ol.tilegrid.TileGrid.prototype.getZForResolution = function(resolution) {
return ol.array.linearFindNearest(this.resolutions_, resolution, 0);
var z = ol.array.linearFindNearest(this.resolutions_, resolution, 0);
return goog.math.clamp(z, this.minZoom, this.maxZoom);
};