diff --git a/src/Models/ThemeConfig/Conversion/PrepareLayer.ts b/src/Models/ThemeConfig/Conversion/PrepareLayer.ts index cbaf06c28..4e37b063c 100644 --- a/src/Models/ThemeConfig/Conversion/PrepareLayer.ts +++ b/src/Models/ThemeConfig/Conversion/PrepareLayer.ts @@ -1,18 +1,6 @@ -import { - Concat, - DesugaringContext, - DesugaringStep, - Each, - FirstOf, - Fuse, - On, - SetDefault, -} from "./Conversion" +import { Concat, DesugaringContext, DesugaringStep, Each, FirstOf, Fuse, On, SetDefault } from "./Conversion" import { LayerConfigJson } from "../Json/LayerConfigJson" -import { - MinimalTagRenderingConfigJson, - TagRenderingConfigJson, -} from "../Json/TagRenderingConfigJson" +import { MinimalTagRenderingConfigJson, TagRenderingConfigJson } from "../Json/TagRenderingConfigJson" import { Utils } from "../../../Utils" import RewritableConfigJson from "../Json/RewritableConfigJson" import SpecialVisualizations from "../../../UI/SpecialVisualizations" @@ -262,6 +250,7 @@ export class AddQuestionBox extends DesugaringStep { /* At this point, we know which question labels are not yet handled and which already are handled, and we * know there is no previous catch-all questions */ + seen.add("hidden") const question: QuestionableTagRenderingConfigJson = { id: "leftover-questions", render: { @@ -879,7 +868,7 @@ export class AddRatingBadge extends DesugaringStep { const funcs = new Set(specialVis.map((rs) => rs.func.funcName)) if (funcs.has("list_reviews")) { - ;(<(string | TagRenderingConfigJson)[]>json.titleIcons).push("icons.rating") + (<(string | TagRenderingConfigJson)[]>json.titleIcons).push("icons.rating") } return json } diff --git a/src/UI/Popup/GroupedView.svelte b/src/UI/Popup/GroupedView.svelte index d77018af2..038b97c22 100644 --- a/src/UI/Popup/GroupedView.svelte +++ b/src/UI/Popup/GroupedView.svelte @@ -5,7 +5,6 @@ import type { OsmTags } from "../../Models/OsmFeature" import LayerConfig from "../../Models/ThemeConfig/LayerConfig" import AccordionSingle from "../Flowbite/AccordionSingle.svelte" - import SelectedElementView from "../BigComponents/SelectedElementView.svelte" import TagRenderingAnswer from "./TagRendering/TagRenderingAnswer.svelte" import TagRenderingEditableDynamic from "./TagRendering/TagRenderingEditableDynamic.svelte" import TagRenderingConfig from "../../Models/ThemeConfig/TagRenderingConfig" @@ -38,6 +37,8 @@ {#each trgs as config (config.id)} - + {#if config.IsKnown($tags) && (config.condition === undefined || config.condition.matchesProperties($tags))} + + {/if} {/each} diff --git a/src/UI/SpecialVisualisations/ImageVisualisations.ts b/src/UI/SpecialVisualisations/ImageVisualisations.ts index 3897331dd..64bf8e177 100644 --- a/src/UI/SpecialVisualisations/ImageVisualisations.ts +++ b/src/UI/SpecialVisualisations/ImageVisualisations.ts @@ -65,7 +65,7 @@ export class ImageVisualisations { args: [ { name: "image_key", - defaultValue: AllImageProviders.defaultKeys.join(","), + defaultValue: AllImageProviders.defaultKeys.join(";"), doc: "The keys given to the images, e.g. if image is given, the first picture URL will be added as image, the second as image:0, the third as image:1, etc... Multiple values are allowed if ';'-separated ", }, ], @@ -73,7 +73,7 @@ export class ImageVisualisations { constr: (state, tags, args) => { let imagePrefixes: string[] = undefined if (args.length > 0) { - imagePrefixes = [].concat(...args.map((a) => a.split(","))) + imagePrefixes = [].concat(...args.map((a) => a.split(";"))) } const images = AllImageProviders.loadImagesFor(tags, imagePrefixes) const estimated = tags.mapD((tags) => @@ -89,8 +89,9 @@ export class ImageVisualisations { needsUrls: [Imgur.apiUrl, ...Imgur.supportingUrls], args: [ { - name: "image-key", + name: "image_key", doc: "Image tag to add the URL to (or image-tag:0, image-tag:1 when multiple images are added)", + defaultValue: "panoramax", required: false, }, { diff --git a/src/UI/SpecialVisualisations/UISpecialVisualisations.ts b/src/UI/SpecialVisualisations/UISpecialVisualisations.ts index 1c6c2da11..57c5ebdff 100644 --- a/src/UI/SpecialVisualisations/UISpecialVisualisations.ts +++ b/src/UI/SpecialVisualisations/UISpecialVisualisations.ts @@ -29,7 +29,7 @@ class QuestionViz implements SpecialVisualizationSvelte { }, { name: "blacklisted-labels", - doc: "One or more ';'-separated labels of questions which should _not_ be included. Default: 'hidden'", + doc: "One or more ';'-separated labels of questions which should _not_ be included. Note that the questionbox which is added by default will blacklist 'hidden'" }, ] svelteBased = true @@ -50,9 +50,6 @@ class QuestionViz implements SpecialVisualizationSvelte { ?.split(";") ?.map((s) => s.trim()) ?.filter((s) => s !== "") - if (blacklist.length === 0) { - blacklist.push("hidden") - } return new SvelteUIElement(Questionbox, { layer, tags,