From 95886744a2272327b379cb7ac2f8e385ddb1bdc5 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 10 Aug 2022 17:29:08 +0200 Subject: [PATCH 1/2] Add internet access questions, add to a few themes --- assets/layers/cafe_pub/cafe_pub.json | 3 + assets/layers/food/food.json | 3 + assets/layers/hotel/hotel.json | 5 +- assets/layers/shops/shops.json | 3 + assets/tagRenderings/questions.json | 105 +++++++++++++++++++++++++++ langs/shared-questions/en.json | 41 +++++++++++ langs/shared-questions/nl.json | 41 +++++++++++ 7 files changed, 200 insertions(+), 1 deletion(-) diff --git a/assets/layers/cafe_pub/cafe_pub.json b/assets/layers/cafe_pub/cafe_pub.json index 3343f4b5f..22250d79f 100644 --- a/assets/layers/cafe_pub/cafe_pub.json +++ b/assets/layers/cafe_pub/cafe_pub.json @@ -271,6 +271,9 @@ "smoking", "service:electricity", "dog-access", + "internet", + "internet-fee", + "internet-ssid", "reviews" ], "filter": [ diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index ba1cbfa7d..8888218b7 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -764,6 +764,9 @@ }, "service:electricity", "dog-access", + "internet", + "internet-fee", + "internet-ssid", "reviews" ], "filter": [ diff --git a/assets/layers/hotel/hotel.json b/assets/layers/hotel/hotel.json index d6a504e5c..be618ac3b 100644 --- a/assets/layers/hotel/hotel.json +++ b/assets/layers/hotel/hotel.json @@ -80,7 +80,10 @@ "phone", "email", "website", - "wheelchair-access" + "wheelchair-access", + "internet", + "internet-fee", + "internet-ssid" ], "allowMove": { "enableImproveAccuracy": true, diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json index 2eb4e11a0..5d5d60e61 100644 --- a/assets/layers/shops/shops.json +++ b/assets/layers/shops/shops.json @@ -201,6 +201,9 @@ } ] }, + "internet", + "internet-fee", + "internet-ssid", "questions", "reviews" ], diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json index c122f83e5..c74dfa34e 100644 --- a/assets/tagRenderings/questions.json +++ b/assets/tagRenderings/questions.json @@ -1148,5 +1148,110 @@ } } ] + }, + "internet": { + "question": { + "en": "Does this place offer internet access?", + "nl": "Biedt deze plaats internettoegang aan?" + }, + "mappings": [ + { + "if": "internet_access=wlan", + "then": { + "en": "This place offers wireless internet access", + "nl": "Deze plaats biedt draadloze internettoegang aan" + } + }, + { + "if": "internet_access=no", + "then": { + "en": "This place does not offer internet access", + "nl": "Deze plaats biedt geen internettoegang aan" + } + }, + { + "if": "internet_access=yes", + "then": { + "en": "This place offers internet access", + "nl": "Deze plaats biedt internettoegang aan" + }, + "hideInAnswer": true + }, + { + "if": "internet_access=terminal", + "then": { + "en": "This place offers internet access via a terminal or computer", + "nl": "Deze plaats biedt internettoegang via een terminal of computer aan" + } + }, + { + "if": "internet_access=wired", + "then": { + "en": "This place offers wired internet access", + "nl": "Deze plaats biedt bedrade internettoegang aan" + } + } + ] + }, + "internet-fee": { + "condition": { + "and": [ + "internet_access!=no", + "internet_access!=" + ] + }, + "question": { + "en": "Is there a fee for internet access?", + "nl": "Zijn er kosten voor internettoegang?" + }, + "mappings": [ + { + "if": "internet_access:fee=yes", + "then": { + "en": "There is a fee for the internet access at this place", + "nl": "Er zijn kosten voor internettoegang op deze plaats" + } + }, + { + "if": "internet_access:fee=no", + "then": { + "en": "Internet access is free at this place", + "nl": "Internettoegang is gratis op deze plaats" + } + }, + { + "if": "internet_access:fee=customers", + "then": { + "en": "Internet access is free at this place, for customers only", + "nl": "Internettoegang is gratis op deze plaats, alleen voor klanten" + } + } + ] + }, + "internet-ssid": { + "condition": "internet_access=wlan", + "question": { + "en": "What is the network name for the wireless internet access?", + "nl": "Wat is de netwerknaam voor de draadloze internettoegang?" + }, + "freeform": { + "key": "internet_access:ssid", + "type": "string", + "placeholder": { + "en": "Enter the network name", + "nl": "Voer de netwerknaam in" + } + }, + "mappings": [ + { + "if": "internet_access:ssid=Telekom", + "then": "Telekom", + "hideInAnswer": "_country!=de" + } + ], + "render": { + "en": "The network name is {{internet_access:ssid}}", + "nl": "De netwerknaam is {{internet_access:ssid}}" + } } } \ No newline at end of file diff --git a/langs/shared-questions/en.json b/langs/shared-questions/en.json index c716ca0b2..a1c593b35 100644 --- a/langs/shared-questions/en.json +++ b/langs/shared-questions/en.json @@ -34,6 +34,47 @@ }, "question": "Does this place have an audio induction loop for people with reduced hearing?" }, + "internet": { + "mappings": { + "0": { + "then": "This place offers wireless internet access" + }, + "1": { + "then": "This place does not offer internet access" + }, + "2": { + "then": "This place offers internet access" + }, + "3": { + "then": "This place offers internet access via a terminal or computer" + }, + "4": { + "then": "This place offers wired internet access" + } + }, + "question": "Does this place offer internet access?" + }, + "internet-fee": { + "mappings": { + "0": { + "then": "There is a fee for the internet access at this place" + }, + "1": { + "then": "Internet access is free at this place" + }, + "2": { + "then": "Internet access is free at this place, for customers only" + } + }, + "question": "Is there a fee for internet access?" + }, + "internet-ssid": { + "freeform": { + "placeholder": "Enter the network name" + }, + "question": "What is the network name for the wireless internet access?", + "render": "The network name is {{internet_access:ssid}}" + }, "level": { "mappings": { "0": { diff --git a/langs/shared-questions/nl.json b/langs/shared-questions/nl.json index c5bd2085e..9e1a4c1b3 100644 --- a/langs/shared-questions/nl.json +++ b/langs/shared-questions/nl.json @@ -23,6 +23,47 @@ "email": { "question": "Wat is het e-mailadres van {title()}?" }, + "internet": { + "mappings": { + "0": { + "then": "Deze plaats biedt draadloze internettoegang aan" + }, + "1": { + "then": "Deze plaats biedt geen internettoegang aan" + }, + "2": { + "then": "Deze plaats biedt internettoegang aan" + }, + "3": { + "then": "Deze plaats biedt internettoegang via een terminal of computer aan" + }, + "4": { + "then": "Deze plaats biedt bedrade internettoegang aan" + } + }, + "question": "Biedt deze plaats internettoegang aan?" + }, + "internet-fee": { + "mappings": { + "0": { + "then": "Er zijn kosten voor internettoegang op deze plaats" + }, + "1": { + "then": "Internettoegang is gratis op deze plaats" + }, + "2": { + "then": "Internettoegang is gratis op deze plaats, alleen voor klanten" + } + }, + "question": "Zijn er kosten voor internettoegang?" + }, + "internet-ssid": { + "freeform": { + "placeholder": "Voer de netwerknaam in" + }, + "question": "Wat is de netwerknaam voor de draadloze internettoegang?", + "render": "De netwerknaam is {{internet_access:ssid}}" + }, "level": { "mappings": { "0": { From bed18dd948e23e5f8324ffcfdb8cba7676b8f514 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 10 Aug 2022 20:51:00 +0200 Subject: [PATCH 2/2] Remove double braces --- assets/tagRenderings/questions.json | 4 ++-- langs/shared-questions/en.json | 2 +- langs/shared-questions/nl.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json index c74dfa34e..e6237dbde 100644 --- a/assets/tagRenderings/questions.json +++ b/assets/tagRenderings/questions.json @@ -1250,8 +1250,8 @@ } ], "render": { - "en": "The network name is {{internet_access:ssid}}", - "nl": "De netwerknaam is {{internet_access:ssid}}" + "en": "The network name is {internet_access:ssid}", + "nl": "De netwerknaam is {internet_access:ssid}" } } } \ No newline at end of file diff --git a/langs/shared-questions/en.json b/langs/shared-questions/en.json index a1c593b35..c251488a2 100644 --- a/langs/shared-questions/en.json +++ b/langs/shared-questions/en.json @@ -73,7 +73,7 @@ "placeholder": "Enter the network name" }, "question": "What is the network name for the wireless internet access?", - "render": "The network name is {{internet_access:ssid}}" + "render": "The network name is {internet_access:ssid}" }, "level": { "mappings": { diff --git a/langs/shared-questions/nl.json b/langs/shared-questions/nl.json index 9e1a4c1b3..ed7cde93a 100644 --- a/langs/shared-questions/nl.json +++ b/langs/shared-questions/nl.json @@ -62,7 +62,7 @@ "placeholder": "Voer de netwerknaam in" }, "question": "Wat is de netwerknaam voor de draadloze internettoegang?", - "render": "De netwerknaam is {{internet_access:ssid}}" + "render": "De netwerknaam is {internet_access:ssid}" }, "level": { "mappings": {