Merge pull request #3163 from fredj/webglmaprenderer-layerStatesArray

Use the layerStatesArray property from the frameState
openlayers · Jan 23, 2015 · fd5a3ce · fd5a3ce
2 parents edc6746 + 948a1f1
commit fd5a3ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js
@@ -149,7 +149,7 @@ ol.renderer.Map.prototype.forEachFeatureAtPixel =
       return result;
     }
   }
-  var layerStates = this.map_.getLayerGroup().getLayerStatesArray();
+  var layerStates = frameState.layerStatesArray;
   var numLayers = layerStates.length;
   var i;
   for (i = numLayers - 1; i >= 0; --i) {

diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js
@@ -581,7 +581,7 @@ ol.renderer.webgl.Map.prototype.forEachFeatureAtPixel =
       return result;
     }
   }
-  var layerStates = this.getMap().getLayerGroup().getLayerStatesArray();
+  var layerStates = frameState.layerStatesArray;
   var numLayers = layerStates.length;
   var i;
   for (i = numLayers - 1; i >= 0; --i) {
@@ -629,7 +629,7 @@ ol.renderer.webgl.Map.prototype.hasFeatureAtPixel =
       return true;
     }
   }
-  var layerStates = this.getMap().getLayerGroup().getLayerStatesArray();
+  var layerStates = frameState.layerStatesArray;
   var numLayers = layerStates.length;
   var i;
   for (i = numLayers - 1; i >= 0; --i) {