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

Merge feature branch

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-12-04 18:49:18 +01:00
commit a6c752037b
28 changed files with 931 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Models/Constants.ts
View file

@ -41,6 +41,7 @@ export default class Constants {
"usersettings",
"icons",
"filters",
"usertouched"
] as const
/**
* Layer IDs of layers which have special properties through built-in hooks

5
src/Models/ThemeConfig/ThemeConfig.ts
View file

@ -306,7 +306,7 @@ export default class ThemeConfig implements ThemeInformation {
return { untranslated, total }
}
public getMatchingLayer(tags: Record<string, string>): LayerConfig | undefined {
public getMatchingLayer(tags: Record<string, string>, blacklistLayers?: Set<string>): LayerConfig | undefined {
if (tags === undefined) {
return undefined
}
@ -314,6 +314,9 @@ export default class ThemeConfig implements ThemeInformation {
return this.getLayer("current_view")
}
for (const layer of this.layers) {
if(blacklistLayers?.has(layer.id)){
continue
}
if (!layer.source) {
if (layer.isShown?.matchesProperties(tags)) {
return layer

2
src/Models/ThemeViewState.ts
View file

@ -1061,7 +1061,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
/**
* Searches the appropriate layer - will first try if a special layer matches; if not, a normal layer will be used by delegating to the theme
*/
public getMatchingLayer(properties: Record<string, string>) {
public getMatchingLayer(properties: Record<string, string>): LayerConfig | undefined {
const id = properties.id
if (id.startsWith("summary_")) {