From 2ddf0c36be8b32828fdfd6ebf347794084441344 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 11 Jul 2025 03:44:26 +0200 Subject: [PATCH] Refactoring: remove more parts of the old framework --- src/UI/Base/Title.ts | 73 ----------------------- src/UI/BigComponents/TagRenderingChart.ts | 10 +--- src/UI/Statistics/LayerStatistics.svelte | 4 +- 3 files changed, 4 insertions(+), 83 deletions(-) delete mode 100644 src/UI/Base/Title.ts diff --git a/src/UI/Base/Title.ts b/src/UI/Base/Title.ts deleted file mode 100644 index ba4c8d41fd..0000000000 --- a/src/UI/Base/Title.ts +++ /dev/null @@ -1,73 +0,0 @@ -import BaseUIElement from "../BaseUIElement" -import { FixedUiElement } from "./FixedUiElement" -import { Utils } from "../../Utils" - -export default class Title extends BaseUIElement { - private static readonly defaultClassesPerLevel = [ - "", - "text-3xl font-bold", - "text-2xl font-bold", - "text-xl font-bold", - "text-lg font-bold", - ] - public readonly title: BaseUIElement - public readonly level: number - public readonly id: string - - constructor(embedded: string | BaseUIElement, level: number = 3) { - super() - if (embedded === undefined) { - console.warn("A title should have some content. Undefined is not allowed") - embedded = "" - } - if (typeof embedded === "string") { - this.title = new FixedUiElement(embedded) - } else { - this.title = embedded - } - this.level = level - - let text: string = undefined - if (typeof embedded === "string") { - text = embedded - } else if (embedded instanceof FixedUiElement) { - text = embedded.content - } else { - if (!Utils.runningFromConsole) { - text = embedded.ConstructElement()?.textContent - } - } - - this.id = - text - ?.replace(/ /g, "-") - ?.replace(/[?#.;:/]/, "") - ?.toLowerCase() ?? "" - this.SetClass(Title.defaultClassesPerLevel[level] ?? "") - } - - AsMarkdown(): string { - const embedded = " " + this.title.AsMarkdown() + " " - - if (this.level == 1) { - return "\n\n" + embedded + "\n" + "=".repeat(embedded.length) + "\n\n" - } - - if (this.level == 2) { - return "\n\n" + embedded + "\n" + "-".repeat(embedded.length) + "\n\n" - } - - return "\n\n" + "#".repeat(this.level) + embedded + "\n\n" - } - - protected InnerConstructElement(): HTMLElement { - const el = this.title.ConstructElement() - if (el === undefined) { - return undefined - } - const h = document.createElement("h" + this.level) - h.appendChild(el) - el.id = this.id - return h - } -} diff --git a/src/UI/BigComponents/TagRenderingChart.ts b/src/UI/BigComponents/TagRenderingChart.ts index 4935a66f75..eeb4c7c372 100644 --- a/src/UI/BigComponents/TagRenderingChart.ts +++ b/src/UI/BigComponents/TagRenderingChart.ts @@ -5,7 +5,6 @@ import Combine from "../Base/Combine" import { TagUtils } from "../../Logic/Tags/TagUtils" import { Utils } from "../../Utils" import { OsmFeature } from "../../Models/OsmFeature" -import Title from "../Base/Title" export interface TagRenderingChartOptions { groupToOtherCutoff?: 3 | number @@ -195,7 +194,6 @@ export default class TagRenderingChart extends Combine { options?: TagRenderingChartOptions & { chartclasses?: string chartstyle?: string - includeTitle?: boolean chartType?: "pie" | "bar" | "doughnut" } ) { @@ -275,12 +273,8 @@ export default class TagRenderingChart extends Combine { chart.SetStyle(options.chartstyle) } - super([ - new Title(options?.includeTitle ? tagRendering.question ?? tagRendering.id : undefined), - new Combine([chart]).SetClass("flex flex-col justify-center h-full"), - ]) - - this.SetClass("block") + super([chart]) + this.SetClass("flex flex-col justify-center h-full") } public static extractDataAndLabels }>( diff --git a/src/UI/Statistics/LayerStatistics.svelte b/src/UI/Statistics/LayerStatistics.svelte index ec928e9c1f..e3b27bfefe 100644 --- a/src/UI/Statistics/LayerStatistics.svelte +++ b/src/UI/Statistics/LayerStatistics.svelte @@ -43,11 +43,11 @@ {:else}
{#each trs as tr} +

{#if tr.question}{:else} {tr.id}{/if}

new TagRenderingChart($elements, tr, { - chartclasses: "w-full self-center", - includeTitle: true, + chartclasses: "w-full self-center" }).SetClass(tr.multiAnswer ? "w-128" : "w-96")} /> {/each}