Deprecate theatre:type=amphitheatre

Adjust toilet preset fields

data/deprecated.json

@@ -647,6 +647,10 @@
       "old": {"sloped_curb": "yes"},
       "replace": {"kerb": "lowered"}
     },
+    {
+      "old": {"theatre:type": "amphitheatre"},
+      "replace": {"theatre:type": "amphi"}
+    },
     {
       "old": {"toilets:disposal": "longdrop"},
       "replace": {"toilets:disposal": "pitlatrine"}

data/presets/presets.json

@@ -199,9 +199,9 @@
     "amenity/telephone": {"icon": "maki-telephone", "fields": ["operator", "phone", "fee", "payment_multi_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", "toilets/handwashing", "diaper", "wheelchair", "building_area"], "moreFields": ["fee", "opening_hours", "operator", "payment_multi_fee", "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"}, "name": "Flush Toilets"},
-    "amenity/toilets/disposal/pitlatrine": {"icon": "tnp-2009541", "fields": ["toilets/disposal", "{amenity/toilets}"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["head", "lavatory", "long drop", "outhouse", "pit toilet", "privy"], "tags": {"amenity": "toilets", "toilets:disposal": "pitlatrine"}, "name": "Pit Latrine"},
+    "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "diaper", "wheelchair", "building_area"], "moreFields": ["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": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
     "amenity/toy_library": {"icon": "fas-chess-knight", "fields": ["operator", "address", "building_area", "opening_hours"], "moreFields": ["website", "wheelchair"], "geometry": ["point", "area"], "terms": ["game", "toy"], "tags": {"amenity": "toy_library"}, "name": "Toy Library"},
     "amenity/university": {"icon": "maki-college", "fields": ["{amenity/college}"], "moreFields": ["{amenity/college}"], "geometry": ["point", "area"], "terms": ["college", "graduate school", "PhD program", "master's degree program"], "tags": {"amenity": "university"}, "name": "University Grounds"},

data/presets/presets/amenity/toilets.json

@@ -4,7 +4,6 @@
         "toilets/disposal",
         "access_simple",
         "gender",
-        "toilets/handwashing",
         "diaper",
         "wheelchair",
         "building_area"
@@ -14,6 +13,7 @@
         "opening_hours",
         "operator",
         "payment_multi_fee",
+        "toilets/handwashing",
         "toilets/position"
     ],
     "geometry": [

data/presets/presets/amenity/toilets/disposal/flush.json

@@ -26,5 +26,9 @@
         "amenity": "toilets",
         "toilets:disposal": "flush"
     },
+    "reference": {
+        "key": "toilets:disposal",
+        "value": "flush"
+    },
     "name": "Flush Toilets"
 }

data/presets/presets/amenity/toilets/disposal/pitlatrine.json

@@ -2,7 +2,8 @@
     "icon": "tnp-2009541",
     "fields": [
         "toilets/disposal",
-        "{amenity/toilets}"
+        "{amenity/toilets}",
+        "toilets/handwashing"
     ],
     "moreFields": [
         "{amenity/toilets}"
@@ -24,5 +25,9 @@
         "amenity": "toilets",
         "toilets:disposal": "pitlatrine"
     },
+    "reference": {
+        "key": "toilets:disposal",
+        "value": "pitlatrine"
+    },
     "name": "Pit Latrine"
 }

data/taginfo.json

@@ -1779,6 +1779,7 @@
     {"key": "kerb", "value": "flat", "description": "🄳 ➜ kerb=flush"},
     {"key": "landuse", "value": "conservation", "description": "🄳 ➜ boundary=protected_area"},
     {"key": "landuse", "value": "field", "description": "🄳 ➜ landuse=farmland"},
+    {"key": "landuse", "value": "port", "description": "🄳 ➜ landuse=industrial + industrial=port"},
     {"key": "landuse", "value": "wood", "description": "🄳 ➜ natural=wood"},
     {"key": "leisure", "value": "beach", "description": "🄳 ➜ natural=beach"},
     {"key": "leisure", "value": "club", "description": "🄳 ➜ club=*"},
@@ -1836,6 +1837,7 @@
     {"key": "sloped_curb", "value": "low", "description": "🄳 ➜ kerb=lowered"},
     {"key": "sloped_curb", "value": "no", "description": "🄳 ➜ kerb=raised"},
     {"key": "sloped_curb", "value": "yes", "description": "🄳 ➜ kerb=lowered"},
+    {"key": "theatre:type", "value": "amphitheatre", "description": "🄳 ➜ theatre:type=amphi"},
     {"key": "toilets:disposal", "value": "longdrop", "description": "🄳 ➜ toilets:disposal=pitlatrine"},
     {"key": "toilets:disposal", "value": "pit_latrine", "description": "🄳 ➜ toilets:disposal=pitlatrine"},
     {"key": "tourism", "value": "bed_and_breakfast", "description": "🄳 ➜ tourism=guest_house"},