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

Fix: nobrand= is actually applied when using the Name suggestion index

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-09-13 20:37:14 +02:00
parent 89a20ca1af
commit c3bb0cb837
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Models/ThemeConfig/TagRenderingConfig.ts
View file

@ -926,7 +926,7 @@ export default class TagRenderingConfig {
* Might give undefined if setting to unknown is not possible * Might give undefined if setting to unknown is not possible
*/ */
public removeToSetUnknown(partOfLayer: LayerConfig, currentTags: Record<string, string>): string[] | undefined { public removeToSetUnknown(partOfLayer: LayerConfig, currentTags: Record<string, string>): string[] | undefined {
if(!partOfLayer?.source || !currentTags){ if (!partOfLayer?.source || !currentTags) {
return return
} }
const toDelete = new Set<string>() const toDelete = new Set<string>()
@ -1001,12 +1001,17 @@ export class TagRenderingConfigUtils {
// The original mappings get "priorityIf" set // The original mappings get "priorityIf" set
const oldMappingsCloned = const oldMappingsCloned =
clone.mappings?.map( clone.mappings?.map(
(m) => (m) => {
<Mapping>{ const mapping = {
...m, ...m,
addExtraTags: [new Tag("nobrand", "")],
priorityIf: m.priorityIf ?? TagUtils.Tag("id~*"), priorityIf: m.priorityIf ?? TagUtils.Tag("id~*"),
}, }
if (m.if.usedKeys().indexOf("nobrand") < 0) {
// Erase 'nobrand=yes', unless this option explicitly sets it
mapping["addExtraTags"] = [new Tag("nobrand", "")]
}
return <Mapping>mapping
},
) ?? [] ) ?? []
clone.mappings = [...oldMappingsCloned, ...extraMappings] clone.mappings = [...oldMappingsCloned, ...extraMappings]
return clone return clone