From 6420b906e055f5572d093e18febdbe5dba325bce Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 30 Aug 2024 17:18:07 +0200 Subject: [PATCH 001/113] Themes: add metal as material option --- assets/layers/picnic_table/picnic_table.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/layers/picnic_table/picnic_table.json b/assets/layers/picnic_table/picnic_table.json index 6485bbe14..ec7759eaf 100644 --- a/assets/layers/picnic_table/picnic_table.json +++ b/assets/layers/picnic_table/picnic_table.json @@ -146,7 +146,11 @@ "ca": "Açò és una taula de pícnic feta de plàstic reciclat", "cs": "Tento piknikový stůl je vyroben z plastu (recyklované)" } - } + }, + {"if":"material=metal", + "then":{"en": "This picnic table is made from metal", + "nl": "Deze picnictafel is gemaakt uit metaal" + }} ], "id": "picnic_table-material" } From cfa1c28789d2056e6b8ad7483360a007c639d73c Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 30 Aug 2024 18:16:36 +0200 Subject: [PATCH 002/113] Themes: add camp site --- .../tourism_accomodation/tourism_accomodation.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/assets/layers/tourism_accomodation/tourism_accomodation.json b/assets/layers/tourism_accomodation/tourism_accomodation.json index 37348a586..fea55196a 100644 --- a/assets/layers/tourism_accomodation/tourism_accomodation.json +++ b/assets/layers/tourism_accomodation/tourism_accomodation.json @@ -227,6 +227,15 @@ "en": "a small-scale lodging facility, typically operated by the owner", "de": "eine kleine Beherbergungseinrichtung, die in der Regel vom Eigentümer betrieben wird" } + }, + { + "tags": [ + "tourism=camp_site" + ], + "title": { + "en": "a camp site or camp ground", + "de": "een kempeerterrein" + } } ], "tagRenderings": [ From a4018d88b0f187b907c68a49dcfb496c0259bb91 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 30 Aug 2024 23:31:28 +0200 Subject: [PATCH 003/113] Themes: add paid as option, fix #2119 --- assets/layers/playground/playground.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json index 0e3950630..6ffc8f63e 100644 --- a/assets/layers/playground/playground.json +++ b/assets/layers/playground/playground.json @@ -136,7 +136,20 @@ "tagRenderings": [ "images", "reviews", - { + {"question": { + "en": "Does one have to pay to use this playground?", + "nl": "Moet men betalen om deze speeltuin te gebruiken?" + }, + "mappings": [ +{"if": "fee=no", + "alsoShowIf": "fee=", + "then": {"en": "Free to use", "nl": "Gratis te gebruiken"} +},{"if": "fee=yes", + + "then": {"en": "Paid playground", "nl": "Betalend"} +}], + "filter": true + }, { "question": { "nl": "Wat is de ondergrond van deze speeltuin?", "en": "Which is the surface of this playground?", From 1fec96c818463e2efa6e8d83f4cc671bbcb4a464 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 31 Aug 2024 00:34:05 +0200 Subject: [PATCH 004/113] Fix build --- assets/layers/playground/playground.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json index 6ffc8f63e..6b8ecb4d1 100644 --- a/assets/layers/playground/playground.json +++ b/assets/layers/playground/playground.json @@ -139,7 +139,7 @@ {"question": { "en": "Does one have to pay to use this playground?", "nl": "Moet men betalen om deze speeltuin te gebruiken?" - }, + },"id":"fee", "mappings": [ {"if": "fee=no", "alsoShowIf": "fee=", From 0c0af420499df93cddfdf49e3dbb80110921b886 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 31 Aug 2024 12:29:24 +0200 Subject: [PATCH 005/113] Move close butto' --- src/UI/BigComponents/MenuDrawer.svelte | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/UI/BigComponents/MenuDrawer.svelte b/src/UI/BigComponents/MenuDrawer.svelte index f5c042d0c..3b99c5f7e 100644 --- a/src/UI/BigComponents/MenuDrawer.svelte +++ b/src/UI/BigComponents/MenuDrawer.svelte @@ -62,6 +62,21 @@
+
+

Menu

+ +

+{#if $showHome} + + + {#if Utils.isIframe} + + {:else} + + {/if} + + {/if} +