From 26a838f778cefb376a13bfa901f0a3dbbf3fbdbf Mon Sep 17 00:00:00 2001 From: arch0345 Date: Thu, 29 May 2025 16:04:13 -0700 Subject: [PATCH 1/3] Add specific waste bin presets --- data/presets/amenity/waste/_waste.json | 24 ++++++++++++++++++ data/presets/amenity/waste/ash.json | 29 ++++++++++++++++++++++ data/presets/amenity/waste/cigarettes.json | 25 +++++++++++++++++++ data/presets/amenity/waste/drugs.json | 27 ++++++++++++++++++++ data/presets/amenity/waste/organic.json | 26 +++++++++++++++++++ data/presets/amenity/waste/sharps.json | 26 +++++++++++++++++++ data/presets/amenity/waste/trash.json | 29 ++++++++++++++++++++++ data/presets/amenity/waste_basket.json | 9 +++---- 8 files changed, 189 insertions(+), 6 deletions(-) create mode 100644 data/presets/amenity/waste/_waste.json create mode 100644 data/presets/amenity/waste/ash.json create mode 100644 data/presets/amenity/waste/cigarettes.json create mode 100644 data/presets/amenity/waste/drugs.json create mode 100644 data/presets/amenity/waste/organic.json create mode 100644 data/presets/amenity/waste/sharps.json create mode 100644 data/presets/amenity/waste/trash.json diff --git a/data/presets/amenity/waste/_waste.json b/data/presets/amenity/waste/_waste.json new file mode 100644 index 00000000..6bfef5c1 --- /dev/null +++ b/data/presets/amenity/waste/_waste.json @@ -0,0 +1,24 @@ +{ + "icon": "maki-waste-basket", + "fields": [ + "{amenity/waste_basket}" + ], + "moreFields": [ + "{amenity/waste_basket}" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "amenity": "waste_basket", + "waste": "*" + }, + "reference": { + "key": "amenity", + "value": "waste_basket" + }, + "name": "Waste Bin", + "searchable": false, + "matchScore": 0.95 +} diff --git a/data/presets/amenity/waste/ash.json b/data/presets/amenity/waste/ash.json new file mode 100644 index 00000000..7db02792 --- /dev/null +++ b/data/presets/amenity/waste/ash.json @@ -0,0 +1,29 @@ +{ + "icon": "fas-trash-can", + "fields": [ + "{amenity/waste_basket}" + ], + "moreFields": [ + "{amenity/waste_basket}" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "amenity": "waste_basket", + "waste": "ash" + }, + "reference": { + "key": "waste", + "value": "ash" + }, + "terms": [ + "charcoal", + "hot coals only" + ], + "aliases": [ + "Hot Coal Disposal" + ], + "name": "Hot Coal Bin" +} diff --git a/data/presets/amenity/waste/cigarettes.json b/data/presets/amenity/waste/cigarettes.json new file mode 100644 index 00000000..bbbebee6 --- /dev/null +++ b/data/presets/amenity/waste/cigarettes.json @@ -0,0 +1,25 @@ +{ + "icon": "fas-smoking", + "fields": [ + "{amenity/waste_basket}" + ], + "moreFields": [ + "{amenity/waste_basket}" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "amenity": "waste_basket", + "waste": "cigarettes" + }, + "reference": { + "key": "waste", + "value": "cigarettes" + }, + "terms": [ + "ashtray" + ], + "name": "Cigarette Disposal Bin" +} diff --git a/data/presets/amenity/waste/drugs.json b/data/presets/amenity/waste/drugs.json new file mode 100644 index 00000000..10cef78b --- /dev/null +++ b/data/presets/amenity/waste/drugs.json @@ -0,0 +1,27 @@ +{ + "icon": "fas-pills", + "fields": [ + "{amenity/waste_basket}" + ], + "moreFields": [ + "{amenity/waste_basket}" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "amenity": "waste_bin", + "waste": "drugs" + }, + "reference": { + "key": "waste", + "value": "drugs" + }, + "terms": [ + "drugs", + "pharmaceuticals", + "prescription" + ], + "name": "Medication Disposal Bin" +} diff --git a/data/presets/amenity/waste/organic.json b/data/presets/amenity/waste/organic.json new file mode 100644 index 00000000..7af01cf8 --- /dev/null +++ b/data/presets/amenity/waste/organic.json @@ -0,0 +1,26 @@ +{ + "icon": "fas-seedling", + "fields": [ + "{amenity/waste_basket}" + ], + "moreFields": [ + "{amenity/waste_basket}" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "amenity": "waste_basket", + "waste": "organic" + }, + "reference": { + "key": "waste", + "value": "organic" + }, + "terms": [ + "food scraps", + "food waste" + ], + "name": "Compost Bin" +} diff --git a/data/presets/amenity/waste/sharps.json b/data/presets/amenity/waste/sharps.json new file mode 100644 index 00000000..a5fbbb40 --- /dev/null +++ b/data/presets/amenity/waste/sharps.json @@ -0,0 +1,26 @@ +{ + "icon": "fas-syringe", + "fields": [ + "{amenity/waste_basket}" + ], + "moreFields": [ + "{amenity/waste_basket}" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "amenity": "waste_basket", + "waste": "sharps" + }, + "reference": { + "key": "waste", + "value": "sharps" + }, + "terms": [ + "needle", + "syringe" + ], + "name": "Sharps Container" +} diff --git a/data/presets/amenity/waste/trash.json b/data/presets/amenity/waste/trash.json new file mode 100644 index 00000000..1f1c99ac --- /dev/null +++ b/data/presets/amenity/waste/trash.json @@ -0,0 +1,29 @@ +{ + "icon": "maki-waste-basket", + "fields": [ + "{amenity/waste_basket}" + ], + "moreFields": [ + "{amenity/waste_basket}" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "amenity": "waste_basket", + "waste": "trash" + }, + "reference": { + "key": "waste", + "value": "trash" + }, + "terms": [ + "garbage", + "landfill", + "rubbish", + "litter", + "trash" + ], + "name": "Trash Can" +} diff --git a/data/presets/amenity/waste_basket.json b/data/presets/amenity/waste_basket.json index ec76b181..ee8ac135 100644 --- a/data/presets/amenity/waste_basket.json +++ b/data/presets/amenity/waste_basket.json @@ -20,14 +20,11 @@ "amenity": "waste_basket" }, "terms": [ - "bin", - "garbage", - "rubbish", - "litter", - "trash" + "bin" ], "aliases": [ "Waste Basket" ], - "name": "Trash Can" + "name": "Waste Bin (unspecified type)", + "matchScore": 0.9 } From ad0caaeea0d1b28b59052908c1efa353c943a690 Mon Sep 17 00:00:00 2001 From: arch0345 Date: Fri, 30 May 2025 00:14:20 -0700 Subject: [PATCH 2/3] Undo name change for main preset --- data/presets/amenity/waste/_waste.json | 24 --------------------- data/presets/amenity/waste/trash.json | 29 -------------------------- data/presets/amenity/waste_basket.json | 9 +++++--- 3 files changed, 6 insertions(+), 56 deletions(-) delete mode 100644 data/presets/amenity/waste/_waste.json delete mode 100644 data/presets/amenity/waste/trash.json diff --git a/data/presets/amenity/waste/_waste.json b/data/presets/amenity/waste/_waste.json deleted file mode 100644 index 6bfef5c1..00000000 --- a/data/presets/amenity/waste/_waste.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "icon": "maki-waste-basket", - "fields": [ - "{amenity/waste_basket}" - ], - "moreFields": [ - "{amenity/waste_basket}" - ], - "geometry": [ - "point", - "vertex" - ], - "tags": { - "amenity": "waste_basket", - "waste": "*" - }, - "reference": { - "key": "amenity", - "value": "waste_basket" - }, - "name": "Waste Bin", - "searchable": false, - "matchScore": 0.95 -} diff --git a/data/presets/amenity/waste/trash.json b/data/presets/amenity/waste/trash.json deleted file mode 100644 index 1f1c99ac..00000000 --- a/data/presets/amenity/waste/trash.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "icon": "maki-waste-basket", - "fields": [ - "{amenity/waste_basket}" - ], - "moreFields": [ - "{amenity/waste_basket}" - ], - "geometry": [ - "point", - "vertex" - ], - "tags": { - "amenity": "waste_basket", - "waste": "trash" - }, - "reference": { - "key": "waste", - "value": "trash" - }, - "terms": [ - "garbage", - "landfill", - "rubbish", - "litter", - "trash" - ], - "name": "Trash Can" -} diff --git a/data/presets/amenity/waste_basket.json b/data/presets/amenity/waste_basket.json index ee8ac135..ec76b181 100644 --- a/data/presets/amenity/waste_basket.json +++ b/data/presets/amenity/waste_basket.json @@ -20,11 +20,14 @@ "amenity": "waste_basket" }, "terms": [ - "bin" + "bin", + "garbage", + "rubbish", + "litter", + "trash" ], "aliases": [ "Waste Basket" ], - "name": "Waste Bin (unspecified type)", - "matchScore": 0.9 + "name": "Trash Can" } From 7418620a8a0a8ebf5cd04557fc622b388eda1819 Mon Sep 17 00:00:00 2001 From: arch0345 Date: Tue, 9 Sep 2025 00:12:38 -0700 Subject: [PATCH 3/3] Fix typo, adjust name for `waste=ash` preset --- data/presets/amenity/waste/ash.json | 2 +- data/presets/amenity/waste/drugs.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/presets/amenity/waste/ash.json b/data/presets/amenity/waste/ash.json index 7db02792..e995285a 100644 --- a/data/presets/amenity/waste/ash.json +++ b/data/presets/amenity/waste/ash.json @@ -25,5 +25,5 @@ "aliases": [ "Hot Coal Disposal" ], - "name": "Hot Coal Bin" + "name": "Ash / Hot Coal Bin" } diff --git a/data/presets/amenity/waste/drugs.json b/data/presets/amenity/waste/drugs.json index 10cef78b..201e3a18 100644 --- a/data/presets/amenity/waste/drugs.json +++ b/data/presets/amenity/waste/drugs.json @@ -11,7 +11,7 @@ "vertex" ], "tags": { - "amenity": "waste_bin", + "amenity": "waste_basket", "waste": "drugs" }, "reference": {