diff --git a/Logic/FeatureSource/FeatureSourceMerger.ts b/Logic/FeatureSource/FeatureSourceMerger.ts index 9ceef44298..e9901d1f5b 100644 --- a/Logic/FeatureSource/FeatureSourceMerger.ts +++ b/Logic/FeatureSource/FeatureSourceMerger.ts @@ -27,7 +27,7 @@ export default class FeatureSourceMerger implements FeatureSource { // We seed the dictionary with the previously loaded features const oldValues = this.features.data ?? []; for (const oldValue of oldValues) { - all.set(oldValue.feature.id, oldValue) + all.set(oldValue.feature.id + oldValue.feature._matching_layer_id, oldValue) } for (const source of this._sources) { @@ -35,7 +35,7 @@ export default class FeatureSourceMerger implements FeatureSource { continue; } for (const f of source.features.data) { - const id = f.feature.properties.id; + const id = f.feature.properties.id + f.feature._matching_layer_id; if (!all.has(id)) { // This is a new feature somethingChanged = true; diff --git a/Logic/FeatureSource/RememberingSource.ts b/Logic/FeatureSource/RememberingSource.ts index b77e613ace..c840aecba5 100644 --- a/Logic/FeatureSource/RememberingSource.ts +++ b/Logic/FeatureSource/RememberingSource.ts @@ -20,9 +20,9 @@ export default class RememberingSource implements FeatureSource { } // Then new ids - const ids = new Set(features.map(f => f.feature.properties.id + f.feature.geometry.type)); + const ids = new Set(features.map(f => f.feature.properties.id + f.feature.geometry.type + f.feature._matching_layer_id)); // the old data - const oldData = oldFeatures.filter(old => !ids.has(old.feature.properties.id + old.feature.geometry.type)) + const oldData = oldFeatures.filter(old => !ids.has(old.feature.properties.id + old.feature.geometry.type + old.feature._matching_layer_id)) return [...features, ...oldData]; }) } diff --git a/Models/Constants.ts b/Models/Constants.ts index 61bb8d3fc7..a350603c75 100644 --- a/Models/Constants.ts +++ b/Models/Constants.ts @@ -2,7 +2,7 @@ import { Utils } from "../Utils"; export default class Constants { - public static vNumber = "0.7.5a"; + public static vNumber = "0.7.5b"; // The user journey states thresholds when a new feature gets unlocked public static userJourney = {