Merge pull request #2109 from elemoine/visibleandinrange

Hit detection respects min and maxResolution
2014-05-25 14:43:44 +02:00
parent df5b41862b fd8a46dcae
commit 8cd5f6d642
5 changed files with 72 additions and 9 deletions
@@ -17,6 +17,7 @@ goog.require('ol.Tile');
 goog.require('ol.css');
 goog.require('ol.dom');
 goog.require('ol.layer.Image');
+goog.require('ol.layer.Layer');
 goog.require('ol.layer.Tile');
 goog.require('ol.render.Event');
 goog.require('ol.render.EventType');
@@ -442,10 +443,8 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
  var i, ii, layerState;
  for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
    layerState = layerStatesArray[i];
-    if (layerState.visible &&
-        layerState.sourceState == ol.source.State.READY &&
-        viewResolution < layerState.maxResolution &&
-        viewResolution >= layerState.minResolution) {
+    if (ol.layer.Layer.visibleAtResolution(layerState, viewResolution) &&
+        layerState.sourceState == ol.source.State.READY) {
      layerStatesToDraw.push(layerState);
    }
  }