From 0c6c7d08271bc64561ed8d46d808d268550413ec Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sun, 11 Aug 2019 10:48:05 -0500 Subject: [PATCH] Deprecate `diaper` in favor of `changing_table` (close #6529) --- data/deprecated.json | 16 ++++++++++++++++ data/presets.yaml | 6 +++--- data/presets/fields.json | 2 +- data/presets/fields/changing_table.json | 5 +++++ data/presets/fields/diaper.json | 6 ------ data/presets/presets.json | 2 +- data/presets/presets/amenity/toilets.json | 2 +- data/taginfo.json | 6 +++++- dist/locales/en.json | 8 ++++---- 9 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 data/presets/fields/changing_table.json delete mode 100644 data/presets/fields/diaper.json diff --git a/data/deprecated.json b/data/deprecated.json index 284ca8bb2..67fa8a94d 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -264,6 +264,22 @@ "old": {"curb": "*"}, "replace": {"kerb": "$1"} }, + { + "old": {"diaper": "1"}, + "replace": {"changing_table": "yes", "changing_table:count": "1"} + }, + { + "old": {"diaper": "no"}, + "replace": {"changing_table": "no"} + }, + { + "old": {"diaper": "room"}, + "replace": {"changing_table": "yes", "changing_table:location": "room"} + }, + { + "old": {"diaper": "yes"}, + "replace": {"changing_table": "yes"} + }, { "old": {"drinkable": "*"}, "replace": {"drinking_water": "$1"} diff --git a/data/presets.yaml b/data/presets.yaml index 8bdd056db..2a8ce4190 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -378,6 +378,9 @@ en: castle_type: # castle_type=* label: Type + changing_table: + # changing_table=* + label: Diaper Changing Table charge_fee: # charge=* label: Fee Amount @@ -581,9 +584,6 @@ en: label: Diameter # diameter field placeholder placeholder: '5 mm, 10 cm, 15 in…' - diaper: - # diaper=* - label: Diaper Changing Available diet_multi: # 'diet:=*' label: Diet Types diff --git a/data/presets/fields.json b/data/presets/fields.json index 34d609497..a49e13e8d 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -59,6 +59,7 @@ "capacity": {"key": "capacity", "type": "number", "minValue": 0, "label": "Capacity", "placeholder": "50, 100, 200..."}, "cash_in": {"key": "cash_in", "type": "check", "label": "Cash In"}, "castle_type": {"key": "castle_type", "type": "combo", "label": "Type"}, + "changing_table": {"key": "changing_table", "type": "check", "label": "Diaper Changing Table"}, "charge_fee": {"key": "charge", "type": "text", "label": "Fee Amount", "placeholder": "1 EUR, 5 USD, 10 JPY…", "prerequisiteTag": {"key": "fee", "valueNot": "no"}}, "charge_toll": {"key": "charge", "type": "text", "label": "Toll Amount", "placeholder": "1 EUR, 5 USD, 10 JPY…", "prerequisiteTag": {"key": "toll", "valueNot": "no"}}, "check_date": {"key": "check_date", "type": "text", "label": "Last Checked Date"}, @@ -98,7 +99,6 @@ "destination/symbol_oneway": {"key": "destination:symbol", "type": "semiCombo", "label": "Destination Symbols", "prerequisiteTag": {"key": "oneway", "value": "yes"}}, "devices": {"key": "devices", "type": "number", "minValue": 0, "label": "Devices", "placeholder": "1, 2, 3..."}, "diameter": {"key": "diameter", "type": "combo", "label": "Diameter", "snake_case": false, "placeholder": "5 mm, 10 cm, 15 in…"}, - "diaper": {"key": "diaper", "type": "combo", "label": "Diaper Changing Available", "options": ["yes", "no", "room", "1", "2", "3", "4", "5"]}, "diet_multi": {"key": "diet:", "type": "multiCombo", "label": "Diet Types", "terms": ["gluten free", "fruitarian", "halal", "kosher", "lactose free", "meat", "pescatarian", "raw", "vegan", "vegetarian"]}, "diplomatic": {"key": "diplomatic", "type": "combo", "label": "Type"}, "diplomatic/services": {"key": "diplomatic:services:", "type": "multiCombo", "label": "Services"}, diff --git a/data/presets/fields/changing_table.json b/data/presets/fields/changing_table.json new file mode 100644 index 000000000..e746b25f0 --- /dev/null +++ b/data/presets/fields/changing_table.json @@ -0,0 +1,5 @@ +{ + "key": "changing_table", + "type": "check", + "label": "Diaper Changing Table" +} diff --git a/data/presets/fields/diaper.json b/data/presets/fields/diaper.json deleted file mode 100644 index 555abfd0f..000000000 --- a/data/presets/fields/diaper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "key": "diaper", - "type": "combo", - "label": "Diaper Changing Available", - "options": ["yes", "no", "room", "1", "2", "3", "4", "5"] -} diff --git a/data/presets/presets.json b/data/presets/presets.json index ad921ec8c..fb5d630f0 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -220,7 +220,7 @@ "amenity/telephone": {"icon": "maki-telephone", "fields": ["operator", "phone", "fee", "payment_multi_fee", "charge_fee", "booth"], "moreFields": ["covered", "indoor", "lit", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "telephone"}, "terms": ["phone"], "name": "Telephone"}, "amenity/theatre": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["theatre", "performance", "play", "musical"], "tags": {"amenity": "theatre"}, "name": "Theater"}, "amenity/theatre/type/amphi": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "lit"], "geometry": ["point", "area"], "terms": ["open air", "outdoor", "greek", "ampi"], "tags": {"amenity": "theatre", "theatre:type": "amphi"}, "name": "Amphitheatre"}, - "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "diaper", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "opening_hours", "operator", "payment_multi_fee", "toilets/handwashing", "toilets/position"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"}, + "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "changing_table", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "opening_hours", "operator", "payment_multi_fee", "toilets/handwashing", "toilets/position"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"}, "amenity/toilets/disposal/flush": {"icon": "fas-toilet", "fields": ["toilets/disposal", "{amenity/toilets}"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "head", "lavatory", "privy", "restroom", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets", "toilets:disposal": "flush"}, "reference": {"key": "toilets:disposal", "value": "flush"}, "name": "Flush Toilets"}, "amenity/toilets/disposal/pitlatrine": {"icon": "tnp-2009541", "fields": ["toilets/disposal", "{amenity/toilets}", "toilets/handwashing"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["head", "lavatory", "long drop", "outhouse", "pit toilet", "privy"], "tags": {"amenity": "toilets", "toilets:disposal": "pitlatrine"}, "reference": {"key": "toilets:disposal", "value": "pitlatrine"}, "name": "Pit Latrine"}, "amenity/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"}, diff --git a/data/presets/presets/amenity/toilets.json b/data/presets/presets/amenity/toilets.json index 21ebb9986..3fb1ba68b 100644 --- a/data/presets/presets/amenity/toilets.json +++ b/data/presets/presets/amenity/toilets.json @@ -4,7 +4,7 @@ "toilets/disposal", "access_simple", "gender", - "diaper", + "changing_table", "wheelchair", "building_area" ], diff --git a/data/taginfo.json b/data/taginfo.json index e5f429d32..e20894cdc 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1279,6 +1279,7 @@ {"key": "capacity", "description": "πŸ„΅ Capacity"}, {"key": "cash_in", "description": "πŸ„΅ Cash In"}, {"key": "castle_type", "description": "πŸ„΅ Type"}, + {"key": "changing_table", "description": "πŸ„΅ Diaper Changing Table"}, {"key": "charge", "description": "πŸ„΅ Fee Amount, πŸ„΅ Toll Amount"}, {"key": "check_date", "description": "πŸ„΅ Last Checked Date"}, {"key": "clothes", "description": "πŸ„΅ Clothes"}, @@ -1342,7 +1343,6 @@ {"key": "destination:symbol", "description": "πŸ„΅ Destination Symbols"}, {"key": "devices", "description": "πŸ„΅ Devices"}, {"key": "diameter", "description": "πŸ„΅ Diameter"}, - {"key": "diaper", "description": "πŸ„΅ Diaper Changing Available"}, {"key": "diet:", "description": "πŸ„΅ Diet Types"}, {"key": "diplomatic", "description": "πŸ„΅ Type"}, {"key": "diplomatic:services:", "description": "πŸ„΅ Services"}, @@ -1873,6 +1873,10 @@ {"key": "cuisine", "value": "vegan", "description": "πŸ„³ ➜ diet:vegan=*"}, {"key": "cuisine", "value": "vegetarian", "description": "πŸ„³ ➜ diet:vegetarian=*"}, {"key": "curb", "description": "πŸ„³ ➜ kerb=*"}, + {"key": "diaper", "value": "1", "description": "πŸ„³ ➜ changing_table=yes + changing_table:count=1"}, + {"key": "diaper", "value": "no", "description": "πŸ„³ ➜ changing_table=no"}, + {"key": "diaper", "value": "room", "description": "πŸ„³ ➜ changing_table=yes + changing_table:location=room"}, + {"key": "diaper", "value": "yes", "description": "πŸ„³ ➜ changing_table=yes"}, {"key": "drinkable", "description": "πŸ„³ ➜ drinking_water=*"}, {"key": "dropped_kerb", "description": "πŸ„³ ➜ kerb=lowered"}, {"key": "escalator", "description": "πŸ„³ ➜ highway=steps + conveying=*"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index e08f1cf5b..d909b2ebd 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2771,6 +2771,10 @@ "label": "Type", "terms": "" }, + "changing_table": { + "label": "Diaper Changing Table", + "terms": "" + }, "charge_fee": { "label": "Fee Amount", "terms": "", @@ -2986,10 +2990,6 @@ "terms": "", "placeholder": "5 mm, 10 cm, 15 in…" }, - "diaper": { - "label": "Diaper Changing Available", - "terms": "" - }, "diet_multi": { "label": "Diet Types", "terms": "gluten free,fruitarian,halal,kosher,lactose free,meat,pescatarian,raw,vegan,vegetarian"