diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json index 88ee2afbdd..f1663968cc 100644 --- a/assets/layers/atm/atm.json +++ b/assets/layers/atm/atm.json @@ -274,27 +274,8 @@ }, { "or": [ - "_country=", - "_country=at", - "_country=be", - "_country=cy", - "_country=de", - "_country=ee", - "_country=es", - "_country=fi", - "_country=fr", - "_country=gr", - "_country=hr", - "_country=ie", - "_country=it", - "_country=lt", - "_country=lu", - "_country=lv", - "_country=mt", - "_country=nl", - "_country=pt", - "_country=si", - "_country=sk" + "_currency=", + "_currency~.*EUR.*" ] } ] @@ -311,7 +292,7 @@ "mappings": [ { "if": "cash_out:notes:denominations=5 EUR", - "icon": "./assets/layers/questions/5euro.svg", + "icon": "./assets/layers/questions/denominations/eur/5euro.svg", "then": { "en": "5 euro notes can be withdrawn", "nl": "Je kunt biljetten van 5 euro afhalen", @@ -321,7 +302,7 @@ }, { "if": "cash_out:notes:denominations=10 EUR", - "icon": "./assets/layers/questions/10euro.svg", + "icon": "./assets/layers/questions/denominations/eur/10euro.svg", "then": { "en": "10 euro notes can be withdrawn", "nl": "Je kunt biljetten van 10 euro afhalen", @@ -331,7 +312,7 @@ }, { "if": "cash_out:notes:denominations=20 EUR", - "icon": "./assets/layers/questions/20euro.svg", + "icon": "./assets/layers/questions/denominations/eur/20euro.svg", "then": { "en": "20 euro notes can be withdrawn", "nl": "Je kunt biljetten van 20 euro afhalen", @@ -341,7 +322,7 @@ }, { "if": "cash_out:notes:denominations=50 EUR", - "icon": "./assets/layers/questions/50euro.svg", + "icon": "./assets/layers/questions/denominations/eur/50euro.svg", "then": { "en": "50 euro notes can be withdrawn", "nl": "Je kunt biljetten van 50 euro afhalen", @@ -351,7 +332,7 @@ }, { "if": "cash_out:notes:denominations=100 EUR", - "icon": "./assets/layers/questions/100euro.svg", + "icon": "./assets/layers/questions/denominations/eur/100euro.svg", "then": { "en": "100 euro notes can be withdrawn", "nl": "Je kunt biljetten van 100 euro afhalen", @@ -361,7 +342,7 @@ }, { "if": "cash_out:notes:denominations=200 EUR", - "icon": "./assets/layers/questions/200euro.svg", + "icon": "./assets/layers/questions/denominations/eur/200euro.svg", "then": { "en": "200 euro notes can be withdrawn", "nl": "Je kunt biljetten van 200 euro afhalen", @@ -371,7 +352,7 @@ }, { "if": "cash_out:notes:denominations=500 EUR", - "icon": "./assets/layers/questions/500euro.svg", + "icon": "./assets/layers/questions/denominations/eur/500euro.svg", "then": { "en": "500 euro notes can be withdrawn", "nl": "Je kunt biljetten van 500 euro afhalen", @@ -491,4 +472,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/assets/layers/elongated_coin/elongated_coin.json b/assets/layers/elongated_coin/elongated_coin.json index 7d346ad400..0ecc82ea71 100644 --- a/assets/layers/elongated_coin/elongated_coin.json +++ b/assets/layers/elongated_coin/elongated_coin.json @@ -84,7 +84,50 @@ } ] }, - "payment-options-split", + { + "id": "fee", + "question": { + "en": "Does it cost money to press a penny?" + }, + "mappings": [ + { + "if": "fee=", + "then": { + "en": "It costs money to press a penny." + } + }, + { + "if": "fee=yes", + "then": { + "en": "It costs money to press a penny." + } + }, + { + "if": "fee=no", + "then": { + "en": "It is free to press a penny." + }, + "addExtraTags": [ + "payment:qr_code=", + "payment:coins=", + "payment:notes=", + "payment:debit_cards=", + "payment:credit_cards=" + ] + } + ] + }, + { + "builtin": "payment-options-split", + "override": { + "condition": { + "or": [ + "fee=yes", + "fee=" + ] + } + } + }, { "id": "coin", "question": { @@ -108,6 +151,12 @@ "en": "This penny press uses a 2 cent coin for pressing.", "de": "Die Münzpresse benötigt eine 2 Cent Münze um zu Pressen.", "es": "Esta prensa de centavo utiliza una moneda de 2 centavos para presionar." + }, + "hideInAnswer": { + "and": [ + "_currency!~.*EUR.*", + "_currency!~.*USD.*" + ] } }, { @@ -116,6 +165,12 @@ "en": "This penny press uses a 5 cent coin for pressing.", "de": "Die Münzpresse benötigt eine 5 Cent Münze um zu Pressen.", "es": "Esta prensa de centavo utiliza una moneda de 5 centavos para presionar." + }, + "hideInAnswer": { + "and": [ + "_currency!~.*EUR.*", + "_currency!~.*USD.*" + ] } }, { @@ -124,6 +179,12 @@ "en": "This penny press uses a 10 cent coin for pressing.", "de": "Die Münzpresse benötigt eine 10 Cent Münze um zu Pressen.", "es": "Esta prensa de centavo utiliza una moneda de 10 centavos para presionar." + }, + "hideInAnswer": { + "and": [ + "_currency!~.*EUR.*", + "_currency!~.*USD.*" + ] } }, { @@ -143,6 +204,20 @@ "es": "Esta prensa de centavo utiliza una moneda de 50 centavos para presionar." }, "hideInAnswer": "_currency!~.*USD.*" + }, + { + "if": "coin:type=10centimes", + "then": { + "en": "This penny press uses a 10 centimes coin for pressing." + }, + "hideInAnswer": "_currency!~.*CHF.*" + }, + { + "if": "coin:type=20centimes", + "then": { + "en": "This penny press uses a 20 centimes coin for pressing." + }, + "hideInAnswer": "_currency!~.*CHF.*" } ], "render": { @@ -154,6 +229,12 @@ "website", { "id": "charge", + "condition": { + "or": [ + "fee=yes", + "fee=" + ] + }, "question": { "en": "How much does it cost to press a penny?", "de": "Wieviel kostet es eine Münze zu Pressen?", @@ -186,6 +267,20 @@ "es": "Cuesta 2 euros para presionar un centavo." }, "hideInAnswer": "_currency!~.*EUR.*" + }, + { + "if": "charge=2 CHF", + "then": { + "en": "It costs 2 Swiss francs to press a penny." + }, + "hideInAnswer": "_currency!~.*CHF.*" + }, + { + "if": "charge=1 CHF", + "then": { + "en": "It costs 1 Swiss franc to press a penny." + }, + "hideInAnswer": "_currency!~.*CHF.*" } ], "render": { @@ -263,4 +358,4 @@ "accepts_debit_cards", "accepts_credit_cards" ] -} +} \ No newline at end of file diff --git a/assets/layers/questions/denominations/chf/1000chf.svg b/assets/layers/questions/denominations/chf/1000chf.svg new file mode 100644 index 0000000000..620e2802aa --- /dev/null +++ b/assets/layers/questions/denominations/chf/1000chf.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/questions/denominations/chf/1000chf.svg.license b/assets/layers/questions/denominations/chf/1000chf.svg.license new file mode 100644 index 0000000000..75299f8845 --- /dev/null +++ b/assets/layers/questions/denominations/chf/1000chf.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/denominations/chf/100chf.svg b/assets/layers/questions/denominations/chf/100chf.svg new file mode 100644 index 0000000000..04148d0158 --- /dev/null +++ b/assets/layers/questions/denominations/chf/100chf.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/questions/denominations/chf/100chf.svg.license b/assets/layers/questions/denominations/chf/100chf.svg.license new file mode 100644 index 0000000000..75299f8845 --- /dev/null +++ b/assets/layers/questions/denominations/chf/100chf.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/denominations/chf/10chf.svg b/assets/layers/questions/denominations/chf/10chf.svg new file mode 100644 index 0000000000..fe020f3ebf --- /dev/null +++ b/assets/layers/questions/denominations/chf/10chf.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/questions/denominations/chf/10chf.svg.license b/assets/layers/questions/denominations/chf/10chf.svg.license new file mode 100644 index 0000000000..75299f8845 --- /dev/null +++ b/assets/layers/questions/denominations/chf/10chf.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/denominations/chf/10rp-2019-800px.png b/assets/layers/questions/denominations/chf/10rp-2019-800px.png new file mode 100644 index 0000000000..31b93b6387 Binary files /dev/null and b/assets/layers/questions/denominations/chf/10rp-2019-800px.png differ diff --git a/assets/layers/questions/denominations/chf/10rp-2019-800px.png.license b/assets/layers/questions/denominations/chf/10rp-2019-800px.png.license new file mode 100644 index 0000000000..17bb1c1671 --- /dev/null +++ b/assets/layers/questions/denominations/chf/10rp-2019-800px.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Swissmint +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/denominations/chf/1fr-2019-800px.png b/assets/layers/questions/denominations/chf/1fr-2019-800px.png new file mode 100644 index 0000000000..d9d33e5bfa Binary files /dev/null and b/assets/layers/questions/denominations/chf/1fr-2019-800px.png differ diff --git a/assets/layers/questions/denominations/chf/1fr-2019-800px.png.license b/assets/layers/questions/denominations/chf/1fr-2019-800px.png.license new file mode 100644 index 0000000000..17bb1c1671 --- /dev/null +++ b/assets/layers/questions/denominations/chf/1fr-2019-800px.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Swissmint +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/denominations/chf/200chf.svg b/assets/layers/questions/denominations/chf/200chf.svg new file mode 100644 index 0000000000..2f40ca8b34 --- /dev/null +++ b/assets/layers/questions/denominations/chf/200chf.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/questions/denominations/chf/200chf.svg.license b/assets/layers/questions/denominations/chf/200chf.svg.license new file mode 100644 index 0000000000..75299f8845 --- /dev/null +++ b/assets/layers/questions/denominations/chf/200chf.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/denominations/chf/20chf.svg b/assets/layers/questions/denominations/chf/20chf.svg new file mode 100644 index 0000000000..9ee9193933 --- /dev/null +++ b/assets/layers/questions/denominations/chf/20chf.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/questions/denominations/chf/20chf.svg.license b/assets/layers/questions/denominations/chf/20chf.svg.license new file mode 100644 index 0000000000..75299f8845 --- /dev/null +++ b/assets/layers/questions/denominations/chf/20chf.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/denominations/chf/20rp-2019-800px.png b/assets/layers/questions/denominations/chf/20rp-2019-800px.png new file mode 100644 index 0000000000..20317c011e Binary files /dev/null and b/assets/layers/questions/denominations/chf/20rp-2019-800px.png differ diff --git a/assets/layers/questions/denominations/chf/20rp-2019-800px.png.license b/assets/layers/questions/denominations/chf/20rp-2019-800px.png.license new file mode 100644 index 0000000000..17bb1c1671 --- /dev/null +++ b/assets/layers/questions/denominations/chf/20rp-2019-800px.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Swissmint +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/denominations/chf/2fr-2019-800px.png b/assets/layers/questions/denominations/chf/2fr-2019-800px.png new file mode 100644 index 0000000000..728c5deba0 Binary files /dev/null and b/assets/layers/questions/denominations/chf/2fr-2019-800px.png differ diff --git a/assets/layers/questions/denominations/chf/2fr-2019-800px.png.license b/assets/layers/questions/denominations/chf/2fr-2019-800px.png.license new file mode 100644 index 0000000000..17bb1c1671 --- /dev/null +++ b/assets/layers/questions/denominations/chf/2fr-2019-800px.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Swissmint +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/denominations/chf/50chf.svg b/assets/layers/questions/denominations/chf/50chf.svg new file mode 100644 index 0000000000..24d62bbebe --- /dev/null +++ b/assets/layers/questions/denominations/chf/50chf.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/questions/denominations/chf/50chf.svg.license b/assets/layers/questions/denominations/chf/50chf.svg.license new file mode 100644 index 0000000000..75299f8845 --- /dev/null +++ b/assets/layers/questions/denominations/chf/50chf.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/denominations/chf/50rp-2019-800px.png b/assets/layers/questions/denominations/chf/50rp-2019-800px.png new file mode 100644 index 0000000000..f1cd3f7aaa Binary files /dev/null and b/assets/layers/questions/denominations/chf/50rp-2019-800px.png differ diff --git a/assets/layers/questions/denominations/chf/50rp-2019-800px.png.license b/assets/layers/questions/denominations/chf/50rp-2019-800px.png.license new file mode 100644 index 0000000000..17bb1c1671 --- /dev/null +++ b/assets/layers/questions/denominations/chf/50rp-2019-800px.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Swissmint +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/denominations/chf/5fr-2019-800px.png b/assets/layers/questions/denominations/chf/5fr-2019-800px.png new file mode 100644 index 0000000000..1b52e22734 Binary files /dev/null and b/assets/layers/questions/denominations/chf/5fr-2019-800px.png differ diff --git a/assets/layers/questions/denominations/chf/5fr-2019-800px.png.license b/assets/layers/questions/denominations/chf/5fr-2019-800px.png.license new file mode 100644 index 0000000000..17bb1c1671 --- /dev/null +++ b/assets/layers/questions/denominations/chf/5fr-2019-800px.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Swissmint +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/denominations/chf/5rp-2019-800px.png b/assets/layers/questions/denominations/chf/5rp-2019-800px.png new file mode 100644 index 0000000000..915926a688 Binary files /dev/null and b/assets/layers/questions/denominations/chf/5rp-2019-800px.png differ diff --git a/assets/layers/questions/denominations/chf/5rp-2019-800px.png.license b/assets/layers/questions/denominations/chf/5rp-2019-800px.png.license new file mode 100644 index 0000000000..17bb1c1671 --- /dev/null +++ b/assets/layers/questions/denominations/chf/5rp-2019-800px.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Swissmint +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/denominations/chf/license_info.json b/assets/layers/questions/denominations/chf/license_info.json new file mode 100644 index 0000000000..c3119f7fb4 --- /dev/null +++ b/assets/layers/questions/denominations/chf/license_info.json @@ -0,0 +1,120 @@ +[ + { + "path": "1000chf.svg", + "license": "CC0-1.0", + "authors": [ + "Robin van der Linde" + ], + "sources": [] + }, + { + "path": "100chf.svg", + "license": "CC0-1.0", + "authors": [ + "Robin van der Linde" + ], + "sources": [] + }, + { + "path": "10chf.svg", + "license": "CC0-1.0", + "authors": [ + "Robin van der Linde" + ], + "sources": [] + }, + { + "path": "10rp-2019-800px.png", + "license": "CC0-1.0", + "authors": [ + "Swissmint" + ], + "sources": [ + "https://www.swissmint.ch/swissmint/de/home/dokumentation/bildgalerie/umlaufmuenzen-bildgalerie.html" + ] + }, + { + "path": "1fr-2019-800px.png", + "license": "CC0-1.0", + "authors": [ + "Swissmint" + ], + "sources": [ + "https://www.swissmint.ch/swissmint/de/home/dokumentation/bildgalerie/umlaufmuenzen-bildgalerie.html" + ] + }, + { + "path": "200chf.svg", + "license": "CC0-1.0", + "authors": [ + "Robin van der Linde" + ], + "sources": [] + }, + { + "path": "20chf.svg", + "license": "CC0-1.0", + "authors": [ + "Robin van der Linde" + ], + "sources": [] + }, + { + "path": "20rp-2019-800px.png", + "license": "CC0-1.0", + "authors": [ + "Swissmint" + ], + "sources": [ + "https://www.swissmint.ch/swissmint/de/home/dokumentation/bildgalerie/umlaufmuenzen-bildgalerie.html" + ] + }, + { + "path": "2fr-2019-800px.png", + "license": "CC0-1.0", + "authors": [ + "Swissmint" + ], + "sources": [ + "https://www.swissmint.ch/swissmint/de/home/dokumentation/bildgalerie/umlaufmuenzen-bildgalerie.html" + ] + }, + { + "path": "50chf.svg", + "license": "CC0-1.0", + "authors": [ + "Robin van der Linde" + ], + "sources": [] + }, + { + "path": "50rp-2019-800px.png", + "license": "CC0-1.0", + "authors": [ + "Swissmint" + ], + "sources": [ + "https://www.swissmint.ch/swissmint/de/home/dokumentation/bildgalerie/umlaufmuenzen-bildgalerie.html" + ] + }, + { + "path": "5fr-2019-800px.png", + "license": "CC0-1.0", + "authors": [ + "Swissmint" + ], + "sources": [ + "https://www.swissmint.ch/swissmint/de/home/dokumentation/bildgalerie/umlaufmuenzen-bildgalerie.html" + ] + }, + { + "path": "5rp-2019-800px.png", + "license": "CC0-1.0", + "authors": [ + "Swissmint" + ], + "sources": [ + "https://www.swissmint.ch/swissmint/de/home/dokumentation/bildgalerie/umlaufmuenzen-bildgalerie.html" + ] + } +] \ No newline at end of file diff --git a/assets/layers/questions/100euro.svg b/assets/layers/questions/denominations/eur/100euro.svg similarity index 100% rename from assets/layers/questions/100euro.svg rename to assets/layers/questions/denominations/eur/100euro.svg diff --git a/assets/layers/questions/100euro.svg.license b/assets/layers/questions/denominations/eur/100euro.svg.license similarity index 100% rename from assets/layers/questions/100euro.svg.license rename to assets/layers/questions/denominations/eur/100euro.svg.license diff --git a/assets/layers/questions/10cent.svg b/assets/layers/questions/denominations/eur/10cent.svg similarity index 100% rename from assets/layers/questions/10cent.svg rename to assets/layers/questions/denominations/eur/10cent.svg diff --git a/assets/layers/questions/10cent.svg.license b/assets/layers/questions/denominations/eur/10cent.svg.license similarity index 100% rename from assets/layers/questions/10cent.svg.license rename to assets/layers/questions/denominations/eur/10cent.svg.license diff --git a/assets/layers/questions/10euro.svg b/assets/layers/questions/denominations/eur/10euro.svg similarity index 100% rename from assets/layers/questions/10euro.svg rename to assets/layers/questions/denominations/eur/10euro.svg diff --git a/assets/layers/questions/10euro.svg.license b/assets/layers/questions/denominations/eur/10euro.svg.license similarity index 100% rename from assets/layers/questions/10euro.svg.license rename to assets/layers/questions/denominations/eur/10euro.svg.license diff --git a/assets/layers/questions/1cent.svg b/assets/layers/questions/denominations/eur/1cent.svg similarity index 100% rename from assets/layers/questions/1cent.svg rename to assets/layers/questions/denominations/eur/1cent.svg diff --git a/assets/layers/questions/1cent.svg.license b/assets/layers/questions/denominations/eur/1cent.svg.license similarity index 100% rename from assets/layers/questions/1cent.svg.license rename to assets/layers/questions/denominations/eur/1cent.svg.license diff --git a/assets/layers/questions/1euro.svg b/assets/layers/questions/denominations/eur/1euro.svg similarity index 100% rename from assets/layers/questions/1euro.svg rename to assets/layers/questions/denominations/eur/1euro.svg diff --git a/assets/layers/questions/1euro.svg.license b/assets/layers/questions/denominations/eur/1euro.svg.license similarity index 100% rename from assets/layers/questions/1euro.svg.license rename to assets/layers/questions/denominations/eur/1euro.svg.license diff --git a/assets/layers/questions/200euro.svg b/assets/layers/questions/denominations/eur/200euro.svg similarity index 100% rename from assets/layers/questions/200euro.svg rename to assets/layers/questions/denominations/eur/200euro.svg diff --git a/assets/layers/questions/200euro.svg.license b/assets/layers/questions/denominations/eur/200euro.svg.license similarity index 100% rename from assets/layers/questions/200euro.svg.license rename to assets/layers/questions/denominations/eur/200euro.svg.license diff --git a/assets/layers/questions/20cent.svg b/assets/layers/questions/denominations/eur/20cent.svg similarity index 100% rename from assets/layers/questions/20cent.svg rename to assets/layers/questions/denominations/eur/20cent.svg diff --git a/assets/layers/questions/20cent.svg.license b/assets/layers/questions/denominations/eur/20cent.svg.license similarity index 100% rename from assets/layers/questions/20cent.svg.license rename to assets/layers/questions/denominations/eur/20cent.svg.license diff --git a/assets/layers/questions/20euro.svg b/assets/layers/questions/denominations/eur/20euro.svg similarity index 100% rename from assets/layers/questions/20euro.svg rename to assets/layers/questions/denominations/eur/20euro.svg diff --git a/assets/layers/questions/20euro.svg.license b/assets/layers/questions/denominations/eur/20euro.svg.license similarity index 100% rename from assets/layers/questions/20euro.svg.license rename to assets/layers/questions/denominations/eur/20euro.svg.license diff --git a/assets/layers/questions/2cent.svg b/assets/layers/questions/denominations/eur/2cent.svg similarity index 100% rename from assets/layers/questions/2cent.svg rename to assets/layers/questions/denominations/eur/2cent.svg diff --git a/assets/layers/questions/2cent.svg.license b/assets/layers/questions/denominations/eur/2cent.svg.license similarity index 100% rename from assets/layers/questions/2cent.svg.license rename to assets/layers/questions/denominations/eur/2cent.svg.license diff --git a/assets/layers/questions/2euro.svg b/assets/layers/questions/denominations/eur/2euro.svg similarity index 100% rename from assets/layers/questions/2euro.svg rename to assets/layers/questions/denominations/eur/2euro.svg diff --git a/assets/layers/questions/2euro.svg.license b/assets/layers/questions/denominations/eur/2euro.svg.license similarity index 100% rename from assets/layers/questions/2euro.svg.license rename to assets/layers/questions/denominations/eur/2euro.svg.license diff --git a/assets/layers/questions/500euro.svg b/assets/layers/questions/denominations/eur/500euro.svg similarity index 100% rename from assets/layers/questions/500euro.svg rename to assets/layers/questions/denominations/eur/500euro.svg diff --git a/assets/layers/questions/500euro.svg.license b/assets/layers/questions/denominations/eur/500euro.svg.license similarity index 100% rename from assets/layers/questions/500euro.svg.license rename to assets/layers/questions/denominations/eur/500euro.svg.license diff --git a/assets/layers/questions/50cent.svg b/assets/layers/questions/denominations/eur/50cent.svg similarity index 100% rename from assets/layers/questions/50cent.svg rename to assets/layers/questions/denominations/eur/50cent.svg diff --git a/assets/layers/questions/50cent.svg.license b/assets/layers/questions/denominations/eur/50cent.svg.license similarity index 100% rename from assets/layers/questions/50cent.svg.license rename to assets/layers/questions/denominations/eur/50cent.svg.license diff --git a/assets/layers/questions/50euro.svg b/assets/layers/questions/denominations/eur/50euro.svg similarity index 100% rename from assets/layers/questions/50euro.svg rename to assets/layers/questions/denominations/eur/50euro.svg diff --git a/assets/layers/questions/50euro.svg.license b/assets/layers/questions/denominations/eur/50euro.svg.license similarity index 100% rename from assets/layers/questions/50euro.svg.license rename to assets/layers/questions/denominations/eur/50euro.svg.license diff --git a/assets/layers/questions/5cent.svg b/assets/layers/questions/denominations/eur/5cent.svg similarity index 100% rename from assets/layers/questions/5cent.svg rename to assets/layers/questions/denominations/eur/5cent.svg diff --git a/assets/layers/questions/5cent.svg.license b/assets/layers/questions/denominations/eur/5cent.svg.license similarity index 100% rename from assets/layers/questions/5cent.svg.license rename to assets/layers/questions/denominations/eur/5cent.svg.license diff --git a/assets/layers/questions/5euro.svg b/assets/layers/questions/denominations/eur/5euro.svg similarity index 100% rename from assets/layers/questions/5euro.svg rename to assets/layers/questions/denominations/eur/5euro.svg diff --git a/assets/layers/questions/5euro.svg.license b/assets/layers/questions/denominations/eur/5euro.svg.license similarity index 100% rename from assets/layers/questions/5euro.svg.license rename to assets/layers/questions/denominations/eur/5euro.svg.license diff --git a/assets/layers/questions/denominations/eur/license_info.json b/assets/layers/questions/denominations/eur/license_info.json new file mode 100644 index 0000000000..2576175567 --- /dev/null +++ b/assets/layers/questions/denominations/eur/license_info.json @@ -0,0 +1,167 @@ +[ + { + "path": "100euro.svg", + "license": "CC0-1.0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311346/worksheet-100-euro-coloured" + ] + }, + { + "path": "10cent.svg", + "license": "CC0-1.0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311337/worksheet-10-cent-coloured" + ] + }, + { + "path": "10euro.svg", + "license": "CC0-1.0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311343/worksheet-10-euro-coloured" + ] + }, + { + "path": "1cent.svg", + "license": "CC0-1.0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311334/worksheet-1-cent-coloured" + ] + }, + { + "path": "1euro.svg", + "license": "CC0-1.0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311340/worksheet-1-euro-coloured" + ] + }, + { + "path": "200euro.svg", + "license": "CC0-1.0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311347/worksheet-200-euro-coloured" + ] + }, + { + "path": "20cent.svg", + "license": "CC0-1.0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311338/worksheet-20-cent-coloured" + ] + }, + { + "path": "20euro.svg", + "license": "CC0-1.0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311344/worksheet-20-euro-coloured" + ] + }, + { + "path": "2cent.svg", + "license": "CC0-1.0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311335/worksheet-2-cent-coloured" + ] + }, + { + "path": "2euro.svg", + "license": "CC0-1.0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311341/worksheet-2-euro-coloured" + ] + }, + { + "path": "500euro.svg", + "license": "CC0-1.0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311348/worksheet-500-euro-coloured" + ] + }, + { + "path": "50cent.svg", + "license": "CC0-1.0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311339/worksheet-50-cent-coloured" + ] + }, + { + "path": "50euro.svg", + "license": "CC0-1.0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311345/worksheet-50-euro-coloured" + ] + }, + { + "path": "5cent.svg", + "license": "CC0-1.0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311336/worksheet-5-cent-coloured" + ] + }, + { + "path": "5euro.svg", + "license": "CC0-1.0", + "authors": [ + "OpenClipart", + "frankes" + ], + "sources": [ + "https://openclipart.org/detail/311342/worksheet-5-euro-coloured" + ] + } +] \ No newline at end of file diff --git a/assets/layers/questions/license_info.json b/assets/layers/questions/license_info.json index cbc306b77a..65a360bb66 100644 --- a/assets/layers/questions/license_info.json +++ b/assets/layers/questions/license_info.json @@ -1,169 +1,4 @@ [ - { - "path": "100euro.svg", - "license": "CC0-1.0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311346/worksheet-100-euro-coloured" - ] - }, - { - "path": "10cent.svg", - "license": "CC0-1.0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311337/worksheet-10-cent-coloured" - ] - }, - { - "path": "10euro.svg", - "license": "CC0-1.0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311343/worksheet-10-euro-coloured" - ] - }, - { - "path": "1cent.svg", - "license": "CC0-1.0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311334/worksheet-1-cent-coloured" - ] - }, - { - "path": "1euro.svg", - "license": "CC0-1.0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311340/worksheet-1-euro-coloured" - ] - }, - { - "path": "200euro.svg", - "license": "CC0-1.0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311347/worksheet-200-euro-coloured" - ] - }, - { - "path": "20cent.svg", - "license": "CC0-1.0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311338/worksheet-20-cent-coloured" - ] - }, - { - "path": "20euro.svg", - "license": "CC0-1.0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311344/worksheet-20-euro-coloured" - ] - }, - { - "path": "2cent.svg", - "license": "CC0-1.0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311335/worksheet-2-cent-coloured" - ] - }, - { - "path": "2euro.svg", - "license": "CC0-1.0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311341/worksheet-2-euro-coloured" - ] - }, - { - "path": "500euro.svg", - "license": "CC0-1.0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311348/worksheet-500-euro-coloured" - ] - }, - { - "path": "50cent.svg", - "license": "CC0-1.0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311339/worksheet-50-cent-coloured" - ] - }, - { - "path": "50euro.svg", - "license": "CC0-1.0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311345/worksheet-50-euro-coloured" - ] - }, - { - "path": "5cent.svg", - "license": "CC0-1.0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311336/worksheet-5-cent-coloured" - ] - }, - { - "path": "5euro.svg", - "license": "CC0-1.0", - "authors": [ - "OpenClipart", - "frankes" - ], - "sources": [ - "https://openclipart.org/detail/311342/worksheet-5-euro-coloured" - ] - }, { "path": "audio_induction_loop.svg", "license": "CC-BY-4.0", diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json index ff9cca18c2..0ae2cbeb6d 100644 --- a/assets/layers/questions/questions.json +++ b/assets/layers/questions/questions.json @@ -1126,7 +1126,8 @@ }, { "or": [ - "_currency=EUR" + "_currency~.*EUR.*", + "_currency~.*CHF.*" ] } ] @@ -1146,7 +1147,7 @@ "mappings": [ { "if": "payment:coins:denominations=0.01 EUR", - "icon": "./assets/layers/questions/1cent.svg", + "icon": "./assets/layers/questions/denominations/eur/1cent.svg", "then": { "en": "1 cent coins are accepted", "de": "1-Cent-Münzen werden akzeptiert", @@ -1163,7 +1164,7 @@ }, { "if": "payment:coins:denominations=0.02 EUR", - "icon": "./assets/layers/questions/2cent.svg", + "icon": "./assets/layers/questions/denominations/eur/2cent.svg", "then": { "en": "2 cent coins are accepted", "de": "2-Cent-Münzen werden akzeptiert", @@ -1180,7 +1181,7 @@ }, { "if": "payment:coins:denominations=0.05 EUR", - "icon": "./assets/layers/questions/5cent.svg", + "icon": "./assets/layers/questions/denominations/eur/5cent.svg", "then": { "en": "5 cent coins are accepted", "de": "5-Cent-Münzen werden akzeptiert", @@ -1197,7 +1198,7 @@ }, { "if": "payment:coins:denominations=0.10 EUR", - "icon": "./assets/layers/questions/10cent.svg", + "icon": "./assets/layers/questions/denominations/eur/10cent.svg", "then": { "en": "10 cent coins are accepted", "de": "10-Cent-Münzen werden akzeptiert", @@ -1214,7 +1215,7 @@ }, { "if": "payment:coins:denominations=0.20 EUR", - "icon": "./assets/layers/questions/20cent.svg", + "icon": "./assets/layers/questions/denominations/eur/20cent.svg", "then": { "en": "20 cent coins are accepted", "de": "20-Cent-Münzen werden akzeptiert", @@ -1231,7 +1232,7 @@ }, { "if": "payment:coins:denominations=0.50 EUR", - "icon": "./assets/layers/questions/50cent.svg", + "icon": "./assets/layers/questions/denominations/eur/50cent.svg", "then": { "en": "50 cent coins are accepted", "de": "50-Cent-Münzen werden akzeptiert", @@ -1248,7 +1249,7 @@ }, { "if": "payment:coins:denominations=1 EUR", - "icon": "./assets/layers/questions/1euro.svg", + "icon": "./assets/layers/questions/denominations/eur/1euro.svg", "then": { "en": "1 euro coins are accepted", "de": "1-Euro-Münzen werden akzeptiert", @@ -1264,7 +1265,7 @@ }, { "if": "payment:coins:denominations=2 EUR", - "icon": "./assets/layers/questions/2euro.svg", + "icon": "./assets/layers/questions/denominations/eur/2euro.svg", "then": { "en": "2 euro coins are accepted", "de": "2-Euro-Münzen werden akzeptiert", @@ -1277,6 +1278,69 @@ "cs": "Jsou přijímány mince v hodnotě 2 euro" }, "hideInAnswer": "_currency!~.*EUR.*" + }, + { + "if": "payment:coins:denominations=0.05 CHF", + "icon": "./assets/layers/questions/denominations/chf/5rp-2019-800px.png", + "then": { + "en": "5 centimes coins are accepted", + "nl": "Munten van 5 rappen worden geaccepteerd" + }, + "hideInAnswer": "_currency!~.*CHF.*" + }, + { + "if": "payment:coins:denominations=0.10 CHF", + "icon": "./assets/layers/questions/denominations/chf/10rp-2019-800px.png", + "then": { + "en": "10 centimes coins are accepted", + "nl": "Munten van 10 rappen worden geaccepteerd" + }, + "hideInAnswer": "_currency!~.*CHF.*" + }, + { + "if": "payment:coins:denominations=0.20 CHF", + "icon": "./assets/layers/questions/denominations/chf/20rp-2019-800px.png", + "then": { + "en": "20 centimes coins are accepted", + "nl": "Munten van 20 rappen worden geaccepteerd" + }, + "hideInAnswer": "_currency!~.*CHF.*" + }, + { + "if": "payment:coins:denominations=0.50 CHF", + "icon": "./assets/layers/questions/denominations/chf/50rp-2019-800px.png", + "then": { + "en": "½ franc coins are accepted", + "nl": "Munten van ½ frank worden geaccepteerd" + }, + "hideInAnswer": "_currency!~.*CHF.*" + }, + { + "if": "payment:coins:denominations=1 CHF", + "icon": "./assets/layers/questions/denominations/chf/1fr-2019-800px.png", + "then": { + "en": "1 franc coins are accepted", + "nl": "Munten van 1 frank worden geaccepteerd" + }, + "hideInAnswer": "_currency!~.*CHF.*" + }, + { + "if": "payment:coins:denominations=2 CHF", + "icon": "./assets/layers/questions/denominations/chf/2fr-2019-800px.png", + "then": { + "en": "2 francs coins are accepted", + "nl": "Munten van 2 frank worden geaccepteerd" + }, + "hideInAnswer": "_currency!~.*CHF.*" + }, + { + "if": "payment:coins:denominations=5 CHF", + "icon": "./assets/layers/questions/denominations/chf/5fr-2019-800px.png", + "then": { + "en": "5 francs coins are accepted", + "nl": "Munten van 5 frank worden geaccepteerd" + }, + "hideInAnswer": "_currency!~.*CHF.*" } ] }, @@ -1292,7 +1356,8 @@ }, { "or": [ - "_currency=EUR" + "_currency~.*EUR.*", + "_currency~.*CHF.*" ] } ] @@ -1311,7 +1376,7 @@ "mappings": [ { "if": "payment:notes:denominations=5 EUR", - "icon": "./assets/layers/questions/5euro.svg", + "icon": "./assets/layers/questions/denominations/eur/5euro.svg", "then": { "en": "5 euro notes are accepted", "nl": "Biljetten van 5 euro worden geaccepteerd", @@ -1326,7 +1391,7 @@ }, { "if": "payment:notes:denominations=10 EUR", - "icon": "./assets/layers/questions/10euro.svg", + "icon": "./assets/layers/questions/denominations/eur/10euro.svg", "then": { "en": "10 euro notes are accepted", "nl": "Biljetten van 10 euro worden geaccepteerd", @@ -1341,7 +1406,7 @@ }, { "if": "payment:notes:denominations=20 EUR", - "icon": "./assets/layers/questions/20euro.svg", + "icon": "./assets/layers/questions/denominations/eur/20euro.svg", "then": { "en": "20 euro notes are accepted", "nl": "Biljetten van 20 euro worden geaccepteerd", @@ -1356,7 +1421,7 @@ }, { "if": "payment:notes:denominations=50 EUR", - "icon": "./assets/layers/questions/50euro.svg", + "icon": "./assets/layers/questions/denominations/eur/50euro.svg", "then": { "en": "50 euro notes are accepted", "nl": "Biljetten van 50 euro worden geaccepteerd", @@ -1371,7 +1436,7 @@ }, { "if": "payment:notes:denominations=100 EUR", - "icon": "./assets/layers/questions/100euro.svg", + "icon": "./assets/layers/questions/denominations/eur/100euro.svg", "then": { "en": "100 euro notes are accepted", "nl": "Biljetten van 100 euro worden geaccepteerd", @@ -1386,7 +1451,7 @@ }, { "if": "payment:notes:denominations=200 EUR", - "icon": "./assets/layers/questions/200euro.svg", + "icon": "./assets/layers/questions/denominations/eur/200euro.svg", "then": { "en": "200 euro notes are accepted", "nl": "Biljetten van 200 euro worden geaccepteerd", @@ -1401,7 +1466,7 @@ }, { "if": "payment:notes:denominations=500 EUR", - "icon": "./assets/layers/questions/500euro.svg", + "icon": "./assets/layers/questions/denominations/eur/500euro.svg", "then": { "en": "500 euro notes are accepted", "nl": "Biljetten van 500 euro worden geaccepteerd", @@ -1413,6 +1478,60 @@ "fr": "Les billets de 500 euros sont acceptés" }, "hideInAnswer": "_currency!~.*EUR.*" + }, + { + "if": "payment:notes:denominations=10 CHF", + "icon": "./assets/layers/questions/denominations/chf/10chf.svg", + "then": { + "en": "10 francs notes are accepted", + "nl": "Biljetten van 10 frank worden geaccepteerd" + }, + "hideInAnswer": "_currency!~.*CHF.*" + }, + { + "if": "payment:notes:denominations=20 CHF", + "icon": "./assets/layers/questions/denominations/chf/20chf.svg", + "then": { + "en": "20 francs notes are accepted", + "nl": "Biljetten van 20 frank worden geaccepteerd" + }, + "hideInAnswer": "_currency!~.*CHF.*" + }, + { + "if": "payment:notes:denominations=50 CHF", + "icon": "./assets/layers/questions/denominations/chf/50chf.svg", + "then": { + "en": "50 francs notes are accepted", + "nl": "Biljetten van 50 frank worden geaccepteerd" + }, + "hideInAnswer": "_currency!~.*CHF.*" + }, + { + "if": "payment:notes:denominations=100 CHF", + "icon": "./assets/layers/questions/denominations/chf/100chf.svg", + "then": { + "en": "100 francs notes are accepted", + "nl": "Biljetten van 100 frank worden geaccepteerd" + }, + "hideInAnswer": "_currency!~.*CHF.*" + }, + { + "if": "payment:notes:denominations=200 CHF", + "icon": "./assets/layers/questions/denominations/chf/200chf.svg", + "then": { + "en": "200 francs notes are accepted", + "nl": "Biljetten van 200 frank worden geaccepteerd" + }, + "hideInAnswer": "_currency!~.*CHF.*" + }, + { + "if": "payment:notes:denominations=1000 CHF", + "icon": "./assets/layers/questions/denominations/chf/1000chf.svg", + "then": { + "en": "1000 francs notes are accepted", + "nl": "Biljetten van 1000 frank worden geaccepteerd" + }, + "hideInAnswer": "_currency!~.*CHF.*" } ] }, @@ -2224,4 +2343,4 @@ ] } ] -} +} \ No newline at end of file