Further development of split-road feature; refactoring of change-handling

Logic/FeatureSource/ChangeApplicator.ts

@@ -0,0 +1,138 @@
+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) {
+
+        this.name = "ChangesApplied(" + source.name + ")"
+        this.features = source.features
+
+        source.features.addCallbackAndRunD(features => {
+            ChangeApplicator.ApplyChanges(features, changes.pendingChanges.data)
+        })
+
+        changes.pendingChanges.addCallbackAndRunD(changes => {
+            ChangeApplicator.ApplyChanges(source.features.data, changes)
+            source.features.ping()
+        })
+
+
+    }
+
+
+    private static ApplyChanges(features: { feature: any, freshness: Date }[], cs: ChangeDescription[]) {
+        if (cs.length === 0 || features === undefined) {
+            return features;
+        }
+
+        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) {
+            features.push({
+                feature: feature,
+                freshness: now
+            })
+        }
+
+        // First, create the new features - they have a negative ID
+        // We don't set the properties yet though
+        changesPerId.forEach(cs => {
+            cs.forEach(change => {
+                if (change.id >= 0) {
+                    return; // Nothing to do here, already created
+                }
+
+
+                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 id = feature.feature.properties.id;
+            const f = feature.feature;
+            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
+                    const k = kv.k
+                    let v = kv.v
+                    if (v === "") {
+                        v = undefined;
+                    }
+                    f.properties[k] = v;
+                }
+
+                // Apply other changes to the object
+                if (change.changes !== undefined) {
+                    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;
+                    }
+                }
+            }
+        }
+    }
+}

Logic/FeatureSource/FeaturePipeline.ts

@@ -13,6 +13,8 @@ import Loc from "../../Models/Loc";
 import GeoJsonSource from "./GeoJsonSource";
 import MetaTaggingFeatureSource from "./MetaTaggingFeatureSource";
 import RegisteringFeatureSource from "./RegisteringFeatureSource";
+import {Changes} from "../Osm/Changes";
+import ChangeApplicator from "./ChangeApplicator";
 
 export default class FeaturePipeline implements FeatureSource {
 
@@ -21,10 +23,10 @@ export default class FeaturePipeline implements FeatureSource {
     public readonly name = "FeaturePipeline"
 
     constructor(flayers: UIEventSource<{ isDisplayed: UIEventSource<boolean>, layerDef: LayerConfig }[]>,
+                changes: Changes,
                 updater: FeatureSource,
                 fromOsmApi: FeatureSource,
                 layout: UIEventSource<LayoutConfig>,
-                newPoints: FeatureSource,
                 locationControl: UIEventSource<Loc>,
                 selectedElement: UIEventSource<any>) {
 
@@ -40,13 +42,16 @@ export default class FeaturePipeline implements FeatureSource {
                     new MetaTaggingFeatureSource(allLoadedFeatures,
                         new FeatureDuplicatorPerLayer(flayers,
                             new RegisteringFeatureSource(
-                                updater)
+                                new ChangeApplicator(
+                                    updater, changes
+                                ))
                         )), layout));
 
         const geojsonSources: FeatureSource [] = GeoJsonSource
             .ConstructMultiSource(flayers.data, locationControl)
             .map(geojsonSource => {
-                let source = new RegisteringFeatureSource(new FeatureDuplicatorPerLayer(flayers, geojsonSource));
+                let source = new RegisteringFeatureSource(new FeatureDuplicatorPerLayer(flayers, 
+                    new ChangeApplicator(geojsonSource, changes)));
                 if(!geojsonSource.isOsmCache){
                     source = new MetaTaggingFeatureSource(allLoadedFeatures, source, updater.features);
                 }
@@ -54,25 +59,19 @@ 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)))));
 
         const merged =
             new FeatureSourceMerger([
                 amendedOverpassSource,
                 amendedOsmApiSource,
                 amendedLocalStorageSource,
-                newPoints,
                 ...geojsonSources
             ]);