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

Full code cleanup

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-01-26 21:40:38 +01:00
parent 3a4a2a2016
commit fa971ffbbf
300 changed files with 16352 additions and 19284 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Logic/FeatureSource/Actors/MetaTagRecalculator.ts
View file

@ -14,7 +14,7 @@ class MetatagUpdater {
private source: FeatureSourceForLayer & Tiled;
private readonly params: ExtraFuncParams
private state: { allElements?: ElementStorage };
private readonly isDirty = new UIEventSource(false)
constructor(source: FeatureSourceForLayer & Tiled, state: { allElements?: ElementStorage }, featurePipeline: FeaturePipeline) {
@ -31,14 +31,14 @@ class MetatagUpdater {
if (oldBbox === undefined) {
self.neededLayerBboxes.set(layerId, bbox);
} else if (!bbox.isContainedIn(oldBbox)) {
self.neededLayerBboxes.set(layerId,oldBbox.unionWith(bbox))
self.neededLayerBboxes.set(layerId, oldBbox.unionWith(bbox))
}
return featurePipeline.GetFeaturesWithin(layerId, bbox)
},
memberships: featurePipeline.relationTracker
}
this.isDirty.stabilized(100).addCallback(dirty => {
if(dirty){
if (dirty) {
self.updateMetaTags()
}
})
@ -46,10 +46,10 @@ class MetatagUpdater {
}
public requestUpdate(){
public requestUpdate() {
this.isDirty.setData(true)
}
private updateMetaTags() {
const features = this.source.features.data
@ -74,7 +74,8 @@ export default class MetaTagRecalculator {
};
private _featurePipeline: FeaturePipeline;
private readonly _alreadyRegistered: Set<FeatureSourceForLayer & Tiled> = new Set<FeatureSourceForLayer & Tiled>()
private readonly _notifiers : MetatagUpdater[] = []
private readonly _notifiers: MetatagUpdater[] = []
/**
* The meta tag recalculator receives tiles of layers.
* It keeps track of which sources have had their share calculated, and which should be re-updated if some other data is loaded
@ -92,16 +93,16 @@ private readonly _notifiers : MetatagUpdater[] = []
return;
}
this._alreadyRegistered.add(source)
this._notifiers.push(new MetatagUpdater(source,this._state,this._featurePipeline))
this._notifiers.push(new MetatagUpdater(source, this._state, this._featurePipeline))
const self = this;
source.features.addCallbackAndRunD(_ => {
const layerName = source.layer.layerDef.id
for (const updater of self._notifiers ) {
for (const updater of self._notifiers) {
const neededBbox = updater.neededLayerBboxes.get(layerName)
if(neededBbox == undefined){
if (neededBbox == undefined) {
continue
}
if(source.bbox === undefined || neededBbox.overlapsWith(source.bbox)){
if (source.bbox === undefined || neededBbox.overlapsWith(source.bbox)) {
updater.requestUpdate()
}
}

8
Logic/FeatureSource/Actors/SaveTileToLocalStorageActor.ts
View file

@ -41,7 +41,7 @@ export default class SaveTileToLocalStorageActor {
})
}
public LoadTilesFromDisk(currentBounds: UIEventSource<BBox>, location: UIEventSource<Loc>,
registerFreshness: (tileId: number, freshness: Date) => void,
registerTile: ((src: FeatureSource & Tiled) => void)) {
@ -55,7 +55,7 @@ export default class SaveTileToLocalStorageActor {
}
currentBounds.addCallbackAndRunD(bbox => {
if(self._layer.minzoomVisible > location.data.zoom){
if (self._layer.minzoomVisible > location.data.zoom) {
// Not enough zoom
return;
}
@ -119,9 +119,9 @@ export default class SaveTileToLocalStorageActor {
}
private SetIdb(tileIndex, data) {
try{
try {
IdbLocalStorage.SetDirectly(this._layer.id + "_" + tileIndex, data)
}catch(e){
} catch (e) {
console.error("Could not save tile to indexed-db: ", e, "tileIndex is:", tileIndex, "for layer", this._layer.id)
}
}