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

More work on refactoring the changes handling

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-07-18 14:52:09 +02:00
parent 42391b4ff1
commit b55f9a25c6
19 changed files with 181 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Logic/FeatureSource/ChangeApplicator.ts
View file

@ -5,6 +5,7 @@ import {ChangeDescription} from "../Osm/Actions/ChangeDescription";
import {Utils} from "../../Utils";
import {OsmNode, OsmRelation, OsmWay} from "../Osm/OsmObject";
/**
* Applies changes from 'Changes' onto a featureSource
*/
@ -16,25 +17,41 @@ export default class ChangeApplicator implements FeatureSource {
this.name = "ChangesApplied(" + source.name + ")"
this.features = source.features
const seenChanges = new Set<ChangeDescription>();
const self = this;
let runningUpdate = false;
source.features.addCallbackAndRunD(features => {
if(runningUpdate){
return; // No need to ping again
}
ChangeApplicator.ApplyChanges(features, changes.pendingChanges.data)
seenChanges.clear()
})
changes.pendingChanges.addCallbackAndRunD(changes => {
ChangeApplicator.ApplyChanges(source.features.data, changes)
runningUpdate = true;
changes = changes.filter(ch => !seenChanges.has(ch))
changes.forEach(c => seenChanges.add(c))
console.log("Called back", changes)
ChangeApplicator.ApplyChanges(self.features.data, changes)
source.features.ping()
runningUpdate = false;
})
}
private static ApplyChanges(features: { feature: any, freshness: Date }[], cs: ChangeDescription[]) {
if (cs.length === 0 || features === undefined) {
return features;
/**
* Returns true if the geometry is changed and the source should be pinged
*/
private static ApplyChanges(features: {feature: any, freshness: Date}[], cs: ChangeDescription[]): boolean {
if (cs.length === 0 || features === undefined ) {
return ;
}
console.log("Applying changes ", this.name, cs)
let geometryChanged = false;
const changesPerId: Map<string, ChangeDescription[]> = new Map<string, ChangeDescription[]>()
for (const c of cs) {
const id = c.type + "/" + c.id
@ -52,6 +69,8 @@ export default class ChangeApplicator implements FeatureSource {
feature: feature,
freshness: now
})
console.log("Added a new feature: ", feature)
geometryChanged = true;
}
// First, create the new features - they have a negative ID
@ -61,7 +80,11 @@ export default class ChangeApplicator implements FeatureSource {
if (change.id >= 0) {
return; // Nothing to do here, already created
}
if(change.changes === undefined){
// An update to the object - not the actual created
return;
}
try {
@ -93,8 +116,8 @@ export default class ChangeApplicator implements FeatureSource {
for (const feature of features) {
const id = feature.feature.properties.id;
const f = feature.feature;
const id = f.properties.id;
if (!changesPerId.has(id)) {
continue;
}
@ -118,11 +141,12 @@ export default class ChangeApplicator implements FeatureSource {
// Apply other changes to the object
if (change.changes !== undefined) {
geometryChanged = true;
switch (change.type) {
case "node":
// @ts-ignore
const coor: { lat, lon } = change.changes;
f.geometry.coordinates = [[coor.lon, coor.lat]]
f.geometry.coordinates = [coor.lon, coor.lat]
break;
case "way":
f.geometry.coordinates = change.changes["locations"]
@ -134,5 +158,6 @@ export default class ChangeApplicator implements FeatureSource {
}
}
}
return geometryChanged
}
}

16
Logic/FeatureSource/OsmApiFeatureSource.ts
View file

@ -15,15 +15,19 @@ export default class OsmApiFeatureSource implements FeatureSource {
public load(id: string) {
if(id.indexOf("-") >= 0){
if (id.indexOf("-") >= 0) {
// Newly added point - not yet in OSM
return;
}
console.debug("Downloading", id, "from the OSM-API")
OsmObject.DownloadObject(id).addCallbackAndRunD(element => {
const geojson = element.asGeoJson();
geojson.id = geojson.properties.id;
this.features.setData([{feature: geojson, freshness: element.timestamp}])
try {
const geojson = element.asGeoJson();
geojson.id = geojson.properties.id;
this.features.setData([{feature: geojson, freshness: element.timestamp}])
} catch (e) {
console.error(e)
}
})
}
@ -58,7 +62,7 @@ export default class OsmApiFeatureSource implements FeatureSource {
const bounds = Utils.tile_bounds(z, x, y);
console.log("Loading OSM data tile", z, x, y, " with bounds", bounds)
OsmObject.LoadArea(bounds, objects => {
const keptGeoJson: {feature:any, freshness: Date}[] = []
const keptGeoJson: { feature: any, freshness: Date }[] = []
// Which layer does the object match?
for (const object of objects) {
@ -69,7 +73,7 @@ export default class OsmApiFeatureSource implements FeatureSource {
if (doesMatch) {
const geoJson = object.asGeoJson();
geoJson._matching_layer_id = layer.id
keptGeoJson.push({feature: geoJson, freshness: object.timestamp})
keptGeoJson.push({feature: geoJson, freshness: object.timestamp})
break;
}