diff --git a/data/presets.yaml b/data/presets.yaml index dd76741b7..3215804d6 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2445,6 +2445,9 @@ en: wall: # wall=* label: Type + waste: + # waste=* + label: Waste water: # water=* label: Type diff --git a/data/presets/fields.json b/data/presets/fields.json index 559af0b8a..f03fe2891 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -413,6 +413,7 @@ "voltage/secondary": {"key": "voltage:secondary", "type": "combo", "label": "Secondary Voltage"}, "voltage/tertiary": {"key": "voltage:tertiary", "type": "combo", "label": "Tertiary Voltage"}, "wall": {"key": "wall", "type": "combo", "label": "Type"}, + "waste": {"key": "waste", "type": "semiCombo", "label": "Waste"}, "water_point": {"key": "water_point", "type": "check", "label": "Water Point"}, "water_source": {"key": "water_source", "default": "main", "type": "combo", "label": "Water Source"}, "water_volume": {"key": "water_volume", "type": "number", "label": "Water Reserve Volume (mĀ³)", "snake_case": false}, diff --git a/data/presets/fields/waste.json b/data/presets/fields/waste.json new file mode 100644 index 000000000..312ca185e --- /dev/null +++ b/data/presets/fields/waste.json @@ -0,0 +1,5 @@ +{ + "key": "waste", + "type": "semiCombo", + "label": "Waste" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index b33ff6aa3..45401d48b 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -251,9 +251,9 @@ "amenity/vending_machine/stamps": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["mail", "postage", "stamp"], "tags": {"amenity": "vending_machine", "vending": "stamps"}, "reference": {"key": "vending", "value": "stamps"}, "name": "Postage Vending Machine"}, "amenity/vending_machine/sweets": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["candy", "gum", "chip", "pretzel", "cookie", "cracker"], "tags": {"amenity": "vending_machine", "vending": "sweets"}, "reference": {"key": "vending", "value": "sweets"}, "name": "Snack Vending Machine"}, "amenity/veterinary": {"icon": "temaki-veterinary_care", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["charge_fee", "fee", "payment_multi_fee", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["pet clinic", "veterinarian", "animal hospital", "pet doctor"], "tags": {"amenity": "veterinary"}, "name": "Veterinary"}, - "amenity/waste_basket": {"icon": "maki-waste-basket", "fields": ["operator", "collection_times", "material", "colour"], "moreFields": ["covered", "indoor", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"amenity": "waste_basket"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash"], "name": "Waste Basket"}, - "amenity/waste_disposal": {"icon": "fas-dumpster", "fields": ["operator", "collection_times", "access_simple"], "moreFields": ["brand", "colour", "height", "manufacturer", "material"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_disposal"}, "terms": ["garbage", "rubbish", "litter", "trash"], "name": "Garbage Dumpster"}, - "amenity/waste_transfer_station": {"icon": "maki-waste-basket", "fields": ["name", "operator", "operator/type", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dump", "garbage", "recycling", "rubbish", "scrap", "trash"], "tags": {"amenity": "waste_transfer_station"}, "name": "Waste Transfer Station"}, + "amenity/waste_basket": {"icon": "maki-waste-basket", "fields": ["operator", "waste", "collection_times", "material", "colour"], "moreFields": ["covered", "indoor", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"amenity": "waste_basket"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash"], "name": "Waste Basket"}, + "amenity/waste_disposal": {"icon": "fas-dumpster", "fields": ["operator", "waste", "collection_times", "access_simple"], "moreFields": ["brand", "colour", "height", "manufacturer", "material"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_disposal"}, "terms": ["garbage", "rubbish", "litter", "trash"], "name": "Garbage Dumpster"}, + "amenity/waste_transfer_station": {"icon": "maki-waste-basket", "fields": ["name", "operator", "operator/type", "waste", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dump", "garbage", "recycling", "rubbish", "scrap", "trash"], "tags": {"amenity": "waste_transfer_station"}, "name": "Waste Transfer Station"}, "amenity/waste/dog_excrement": {"icon": "maki-waste-basket", "fields": ["collection_times"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_basket", "waste": "dog_excrement"}, "reference": {"key": "waste", "value": "dog_excrement"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash", "poo", "dog"], "name": "Dog Excrement Bin"}, "amenity/water_point": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "water_point"}, "name": "RV Drinking Water"}, "amenity/watering_place": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "watering_place"}, "name": "Animal Watering Place"}, diff --git a/data/presets/presets/amenity/waste_basket.json b/data/presets/presets/amenity/waste_basket.json index ae4288409..c482eb067 100644 --- a/data/presets/presets/amenity/waste_basket.json +++ b/data/presets/presets/amenity/waste_basket.json @@ -2,6 +2,7 @@ "icon": "maki-waste-basket", "fields": [ "operator", + "waste", "collection_times", "material", "colour" diff --git a/data/presets/presets/amenity/waste_disposal.json b/data/presets/presets/amenity/waste_disposal.json index 42908ce2c..457745c1c 100644 --- a/data/presets/presets/amenity/waste_disposal.json +++ b/data/presets/presets/amenity/waste_disposal.json @@ -2,6 +2,7 @@ "icon": "fas-dumpster", "fields": [ "operator", + "waste", "collection_times", "access_simple" ], diff --git a/data/presets/presets/amenity/waste_transfer_station.json b/data/presets/presets/amenity/waste_transfer_station.json index 792d53cf0..64259990f 100644 --- a/data/presets/presets/amenity/waste_transfer_station.json +++ b/data/presets/presets/amenity/waste_transfer_station.json @@ -4,6 +4,7 @@ "name", "operator", "operator/type", + "waste", "address", "opening_hours", "fee", diff --git a/data/taginfo.json b/data/taginfo.json index 87894084b..d0c726579 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1804,6 +1804,7 @@ {"key": "voltage:secondary", "description": "šŸ„µ Secondary Voltage"}, {"key": "voltage:tertiary", "description": "šŸ„µ Tertiary Voltage"}, {"key": "wall", "description": "šŸ„µ Type"}, + {"key": "waste", "description": "šŸ„µ Waste"}, {"key": "water_point", "description": "šŸ„µ Water Point"}, {"key": "water_source", "description": "šŸ„µ Water Source"}, {"key": "water_volume", "description": "šŸ„µ Water Reserve Volume (mĀ³)"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 3ce0bfbfd..1d46ce6ea 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4752,6 +4752,10 @@ "label": "Type", "terms": "" }, + "waste": { + "label": "Waste", + "terms": "" + }, "water_point": { "label": "Water Point", "terms": ""