diff --git a/assets/layers/diets/diets.json b/assets/layers/diets/diets.json index d64e4b2a1f..a37b990fe0 100644 --- a/assets/layers/diets/diets.json +++ b/assets/layers/diets/diets.json @@ -8,6 +8,7 @@ "id": "diets_title", "labels": [ "diets", + "diets_grouped", "hidden" ], "render": { @@ -17,7 +18,8 @@ { "id": "diets_grouped", "labels": [ - "diets" + "diets", + "diets_grouped" ], "render": { "special": { @@ -31,6 +33,7 @@ "id": "sugar_free", "labels": [ "diets", + "diets_grouped", "diets-content", "hidden" ], @@ -179,6 +182,8 @@ "labels": [ "diets", "diets-content", + "diets_grouped", + "hidden" ], "question": { @@ -249,6 +254,7 @@ "id": "vegan", "labels": [ "diets", + "diets_grouped", "diets-content", "hidden" ], @@ -331,6 +337,8 @@ "labels": [ "diets", "diets-content", + "diets_grouped", + "hidden" ], "mappings": [ @@ -504,6 +512,8 @@ "labels": [ "diets", "diets-content", + "diets_grouped", + "hidden" ], "condition": { @@ -523,6 +533,8 @@ "labels": [ "diets", "diets-content", + "diets_grouped", + "hidden" ], "question": { @@ -608,6 +620,8 @@ "labels": [ "diets", "diets-content", + "diets_grouped", + "hidden" ], "id": "organic", @@ -677,6 +691,7 @@ { "labels": [ "diets", + "diets_grouped", "diets-content", "hidden" ], @@ -749,6 +764,7 @@ "id": "friture-vegan", "labels": [ "diets", + "diets_grouped", "diets-content", "hidden" ], @@ -820,6 +836,7 @@ "id": "friture-organic", "labels": [ "diets", + "diets_grouped", "diets-content", "hidden" ], @@ -876,6 +893,7 @@ "id": "friture-oil", "labels": [ "diets", + "diets_grouped", "diets-content", "hidden" ], @@ -926,6 +944,7 @@ "labels": [ "hidden", "diets", + "diets_grouped", "diets-content" ], "render": { diff --git a/assets/layers/historic_rolling_stock/steam_locomotive.svg b/assets/layers/historic_rolling_stock/steam_locomotive.svg index 3e4896aebb..5685c4c4a2 100644 --- a/assets/layers/historic_rolling_stock/steam_locomotive.svg +++ b/assets/layers/historic_rolling_stock/steam_locomotive.svg @@ -3,7 +3,7 @@ + viewBox="0 0 512 512" height="512" width="512" xml:space="preserve"> @@ -41,4 +41,4 @@ c0-8.028-6.517-14.561-14.561-14.561c-6.102,0-11.306,3.77-13.472,9.084h-12.432c2.531-11.977,13.176-21.005,25.904-21.005 c14.61,0,26.49,11.88,26.49,26.482C394.981,475.158,383.102,487.038,368.491,487.038z"/> - \ No newline at end of file + diff --git a/assets/layers/ice_cream/ice_cream.json b/assets/layers/ice_cream/ice_cream.json index fad6360013..7cf15c718c 100644 --- a/assets/layers/ice_cream/ice_cream.json +++ b/assets/layers/ice_cream/ice_cream.json @@ -135,7 +135,7 @@ }, "opening_hours", "contact", - "diets", + "diets.diets_grouped", "payment-options", "wheelchair-access", "toilet_at_amenity_lib.all" diff --git a/assets/layers/pharmacy/pharmacy.json b/assets/layers/pharmacy/pharmacy.json index e81fbd93c0..39921c1d98 100644 --- a/assets/layers/pharmacy/pharmacy.json +++ b/assets/layers/pharmacy/pharmacy.json @@ -161,7 +161,7 @@ "contact", "address.address", "payment-options", - "wheelchair", + "wheelchair-access", "toilet_at_amenity_lib.all" ], "filter": [ diff --git a/assets/layers/police_call_box/police_call_box.svg b/assets/layers/police_call_box/police_call_box.svg index 54b862d5f9..636004bc6f 100644 --- a/assets/layers/police_call_box/police_call_box.svg +++ b/assets/layers/police_call_box/police_call_box.svg @@ -1,144 +1,337 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/sauna/sauna.svg b/assets/layers/sauna/sauna.svg index 49f43a322b..78536f8fdd 100644 --- a/assets/layers/sauna/sauna.svg +++ b/assets/layers/sauna/sauna.svg @@ -1,26 +1,140 @@ - - - + + + + - + image/svg+xml - - + - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json index e66da0144b..6700e569b7 100644 --- a/assets/layers/shops/shops.json +++ b/assets/layers/shops/shops.json @@ -367,6 +367,7 @@ }, { "id": "beauty_shop_type", + "condition": "shop=beauty", "question": { "en": "What type of beauty shop is this?" }, @@ -1420,6 +1421,95 @@ { "builtin": "bike_cleaning.bike_cleaning-service_bicycle_cleaning_charge" }, + { + "id": "erotic_shop_fetish", + "condition": "shop=erotic", + "labels": ["nsfw"], + "multiAnswer": true, + "question": { + "en": "Does this shop offer fetish gear?", + "de": "Bietet dieser Laden Fetischkleidung an?", + "es": "¿Esta tienda ofrece artículos fetiche?", + "cs": "Nabízí tento obchod vybavení pro fetišisty?", + "nl": "Biedt deze winkel fetisjspullen aan?", + "ko": "이 상점은 페티시 기어를 제공하나요?", + "it": "Questo negozio offre attrezzature fetish?", + "zh_Hant": "這家商店提供戀物癖裝備嗎？" + }, + "mappings": [ + { + "if": "fetish:bdsm:soft=yes", + "ifnot": "fetish:bdsm:soft=no", + "then": { + "en": "This shop offers soft BDSM-gear, such as fluffy handcuffs, a 'fifty-shade-of-grey'-starterset, ...", + "de": "Dieser Laden bietet weiches BDSM-Zubehör an, wie zum Beispiel flauschige Handschellen, ein \"Fifty Shades of Grey\"-Starterset, ...", + "es": "Esta tienda ofrece artículos BDSM suaves, como esposas de peluche, un kit de iniciación 'cincuenta sombras de Grey',...", + "cs": "Tento obchod nabízí měkké BDSM pomůcky, jako jsou chlupatá pouta, sada „padesát odstínů šedi“, ...", + "nl": "Deze winkel biedt soft BDSM-accessoires, zoals zachte handboeien, een 'fifty-shade-of-grey'-starterset, ...", + "ko": "이 상점은 털 수갑과 같은 soft BDSM-gear를 제공합니다.", + "it": "Questo negozio offre attrezzature BDSM leggere, come manette pelose, un 'kit di partenza cinquanta sfumature di grigio', ...", + "zh_Hant": "這間店提供軟性調教道具，例如完整的手銬、完整的格雷的五十道陰影入門款、…" + } + }, + { + "if": "fetish:bdsm:specialized=yes", + "ifnot": "fetish:bdsm:specialized=no", + "then": { + "en": "This shop offers specialized BDSM-gear, such as spreader bars, supplies for needle play, medical bondage supplies, impact tools, shackles, metal colors, cuffs, nipple clamps, shibari accessories, ...", + "de": "Dieser Laden bietet spezialisiertes BDSM-Zubehör an, wie zum Beispiel Spreizstangen, Utensilien für Nadelfolter, medizinische Bondage-Ausrüstung, Schlagwerkzeuge, Fesseln, Metallhalsbänder, Handschellen, Nippelklemmen, Shibari-Zubehör, ...", + "es": "Esta tienda ofrece artículos BDSM especializados, como barras separadoras, artículos para juegos con agujas, artículos de bondage médico, herramientas de impacto, grilletes, colores metálicos, puños, pinzas para pezones, accesorios shibari,...", + "cs": "Tento obchod nabízí specializované BDSM pomůcky, jako jsou roztahovací tyče, potřeby pro hru na jehlách, potřeby pro lékařskou bondáž, nárazové nástroje, pouta, kovové barvy, pouta, svorky na bradavky, shibari doplňky, ...", + "nl": "Deze winkel biedt gespecialiseerde BDSM-benodigdheden, zoals spreidstangen, benodigdheden voor naaldspellen, medische bondagebenodigdheden, slagwerktuigen, kluisters, metalen kleuren, boeien, tepelklemmen, shibari-accessoires, ...", + "ko": "이 상점은 스프레더 바와 같은 specialized BDSM-gear를 제공합니다.", + "it": "Questo negozio offre attrezzature BDSM specializzate, come barre divaricatrici, forniture per giochi con aghi, forniture per bondage medico, strumenti d'impatto, catene, polsini, morsetti per capezzoli, accessori per shibari, ...", + "zh_Hant": "這間店提供特規調教工具，例如擴張桿、針刺遊戲用品、醫療束縛用品、衝擊工具、枷鎖、金屬色料、袖口、乳頭夾、繩縛配件、…" + } + }, + { + "if": "fetish:pet_play=yes", + "ifnot": "fetish:pet_play=no", + "then": { + "en": "This shop offers pet play accessories, such as puppy masks, animal masks, pony play, tails, hoof shoes, ...", + "de": "Dieser Laden bietet Petplay-Zubehör an, wie zum Beispiel Hundemasken, Tiermasken, Ponyplay-Ausrüstung, Schwänze, Hufschuhe, ...", + "es": "Esta tienda ofrece accesorios para juegos con mascotas, como máscaras de cachorro, máscaras de animales, juegos de pony, colas, zapatos de casco,...", + "cs": "Tento obchod nabízí doplňky na hraní si na zvířata, jako jsou masky štěňat, masky zvířat, poníci na hraní, ocasy, boty na kopyta, ...", + "nl": "Deze winkel biedt 'pet play'-accessoires, zoals puppymaskers, dierenmaskers, ponyspellen, staarten, hoefschoenen, ...", + "ko": "이 상점은 동물 마스크와 같은 pet play 악세사리를 제공합니다.", + "it": "Questo negozio offre accessori per pet play, come maschere da cucciolo, maschere di animali, pony play, code, scarpe a zoccolo, ...", + "zh_Hant": "這間店提供寵物扮演配件，像是寵物面具、動物面具、馬尾、馬蹄鐵、…" + } + }, + { + "if": "fetish:leather=yes", + "ifnot": "fetish:leather=no", + "then": { + "en": "This shop offers leather gear, including pants and shirts usable in daily life up till leather harnesses", + "de": "Dieser Laden bietet Lederkleidung an, darunter Hosen und Hemden für den Alltag bis hin zu Lederharnissen", + "es": "Esta tienda ofrece artículos de cuero, incluyendo pantalones y camisas utilizables en la vida diaria hasta arneses de cuero", + "cs": "Tento obchod nabízí kožené vybavení, včetně kalhot a košil použitelných v každodenním životě až po kožené postroje", + "nl": "Deze winkel biedt leren kledij aan, waaronder broeken en shirts die je in het dagelijks leven kunt gebruiken tot en met leren harnassen", + "ko": "이 상점은 바지, 셔츠, 가죽 하네스와 같은 leather gear를 제공합니다", + "it": "Questo negozio offre abbigliamento in pelle, inclusi pantaloni e camicie utilizzabili nella vita quotidiana fino a imbracature in pelle", + "zh_Hant": "這間店提供皮革工具，包括日常生活中穿的褲子和襯衫，採用皮革馬具" + } + }, + { + "if": "fetish:uniform=yes", + "ifnot": "fetish:uniform=no", + "then": { + "en": "This shop offers uniforms for roleplay, such nurse uniforms, military uniforms, police, school girl, french maid, ...", + "de": "Dieser Laden bietet Uniformen für Rollenspiele an, wie Krankenschwester-Uniformen, Militäruniformen, Polizei-, Schulmädchen- und Dienstmädchen-Outfits, ...", + "es": "Esta tienda ofrece uniformes para juegos de rol, como uniformes de enfermera, uniformes militares, policía, colegiala, criada francesa,...", + "cs": "Tento obchod nabízí uniformy pro roleplay, jako jsou uniformy zdravotní sestry, vojenské uniformy, policie, školačky, francouzské pokojské, ...", + "nl": "Deze winkel biedt uniformen voor rollenspelen aan, zoals verpleegsteruniformen, militaire uniformen, politie, schoolmeisje, Franse dienstmeid, ...", + "ko": "이 상점은 롤플레이 유니폼 같은uniforms 을 제공합니다.", + "it": "Questo negozio offre uniformi per giochi di ruolo, come uniformi da infermiera, uniformi militari, polizia, scolaretta, cameriera francese, ...", + "zh_Hant": "這間店提供角色扮演制服，例如護士服、軍服、警察、學生妹、法國女佣、…" + } + } + ] + }, + "internet-all", { "id": "organic", diff --git a/assets/themes/glutenfree/glutenfree.json b/assets/themes/glutenfree/glutenfree.json index 4288e83ff6..f6b591b9d3 100644 --- a/assets/themes/glutenfree/glutenfree.json +++ b/assets/themes/glutenfree/glutenfree.json @@ -70,7 +70,8 @@ "builtin": "ice_cream", "hideTagRenderingsWithLabels": [ "images", - "reviews" + "reviews", + "gluten_free" ], "override": { "source": { @@ -90,7 +91,8 @@ "builtin": "ice_cream", "hideTagRenderingsWithLabels": [ "images", - "reviews" + "reviews", + "gluten_free" ], "override": { "name": null, diff --git a/assets/themes/lactosefree/lactosefree.json b/assets/themes/lactosefree/lactosefree.json index 072796fd55..a326b0ddc4 100644 --- a/assets/themes/lactosefree/lactosefree.json +++ b/assets/themes/lactosefree/lactosefree.json @@ -141,7 +141,7 @@ "+tagRenderings": [ "images", "reviews", - "lactose_free" + "diets.lactose_free" ] } } diff --git a/src/Models/ThemeConfig/Json/ThemeConfigJson.ts b/src/Models/ThemeConfig/Json/ThemeConfigJson.ts index 61f6cd388b..4644b1a8f2 100644 --- a/src/Models/ThemeConfig/Json/ThemeConfigJson.ts +++ b/src/Models/ThemeConfig/Json/ThemeConfigJson.ts @@ -39,6 +39,8 @@ export interface ThemeConfigJson { */ id: string + labels?: string[] + /** * question: What is the title of this theme? *