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

Further work on GRB, bugfixes

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-12-06 03:24:33 +01:00
parent 4e4e64ce13
commit 89004af7f9
16 changed files with 456 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Logic/FeatureSource/FeaturePipeline.ts
View file

@ -58,6 +58,7 @@ export default class FeaturePipeline {
private readonly osmSourceZoomLevel
private readonly localStorageSavers = new Map<string, SaveTileToLocalStorageActor>()
private readonly metataggingRecalculated = new UIEventSource<void>(undefined)
constructor(
handleFeatureSource: (source: FeatureSourceForLayer & Tiled) => void,
@ -95,11 +96,13 @@ export default class FeaturePipeline {
const perLayerHierarchy = new Map<string, TileHierarchyMerger>()
this.perLayerHierarchy = perLayerHierarchy
// Given a tile, wraps it and passes it on to render (handled by 'handleFeatureSource'
function patchedHandleFeatureSource (src: FeatureSourceForLayer & IndexedFeatureSource & Tiled) {
// This will already contain the merged features for this tile. In other words, this will only be triggered once for every tile
const srcFiltered =
new FilteringFeatureSource(state, src.tileIndex,
new ChangeGeometryApplicator(src, state.changes)
new ChangeGeometryApplicator(src, state.changes),
self.metataggingRecalculated
)
handleFeatureSource(srcFiltered)
@ -472,6 +475,7 @@ export default class FeaturePipeline {
self.applyMetaTags(tile)
})
})
self.metataggingRecalculated.ping()
}

13
Logic/FeatureSource/Sources/FilteringFeatureSource.ts
View file

@ -28,7 +28,8 @@ export default class FilteringFeatureSource implements FeatureSourceForLayer, Ti
allElements: ElementStorage
},
tileIndex,
upstream: FeatureSourceForLayer
upstream: FeatureSourceForLayer,
metataggingUpdated: UIEventSource<any>
) {
this.name = "FilteringFeatureSource(" + upstream.name + ")"
this.tileIndex = tileIndex
@ -53,11 +54,15 @@ export default class FilteringFeatureSource implements FeatureSourceForLayer, Ti
self.update()
}
})
metataggingUpdated.addCallback(_ => {
self._is_dirty.setData(true)
})
this.update();
}
public update() {
private update() {
const self = this;
const layer = this.upstream.layer;
const features: { feature: any; freshness: Date }[] = this.upstream.features.data;
@ -106,13 +111,11 @@ export default class FilteringFeatureSource implements FeatureSourceForLayer, Ti
return
}
this._alreadyRegistered.add(src)
if (layer.isShown !== undefined) {
const self = this;
src.map(tags => layer.isShown?.GetRenderValue(tags, "yes").txt).addCallbackAndRunD(isShown => {
src.addCallbackAndRunD(isShown => {
self._is_dirty.setData(true)
})
}
}
}