midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Refactoring: add generics to some featureSources

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-05-05 01:25:12 +02:00
parent e038394331
commit dec4296204
3 changed files with 21 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Logic/FeatureSource/Sources/TouchesBboxFeatureSource.ts
View file

@ -1,14 +1,15 @@
import { FeatureSource, FeatureSourceForLayer } from "../FeatureSource"
import {FeatureSource, FeatureSourceForLayer} from "../FeatureSource"
import StaticFeatureSource from "./StaticFeatureSource"
import { BBox } from "../../BBox"
import {BBox} from "../../BBox"
import FilteredLayer from "../../../Models/FilteredLayer"
import { Store } from "../../UIEventSource"
import {Store} from "../../UIEventSource"
import {Feature} from "geojson";
/**
* Results in a feature source which has all the elements that touch the given features
*/
export default class BBoxFeatureSource extends StaticFeatureSource {
constructor(features: FeatureSource, mustTouch: Store<BBox>) {
export default class BBoxFeatureSource<T extends Feature = Feature> extends StaticFeatureSource<T> {
constructor(features: FeatureSource<T>, mustTouch: Store<BBox>) {
super(
features.features.mapD(
(features) => {
@ -29,10 +30,10 @@ export default class BBoxFeatureSource extends StaticFeatureSource {
}
}
export class BBoxFeatureSourceForLayer extends BBoxFeatureSource implements FeatureSourceForLayer {
export class BBoxFeatureSourceForLayer<T extends Feature = Feature> extends BBoxFeatureSource<T> implements FeatureSourceForLayer {
readonly layer: FilteredLayer
constructor(features: FeatureSourceForLayer, mustTouch: Store<BBox>) {
constructor(features: FeatureSourceForLayer<T>, mustTouch: Store<BBox>) {
super(features, mustTouch)
this.layer = features.layer
}