From 5eb77840c9b8a9ac555037ecaf1db70b22dfc0a8 Mon Sep 17 00:00:00 2001 From: Avan2021 Date: Mon, 17 Feb 2025 17:36:35 +0530 Subject: [PATCH 01/16] preset for shop=groundskeeping --- data/presets/shop/groundskeeping.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 data/presets/shop/groundskeeping.json diff --git a/data/presets/shop/groundskeeping.json b/data/presets/shop/groundskeeping.json new file mode 100644 index 0000000000..414e490051 --- /dev/null +++ b/data/presets/shop/groundskeeping.json @@ -0,0 +1,19 @@ +{ + "icon": "fas fa-lawn-mower", + "geometry": [ + "point", + "area" + ], + "terms": [ + "garden machinery", + "garden power tools", + "mower, string trimmer", + "cultivator", + "chainsaw", + "snow blower" + ], + "tags": { + "shop": "groundskeeping" + }, + "name": "Lawn & Garden Equipment" +} \ No newline at end of file From 0e0763dc88aa77e2faa187ddbacbc357b1c15bda Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 18 Feb 2025 08:32:43 +0100 Subject: [PATCH 02/16] sort terms alphabetically, drop trailing whitespace --- data/presets/shop/groundskeeping.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/presets/shop/groundskeeping.json b/data/presets/shop/groundskeeping.json index 414e490051..5e28228f5d 100644 --- a/data/presets/shop/groundskeeping.json +++ b/data/presets/shop/groundskeeping.json @@ -5,15 +5,15 @@ "area" ], "terms": [ + "chainsaw", + "cultivator", "garden machinery", - "garden power tools", - "mower, string trimmer", - "cultivator", - "chainsaw", + "garden power tools", + "mower, string trimmer", "snow blower" ], "tags": { "shop": "groundskeeping" }, "name": "Lawn & Garden Equipment" -} \ No newline at end of file +} From ee48aa393f3bacf5f9ce82689a407455cc56e253 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 18 Feb 2025 08:50:25 +0100 Subject: [PATCH 03/16] tweak preset label --- data/presets/shop/groundskeeping.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/shop/groundskeeping.json b/data/presets/shop/groundskeeping.json index 5e28228f5d..d8282ce101 100644 --- a/data/presets/shop/groundskeeping.json +++ b/data/presets/shop/groundskeeping.json @@ -15,5 +15,5 @@ "tags": { "shop": "groundskeeping" }, - "name": "Lawn & Garden Equipment" + "name": "Lawn & Garden Equipment Store" } From a19daadcca528d52640f0ecbb597436876edd3f5 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 18 Feb 2025 09:11:42 +0100 Subject: [PATCH 04/16] add "groundskeeping" as search term --- data/presets/shop/groundskeeping.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/presets/shop/groundskeeping.json b/data/presets/shop/groundskeeping.json index d8282ce101..90d595016e 100644 --- a/data/presets/shop/groundskeeping.json +++ b/data/presets/shop/groundskeeping.json @@ -9,6 +9,7 @@ "cultivator", "garden machinery", "garden power tools", + "groundskeeping", "mower, string trimmer", "snow blower" ], From 133f005f4af5441b0de086f91dec04c200887466 Mon Sep 17 00:00:00 2001 From: Avan2021 Date: Tue, 18 Feb 2025 14:31:42 +0530 Subject: [PATCH 05/16] Fix: Icon changed to tractor from fontawesome --- data/presets/shop/groundskeeping.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/shop/groundskeeping.json b/data/presets/shop/groundskeeping.json index 414e490051..44ce71af49 100644 --- a/data/presets/shop/groundskeeping.json +++ b/data/presets/shop/groundskeeping.json @@ -1,5 +1,5 @@ { - "icon": "fas fa-lawn-mower", + "icon": "fa-solid fa-tractor", "geometry": [ "point", "area" From e1b4ef1e7e2a30bda64b58ea55794fb32a8de698 Mon Sep 17 00:00:00 2001 From: Avan2021 Date: Fri, 21 Feb 2025 16:27:50 +0530 Subject: [PATCH 06/16] Preset for Veterinary Pharmacy --- data/presets/amenity/veterinary_pharmacy.json | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 data/presets/amenity/veterinary_pharmacy.json diff --git a/data/presets/amenity/veterinary_pharmacy.json b/data/presets/amenity/veterinary_pharmacy.json new file mode 100644 index 0000000000..9588bed2e6 --- /dev/null +++ b/data/presets/amenity/veterinary_pharmacy.json @@ -0,0 +1,40 @@ +{ + "icon": "fa-solid fa-paw", + "fields": [ + "name", + "operator", + "address", + "building_area_yes", + "opening_hours" + ], + "moreFields": [ + "{@templates/poi}", + "charge_fee", + "fee" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "pet clinic", + "veterinarian", + "pet doctor", + "veterinary pharmacy", + "pet pharmacy", + "animal pharmacy", + "vet pharmacy", + "pet meds", + "animal medication", + "veterinary supplies", + "pet prescriptions", + "veterinary compounding" + ], + "aliases": [ + "Animal Pharmacy" + ], + "tags": { + "amenity": "veterinary_pharmacy" + }, + "name": "Veterinary Care" +} From 0576071ec3ca36137c88886441ec7d6130dc6c00 Mon Sep 17 00:00:00 2001 From: Avan2021 Date: Fri, 21 Feb 2025 16:51:38 +0530 Subject: [PATCH 07/16] Delete data/presets/shop/groundskeeping.json Added it wrongly --- data/presets/shop/groundskeeping.json | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 data/presets/shop/groundskeeping.json diff --git a/data/presets/shop/groundskeeping.json b/data/presets/shop/groundskeeping.json deleted file mode 100644 index 79cfe983cb..0000000000 --- a/data/presets/shop/groundskeeping.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "icon": "fa-solid fa-tractor", - "geometry": [ - "point", - "area" - ], - "terms": [ - "chainsaw", - "cultivator", - "garden machinery", - "garden power tools", - "groundskeeping", - "mower, string trimmer", - "snow blower" - ], - "tags": { - "shop": "groundskeeping" - }, - "name": "Lawn & Garden Equipment Store" -} From 72e9619a2b5e104de758d75bade2973d7d0036bc Mon Sep 17 00:00:00 2001 From: Avan2021 Date: Sat, 22 Feb 2025 21:12:07 +0530 Subject: [PATCH 08/16] Corrected icon, reordered terms, removed unnecessary fields, changed name --- data/presets/amenity/veterinary_pharmacy.json | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/data/presets/amenity/veterinary_pharmacy.json b/data/presets/amenity/veterinary_pharmacy.json index 9588bed2e6..cfd99c85b1 100644 --- a/data/presets/amenity/veterinary_pharmacy.json +++ b/data/presets/amenity/veterinary_pharmacy.json @@ -1,5 +1,5 @@ { - "icon": "fa-solid fa-paw", + "icon": "fas-paw", "fields": [ "name", "operator", @@ -8,27 +8,25 @@ "opening_hours" ], "moreFields": [ - "{@templates/poi}", - "charge_fee", - "fee" + "{@templates/poi}" ], "geometry": [ "point", "area" ], "terms": [ - "pet clinic", - "veterinarian", - "pet doctor", - "veterinary pharmacy", - "pet pharmacy", - "animal pharmacy", - "vet pharmacy", - "pet meds", - "animal medication", - "veterinary supplies", - "pet prescriptions", - "veterinary compounding" + "animal medication", + "animal pharmacy", + "pet clinic", + "pet doctor", + "pet meds", + "pet pharmacy", + "pet prescriptions", + "veterinarian", + "veterinary compounding", + "veterinary pharmacy", + "veterinary supplies", + "vet pharmacy" ], "aliases": [ "Animal Pharmacy" @@ -36,5 +34,5 @@ "tags": { "amenity": "veterinary_pharmacy" }, - "name": "Veterinary Care" + "name": "Veterinary Pharmacy" } From 802770084ec0bcffaf4ca22aec28a1ffd9c80c8b Mon Sep 17 00:00:00 2001 From: Avan2021 Date: Sat, 22 Feb 2025 21:41:25 +0530 Subject: [PATCH 09/16] icon changed fas-paw => fa-paw --- data/presets/amenity/veterinary_pharmacy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/amenity/veterinary_pharmacy.json b/data/presets/amenity/veterinary_pharmacy.json index cfd99c85b1..38e4923f40 100644 --- a/data/presets/amenity/veterinary_pharmacy.json +++ b/data/presets/amenity/veterinary_pharmacy.json @@ -1,5 +1,5 @@ { - "icon": "fas-paw", + "icon": "fa-paw", "fields": [ "name", "operator", From da9f3e2f512031427a24519f3278e0bf27a16ab3 Mon Sep 17 00:00:00 2001 From: Avan2021 Date: Sat, 22 Feb 2025 21:50:41 +0530 Subject: [PATCH 10/16] icon still not working so used the veterinary one --- data/presets/amenity/veterinary_pharmacy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/amenity/veterinary_pharmacy.json b/data/presets/amenity/veterinary_pharmacy.json index 38e4923f40..ea0dace8b4 100644 --- a/data/presets/amenity/veterinary_pharmacy.json +++ b/data/presets/amenity/veterinary_pharmacy.json @@ -1,5 +1,5 @@ { - "icon": "fa-paw", + "icon": "temaki-veterinary_care", "fields": [ "name", "operator", From 51c099b650f2ee63506928971336c9bbcf6518e6 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 24 Feb 2025 18:40:06 +0100 Subject: [PATCH 11/16] drop superfluous whitespace --- data/presets/amenity/veterinary_pharmacy.json | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/data/presets/amenity/veterinary_pharmacy.json b/data/presets/amenity/veterinary_pharmacy.json index ea0dace8b4..476ec1debe 100644 --- a/data/presets/amenity/veterinary_pharmacy.json +++ b/data/presets/amenity/veterinary_pharmacy.json @@ -15,17 +15,17 @@ "area" ], "terms": [ - "animal medication", - "animal pharmacy", - "pet clinic", - "pet doctor", - "pet meds", - "pet pharmacy", - "pet prescriptions", - "veterinarian", - "veterinary compounding", - "veterinary pharmacy", - "veterinary supplies", + "animal medication", + "animal pharmacy", + "pet clinic", + "pet doctor", + "pet meds", + "pet pharmacy", + "pet prescriptions", + "veterinarian", + "veterinary compounding", + "veterinary pharmacy", + "veterinary supplies", "vet pharmacy" ], "aliases": [ From 561d652bd5b5f4a4d291fca7b42bff64b01a3495 Mon Sep 17 00:00:00 2001 From: Avan2021 Date: Tue, 25 Feb 2025 14:54:16 +0530 Subject: [PATCH 12/16] Update data/presets/amenity/veterinary_pharmacy.json Adding "{amenity/pharmacy}" to fields Co-authored-by: Tobias --- data/presets/amenity/veterinary_pharmacy.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/data/presets/amenity/veterinary_pharmacy.json b/data/presets/amenity/veterinary_pharmacy.json index 476ec1debe..14aee87eab 100644 --- a/data/presets/amenity/veterinary_pharmacy.json +++ b/data/presets/amenity/veterinary_pharmacy.json @@ -1,11 +1,7 @@ { "icon": "temaki-veterinary_care", "fields": [ - "name", - "operator", - "address", - "building_area_yes", - "opening_hours" + "{amenity/pharmacy}" ], "moreFields": [ "{@templates/poi}" From 46d305857b9ad6b81006e1856f1fdfeb4488aa74 Mon Sep 17 00:00:00 2001 From: Avan2021 Date: Tue, 25 Feb 2025 14:54:53 +0530 Subject: [PATCH 13/16] Update data/presets/amenity/veterinary_pharmacy.json Adding "{amenity/pharmacy}" to moreFields Co-authored-by: Tobias --- data/presets/amenity/veterinary_pharmacy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/amenity/veterinary_pharmacy.json b/data/presets/amenity/veterinary_pharmacy.json index 14aee87eab..4d9449a3fe 100644 --- a/data/presets/amenity/veterinary_pharmacy.json +++ b/data/presets/amenity/veterinary_pharmacy.json @@ -4,7 +4,7 @@ "{amenity/pharmacy}" ], "moreFields": [ - "{@templates/poi}" + "{amenity/pharmacy}" ], "geometry": [ "point", From 04cf85ba02acc47868728e17d07b17a99247b824 Mon Sep 17 00:00:00 2001 From: Avan2021 Date: Tue, 25 Feb 2025 14:58:27 +0530 Subject: [PATCH 14/16] Adding {amenity/pharmacy} to fields and moreFields --- data/presets/amenity/veterinary_pharmacy.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/presets/amenity/veterinary_pharmacy.json b/data/presets/amenity/veterinary_pharmacy.json index ea0dace8b4..4f6c0f9c2a 100644 --- a/data/presets/amenity/veterinary_pharmacy.json +++ b/data/presets/amenity/veterinary_pharmacy.json @@ -5,10 +5,12 @@ "operator", "address", "building_area_yes", - "opening_hours" + "opening_hours", + "{amenity/pharmacy}" ], "moreFields": [ - "{@templates/poi}" + "{@templates/poi}", + "{amenity/pharmacy}" ], "geometry": [ "point", From 110518fe8d4b59a274970d5c6942f7a2732fc583 Mon Sep 17 00:00:00 2001 From: Avan2021 Date: Tue, 25 Feb 2025 15:13:19 +0530 Subject: [PATCH 15/16] Update data/presets/amenity/veterinary_pharmacy.json We take all fields and moreFields from other preset Co-authored-by: Tobias --- data/presets/amenity/veterinary_pharmacy.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/data/presets/amenity/veterinary_pharmacy.json b/data/presets/amenity/veterinary_pharmacy.json index 9ac9795a48..9a3b865ad8 100644 --- a/data/presets/amenity/veterinary_pharmacy.json +++ b/data/presets/amenity/veterinary_pharmacy.json @@ -1,11 +1,6 @@ { "icon": "temaki-veterinary_care", "fields": [ - "name", - "operator", - "address", - "building_area_yes", - "opening_hours", "{amenity/pharmacy}" ], "moreFields": [ From f736a66b0ee78484c3e57ac358d1d8e511808035 Mon Sep 17 00:00:00 2001 From: Avan2021 Date: Tue, 25 Feb 2025 15:13:56 +0530 Subject: [PATCH 16/16] Update data/presets/amenity/veterinary_pharmacy.json We are taking all fields and more fields from other preset Co-authored-by: Tobias --- data/presets/amenity/veterinary_pharmacy.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/presets/amenity/veterinary_pharmacy.json b/data/presets/amenity/veterinary_pharmacy.json index 9a3b865ad8..4d9449a3fe 100644 --- a/data/presets/amenity/veterinary_pharmacy.json +++ b/data/presets/amenity/veterinary_pharmacy.json @@ -4,7 +4,6 @@ "{amenity/pharmacy}" ], "moreFields": [ - "{@templates/poi}", "{amenity/pharmacy}" ], "geometry": [