From 21244368a6faf3d24d6310a630b7ffc223d0001e Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 2 May 2023 11:07:32 +0200 Subject: [PATCH] use "manyCombo" field for "gender" field, restrict hairdressers to female/male, closes #894 also partially addresses #895 and https://github.com/openstreetmap/iD/issues/7427: for that iD should actually also show the "no" values allow explicitly marking the absense of certain options --- data/fields/gender.json | 2 +- data/fields/gender_simple.json | 13 +++++++++++++ data/presets/shop/hairdresser.json | 2 +- interim/source_strings.yaml | 2 ++ 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 data/fields/gender_simple.json diff --git a/data/fields/gender.json b/data/fields/gender.json index be6bd7a4..7808e5b9 100644 --- a/data/fields/gender.json +++ b/data/fields/gender.json @@ -1,5 +1,5 @@ { - "type": "radio", + "type": "manyCombo", "keys": [ "male", "female", diff --git a/data/fields/gender_simple.json b/data/fields/gender_simple.json new file mode 100644 index 00000000..4d7021a1 --- /dev/null +++ b/data/fields/gender_simple.json @@ -0,0 +1,13 @@ +{ + "type": "manyCombo", + "keys": [ + "female", + "male" + ], + "label": "{gender}", + "stringsCrossReference": "{gender}", + "options": [ + "female", + "male" + ] +} diff --git a/data/presets/shop/hairdresser.json b/data/presets/shop/hairdresser.json index 64e25762..daeab153 100644 --- a/data/presets/shop/hairdresser.json +++ b/data/presets/shop/hairdresser.json @@ -15,7 +15,7 @@ "opening_hours", "payment_multi", "phone", - "gender" + "gender_simple" ], "tags": { "shop": "hairdresser" diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 2f308b93..5c19bcf0 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -2160,6 +2160,8 @@ en: placeholder: Unknown # 'terms: access,female,male,unisex' terms: '[translate with synonyms or related terms for ''Gender'', separated by commas]' + gender_simple: + # female=*, male=* generator/method: # generator:method=* label: Method