Deprecate diaper in favor of changing_table (close #6529)

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"}

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

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"},

data/presets/fields/changing_table.json

@@ -0,0 +1,5 @@
+{
+    "key": "changing_table",
+    "type": "check",
+    "label": "Diaper Changing Table"
+}

data/presets/fields/diaper.json

@@ -1,6 +0,0 @@
-{
-    "key": "diaper",
-    "type": "combo",
-    "label": "Diaper Changing Available",
-    "options": ["yes", "no", "room", "1", "2", "3", "4", "5"]
-}

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"},

data/presets/presets/amenity/toilets.json

@@ -4,7 +4,7 @@
         "toilets/disposal",
         "access_simple",
         "gender",
-        "diaper",
+        "changing_table",
         "wheelchair",
         "building_area"
     ],

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=*"},

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"