contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix: show tags that will be deleted with strikethrough in TagHint

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-06-01 14:54:34 +02:00
parent 14e96094c2
commit 15a481f864
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Logic/Tags/Tag.ts
View file

@ -82,9 +82,9 @@ export class Tag extends TagsFilter {
if (shorten) {
v = Utils.EllipsesAfter(v, 25)
}
if (v === "" || (v === undefined && currentProperties !== undefined)) {
if ((v === "" || v === undefined) && currentProperties !== undefined) {
// This tag will be removed if in the properties, so we indicate this with special rendering
if (currentProperties !== undefined && (currentProperties[this.key] ?? "") === "") {
if ((currentProperties[this.key] ?? "") === "") {
// This tag is not present in the current properties, so this tag doesn't change anything
return ""
}

1
UI/Popup/DeleteWizard.ts
View file

@ -228,6 +228,7 @@ export default class DeleteWizard extends Toggle {
new SvelteUIElement(TagHint, {
osmConnection: state.osmConnection,
tags: retag,
currentProperties: currentTags.data
}),
])
}

4
UI/Popup/TagHint.svelte
View file

@ -11,13 +11,15 @@
*/
export let tags: TagsFilter;
export let state: SpecialVisualizationState;
export let currentProperties: Record<string, string | any> = {}
/**
* If given, this function will be called to embed the given tags hint into this translation
*/
export let embedIn: ((string: string) => Translation) | undefined = undefined;
const userDetails = state.osmConnection.userDetails;
let tagsExplanation = "";
$: tagsExplanation = tags?.asHumanString(true, false, {});
$: tagsExplanation = tags?.asHumanString(true, false, currentProperties);
</script>
{#if $userDetails.loggedIn}

2
UI/Popup/TagRendering/TagRenderingQuestion.svelte
View file

@ -212,7 +212,7 @@
</div>
{#if $showTags === "yes" || $showTags === "always" || ($showTags === "" && numberOfCs >= Constants.userJourney.tagsVisibleAt) || $featureSwitchIsTesting || $featureSwitchIsDebugging}
<span class="flex justify-between flex-wrap">
<TagHint {state} tags={selectedTags}></TagHint>
<TagHint {state} tags={selectedTags} currentProperties={$tags}></TagHint>
<span class="flex flex-wrap">
{#if $featureSwitchIsTesting}
Testmode &nbsp;