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

Ignore non-string objects in image rewriting

Browse source
This commit is contained in:
pietervdvn 2022-02-28 20:49:48 +01:00
parent 8ae679d075
commit 191248a1ab
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Models/ThemeConfig/Conversion/FixImages.ts
View file

@ -116,7 +116,7 @@ export class FixImages extends DesugaringStep<LayoutConfigJson> {
this._knownImages = knownImages;
}
convert(json: LayoutConfigJson, context: string): { result: LayoutConfigJson } {
convert(json: LayoutConfigJson, context: string): { result: LayoutConfigJson, warnings?: [] } {
let url: URL;
try {
url = new URL(json.id)
@ -125,6 +125,7 @@ export class FixImages extends DesugaringStep<LayoutConfigJson> {
return {result: json}
}
const warnings = []
const absolute = url.protocol + "//" + url.host
let relative = url.protocol + "//" + url.host + url.pathname
relative = relative.substring(0, relative.lastIndexOf("/"))
@ -134,6 +135,12 @@ export class FixImages extends DesugaringStep<LayoutConfigJson> {
if (self._knownImages.has(leaf)) {
return leaf;
}
if(typeof leaf !== "string"){
warnings.push("Found a non-string object while replacing images: "+JSON.stringify(leaf))
return leaf;
}
if (leaf.startsWith("./")) {
return relative + leaf.substring(1)
}
@ -178,6 +185,7 @@ export class FixImages extends DesugaringStep<LayoutConfigJson> {
return {
warnings,
result: json
};
}