Robin-van-der-Linde/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge branch 'develop' into feature/disable-questions

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-10-09 00:01:38 +02:00
commit 7cd886b082
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/Logic/Osm/OsmPreferences.ts
View file

@ -41,7 +41,7 @@ export class OsmPreferences {
private initPreference(key: string, value: string = undefined): UIEventSource<string> { private initPreference(key: string, value: string = undefined): UIEventSource<string> {
if (this.preferences[key] !== undefined) { if (this.preferences[key] !== undefined) {
if(value !== undefined){ if (value !== undefined) {
this.preferences[key].set(value) this.preferences[key].set(value)
} }
return this.preferences[key] return this.preferences[key]
@ -62,6 +62,9 @@ export class OsmPreferences {
this.seenKeys = Object.keys(prefs) this.seenKeys = Object.keys(prefs)
const legacy = OsmPreferences.getLegacyCombinedItems(prefs) const legacy = OsmPreferences.getLegacyCombinedItems(prefs)
const merged = OsmPreferences.mergeDict(prefs) const merged = OsmPreferences.mergeDict(prefs)
if(Object.keys(legacy).length > 0){
await this.removeLegacy(legacy)
}
for (const key in merged) { for (const key in merged) {
this.initPreference(key, prefs[key]) this.initPreference(key, prefs[key])
} }
@ -119,6 +122,15 @@ export class OsmPreferences {
this.removeAllWithPrefix("") this.removeAllWithPrefix("")
} }
public async removeLegacy(legacyDict: Record<string, string>) {
for (const k in legacyDict) {
const v = legacyDict[k]
console.log("Upgrading legacy preference",k )
await this.removeAllWithPrefix(k)
this.osmConnection.getPreference(k).set(v)
}
}
/** /**
* *
* OsmPreferences.mergeDict({abc: "123", def: "123", "def:0": "456", "def:1":"789"}) // => {abc: "123", def: "123456789"} * OsmPreferences.mergeDict({abc: "123", def: "123", "def:0": "456", "def:1":"789"}) // => {abc: "123", def: "123456789"}
@ -129,7 +141,7 @@ export class OsmPreferences {
const allKeys: string[] = Object.keys(dict) const allKeys: string[] = Object.keys(dict)
const normalKeys = allKeys.filter(k => !k.match(/[a-z-_0-9A-Z]*:[0-9]+/)) const normalKeys = allKeys.filter(k => !k.match(/[a-z-_0-9A-Z]*:[0-9]+/))
for (const normalKey of normalKeys) { for (const normalKey of normalKeys) {
if(normalKey.match(/-combined-[0-9]*$/) || normalKey.match(/-combined-length$/)){ if (normalKey.match(/-combined-[0-9]*$/) || normalKey.match(/-combined-length$/)) {
// Ignore legacy keys // Ignore legacy keys
continue continue
} }
@ -140,6 +152,7 @@ export class OsmPreferences {
return newDict return newDict
} }
/** /**
* Gets all items which have a 'combined'-string, the legacy long preferences * Gets all items which have a 'combined'-string, the legacy long preferences
* *
@ -158,7 +171,7 @@ export class OsmPreferences {
public static getLegacyCombinedItems(dict: Record<string, string>): Record<string, string> { public static getLegacyCombinedItems(dict: Record<string, string>): Record<string, string> {
const merged: Record<string, string> = {} const merged: Record<string, string> = {}
const keys = Object.keys(dict) const keys = Object.keys(dict)
const toCheck =Utils.NoNullInplace( Utils.Dedup(keys.map(k => k.match(/(.*)-combined-[0-9]+$/)?.[1]))) const toCheck = Utils.NoNullInplace(Utils.Dedup(keys.map(k => k.match(/(.*)-combined-[0-9]+$/)?.[1])))
for (const key of toCheck) { for (const key of toCheck) {
let i = 0 let i = 0
let str = "" let str = ""
@ -170,11 +183,10 @@ export class OsmPreferences {
} while (v !== undefined) } while (v !== undefined)
merged[key] = str merged[key] = str
} }
return merged return merged
} }
/** /**
* Bulk-downloads all preferences * Bulk-downloads all preferences
* @private * @private
@ -217,7 +229,7 @@ export class OsmPreferences {
* *
*/ */
private static keysStartingWith(allKeys: string[], key: string): string[] { private static keysStartingWith(allKeys: string[], key: string): string[] {
const keys = allKeys.filter(k => k === key || k.match(new RegExp(key + ":[0-9]+"))) const keys = allKeys.filter(k => k === key || k.match(new RegExp(key + ":[0-9]+")))
keys.sort() keys.sort()
return keys return keys
} }
@ -242,6 +254,7 @@ export class OsmPreferences {
while (v.length > 0) { while (v.length > 0) {
await this.uploadKeyDirectly(`${k}:${i}`, v.slice(0, 255)) await this.uploadKeyDirectly(`${k}:${i}`, v.slice(0, 255))
v = v.slice(255) v = v.slice(255)
i++
} }
} }
@ -333,12 +346,5 @@ export class OsmPreferences {
} }
} }
getExistingPreference(key: string, defaultValue: undefined, prefix: string): UIEventSource<string> {
if (prefix) {
key = prefix + key
}
key = key.replace(/[:/"' {}.%\\]/g, "")
return this.preferences[key]
}
} }