Merge develop

Logic/Actors/ChangeToElementsActor.ts

@@ -0,0 +1,36 @@
+import {ElementStorage} from "../ElementStorage";
+import {Changes} from "../Osm/Changes";
+
+export default class ChangeToElementsActor {
+    constructor(changes: Changes, allElements: ElementStorage) {
+        changes.pendingChanges.addCallbackAndRun(changes => {
+            for (const change of changes) {
+                const id = change.type + "/" + change.id;
+                if (!allElements.has(id)) {
+                    continue; // Ignored as the geometryFixer will introduce this
+                }
+                const src = allElements.getEventSourceById(id)
+
+                let changed = false;
+                for (const kv of change.tags ?? []) {
+                    // Apply tag changes and ping the consumers
+                    const k = kv.k
+                    let v = kv.v
+                    if (v === "") {
+                        v = undefined;
+                    }
+                    if (src.data[k] === v) {
+                        continue
+                    }
+                    changed = true;
+                    src.data[k] = v;
+                }
+                if (changed) {
+                    src.ping()
+                }
+
+
+            }
+        })
+    }
+}

Logic/Actors/PendingChangesUploader.ts

@@ -9,7 +9,7 @@ export default class PendingChangesUploader {
     constructor(changes: Changes, selectedFeature: UIEventSource<any>) {
         const self = this;
         this.lastChange = new Date();
-        changes.pending.addCallback(() => {
+        changes.pendingChanges.addCallback(() => {
             self.lastChange = new Date();
 
             window.setTimeout(() => {
@@ -54,7 +54,7 @@ export default class PendingChangesUploader {
 
 
         function onunload(e) {
-            if (changes.pending.data.length == 0) {
+            if(changes.pendingChanges.data.length == 0){
                 return;
             }
             changes.flushChanges("onbeforeunload - probably closing or something similar");

Logic/Actors/SelectedFeatureHandler.ts

@@ -13,7 +13,7 @@ export default class SelectedFeatureHandler {
     private readonly _hash: UIEventSource<string>;
     private readonly _selectedFeature: UIEventSource<any>;
 
-    private static readonly _no_trigger_on = ["welcome","copyright","layers"]
+    private static readonly _no_trigger_on = ["welcome","copyright","layers","new"]
     private readonly _osmApiSource: OsmApiFeatureSource;
     
     constructor(hash: UIEventSource<string>, 
@@ -60,7 +60,9 @@ export default class SelectedFeatureHandler {
         if(hash === undefined || SelectedFeatureHandler._no_trigger_on.indexOf(hash) >= 0){
             return; // No valid feature selected
         }
-        // We should have a valid osm-ID and zoom to it
+        // We should have a valid osm-ID and zoom to it... But we wrap it in try-catch to be sure
+        try{
+            
         OsmObject.DownloadObject(hash).addCallbackAndRunD(element => {
             const centerpoint = element.centerpoint();
             console.log("Zooming to location for select point: ", centerpoint)
@@ -68,6 +70,9 @@ export default class SelectedFeatureHandler {
             location.data.lon = centerpoint[1]
             location.ping();
         })
+        }catch(e){
+            console.error("Could not download OSM-object with id", hash, " - probably a weird hash")
+        }
     }
     
     private downloadFeature(hash:  string){

Logic/FeatureSource/ChangeApplicator.ts

@@ -0,0 +1,162 @@
+import FeatureSource from "./FeatureSource";
+import {UIEventSource} from "../UIEventSource";
+import {Changes} from "../Osm/Changes";
+import {ChangeDescription} from "../Osm/Actions/ChangeDescription";
+import {Utils} from "../../Utils";
+import {OsmNode, OsmRelation, OsmWay} from "../Osm/OsmObject";
+
+
+/**
+ * Applies changes from 'Changes' onto a featureSource
+ */
+export default class ChangeApplicator implements FeatureSource {
+    public readonly features: UIEventSource<{ feature: any; freshness: Date }[]>;
+    public readonly name: string;
+
+    constructor(source: FeatureSource, changes: Changes, mode?: {
+        generateNewGeometries: boolean
+    }) {
+
+        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, mode)
+            seenChanges.clear()
+        })
+
+        changes.pendingChanges.addCallbackAndRunD(changes => {
+            runningUpdate = true;
+            changes = changes.filter(ch => !seenChanges.has(ch))
+            changes.forEach(c => seenChanges.add(c))
+            ChangeApplicator.ApplyChanges(self.features.data, changes, mode)
+            source.features.ping()
+            runningUpdate = false;
+        })
+
+
+    }
+
+
+    /**
+     * Returns true if the geometry is changed and the source should be pinged
+     */
+    private static ApplyChanges(features: { feature: any; freshness: Date }[], cs: ChangeDescription[], mode: { generateNewGeometries: boolean }): 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
+            if (!changesPerId.has(id)) {
+                changesPerId.set(id, [])
+            }
+            changesPerId.get(id).push(c)
+        }
+
+
+        const now = new Date()
+
+        function add(feature) {
+            feature.id = feature.properties.id
+            features.push({
+                feature: feature,
+                freshness: now
+            })
+            console.log("Added a new feature: ", feature)
+            geometryChanged = true;
+        }
+
+        // First, create the new features - they have a negative ID
+        // We don't set the properties yet though
+        if (mode?.generateNewGeometries) {
+            changesPerId.forEach(cs => {
+                cs
+                    .forEach(change => {
+                        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 {
+
+                            switch (change.type) {
+                                case "node":
+                                    const n = new OsmNode(change.id)
+                                    n.lat = change.changes["lat"]
+                                    n.lon = change.changes["lon"]
+                                    const geojson = n.asGeoJson()
+                                    add(geojson)
+                                    break;
+                                case "way":
+                                    const w = new OsmWay(change.id)
+                                    w.nodes = change.changes["nodes"]
+                                    add(w.asGeoJson())
+                                    break;
+                                case "relation":
+                                    const r = new OsmRelation(change.id)
+                                    r.members = change.changes["members"]
+                                    add(r.asGeoJson())
+                                    break;
+                            }
+
+                        } catch (e) {
+                            console.error(e)
+                        }
+                    })
+            })
+        }
+
+        for (const feature of features) {
+            const f = feature.feature;
+            const id = f.properties.id;
+            if (!changesPerId.has(id)) {
+                continue;
+            }
+
+
+            const changed = {}
+            // Copy all the properties
+            Utils.Merge(f, changed)
+            // play the changes onto the copied object
+
+            for (const change of changesPerId.get(id)) {
+                for (const kv of change.tags ?? []) {
+                    // Apply tag changes and ping the consumers
+                    f.properties[kv.k] = kv.v;
+                }
+
+                // 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]
+                            break;
+                        case "way":
+                            f.geometry.coordinates = change.changes["locations"]
+                            break;
+                        case "relation":
+                            console.error("Changes to relations are not yet supported")
+                            break;
+                    }
+                }
+            }
+        }
+        return geometryChanged
+    }
+}

Logic/FeatureSource/FeaturePipeline.ts

@@ -6,7 +6,6 @@ import FeatureDuplicatorPerLayer from "../FeatureSource/FeatureDuplicatorPerLaye
 import FeatureSource from "../FeatureSource/FeatureSource";
 import {UIEventSource} from "../UIEventSource";
 import LocalStorageSaver from "./LocalStorageSaver";
-import LayerConfig from "../../Customizations/JSON/LayerConfig";
 import LocalStorageSource from "./LocalStorageSource";
 import LayoutConfig from "../../Customizations/JSON/LayoutConfig";
 import Loc from "../../Models/Loc";
@@ -14,6 +13,8 @@ import GeoJsonSource from "./GeoJsonSource";
 import MetaTaggingFeatureSource from "./MetaTaggingFeatureSource";
 import RegisteringFeatureSource from "./RegisteringFeatureSource";
 import FilteredLayer from "../../Models/FilteredLayer";
+import {Changes} from "../Osm/Changes";
+import ChangeApplicator from "./ChangeApplicator";
 
 export default class FeaturePipeline implements FeatureSource {
 
@@ -22,10 +23,10 @@ export default class FeaturePipeline implements FeatureSource {
     public readonly name = "FeaturePipeline"
 
     constructor(flayers: UIEventSource<FilteredLayer[]>,
+                changes: Changes,
                 updater: FeatureSource,
                 fromOsmApi: FeatureSource,
                 layout: UIEventSource<LayoutConfig>,
-                newPoints: FeatureSource,
                 locationControl: UIEventSource<Loc>,
                 selectedElement: UIEventSource<any>) {
 
@@ -41,7 +42,9 @@ export default class FeaturePipeline implements FeatureSource {
                     new MetaTaggingFeatureSource(allLoadedFeatures,
                         new FeatureDuplicatorPerLayer(flayers,
                             new RegisteringFeatureSource(
-                                updater)
+                                new ChangeApplicator(
+                                    updater, changes
+                                ))
                         )), layout));
 
         const geojsonSources: FeatureSource [] = GeoJsonSource
@@ -49,8 +52,7 @@ export default class FeaturePipeline implements FeatureSource {
             .map(geojsonSource => {
                 let source = new RegisteringFeatureSource(
                     new FeatureDuplicatorPerLayer(flayers,
-                            geojsonSource
-                    ));
+                        new ChangeApplicator(geojsonSource, changes)));
                 if (!geojsonSource.isOsmCache) {
                     source = new MetaTaggingFeatureSource(allLoadedFeatures, source, updater.features);
                 }
@@ -58,25 +60,24 @@ export default class FeaturePipeline implements FeatureSource {
             });
 
         const amendedLocalStorageSource =
-            new RememberingSource(new RegisteringFeatureSource(new FeatureDuplicatorPerLayer(flayers, new LocalStorageSource(layout))
+            new RememberingSource(new RegisteringFeatureSource(new FeatureDuplicatorPerLayer(flayers, new ChangeApplicator(new LocalStorageSource(layout), changes))
             ));
 
-        newPoints = new MetaTaggingFeatureSource(allLoadedFeatures,
-            new FeatureDuplicatorPerLayer(flayers,
-                new RegisteringFeatureSource(newPoints)));
-
         const amendedOsmApiSource = new RememberingSource(
             new MetaTaggingFeatureSource(allLoadedFeatures,
                 new FeatureDuplicatorPerLayer(flayers,
-
-                    new RegisteringFeatureSource(fromOsmApi))));
+                    new RegisteringFeatureSource(new ChangeApplicator(fromOsmApi, changes,
+                        {
+                            // We lump in the new points here
+                            generateNewGeometries: true
+                        }
+                    )))));
 
         const merged =
             new FeatureSourceMerger([
                 amendedOverpassSource,
                 amendedOsmApiSource,
                 amendedLocalStorageSource,
-                newPoints,
                 ...geojsonSources
             ]);
 

Logic/FeatureSource/FeatureSourceMerger.ts

@@ -1,6 +1,10 @@
 import FeatureSource from "./FeatureSource";
 import {UIEventSource} from "../UIEventSource";
 
+/**
+ * Merges features from different featureSources
+ * Uses the freshest feature available in the case multiple sources offer data with the same identifier
+ */
 export default class FeatureSourceMerger implements FeatureSource {
 
     public features: UIEventSource<{ feature: any; freshness: Date }[]> = new UIEventSource<{ feature: any; freshness: Date }[]>([]);

Logic/FeatureSource/FilteringFeatureSource.ts

@@ -94,16 +94,9 @@ export default class FilteringFeatureSource implements FeatureSource {
                     return false;
                 }
 
-              
-
                 return true;
             });
-            console.log(
-                "Filtering layer source: input: ",
-                upstream.features.data?.length,
-                "output:",
-                newFeatures.length
-            );
+
             self.features.setData(newFeatures);
             if (missingLayers.size > 0) {
                 console.error(

Logic/FeatureSource/OsmApiFeatureSource.ts

@@ -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;
                         }
 

Logic/Osm/Actions/ChangeDescription.ts

@@ -0,0 +1,30 @@
+export interface ChangeDescription {
+
+    type: "node" | "way" | "relation",
+    /**
+     * Negative for a new objects
+     */
+    id: number,
+    /*
+ v = "" or v = undefined to erase this tag
+ */
+    tags?: { k: string, v: string }[],
+
+    changes?: {
+        lat: number,
+        lon: number
+    } | {
+        // Coordinates are only used for rendering
+        locations: [number, number][]
+        nodes: number[],
+    } | {
+        members: { type: "node" | "way" | "relation", ref: number, role: string }[]
+    }
+
+    /*
+    Set to delete the object
+     */
+    doDelete?: boolean
+
+
+}

Logic/Osm/Actions/ChangeTagAction.ts

@@ -0,0 +1,52 @@
+import OsmChangeAction from "./OsmChangeAction";
+import {Changes} from "../Changes";
+import {ChangeDescription} from "./ChangeDescription";
+import {TagsFilter} from "../../Tags/TagsFilter";
+
+export default class ChangeTagAction extends OsmChangeAction {
+    private readonly _elementId: string;
+    private readonly _tagsFilter: TagsFilter;
+    private readonly _currentTags: any;
+
+    constructor(elementId: string, tagsFilter: TagsFilter, currentTags: any) {
+        super();
+        this._elementId = elementId;
+        this._tagsFilter = tagsFilter;
+        this._currentTags = currentTags;
+    }
+
+    /**
+     * Doublechecks that no stupid values are added
+     */
+    private static checkChange(kv: { k: string, v: string }): { k: string, v: string } {
+        const key = kv.k;
+        const value = kv.v;
+        if (key === undefined || key === null) {
+            console.log("Invalid key");
+            return undefined;
+        }
+        if (value === undefined || value === null) {
+            console.log("Invalid value for ", key);
+            return undefined;
+        }
+
+        if (key.startsWith(" ") || value.startsWith(" ") || value.endsWith(" ") || key.endsWith(" ")) {
+            console.warn("Tag starts with or ends with a space - trimming anyway")
+        }
+
+        return {k: key.trim(), v: value.trim()};
+    }
+
+    CreateChangeDescriptions(changes: Changes): ChangeDescription [] {
+        const changedTags: { k: string, v: string }[] = this._tagsFilter.asChange(this._currentTags).map(ChangeTagAction.checkChange)
+        const typeId = this._elementId.split("/")
+        const type = typeId[0]
+        const id = Number(typeId  [1])
+        return [{
+            // @ts-ignore
+            type: type,
+            id: id,
+            tags: changedTags
+        }]
+    }
+}

Logic/Osm/Actions/CreateNewNodeAction.ts

@@ -0,0 +1,48 @@
+import {Tag} from "../../Tags/Tag";
+import OsmChangeAction from "./OsmChangeAction";
+import {Changes} from "../Changes";
+import {ChangeDescription} from "./ChangeDescription";
+import {And} from "../../Tags/And";
+
+export default class CreateNewNodeAction extends OsmChangeAction {
+
+    private readonly _basicTags: Tag[];
+    private readonly _lat: number;
+    private readonly _lon: number;
+
+    public newElementId : string = undefined
+    
+    constructor(basicTags: Tag[], lat: number, lon: number) {
+        super()
+        this._basicTags = basicTags;
+        this._lat = lat;
+        this._lon = lon;
+    }
+
+    CreateChangeDescriptions(changes: Changes): ChangeDescription[] {
+        const id = changes.getNewID()
+        const properties = {
+            id: "node/" + id
+        }
+        this.newElementId = "node/"+id
+        for (const kv of this._basicTags) {
+            if (typeof kv.value !== "string") {
+                throw "Invalid value: don't use a regex in a preset"
+            }
+            properties[kv.key] = kv.value;
+        }
+
+        return [{
+            tags: new And(this._basicTags).asChange(properties),
+            type: "node",
+            id: id,
+            changes:{
+                lat: this._lat,
+                lon: this._lon
+            }
+        }]
+
+    }
+
+
+}

Logic/Osm/Actions/DeleteAction.ts

@@ -1,9 +1,9 @@
-import {UIEventSource} from "../UIEventSource";
-import {Translation} from "../../UI/i18n/Translation";
-import Translations from "../../UI/i18n/Translations";
-import {OsmObject} from "./OsmObject";
-import State from "../../State";
-import Constants from "../../Models/Constants";
+import {UIEventSource} from "../../UIEventSource";
+import {Translation} from "../../../UI/i18n/Translation";
+import State from "../../../State";
+import {OsmObject} from "../OsmObject";
+import Translations from "../../../UI/i18n/Translations";
+import Constants from "../../../Models/Constants";
 
 export default class DeleteAction {
 
@@ -30,7 +30,7 @@ export default class DeleteAction {
      * Does actually delete the feature; returns the event source 'this.isDeleted'
      * If deletion is not allowed, triggers the callback instead
      */
-    public DoDelete(reason: string, onNotAllowed : () => void): UIEventSource<boolean> {
+    public DoDelete(reason: string, onNotAllowed : () => void): void {
         const isDeleted = this.isDeleted
         const self = this;
         let deletionStarted = false;
@@ -75,8 +75,6 @@ export default class DeleteAction {
 
             }
         )
-
-        return isDeleted;
     }
 
     /**

Logic/Osm/Actions/OsmChangeAction.ts

@@ -0,0 +1,23 @@
+/**
+ * An action is a change to the OSM-database
+ * It will generate some new/modified/deleted objects, which are all bundled by the 'changes'-object
+ */
+import {Changes} from "../Changes";
+import {ChangeDescription} from "./ChangeDescription";
+
+export default abstract class OsmChangeAction {
+
+    private isUsed = false
+
+    public Perform(changes: Changes) {
+        if (this.isUsed) {
+            throw "This ChangeAction is already used: " + this.constructor.name
+        }
+        this.isUsed = true;
+        return this.CreateChangeDescriptions(changes)
+    }
+
+    protected abstract CreateChangeDescriptions(changes: Changes): ChangeDescription[]
+
+
+}

Logic/Osm/Actions/RelationSplitlHandler.ts

@@ -0,0 +1,20 @@
+/**
+ * The logic to handle relations after a way within 
+ */
+import OsmChangeAction from "./OsmChangeAction";
+import {Changes} from "../Changes";
+import {ChangeDescription} from "./ChangeDescription";
+import {OsmRelation, OsmWay} from "../OsmObject";
+
+export default class RelationSplitlHandler extends OsmChangeAction{
+
+    constructor(partOf: OsmRelation[], newWayIds: number[], originalNodes: number[]) {
+        super()
+    }
+
+    CreateChangeDescriptions(changes: Changes): ChangeDescription[] {
+        return [];
+    }
+
+
+}

Logic/Osm/Actions/SplitAction.ts

@@ -0,0 +1,238 @@
+import {OsmRelation, OsmWay} from "../OsmObject";
+import {Changes} from "../Changes";
+import {GeoOperations} from "../../GeoOperations";
+import OsmChangeAction from "./OsmChangeAction";
+import {ChangeDescription} from "./ChangeDescription";
+import RelationSplitlHandler from "./RelationSplitlHandler";
+
+interface SplitInfo {
+    originalIndex?: number, // or negative for new elements
+    lngLat: [number, number],
+    doSplit: boolean
+}
+
+export default class SplitAction extends OsmChangeAction {
+    private readonly roadObject: any;
+    private readonly osmWay: OsmWay;
+    private _partOf: OsmRelation[];
+    private readonly _splitPoints: any[];
+
+    constructor(osmWay: OsmWay, wayGeoJson: any, partOf: OsmRelation[], splitPoints: any[]) {
+        super()
+        this.osmWay = osmWay;
+        this.roadObject = wayGeoJson;
+        this._partOf = partOf;
+        this._splitPoints = splitPoints;
+    }
+
+    private static SegmentSplitInfo(splitInfo: SplitInfo[]): SplitInfo[][] {
+        const wayParts = []
+        let currentPart = []
+        for (const splitInfoElement of splitInfo) {
+            currentPart.push(splitInfoElement)
+
+            if (splitInfoElement.doSplit) {
+                // We have to do a split!
+                // We add the current index to the currentParts, flush it and add it again
+                wayParts.push(currentPart)
+                currentPart = [splitInfoElement]
+            }
+        }
+        wayParts.push(currentPart)
+        return wayParts.filter(wp => wp.length > 0)
+    }
+
+    CreateChangeDescriptions(changes: Changes): ChangeDescription[] {
+        const splitPoints = this._splitPoints
+        // We mark the new split points with a new id
+        console.log(splitPoints)
+        for (const splitPoint of splitPoints) {
+            splitPoint.properties["_is_split_point"] = true
+        }
+
+
+        const self = this;
+        const partOf = this._partOf
+        const originalElement = this.osmWay
+        const originalNodes = this.osmWay.nodes;
+
+        // First, calculate splitpoints and remove points close to one another
+        const splitInfo = self.CalculateSplitCoordinates(splitPoints)
+        // Now we have a list with e.g. 
+        // [ { originalIndex: 0}, {originalIndex: 1, doSplit: true}, {originalIndex: 2}, {originalIndex: undefined, doSplit: true}, {originalIndex: 3}]
+
+        // Lets change 'originalIndex' to the actual node id first:
+        for (const element of splitInfo) {
+            if (element.originalIndex >= 0) {
+                element.originalIndex = originalElement.nodes[element.originalIndex]
+            } else {
+                element.originalIndex = changes.getNewID();
+            }
+        }
+
+        // Next up is creating actual parts from this
+        const wayParts: SplitInfo[][] = SplitAction.SegmentSplitInfo(splitInfo);
+        // Allright! At this point, we have our new ways!
+        // Which one is the longest of them (and can keep the id)?
+
+        let longest = undefined;
+        for (const wayPart of wayParts) {
+            if (longest === undefined) {
+                longest = wayPart;
+                continue
+            }
+            if (wayPart.length > longest.length) {
+                longest = wayPart
+            }
+        }
+
+        const changeDescription: ChangeDescription[] = []
+        // Let's create the new points as needed
+        for (const element of splitInfo) {
+            if (element.originalIndex >= 0) {
+                continue;
+            }
+            changeDescription.push({
+                type: "node",
+                id: element.originalIndex,
+                changes: {
+                    lon: element.lngLat[0],
+                    lat: element.lngLat[1]
+                }
+            })
+        }
+
+        const newWayIds: number[] = []
+        // Lets create OsmWays based on them
+        for (const wayPart of wayParts) {
+
+            let isOriginal = wayPart === longest
+            if (isOriginal) {
+                // We change the actual element!
+                changeDescription.push({
+                    type: "way",
+                    id: originalElement.id,
+                    changes: {
+                        locations: wayPart.map(p => p.lngLat),
+                        nodes: wayPart.map(p => p.originalIndex)
+                    }
+                })
+            } else {
+                let id = changes.getNewID();
+                newWayIds.push(id)
+
+                const kv = []
+                for (const k in originalElement.tags) {
+                    if (!originalElement.tags.hasOwnProperty(k)) {
+                        continue
+                    }
+                    if (k.startsWith("_") || k === "id") {
+                        continue;
+                    }
+                    kv.push({k: k, v: originalElement.tags[k]})
+                }
+                changeDescription.push({
+                    type: "way",
+                    id: id,
+                    tags: kv,
+                    changes: {
+                        locations: wayPart.map(p => p.lngLat),
+                        nodes: wayPart.map(p => p.originalIndex)
+                    }
+                })
+            }
+
+        }
+
+        // At last, we still have to check that we aren't part of a relation...
+        // At least, the order of the ways is identical, so we can keep the same roles
+        changeDescription.push(...new RelationSplitlHandler(partOf, newWayIds, originalNodes).CreateChangeDescriptions(changes))
+
+        // And we have our objects!
+        // Time to upload
+
+        return changeDescription
+    }
+
+    /**
+     * Calculates the actual points to split
+     * If another point is closer then ~5m, we reuse that point
+     */
+    private CalculateSplitCoordinates(
+        splitPoints: any[],
+        toleranceInM = 5): SplitInfo[] {
+
+        const allPoints = [...splitPoints];
+        // We have a bunch of coordinates here: [ [lat, lon], [lat, lon], ...] ...
+        const originalPoints: [number, number][] = this.roadObject.geometry.coordinates
+        // We project them onto the line (which should yield pretty much the same point
+        for (let i = 0; i < originalPoints.length; i++) {
+            let originalPoint = originalPoints[i];
+            let projected = GeoOperations.nearestPoint(this.roadObject, originalPoint)
+            projected.properties["_is_split_point"] = false
+            projected.properties["_original_index"] = i
+            allPoints.push(projected)
+        }
+        // At this point, we have a list of both the split point and the old points, with some properties to discriminate between them
+        // We sort this list so that the new points are at the same location
+        allPoints.sort((a, b) => a.properties.location - b.properties.location)
+
+        // When this is done, we check that no now point is too close to an already existing point and no very small segments get created
+
+        /*   for (let i = allPoints.length - 1; i > 0; i--) {
+   
+               const point = allPoints[i];
+               if (point.properties._original_index !== undefined) {
+                   // This point is already in OSM - we have to keep it!
+                   continue;
+               }
+   
+               if (i != allPoints.length - 1) {
+                   const prevPoint = allPoints[i + 1]
+                   const diff = Math.abs(point.properties.location - prevPoint.properties.location) * 1000
+                   if (diff <= toleranceInM) {
+                       // To close to the previous point! We delete this point...
+                       allPoints.splice(i, 1)
+                       // ... and mark the previous point as a split point
+                       prevPoint.properties._is_split_point = true
+                       continue;
+                   }
+               }
+   
+               if (i > 0) {
+                   const nextPoint = allPoints[i - 1]
+                   const diff = Math.abs(point.properties.location - nextPoint.properties.location) * 1000
+                   if (diff <= toleranceInM) {
+                       // To close to the next point! We delete this point...
+                       allPoints.splice(i, 1)
+                       // ... and mark the next point as a split point
+                       nextPoint.properties._is_split_point = true
+                       // noinspection UnnecessaryContinueJS
+                       continue;
+                   }
+               }
+               // We don't have to remove this point...
+           }*/
+
+        const splitInfo: SplitInfo[] = []
+        let nextId = -1
+
+        for (const p of allPoints) {
+            let index = p.properties._original_index
+            if (index === undefined) {
+                index = nextId;
+                nextId--;
+            }
+            const splitInfoElement = {
+                originalIndex: index,
+                lngLat: p.geometry.coordinates,
+                doSplit: p.properties._is_split_point
+            }
+            splitInfo.push(splitInfoElement)
+        }
+
+        return splitInfo
+    }
+
+
+}

Logic/Osm/Changes.ts

@@ -1,81 +1,233 @@
-import {OsmNode, OsmObject} from "./OsmObject";
+import {OsmNode, OsmObject, OsmRelation, OsmWay} from "./OsmObject";
 import State from "../../State";
-import {Utils} from "../../Utils";
 import {UIEventSource} from "../UIEventSource";
 import Constants from "../../Models/Constants";
-import FeatureSource from "../FeatureSource/FeatureSource";
-import {TagsFilter} from "../Tags/TagsFilter";
-import {Tag} from "../Tags/Tag";
-import {OsmConnection} from "./OsmConnection";
+import OsmChangeAction from "./Actions/OsmChangeAction";
+import {ChangeDescription} from "./Actions/ChangeDescription";
+import {Utils} from "../../Utils";
 import {LocalStorageSource} from "../Web/LocalStorageSource";
 
 /**
  * Handles all changes made to OSM.
  * Needs an authenticator via OsmConnection
  */
-export class Changes implements FeatureSource {
+export class Changes {
 
 
     private static _nextId = -1; // Newly assigned ID's are negative
     public readonly name = "Newly added features"
     /**
-     * The newly created points, as a FeatureSource
+     * All the newly created features as featureSource + all the modified features
      */
     public features = new UIEventSource<{ feature: any, freshness: Date }[]>([]);
-    /**
-     * All the pending changes
-     */
-    public readonly pending = LocalStorageSource.GetParsed<{ elementId: string, key: string, value: string }[]>("pending-changes", [])
-
-    /**
-     * All the pending new objects to upload
-     */
-    private readonly newObjects = LocalStorageSource.GetParsed<{ id: number, lat: number, lon: number }[]>("newObjects", [])
 
+    public readonly pendingChanges = LocalStorageSource.GetParsed<ChangeDescription[]>("pending-changes", [])
     private readonly isUploading = new UIEventSource(false);
+    
+    private readonly previouslyCreated : OsmObject[] = []
 
-    /**
-     * Adds a change to the pending changes
-     */
-    private static checkChange(kv: { k: string, v: string }): { k: string, v: string } {
-        const key = kv.k;
-        const value = kv.v;
-        if (key === undefined || key === null) {
-            console.log("Invalid key");
-            return undefined;
-        }
-        if (value === undefined || value === null) {
-            console.log("Invalid value for ", key);
-            return undefined;
-        }
-
-        if (key.startsWith(" ") || value.startsWith(" ") || value.endsWith(" ") || key.endsWith(" ")) {
-            console.warn("Tag starts with or ends with a space - trimming anyway")
-        }
-
-        return {k: key.trim(), v: value.trim()};
+    constructor() {
+       
     }
 
+    private static createChangesetFor(csId: string,
+                                     allChanges: {
+                                         modifiedObjects: OsmObject[],
+                                         newObjects: OsmObject[],
+                                         deletedObjects: OsmObject[]
+                                     }): string {
 
-    addTag(elementId: string, tagsFilter: TagsFilter,
-           tags?: UIEventSource<any>) {
-        const eventSource = tags ?? State.state?.allElements.getEventSourceById(elementId);
-        const elementTags = eventSource.data;
-        const changes = tagsFilter.asChange(elementTags).map(Changes.checkChange)
-        if (changes.length == 0) {
-            return;
+        const changedElements = allChanges.modifiedObjects ?? []
+        const newElements = allChanges.newObjects ?? []
+        const deletedElements = allChanges.deletedObjects ?? []
+
+        let changes = `<osmChange version='0.6' generator='Mapcomplete ${Constants.vNumber}'>`;
+        if (newElements.length > 0) {
+            changes +=
+                "\n<create>\n" +
+                newElements.map(e => e.ChangesetXML(csId)).join("\n") +
+                "</create>";
+        }
+        if (changedElements.length > 0) {
+            changes +=
+                "\n<modify>\n" +
+                changedElements.map(e => e.ChangesetXML(csId)).join("\n") +
+                "\n</modify>";
         }
 
+        if (deletedElements.length > 0) {
+            changes +=
+                "\n<deleted>\n" +
+                deletedElements.map(e => e.ChangesetXML(csId)).join("\n") +
+                "\n</deleted>"
+        }
+
+        changes += "</osmChange>";
+        return changes;
+    }
+
+    private static GetNeededIds(changes: ChangeDescription[]) {
+        return Utils.Dedup(changes.filter(c => c.id >= 0)
+            .map(c => c.type + "/" + c.id))
+    }
+
+    private CreateChangesetObjects(changes: ChangeDescription[], downloadedOsmObjects: OsmObject[]): {
+        newObjects: OsmObject[],
+        modifiedObjects: OsmObject[]
+        deletedObjects: OsmObject[]
+
+    } {
+        const objects: Map<string, OsmObject> = new Map<string, OsmObject>()
+        const states: Map<string, "unchanged" | "created" | "modified" | "deleted"> = new Map();
+
+        for (const o of downloadedOsmObjects) {
+            objects.set(o.type + "/" + o.id, o)
+            states.set(o.type + "/" + o.id, "unchanged")
+        }
+
+        for (const o of this.previouslyCreated) {
+            objects.set(o.type + "/" + o.id, o) 
+            states.set(o.type + "/" + o.id, "unchanged")
+        }
+
+        let changed = false;
         for (const change of changes) {
-            if (elementTags[change.k] !== change.v) {
-                elementTags[change.k] = change.v;
-                console.log("Applied ", change.k, "=", change.v)
-                // We use 'elementTags.id' here, as we might have retrieved with the id 'node/-1' as new point, but should use the rewritten id
-                this.pending.data.push({elementId: elementTags.id, key: change.k, value: change.v});
+            const id = change.type + "/" + change.id
+            if (!objects.has(id)) {
+                if(change.id >= 0){
+                    throw "Did not get an object that should be known: "+id
+                }
+                // This is a new object that should be created
+                states.set(id, "created")
+                console.log("Creating object for changeDescription", change)
+                let osmObj: OsmObject = undefined;
+                switch (change.type) {
+                    case "node":
+                        const n = new OsmNode(change.id)
+                        n.lat = change.changes["lat"]
+                        n.lon = change.changes["lon"]
+                        osmObj = n
+                        break;
+                    case "way":
+                        const w = new OsmWay(change.id)
+                        w.nodes = change.changes["nodes"]
+                        osmObj = w
+                        break;
+                    case "relation":
+                        const r = new OsmRelation(change.id)
+                        r.members = change.changes["members"]
+                        osmObj = r
+                        break;
+                }
+                if (osmObj === undefined) {
+                    throw "Hmm? This is a bug"
+                }
+                objects.set(id, osmObj)
+                this.previouslyCreated.push(osmObj)
+            }
+
+            const state = states.get(id)
+            if (change.doDelete) {
+                if (state === "created") {
+                    states.set(id, "unchanged")
+                } else {
+                    states.set(id, "deleted")
+                }
+            }
+
+            const obj = objects.get(id)
+            // Apply tag changes
+            for (const kv of change.tags ?? []) {
+                const k = kv.k
+                let v = kv.v
+
+                if (v === "") {
+                    v = undefined;
+                }
+
+                const oldV = obj.type[k]
+                if (oldV === v) {
+                    continue;
+                }
+
+                obj.tags[k] = v;
+                changed = true;
+
+
+            }
+
+            if (change.changes !== undefined) {
+                switch (change.type) {
+                    case "node":
+                        // @ts-ignore
+                        const nlat = change.changes.lat;
+                        // @ts-ignore
+                        const nlon = change.changes.lon;
+                        const n = <OsmNode>obj
+                        if (n.lat !== nlat || n.lon !== nlon) {
+                            n.lat = nlat;
+                            n.lon = nlon;
+                            changed = true;
+                        }
+                        break;
+                    case "way":
+                        const nnodes = change.changes["nodes"]
+                        const w = <OsmWay>obj
+                        if (!Utils.Identical(nnodes, w.nodes)) {
+                            w.nodes = nnodes
+                            changed = true;
+                        }
+                        break;
+                    case "relation":
+                        const nmembers: { type: "node" | "way" | "relation", ref: number, role: string }[] = change.changes["members"]
+                        const r = <OsmRelation>obj
+                        if (!Utils.Identical(nmembers, r.members, (a, b) => {
+                            return a.role === b.role && a.type === b.type && a.ref === b.ref
+                        })) {
+                            r.members = nmembers;
+                            changed = true;
+                        }
+                        break;
+
+                }
+               
+            }
+
+            if (changed && state === "unchanged") {
+                states.set(id, "modified")
             }
         }
-        this.pending.ping();
-        eventSource.ping();
+
+
+        const result = {
+            newObjects: [],
+            modifiedObjects: [],
+            deletedObjects: []
+        }
+        
+        objects.forEach((v, id) => {
+
+            const state = states.get(id)
+            if (state === "created") {
+                result.newObjects.push(v)
+            }
+            if (state === "modified") {
+                result.modifiedObjects.push(v)
+            }
+            if (state === "deleted") {
+                result.deletedObjects.push(v)
+            }
+
+        })
+
+        return result
+    }
+
+    /**
+     * Returns a new ID and updates the value for the next ID
+     */
+    public getNewID() {
+        return Changes._nextId--;
     }
 
     /**
@@ -83,194 +235,65 @@ export class Changes implements FeatureSource {
      * Triggered by the 'PendingChangeUploader'-actor in Actors
      */
     public flushChanges(flushreason: string = undefined) {
-        if (this.pending.data.length === 0) {
+        if (this.pendingChanges.data.length === 0) {
             return;
         }
-        if (flushreason !== undefined) {
-            console.log(flushreason)
-        }
-        this.uploadAll();
-    }
-
-    /**
-     * Create a new node element at the given lat/long.
-     * An internal OsmObject is created to upload later on, a geojson represention is returned.
-     * Note that the geojson version shares the tags (properties) by pointer, but has _no_ id in properties
-     */
-    public createElement(basicTags: Tag[], lat: number, lon: number) {
-        console.log("Creating a new element with ", basicTags)
-        const newId = Changes._nextId;
-        Changes._nextId--;
-
-        const id = "node/" + newId;
-
-
-        const properties = {id: id};
-
-        const geojson = {
-            "type": "Feature",
-            "properties": properties,
-            "id": id,
-            "geometry": {
-                "type": "Point",
-                "coordinates": [
-                    lon,
-                    lat
-                ]
-            }
-        }
-
-        // The basictags are COPIED, the id is included in the properties
-        // The tags are not yet written into the OsmObject, but this is applied onto a 
-        const changes = [];
-        for (const kv of basicTags) {
-            if (typeof kv.value !== "string") {
-                throw "Invalid value: don't use a regex in a preset"
-            }
-            properties[kv.key] = kv.value;
-            changes.push({elementId: id, key: kv.key, value: kv.value})
-        }
-
-        console.log("New feature added and pinged")
-        this.features.data.push({feature: geojson, freshness: new Date()});
-        this.features.ping();
-
-        State.state.allElements.addOrGetElement(geojson).ping();
-
-        if (State.state.osmConnection.userDetails.data.backend !== OsmConnection.oauth_configs.osm.url) {
-            properties["_backend"] = State.state.osmConnection.userDetails.data.backend
-        }
-
-
-        this.newObjects.data.push({id: newId, lat: lat, lon: lon})
-        this.pending.data.push(...changes)
-        this.pending.ping();
-        this.newObjects.ping();
-        return geojson;
-    }
-
-    private uploadChangesWithLatestVersions(
-        knownElements: OsmObject[]) {
-        const knownById = new Map<string, OsmObject>();
-        knownElements.forEach(knownElement => {
-            knownById.set(knownElement.type + "/" + knownElement.id, knownElement)
-        })
-
-        const newElements: OsmNode [] = this.newObjects.data.map(spec => {
-            const newElement = new OsmNode(spec.id);
-            newElement.lat = spec.lat;
-            newElement.lon = spec.lon;
-            return newElement
-        })
-
-
-        // Here, inside the continuation, we know that all 'neededIds' are loaded in 'knownElements', which maps the ids onto the elements
-        // We apply the changes on them
-        for (const change of this.pending.data) {
-            if (parseInt(change.elementId.split("/")[1]) < 0) {
-                // This is a new element - we should apply this on one of the new elements
-                for (const newElement of newElements) {
-                    if (newElement.type + "/" + newElement.id === change.elementId) {
-                        newElement.addTag(change.key, change.value);
-                    }
-                }
-            } else {
-                knownById.get(change.elementId).addTag(change.key, change.value);
-            }
-        }
-
-        // Small sanity check for duplicate information
-        let changedElements = [];
-        for (const elementId in knownElements) {
-            const element = knownElements[elementId];
-            if (element.changed) {
-                changedElements.push(element);
-            }
-        }
-        if (changedElements.length == 0 && newElements.length == 0) {
-            console.log("No changes in any object - clearing");
-            this.pending.setData([])
-            this.newObjects.setData([])
-            return;
-        }
-        const self = this;
-
+        
         if (this.isUploading.data) {
+            console.log("Is already uploading... Abort")
             return;
         }
+        
+      
         this.isUploading.setData(true)
-
-        console.log("Beginning upload...");
+       
+        console.log("Beginning upload... "+flushreason ?? "");
         // At last, we build the changeset and upload
-        State.state.osmConnection.UploadChangeset(
-            State.state.layoutToUse.data,
-            State.state.allElements,
-            function (csId) {
-
-                let modifications = "";
-                for (const element of changedElements) {
-                    if (!element.changed) {
-                        continue;
-                    }
-                    modifications += element.ChangesetXML(csId) + "\n";
-                }
-
-
-                let creations = "";
-                for (const newElement of newElements) {
-                    creations += newElement.ChangesetXML(csId);
-                }
-
-
-                let changes = `<osmChange version='0.6' generator='Mapcomplete ${Constants.vNumber}'>`;
-
-                if (creations.length > 0) {
-                    changes +=
-                        "<create>" +
-                        creations +
-                        "</create>";
-                }
-
-                if (modifications.length > 0) {
-                    changes +=
-                        "<modify>\n" +
-                        modifications +
-                        "\n</modify>";
-                }
-
-                changes += "</osmChange>";
-
-                return changes;
-            },
-            () => {
-                console.log("Upload successfull!")
-                self.newObjects.setData([])
-                self.pending.setData([]);
-                self.isUploading.setData(false)
-            },
-            () => self.isUploading.setData(false)
-        );
-    };
-
-
-    private uploadAll() {
         const self = this;
+        const pending = self.pendingChanges.data;
+        const neededIds =  Changes.GetNeededIds(pending)
+        console.log("Needed ids", neededIds)
+        OsmObject.DownloadAll(neededIds, true).addCallbackAndRunD(osmObjects => {
+            console.log("Got the fresh objects!", osmObjects, "pending: ", pending)
+            const changes: {
+                newObjects: OsmObject[],
+                modifiedObjects: OsmObject[]
+                deletedObjects: OsmObject[]
 
-        const pending = this.pending.data;
-        let neededIds: string[] = [];
-        for (const change of pending) {
-            const id = change.elementId;
-            if (parseFloat(id.split("/")[1]) < 0) {
-                // New element - we don't have to download this
-            } else {
-                neededIds.push(id);
+            }  = self.CreateChangesetObjects(pending, osmObjects)
+            if (changes.newObjects.length + changes.deletedObjects.length + changes.modifiedObjects.length === 0) {
+                console.log("No changes to be made")
+                self.pendingChanges.setData([])
+                self.isUploading.setData(false)
+                return true; // Unregister the callback
             }
-        }
 
-        neededIds = Utils.Dedup(neededIds);
-        OsmObject.DownloadAll(neededIds).addCallbackAndRunD(knownElements => {
-            self.uploadChangesWithLatestVersions(knownElements)
-        })
+
+            State.state.osmConnection.UploadChangeset(
+                State.state.layoutToUse.data,
+                State.state.allElements,
+                (csId) => Changes.createChangesetFor(csId, changes),
+                () => {
+                    console.log("Upload successfull!")
+                    self.pendingChanges.setData([]);
+                    self.isUploading.setData(false)
+                },
+                () => {
+                    console.log("Upload failed - trying again later")
+                    return self.isUploading.setData(false);
+                } // Failed - mark to try again
+            )
+            return true;
+
+        });
+
+
     }
 
+    public applyAction(action: OsmChangeAction) {
+        const changes = action.Perform(this)
+        console.log("Received changes:", changes)
+        this.pendingChanges.data.push(...changes);
+        this.pendingChanges.ping();
+    }
 }

Logic/Osm/ChangesetHandler.ts

@@ -53,6 +53,8 @@ export class ChangesetHandler {
                 element.ping();
 
             }
+
+
         }
     }
 

Logic/Osm/OsmObject.ts

@@ -23,7 +23,7 @@ export abstract class OsmObject {
         this.id = id;
         this.type = type;
         this.tags = {
-            id: id
+            id: `${this.type}/${id}`
         }
     }
 
@@ -51,7 +51,10 @@ export abstract class OsmObject {
         }
         const splitted = id.split("/");
         const type = splitted[0];
-        const idN = splitted[1];
+        const idN = Number(splitted[1]);
+        if(idN <0){
+            return;
+        }
 
         OsmObject.objectCache.set(id, src);
         const newContinuation = (element: OsmObject) => {
@@ -68,6 +71,8 @@ export abstract class OsmObject {
             case("relation"):
                 new OsmRelation(idN).Download(newContinuation);
                 break;
+            default:
+                throw "Invalid object type:" + type + id;
 
         }
         return src;
@@ -103,7 +108,7 @@ export abstract class OsmObject {
         if (OsmObject.referencingRelationsCache.has(id)) {
             return OsmObject.referencingRelationsCache.get(id);
         }
-        const relsSrc = new UIEventSource<OsmRelation[]>([])
+        const relsSrc = new UIEventSource<OsmRelation[]>(undefined)
         OsmObject.referencingRelationsCache.set(id, relsSrc);
         Utils.downloadJson(`${OsmObject.backendURL}api/0.6/${id}/relations`)
             .then(data => {
@@ -123,7 +128,7 @@ export abstract class OsmObject {
         }
         const splitted = id.split("/");
         const type = splitted[0];
-        const idN = splitted[1];
+        const idN = Number(splitted[1]);
         const src = new UIEventSource<OsmObject[]>([]);
         OsmObject.historyCache.set(id, src);
         Utils.downloadJson(`${OsmObject.backendURL}api/0.6/${type}/${idN}/history`).then(data => {
@@ -312,20 +317,6 @@ export abstract class OsmObject {
         return this;
     }
 
-    public addTag(k: string, v: string): void {
-        if (k in this.tags) {
-            const oldV = this.tags[k];
-            if (oldV == v) {
-                return;
-            }
-            console.log("Overwriting ", oldV, " with ", v, " for key ", k)
-        }
-        this.tags[k] = v;
-        if (v === undefined || v === "") {
-            delete this.tags[k];
-        }
-        this.changed = true;
-    }
 
     abstract ChangesetXML(changesetId: string): string;
 
@@ -360,7 +351,7 @@ export class OsmNode extends OsmObject {
     lat: number;
     lon: number;
 
-    constructor(id) {
+    constructor(id: number) {
         super("node", id);
 
     }
@@ -368,9 +359,9 @@ export class OsmNode extends OsmObject {
     ChangesetXML(changesetId: string): string {
         let tags = this.TagsXML();
 
-        return '        <node id="' + this.id + '" changeset="' + changesetId + '" ' + this.VersionXML() + ' lat="' + this.lat + '" lon="' + this.lon + '">\n' +
+        return '    <node id="' + this.id + '" changeset="' + changesetId + '" ' + this.VersionXML() + ' lat="' + this.lat + '" lon="' + this.lon + '">\n' +
             tags +
-            '        </node>\n';
+            '    </node>\n';
     }
 
     SaveExtraData(element) {
@@ -413,9 +404,8 @@ export class OsmWay extends OsmObject {
     lat: number;
     lon: number;
 
-    constructor(id) {
+    constructor(id: number) {
         super("way", id);
-
     }
 
     centerpoint(): [number, number] {
@@ -432,7 +422,7 @@ export class OsmWay extends OsmObject {
         return '    <way id="' + this.id + '" changeset="' + changesetId + '" ' + this.VersionXML() + '>\n' +
             nds +
             tags +
-            '        </way>\n';
+            '    </way>\n';
     }
 
     SaveExtraData(element, allNodes: OsmNode[]) {
@@ -458,7 +448,7 @@ export class OsmWay extends OsmObject {
         this.nodes = element.nodes;
     }
 
-    asGeoJson() {
+    public asGeoJson() {
         return {
             "type": "Feature",
             "properties": this.tags,
@@ -480,11 +470,14 @@ export class OsmWay extends OsmObject {
 
 export class OsmRelation extends OsmObject {
 
-    members;
+    public members: {
+        type: "node" | "way" | "relation",
+        ref: number,
+        role: string
+    }[];
 
-    constructor(id) {
+    constructor(id: number) {
         super("relation", id);
-
     }
 
     centerpoint(): [number, number] {

Logic/Tags/Tag.ts

@@ -24,12 +24,19 @@ export class Tag extends TagsFilter {
 
     matchesProperties(properties: any): boolean {
         for (const propertiesKey in properties) {
+            if(!properties.hasOwnProperty(propertiesKey)){
+                continue
+            }
             if (this.key === propertiesKey) {
                 const value = properties[propertiesKey];
+                if(value === undefined){
+                    continue
+                }
                 return value === this.value;
             }
         }
         // The tag was not found
+        
         if (this.value === "") {
             // and it shouldn't be found!
             return true;

Logic/UIEventSource.ts

@@ -2,21 +2,27 @@ import {Utils} from "../Utils";
 
 export class UIEventSource<T> {
 
+    private static allSources: UIEventSource<any>[] = UIEventSource.PrepPerf();
     public data: T;
+    public trace: boolean;
     private readonly tag: string;
-    private _callbacks = [];
-    
-    private static allSources : UIEventSource<any>[] = UIEventSource.PrepPerf();
-    
-    static PrepPerf() : UIEventSource<any>[]{
-        if(Utils.runningFromConsole){
+    private _callbacks: ((t: T) => (boolean | void | any)) [] = [];
+
+    constructor(data: T, tag: string = "") {
+        this.tag = tag;
+        this.data = data;
+        UIEventSource.allSources.push(this);
+    }
+
+    static PrepPerf(): UIEventSource<any>[] {
+        if (Utils.runningFromConsole) {
             return [];
         }
         // @ts-ignore
         window.mapcomplete_performance = () => {
             console.log(UIEventSource.allSources.length, "uieventsources created");
             const copy = [...UIEventSource.allSources];
-            copy.sort((a,b) => b._callbacks.length - a._callbacks.length);
+            copy.sort((a, b) => b._callbacks.length - a._callbacks.length);
             console.log("Topten is:")
             for (let i = 0; i < 10; i++) {
                 console.log(copy[i].tag, copy[i]);
@@ -26,12 +32,6 @@ export class UIEventSource<T> {
         return [];
     }
 
-    constructor(data: T, tag: string = "") {
-        this.tag = tag;
-        this.data = data;
-        UIEventSource.allSources.push(this);
-    }
-
     public static flatten<X>(source: UIEventSource<UIEventSource<X>>, possibleSources: UIEventSource<any>[]): UIEventSource<X> {
         const sink = new UIEventSource<X>(source.data?.data);
 
@@ -63,11 +63,20 @@ export class UIEventSource<T> {
 
     }
 
-    public addCallback(callback: ((latestData: T) => void)): UIEventSource<T> {
+    /**
+     * Adds a callback
+     *
+     * If the result of the callback is 'true', the callback is considered finished and will be removed again
+     * @param callback
+     */
+    public addCallback(callback: ((latestData: T) => (boolean | void | any))): UIEventSource<T> {
         if (callback === console.log) {
             // This ^^^ actually works!
             throw "Don't add console.log directly as a callback - you'll won't be able to find it afterwards. Wrap it in a lambda instead."
         }
+        if (this.trace) {
+            console.trace("Added a callback")
+        }
         this._callbacks.push(callback);
         return this;
     }
@@ -87,8 +96,21 @@ export class UIEventSource<T> {
     }
 
     public ping(): void {
+        let toDelete = undefined
         for (const callback of this._callbacks) {
-            callback(this.data);
+            if (callback(this.data) === true) {
+                // This callback wants to be deleted
+                if (toDelete === undefined) {
+                    toDelete = [callback]
+                } else {
+                    toDelete.push(callback)
+                }
+            }
+        }
+        if (toDelete !== undefined) {
+            for (const toDeleteElement of toDelete) {
+                this._callbacks.splice(this._callbacks.indexOf(toDeleteElement), 1)
+            }
         }
     }
 
@@ -101,12 +123,12 @@ export class UIEventSource<T> {
      */
     public map<J>(f: ((t: T) => J),
                   extraSources: UIEventSource<any>[] = [],
-                  g: ((j:J, t:T) => T) = undefined): UIEventSource<J> {
+                  g: ((j: J, t: T) => T) = undefined): UIEventSource<J> {
         const self = this;
 
         const newSource = new UIEventSource<J>(
             f(this.data),
-            "map("+this.tag+")"
+            "map(" + this.tag + ")"
         );
 
         const update = function () {
@@ -159,10 +181,10 @@ export class UIEventSource<T> {
         return newSource;
     }
 
-    addCallbackAndRunD(callback: (data :T ) => void) {
+    addCallbackAndRunD(callback: (data: T) => void) {
         this.addCallbackAndRun(data => {
-            if(data !== undefined && data !== null){
-                callback(data)
+            if (data !== undefined && data !== null) {
+              return  callback(data)
             }
         })
     }