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

Fix more types for TypeScript

Browse Source
This commit is contained in:
ahocevar
2018-10-30 18:55:03 +01:00
parent 2adac0b3e7
commit 1df9189d7f
6 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,9 +150,10 @@ class MapRenderer extends Disposable {
const layer = layerState.layer;
if (visibleAtResolution(layerState, viewResolution) && layerFilter.call(thisArg2, layer)) {
const layerRenderer = this.getLayerRenderer(layer);
if (layer.getSource()) {
const source = /** @type {import("../layer/Layer.js").default} */ (layer).getSource();
if (source) {
result = layerRenderer.forEachFeatureAtCoordinate(
layer.getSource().getWrapX() ? translatedCoordinate : coordinate,
source.getWrapX() ? translatedCoordinate : coordinate,
frameState, hitTolerance, forEachFeatureAtCoordinate);
}
if (result) {
@@ -201,7 +202,7 @@ class MapRenderer extends Disposable {
}
/**
* @param {import("../layer/Layer.js").default} layer Layer.
* @param {import("../layer/Base.js").default} layer Layer.
* @protected
* @return {import("./Layer.js").default} Layer renderer.
*/

6
src/ol/renderer/canvas/ImageLayer.js
View File

@@ -180,11 +180,11 @@ class CanvasImageLayerRenderer extends IntermediateCanvasRenderer {
/**
* @inheritDoc
*/
forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback, thisArg) {
forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback) {
if (this.vectorRenderer_) {
return this.vectorRenderer_.forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback, thisArg);
return this.vectorRenderer_.forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback);
} else {
return super.forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback, thisArg);
return super.forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback);
}
}
}