ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hit detection refactoring

Browse Source 
Get the frame state from the map instead of storing values in the layer renderers.
This commit is contained in:
Éric Lemoine
2014-01-13 10:45:51 +01:00
parent 8b38639082
commit f7be1c155e
5 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ol/renderer/maprenderer.js
View File

@@ -81,7 +81,8 @@ ol.renderer.Map.prototype.disposeInternal = function() {
/**
* @param {ol.Pixel} pixel Pixel.
* @param {ol.Coordinate} coordinate Coordinate.
* @param {ol.FrameState} frameState FrameState.
* @param {function(this: S, ol.Feature, ol.layer.Layer): T} callback Feature
* callback.
* @param {S=} opt_obj Scope for feature callback.
@@ -92,7 +93,8 @@ ol.renderer.Map.prototype.disposeInternal = function() {
* @template S,T,U
*/
ol.renderer.Map.prototype.forEachFeatureAtPixel =
function(pixel, callback, opt_obj, opt_layerFunction, opt_obj2) {
function(coordinate, frameState, callback, opt_obj,
opt_layerFunction, opt_obj2) {
var layerFunction = goog.isDef(opt_layerFunction) ?
opt_layerFunction : goog.functions.TRUE;
var layersArray = this.map_.getLayerGroup().getLayersArray();
@@ -101,8 +103,8 @@ ol.renderer.Map.prototype.forEachFeatureAtPixel =
var layer = layersArray[i];
if (layer.getVisible() && layerFunction.call(opt_obj2, layer)) {
var layerRenderer = this.getLayerRenderer(layer);
var result =
layerRenderer.forEachFeatureAtPixel(pixel, callback, opt_obj);
var result = layerRenderer.forEachFeatureAtPixel(
coordinate, frameState, callback, opt_obj);
if (result) {
return result;
}