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

Merge branch 'develop'

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-05-03 12:16:58 +02:00
commit c7527232bc
12 changed files with 820 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Models/ThemeConfig/Conversion/AddPrefixToTagRenderingConfig.ts
View file

@ -111,7 +111,7 @@ export default class AddPrefixToTagRenderingConfig extends DesugaringStep<Questi
return <QuestionableTagRenderingConfigJson>{
...json,
id: this._prefix + "_" + json.id,
id: this._prefix.replace(/[^a-zA-Z0-9_]/, "_") + "_" + json.id,
question: this.updateTranslatable(json.question),
questionHint: this.updateTranslatable(json.questionHint),

12
src/Models/ThemeViewState/WithLayoutSourceState.ts
View file

@ -7,6 +7,8 @@ import LayerState from "../../Logic/State/LayerState"
import { Store } from "../../Logic/UIEventSource"
import { FeatureSource, IndexedFeatureSource } from "../../Logic/FeatureSource/FeatureSource"
import { Tag } from "../../Logic/Tags/Tag"
import Hotkeys from "../../UI/Base/Hotkeys"
import Translations from "../../UI/i18n/Translations"
export class WithLayoutSourceState extends WithSelectedElementState {
readonly layerState: LayerState
@ -50,6 +52,15 @@ export class WithLayoutSourceState extends WithSelectedElementState {
this.floors = WithLayoutSourceState.initFloors(this.featuresInView)
this.initFilters()
Hotkeys.RegisterHotkey(
{ nomod: "n" },
Translations.t.hotkeyDocumentation.addNew,
() => {
this.openNewDialog()
}
)
}
/**
@ -121,4 +132,5 @@ export class WithLayoutSourceState extends WithSelectedElementState {
this.featureProperties.trackFeature(feature)
this.selectedElement.setData(feature)
}
}

1
src/UI/Popup/TagRendering/TagRenderingAnswer.svelte
View file

@ -39,7 +39,6 @@
{state}
{selectedElement}
{layer}
clss={config?.classes?.join(" ") ?? ""}
{noIcons}
/>
{/if}

5
src/UI/Popup/TagRendering/TagRenderingMapping.svelte
View file

@ -7,13 +7,8 @@
import LayerConfig from "../../../Models/ThemeConfig/LayerConfig"
import { twJoin } from "tailwind-merge"
import Marker from "../../Map/Marker.svelte"
import ToSvelte from "../../Base/ToSvelte.svelte"
import { And } from "../../../Logic/Tags/And"
import { TagUtils } from "../../../Logic/Tags/TagUtils"
import BaseUIElement from "../../BaseUIElement"
import type { Mapping } from "../../../Models/ThemeConfig/TagRenderingConfig"
import SvelteUIElement from "../../Base/SvelteUIElement"
import Icon from "../../Map/Icon.svelte"
import { TagsFilter } from "../../../Logic/Tags/TagsFilter"
import DefaultIcon from "../../Map/DefaultIcon.svelte"