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

Merge master

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-01-26 21:12:25 +01:00
commit 99edba4c73
12 changed files with 129 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Logic/FeatureSource/Sources/FilteringFeatureSource.ts
View file

@ -82,15 +82,12 @@ export default class FilteringFeatureSource implements FeatureSourceForLayer, Ti
}
}
const appliedFilters = layer.appliedFilters?.data
if(appliedFilters !== undefined){
const tagsFilter = Array.from(appliedFilters.values());
for (const filter of tagsFilter ?? []) {
const neededTags : TagsFilter = filter?.currentFilter
if (neededTags !== undefined && !neededTags.matchesProperties(f.feature.properties)) {
// Hidden by the filter on the layer itself - we want to hide it no matter wat
return false;
}
const tagsFilter = Array.from(layer.appliedFilters?.data?.values() ?? [])
for (const filter of tagsFilter) {
const neededTags: TagsFilter = filter?.currentFilter
if (neededTags !== undefined && !neededTags.matchesProperties(f.feature.properties)) {
// Hidden by the filter on the layer itself - we want to hide it no matter wat
return false;
}
}