Merge branch 'develop'

This commit is contained in:
Pieter Vander Vennet 2024-05-24 14:24:49 +02:00
commit a3f7a0fd4e
4 changed files with 10 additions and 8 deletions

View file

@ -0,0 +1,3 @@
.tr-qr_code , .tr-favourite_status {
display: none;
}

View file

@ -4,6 +4,7 @@
"en": "Velopark to OpenStreetMap synchronisation tool", "en": "Velopark to OpenStreetMap synchronisation tool",
"nl": "Velopark naar OpenStreetMap sync tool" "nl": "Velopark naar OpenStreetMap sync tool"
}, },
"customCss": "./assets/themes/velopark/velopark.css",
"mustHaveLanguage": [ "mustHaveLanguage": [
"nl", "nl",
"en" "en"
@ -309,9 +310,7 @@
], ],
"hideTagRenderingsWithLabels": [ "hideTagRenderingsWithLabels": [
"images", "images",
"leftover-questions", "leftover-questions"
"qr_code",
"favourite_status"
], ],
"override": { "override": {
"id": "bike_parking_with_velopark_ref", "id": "bike_parking_with_velopark_ref",
@ -395,9 +394,7 @@
], ],
"hideTagRenderingsWithLabels": [ "hideTagRenderingsWithLabels": [
"images", "images",
"leftover-questions", "leftover-questions"
"qr_code",
"favourite_status"
], ],
"override": { "override": {
"doCount": false, "doCount": false,

View file

@ -315,9 +315,11 @@ export default class LayoutConfig implements LayoutInformation {
continue continue
} }
if (layer.source.osmTags.matchesProperties(tags)) { if (layer.source.osmTags.matchesProperties(tags)) {
if(!layer.isShown || layer.isShown.matchesProperties(tags)){// https://github.com/pietervdvn/MapComplete/issues/1959
return layer return layer
} }
} }
}
console.log("Fallthrough", this, tags) console.log("Fallthrough", this, tags)
return undefined return undefined
} }

View file

@ -193,7 +193,7 @@ export default class TagApplyButton implements AutoAction, SpecialVisualization
} }
return el return el
}) })
).SetClass("subtle") ).SetClass("subtle break-all")
const applied = new UIEventSource( const applied = new UIEventSource(
tags?.data?.["mr_taskStatus"] !== undefined && tags?.data?.["mr_taskStatus"] !== undefined &&
tags?.data?.["mr_taskStatus"] !== "Created" tags?.data?.["mr_taskStatus"] !== "Created"