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

Check hits for wrapped around geometries

Browse Source
This commit is contained in:
Simon Seyock
2019-09-25 18:02:04 +02:00
parent 6b5c2f47bb
commit 54cbe14f88
4 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/ol/renderer/Map.js
View File

@@ -9,6 +9,7 @@ import {inView} from '../layer/Layer.js';
import {shared as iconImageCache} from '../style/IconImageCache.js';
import {compose as composeTransform, makeInverse} from '../transform.js';
import {renderDeclutterItems} from '../render.js';
import {add} from '../coordinate.js';
/**
* @abstract
@@ -65,6 +66,7 @@ class MapRenderer extends Disposable {
* @param {import("../coordinate.js").Coordinate} coordinate Coordinate.
* @param {import("../PluggableMap.js").FrameState} frameState FrameState.
* @param {number} hitTolerance Hit tolerance in pixels.
* @param {boolean} checkWrapped Check for wrapped geometries.
* @param {function(this: S, import("../Feature.js").FeatureLike,
* import("../layer/Layer.js").default): T} callback Feature callback.
* @param {S} thisArg Value to use as `this` when executing `callback`.
@@ -80,6 +82,7 @@ class MapRenderer extends Disposable {
coordinate,
frameState,
hitTolerance,
checkWrapped,
callback,
thisArg,
layerFilter,
@@ -103,6 +106,7 @@ class MapRenderer extends Disposable {
const projection = viewState.projection;
let translatedCoordinate = coordinate;
const offsets = [[0, 0]];
if (projection.canWrapX()) {
const projectionExtent = projection.getExtent();
const worldWidth = getWidth(projectionExtent);
@@ -111,6 +115,9 @@ class MapRenderer extends Disposable {
const worldsAway = Math.ceil((projectionExtent[0] - x) / worldWidth);
translatedCoordinate = [x + worldWidth * worldsAway, coordinate[1]];
}
if (checkWrapped) {
offsets.push([-worldWidth, 0], [worldWidth, 0]);
}
}
const layerStates = frameState.layerStatesArray;
@@ -121,21 +128,22 @@ class MapRenderer extends Disposable {
return entry.value;
});
}
let i;
for (i = numLayers - 1; i >= 0; --i) {
const layerState = layerStates[i];
const layer = /** @type {import("../layer/Layer.js").default} */ (layerState.layer);
if (layer.hasRenderer() && inView(layerState, viewState) && layerFilter.call(thisArg2, layer)) {
const layerRenderer = layer.getRenderer();
const source = layer.getSource();
if (layerRenderer && source) {
const callback = forEachFeatureAtCoordinate.bind(null, layerState.managed);
result = layerRenderer.forEachFeatureAtCoordinate(
source.getWrapX() ? translatedCoordinate : coordinate,
frameState, hitTolerance, callback, declutteredFeatures);
}
if (result) {
return result;
for (let i = 0; i < offsets.length; i++) {
for (let j = numLayers - 1; j >= 0; --j) {
const layerState = layerStates[j];
const layer = /** @type {import("../layer/Layer.js").default} */ (layerState.layer);
if (layer.hasRenderer() && inView(layerState, viewState) && layerFilter.call(thisArg2, layer)) {
const layerRenderer = layer.getRenderer();
const source = layer.getSource();
if (layerRenderer && source) {
const callback = forEachFeatureAtCoordinate.bind(null, layerState.managed);
result = layerRenderer.forEachFeatureAtCoordinate(
add(source.getWrapX() ? translatedCoordinate : coordinate, offsets[i]),
frameState, hitTolerance, callback, declutteredFeatures);
}
if (result) {
return result;
}
}
}
}
@@ -164,6 +172,7 @@ class MapRenderer extends Disposable {
* @param {import("../coordinate.js").Coordinate} coordinate Coordinate.
* @param {import("../PluggableMap.js").FrameState} frameState FrameState.
* @param {number} hitTolerance Hit tolerance in pixels.
* @param {boolean} checkWrapped Check for wrapped geometries.
* @param {function(this: U, import("../layer/Layer.js").default): boolean} layerFilter Layer filter
* function, only layers which are visible and for which this function
* returns `true` will be tested for features. By default, all visible
@@ -172,9 +181,9 @@ class MapRenderer extends Disposable {
* @return {boolean} Is there a feature at the given coordinate?
* @template U
*/
hasFeatureAtCoordinate(coordinate, frameState, hitTolerance, layerFilter, thisArg) {
hasFeatureAtCoordinate(coordinate, frameState, hitTolerance, checkWrapped, layerFilter, thisArg) {
const hasFeature = this.forEachFeatureAtCoordinate(
coordinate, frameState, hitTolerance, TRUE, this, layerFilter, thisArg);
coordinate, frameState, hitTolerance, checkWrapped, TRUE, this, layerFilter, thisArg);
return hasFeature !== undefined;
}