From 36b3faf2d14bf174545d437705a17d3c2917c643 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 31 Jul 2025 00:21:35 +0200 Subject: [PATCH 1/6] Fix: split values for tag2link --- src/UI/Popup/AllTagsPanel/TagLink.svelte | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/UI/Popup/AllTagsPanel/TagLink.svelte b/src/UI/Popup/AllTagsPanel/TagLink.svelte index a90c8b1747..453a4f6a30 100644 --- a/src/UI/Popup/AllTagsPanel/TagLink.svelte +++ b/src/UI/Popup/AllTagsPanel/TagLink.svelte @@ -5,6 +5,8 @@ export let tags: UIEventSource> export let key: string + const values = $tags[key].split(";").map((v) => v.trim()) + const tag2linkData = tag2link as Tag2LinkElement[] interface Tag2LinkElement { @@ -33,14 +35,14 @@ {#if url} - - {$tags[key]} - + {#each values as value, index} + + {#if index > 0}; {/if} + + {value} + + + {/each} {:else} {$tags[key]} {/if} From 40bd564f864a73e4b9f476e3347c22134cf3f79b Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 30 Jul 2025 23:53:18 +0200 Subject: [PATCH 2/6] Themes(zhv): fix broken import --- assets/themes/zhv/zhv.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/themes/zhv/zhv.json b/assets/themes/zhv/zhv.json index e6807a0373..2629288f40 100644 --- a/assets/themes/zhv/zhv.json +++ b/assets/themes/zhv/zhv.json @@ -49,7 +49,7 @@ "render": { "special": { "type": "import_button", - "targetLayer": "transit_stops", + "targetLayer": "all_transit_stops", "tags": "_tags", "text": { "en": "Add this stop" From ccab070938066e763ba71fec6868989576939868 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Tue, 29 Jul 2025 10:18:52 +0200 Subject: [PATCH 3/6] Chore: Enable file nesting --- .vscode/settings.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index b607ae0fc3..a0e2c3e545 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -60,5 +60,10 @@ "type": "Gitea", "name": "MapComplete Forgejo" } - ] + ], + "explorer.fileNesting.enabled": true, + "explorer.fileNesting.patterns": { + "*": "${capture}.license" + }, + "explorer.fileNesting.expand": false } From c0ee578df1b0db3c9670b6c8f722787e6a9b72f3 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Tue, 12 Aug 2025 23:54:01 +0200 Subject: [PATCH 4/6] Themes(parkings): Add charge points --- assets/themes/parkings/parkings.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/assets/themes/parkings/parkings.json b/assets/themes/parkings/parkings.json index 0e34800338..bb1ec86920 100644 --- a/assets/themes/parkings/parkings.json +++ b/assets/themes/parkings/parkings.json @@ -65,7 +65,10 @@ "parking_spaces", "parking_ticket_machine", { - "builtin": "charging_station", + "builtin": [ + "charging_station", + "charge_point" + ], "override": { "minzoom": 18 } From 2cf0bc1866cd8df4bc7006b29a5f49210761ccb3 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 13 Aug 2025 01:32:34 +0200 Subject: [PATCH 5/6] Themes(shops): Add self_checkout question --- assets/layers/filters/filters.json | 19 ++++++- assets/layers/questions/questions.json | 75 ++++++++++++++++++++++++++ assets/layers/shops/shops.json | 5 +- 3 files changed, 96 insertions(+), 3 deletions(-) diff --git a/assets/layers/filters/filters.json b/assets/layers/filters/filters.json index 40270aea15..fa436162b1 100644 --- a/assets/layers/filters/filters.json +++ b/assets/layers/filters/filters.json @@ -545,7 +545,24 @@ "osmTags": "kids_area!=no" } ] + }, + { + "id": "self_checkout", + "options": [ + { + "question": { + "en": "Has self-checkout", + "nl": "Heeft zelfscan" + }, + "osmTags": { + "or": [ + "self_checkout=yes", + "self_checkout=only" + ] + } + } + ] } ], "allowMove": false -} +} \ No newline at end of file diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json index a6ccc291a1..a5c92897f7 100644 --- a/assets/layers/questions/questions.json +++ b/assets/layers/questions/questions.json @@ -3543,6 +3543,81 @@ "filter": [ "filters.kids_area" ] + }, + { + "id": "self_checkout", + "labels": [ + "self_checkout_questions" + ], + "question": { + "en": "Does this place offer self-checkout?", + "nl": "Biedt deze plaats zelfscannen aan?" + }, + "questionHint": { + "en": "e.g. handheld scanners or a self-checkout kiosk", + "nl": "bijv. handscanners of een zelfscankassa" + }, + "mappings": [ + { + "if": "self_checkout=yes", + "then": { + "en": "This place offers self-checkout", + "nl": "Deze plaats biedt zelfscannen aan" + } + }, + { + "if": "self_checkout=no", + "then": { + "en": "This place does not offer self-checkout", + "nl": "Deze plaats biedt geen zelfscannen aan" + } + }, + { + "if": "self_checkout=only", + "then": { + "en": "This place only offers self-checkout", + "nl": "Deze plaats biedt enkel zelfscannen aan" + } + } + ], + "filter": [ + "filters.self_checkout" + ] + }, + { + "id": "self_checkout_type", + "labels": [ + "self_checkout_questions" + ], + "question": { + "en": "What kind of self-checkout does this place offer?", + "nl": "Wat voor soort zelfscannen biedt deze plaats aan?" + }, + "mappings": [ + { + "if": "self_checkout:handheld=yes", + "ifnot": "self_checkout:handheld=no", + "then": { + "en": "This place offers self-checkout using a handheld scanner", + "nl": "Deze plaats biedt zelfscannen met een handscanner aan" + } + }, + { + "if": "self_checkout:self_scan=yes", + "ifnot": "self_checkout:self_scan=no", + "then": { + "en": "This place offers self-checkout using a self-checkout kiosk", + "nl": "Deze plaats biedt zelfscannen met een zelfscankassa aan" + } + } + ], + "condition": { + "or": [ + "self_checkout=yes", + "self_checkout=only" + ] + }, + "multiAnswer": true } ], "allowMove": false, diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json index a17a015ed8..cb835446e3 100644 --- a/assets/layers/shops/shops.json +++ b/assets/layers/shops/shops.json @@ -1644,7 +1644,8 @@ } }, "description", - "toilet_at_amenity_lib.all" + "toilet_at_amenity_lib.all", + "self_checkout_questions" ], "filter": [ { @@ -1715,4 +1716,4 @@ ] }, "allowMove": true -} +} \ No newline at end of file From bd3c266a4d1ce344b613431e5704a91207347b8c Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 13 Aug 2025 01:54:38 +0200 Subject: [PATCH 6/6] Fix: check for type in TagLink --- src/UI/Popup/AllTagsPanel/TagLink.svelte | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/UI/Popup/AllTagsPanel/TagLink.svelte b/src/UI/Popup/AllTagsPanel/TagLink.svelte index 453a4f6a30..1af12f7575 100644 --- a/src/UI/Popup/AllTagsPanel/TagLink.svelte +++ b/src/UI/Popup/AllTagsPanel/TagLink.svelte @@ -1,12 +1,11 @@ -{#if url} +{#if url && values.length > 0} {#each values as value, index} {#if index > 0}; {/if}