From 054227fd264b83a6f220ef3e1f01c912cb58c5b1 Mon Sep 17 00:00:00 2001 From: tsauerwein Date: Thu, 29 Jan 2015 11:16:22 +0100 Subject: [PATCH] Make signature for *AtPixel methods more consistent pixel/coordinate is the first argument. --- src/ol/render/canvas/canvasreplay.js | 4 ++-- src/ol/render/webgl/webglreplay.js | 13 ++++++------- .../canvas/canvasimagelayerrenderer.js | 2 +- .../canvas/canvasvectorlayerrenderer.js | 4 ++-- src/ol/renderer/dom/domimagelayerrenderer.js | 2 +- src/ol/renderer/dom/domvectorlayerrenderer.js | 4 ++-- src/ol/renderer/maprenderer.js | 8 ++++---- .../renderer/webgl/webglimagelayerrenderer.js | 2 +- src/ol/renderer/webgl/webglmaprenderer.js | 19 ++++++++----------- .../webgl/webglvectorlayerrenderer.js | 12 +++++------- src/ol/source/imagevectorsource.js | 4 ++-- src/ol/source/source.js | 2 +- 12 files changed, 35 insertions(+), 41 deletions(-) diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js index 97619a1629..866823231e 100644 --- a/src/ol/render/canvas/canvasreplay.js +++ b/src/ol/render/canvas/canvasreplay.js @@ -1858,16 +1858,16 @@ ol.render.canvas.ReplayGroup.prototype.finish = function() { /** + * @param {ol.Coordinate} coordinate Coordinate. * @param {number} resolution Resolution. * @param {number} rotation Rotation. - * @param {ol.Coordinate} coordinate Coordinate. * @param {Object} skippedFeaturesHash Ids of features to skip * @param {function(ol.Feature): T} callback Feature callback. * @return {T|undefined} Callback result. * @template T */ ol.render.canvas.ReplayGroup.prototype.forEachFeatureAtPixel = function( - resolution, rotation, coordinate, skippedFeaturesHash, callback) { + coordinate, resolution, rotation, skippedFeaturesHash, callback) { var transform = this.hitDetectionTransform_; ol.vec.Mat4.makeTransform2D(transform, 0.5, 0.5, diff --git a/src/ol/render/webgl/webglreplay.js b/src/ol/render/webgl/webglreplay.js index 9af1caa62d..2913c010a7 100644 --- a/src/ol/render/webgl/webglreplay.js +++ b/src/ol/render/webgl/webglreplay.js @@ -1154,6 +1154,7 @@ ol.render.webgl.ReplayGroup.prototype.replayHitDetection_ = function(context, /** + * @param {ol.Coordinate} coordinate Coordinate. * @param {ol.webgl.Context} context Context. * @param {ol.Coordinate} center Center. * @param {number} resolution Resolution. @@ -1166,15 +1167,14 @@ ol.render.webgl.ReplayGroup.prototype.replayHitDetection_ = function(context, * @param {number} hue Global hue. * @param {number} saturation Global saturation. * @param {Object} skippedFeaturesHash Ids of features to skip. - * @param {ol.Coordinate} coordinate Coordinate. * @param {function(ol.Feature): T|undefined} callback Feature callback. * @return {T|undefined} Callback result. * @template T */ ol.render.webgl.ReplayGroup.prototype.forEachFeatureAtPixel = function( - context, center, resolution, rotation, size, pixelRatio, + coordinate, context, center, resolution, rotation, size, pixelRatio, opacity, brightness, contrast, hue, saturation, skippedFeaturesHash, - coordinate, callback) { + callback) { var gl = context.getGL(); gl.bindFramebuffer( gl.FRAMEBUFFER, context.getHitDetectionFramebuffer()); @@ -1215,6 +1215,7 @@ ol.render.webgl.ReplayGroup.prototype.forEachFeatureAtPixel = function( /** + * @param {ol.Coordinate} coordinate Coordinate. * @param {ol.webgl.Context} context Context. * @param {ol.Coordinate} center Center. * @param {number} resolution Resolution. @@ -1227,13 +1228,11 @@ ol.render.webgl.ReplayGroup.prototype.forEachFeatureAtPixel = function( * @param {number} hue Global hue. * @param {number} saturation Global saturation. * @param {Object} skippedFeaturesHash Ids of features to skip. - * @param {ol.Coordinate} coordinate Coordinate. * @return {boolean} Is there a feature at the given pixel? */ ol.render.webgl.ReplayGroup.prototype.hasFeatureAtPixel = function( - context, center, resolution, rotation, size, pixelRatio, - opacity, brightness, contrast, hue, saturation, skippedFeaturesHash, - coordinate) { + coordinate, context, center, resolution, rotation, size, pixelRatio, + opacity, brightness, contrast, hue, saturation, skippedFeaturesHash) { var gl = context.getGL(); gl.bindFramebuffer( gl.FRAMEBUFFER, context.getHitDetectionFramebuffer()); diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js index abc974a832..dd8d3361bf 100644 --- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js @@ -64,7 +64,7 @@ ol.renderer.canvas.ImageLayer.prototype.forEachFeatureAtPixel = var rotation = frameState.viewState.rotation; var skippedFeatureUids = frameState.skippedFeatureUids; return source.forEachFeatureAtPixel( - resolution, rotation, coordinate, skippedFeatureUids, + coordinate, resolution, rotation, skippedFeatureUids, /** * @param {ol.Feature} feature Feature. * @return {?} Callback result. diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index a7c4842698..e8baf6274c 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -126,8 +126,8 @@ ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtPixel = var layer = this.getLayer(); /** @type {Object.} */ var features = {}; - return this.replayGroup_.forEachFeatureAtPixel(resolution, - rotation, coordinate, frameState.skippedFeatureUids, + return this.replayGroup_.forEachFeatureAtPixel(coordinate, + resolution, rotation, frameState.skippedFeatureUids, /** * @param {ol.Feature} feature Feature. * @return {?} Callback result. diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/domimagelayerrenderer.js index 624fa8f0c2..334357da44 100644 --- a/src/ol/renderer/dom/domimagelayerrenderer.js +++ b/src/ol/renderer/dom/domimagelayerrenderer.js @@ -55,7 +55,7 @@ ol.renderer.dom.ImageLayer.prototype.forEachFeatureAtPixel = var rotation = frameState.viewState.rotation; var skippedFeatureUids = frameState.skippedFeatureUids; return source.forEachFeatureAtPixel( - resolution, rotation, coordinate, skippedFeatureUids, + coordinate, resolution, rotation, skippedFeatureUids, /** * @param {ol.Feature} feature Feature. * @return {?} Callback result. diff --git a/src/ol/renderer/dom/domvectorlayerrenderer.js b/src/ol/renderer/dom/domvectorlayerrenderer.js index 8c46bce8d0..fe7cee6af2 100644 --- a/src/ol/renderer/dom/domvectorlayerrenderer.js +++ b/src/ol/renderer/dom/domvectorlayerrenderer.js @@ -186,8 +186,8 @@ ol.renderer.dom.VectorLayer.prototype.forEachFeatureAtPixel = var layer = this.getLayer(); /** @type {Object.} */ var features = {}; - return this.replayGroup_.forEachFeatureAtPixel(resolution, - rotation, coordinate, frameState.skippedFeatureUids, + return this.replayGroup_.forEachFeatureAtPixel(coordinate, + resolution, rotation, frameState.skippedFeatureUids, /** * @param {ol.Feature} feature Feature. * @return {?} Callback result. diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js index 82dc358f2c..6c4cce1ee3 100644 --- a/src/ol/renderer/maprenderer.js +++ b/src/ol/renderer/maprenderer.js @@ -131,8 +131,8 @@ ol.renderer.Map.prototype.forEachFeatureAtPixel = if (!goog.isNull(this.replayGroup)) { /** @type {Object.} */ var features = {}; - result = this.replayGroup.forEachFeatureAtPixel(viewResolution, - viewRotation, coordinate, {}, + result = this.replayGroup.forEachFeatureAtPixel(coordinate, + viewResolution, viewRotation, {}, /** * @param {ol.Feature} feature Feature. * @return {?} Callback result. @@ -192,8 +192,8 @@ ol.renderer.Map.prototype.forEachLayerAtPixel = var viewRotation = viewState.rotation; if (!goog.isNull(this.replayGroup)) { - var hasFeature = this.replayGroup.forEachFeatureAtPixel(viewResolution, - viewRotation, coordinate, {}, goog.functions.TRUE); + var hasFeature = this.replayGroup.forEachFeatureAtPixel(coordinate, + viewResolution, viewRotation, {}, goog.functions.TRUE); if (hasFeature) { result = callback.call(thisArg, null); diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js index ce1a625f3e..6755b4f2d5 100644 --- a/src/ol/renderer/webgl/webglimagelayerrenderer.js +++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js @@ -81,7 +81,7 @@ ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtPixel = var rotation = frameState.viewState.rotation; var skippedFeatureUids = frameState.skippedFeatureUids; return source.forEachFeatureAtPixel( - resolution, rotation, coordinate, skippedFeatureUids, + coordinate, resolution, rotation, skippedFeatureUids, /** * @param {ol.Feature} feature Feature. diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index a9c4205659..49ae80457e 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -560,11 +560,10 @@ ol.renderer.webgl.Map.prototype.forEachFeatureAtPixel = // use default color values var d = ol.renderer.webgl.Map.DEFAULT_COLOR_VALUES_; - result = this.replayGroup.forEachFeatureAtPixel(context, - viewState.center, viewState.resolution, viewState.rotation, + result = this.replayGroup.forEachFeatureAtPixel(coordinate, + context, viewState.center, viewState.resolution, viewState.rotation, frameState.size, frameState.pixelRatio, d.opacity, d.brightness, d.contrast, d.hue, d.saturation, {}, - coordinate, /** * @param {ol.Feature} feature Feature. * @return {?} Callback result. @@ -620,11 +619,10 @@ ol.renderer.webgl.Map.prototype.hasFeatureAtPixel = // use default color values var d = ol.renderer.webgl.Map.DEFAULT_COLOR_VALUES_; - hasFeature = this.replayGroup.hasFeatureAtPixel(context, - viewState.center, viewState.resolution, viewState.rotation, + hasFeature = this.replayGroup.hasFeatureAtPixel(coordinate, + context, viewState.center, viewState.resolution, viewState.rotation, frameState.size, frameState.pixelRatio, - d.opacity, d.brightness, d.contrast, d.hue, d.saturation, {}, - coordinate); + d.opacity, d.brightness, d.contrast, d.hue, d.saturation, {}); if (hasFeature) { return true; } @@ -667,11 +665,10 @@ ol.renderer.webgl.Map.prototype.forEachLayerAtPixel = // use default color values var d = ol.renderer.webgl.Map.DEFAULT_COLOR_VALUES_; - var hasFeature = this.replayGroup.hasFeatureAtPixel(context, - viewState.center, viewState.resolution, viewState.rotation, + var hasFeature = this.replayGroup.hasFeatureAtPixel(coordinate, + context, viewState.center, viewState.resolution, viewState.rotation, frameState.size, frameState.pixelRatio, - d.opacity, d.brightness, d.contrast, d.hue, d.saturation, {}, - coordinate); + d.opacity, d.brightness, d.contrast, d.hue, d.saturation, {}); if (hasFeature) { result = callback.call(thisArg, null); if (result) { diff --git a/src/ol/renderer/webgl/webglvectorlayerrenderer.js b/src/ol/renderer/webgl/webglvectorlayerrenderer.js index 904f496e95..443310543c 100644 --- a/src/ol/renderer/webgl/webglvectorlayerrenderer.js +++ b/src/ol/renderer/webgl/webglvectorlayerrenderer.js @@ -118,12 +118,11 @@ ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtPixel = var layerState = this.layerState_; /** @type {Object.} */ var features = {}; - return this.replayGroup_.forEachFeatureAtPixel(context, - viewState.center, viewState.resolution, viewState.rotation, + return this.replayGroup_.forEachFeatureAtPixel(coordinate, + context, viewState.center, viewState.resolution, viewState.rotation, frameState.size, frameState.pixelRatio, layerState.opacity, layerState.brightness, layerState.contrast, layerState.hue, layerState.saturation, frameState.skippedFeatureUids, - coordinate, /** * @param {ol.Feature} feature Feature. * @return {?} Callback result. @@ -152,12 +151,11 @@ ol.renderer.webgl.VectorLayer.prototype.hasFeatureAtPixel = var context = mapRenderer.getContext(); var viewState = frameState.viewState; var layerState = this.layerState_; - return this.replayGroup_.hasFeatureAtPixel(context, - viewState.center, viewState.resolution, viewState.rotation, + return this.replayGroup_.hasFeatureAtPixel(coordinate, + context, viewState.center, viewState.resolution, viewState.rotation, frameState.size, frameState.pixelRatio, layerState.opacity, layerState.brightness, layerState.contrast, - layerState.hue, layerState.saturation, frameState.skippedFeatureUids, - coordinate); + layerState.hue, layerState.saturation, frameState.skippedFeatureUids); } }; diff --git a/src/ol/source/imagevectorsource.js b/src/ol/source/imagevectorsource.js index 0bdd75a319..0ce9683a6f 100644 --- a/src/ol/source/imagevectorsource.js +++ b/src/ol/source/imagevectorsource.js @@ -153,14 +153,14 @@ ol.source.ImageVector.prototype.canvasFunctionInternal_ = * @inheritDoc */ ol.source.ImageVector.prototype.forEachFeatureAtPixel = function( - resolution, rotation, coordinate, skippedFeatureUids, callback) { + coordinate, resolution, rotation, skippedFeatureUids, callback) { if (goog.isNull(this.replayGroup_)) { return undefined; } else { /** @type {Object.} */ var features = {}; return this.replayGroup_.forEachFeatureAtPixel( - resolution, 0, coordinate, skippedFeatureUids, + coordinate, resolution, 0, skippedFeatureUids, /** * @param {ol.Feature} feature Feature. * @return {?} Callback result. diff --git a/src/ol/source/source.js b/src/ol/source/source.js index ea2c84c9c9..0113df474d 100644 --- a/src/ol/source/source.js +++ b/src/ol/source/source.js @@ -77,9 +77,9 @@ goog.inherits(ol.source.Source, ol.Observable); /** + * @param {ol.Coordinate} coordinate Coordinate. * @param {number} resolution Resolution. * @param {number} rotation Rotation. - * @param {ol.Coordinate} coordinate Coordinate. * @param {Object.} skippedFeatureUids Skipped feature uids. * @param {function(ol.Feature): T} callback Feature callback. * @return {T|undefined} Callback result.