From eb9e4e54960cb479bc7772ea8e75043671e3ad5b Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 18 Apr 2019 12:33:47 -0700 Subject: [PATCH] Deprecate theatre:type=amphitheatre Adjust toilet preset fields --- data/deprecated.json | 4 ++++ data/presets/presets.json | 6 +++--- data/presets/presets/amenity/toilets.json | 2 +- data/presets/presets/amenity/toilets/disposal/flush.json | 4 ++++ .../presets/amenity/toilets/disposal/pitlatrine.json | 7 ++++++- data/taginfo.json | 2 ++ 6 files changed, 20 insertions(+), 5 deletions(-) diff --git a/data/deprecated.json b/data/deprecated.json index 864f18568..596b7eb01 100644 --- a/data/deprecated.json +++ b/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"} diff --git a/data/presets/presets.json b/data/presets/presets.json index 95d0e52ba..38ad9600e 100644 --- a/data/presets/presets.json +++ b/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"}, diff --git a/data/presets/presets/amenity/toilets.json b/data/presets/presets/amenity/toilets.json index 2b04dbbfa..e89d4423e 100644 --- a/data/presets/presets/amenity/toilets.json +++ b/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": [ diff --git a/data/presets/presets/amenity/toilets/disposal/flush.json b/data/presets/presets/amenity/toilets/disposal/flush.json index 9f04d59bb..f681e9e95 100644 --- a/data/presets/presets/amenity/toilets/disposal/flush.json +++ b/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" } diff --git a/data/presets/presets/amenity/toilets/disposal/pitlatrine.json b/data/presets/presets/amenity/toilets/disposal/pitlatrine.json index d56169eed..bed09ee8d 100644 --- a/data/presets/presets/amenity/toilets/disposal/pitlatrine.json +++ b/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" } diff --git a/data/taginfo.json b/data/taginfo.json index 2b3144734..4744d165a 100644 --- a/data/taginfo.json +++ b/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"},