From 43eb4fc4b6322c7265dd8a122bb0e3fd7c0068db Mon Sep 17 00:00:00 2001 From: Will Date: Sat, 2 Dec 2023 14:27:22 -0500 Subject: [PATCH 1/5] Add fuel poi icon --- icons/poi_fuel.svg | 3 +++ scripts/taginfo_template.json | 8 ++++++++ src/layer/poi.js | 20 ++++++++++++++++++-- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 icons/poi_fuel.svg diff --git a/icons/poi_fuel.svg b/icons/poi_fuel.svg new file mode 100644 index 000000000..75b711389 --- /dev/null +++ b/icons/poi_fuel.svg @@ -0,0 +1,3 @@ + + + diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json index d6055d37e..48cbf2850 100644 --- a/scripts/taginfo_template.json +++ b/scripts/taginfo_template.json @@ -383,6 +383,14 @@ "description": "Intermittent lakes are translucent with a dashed line representing the lakeshore.", "doc_url": "https://openmaptiles.org/schema/#water" }, + { + "key": "amenity", + "value": "fuel", + "object_types": ["node", "area"], + "description": "Fuel stations are marked by an icon representing a gas pump.", + "doc_url": "https://openmaptiles.org/schema/#poi", + "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_fuel.svg" + }, { "key": "amenity", "value": "school", diff --git a/src/layer/poi.js b/src/layer/poi.js index 9e1ae3866..8a4daf6f8 100644 --- a/src/layer/poi.js +++ b/src/layer/poi.js @@ -43,6 +43,14 @@ var iconDefs = { color: Color.poi.consumer, description: "Coffee shop", }, + fuel: { + classes: { + fuel: ["fuel"], + }, + sprite: "poi_fuel", + color: Color.poi.consumer, + description: "Gas station", + }, hospital: { classes: { hospital: ["hospital"], @@ -238,7 +246,11 @@ export const poi = { "text-color": [ "match", ["get", "subclass"], - [...getSubclasses(iconDefs.bar), ...getSubclasses(iconDefs.coffee)], + [ + ...getSubclasses(iconDefs.fuel), + ...getSubclasses(iconDefs.bar), + ...getSubclasses(iconDefs.coffee), + ], Color.poi.consumer, [ "bus_station", @@ -297,7 +309,11 @@ export const poi = { "tram_stop", ], 15, - [...getSubclasses(iconDefs.bar), ...getSubclasses(iconDefs.coffee)], + [ + ...getSubclasses(iconDefs.fuel), + ...getSubclasses(iconDefs.bar), + ...getSubclasses(iconDefs.coffee), + ], 16, ["clinic", "doctors", "parking"], 17, From 113a3e2c283c90cb30c3f43dfd8476e3bbbaa746 Mon Sep 17 00:00:00 2001 From: Will Date: Sun, 3 Dec 2023 07:42:21 -0500 Subject: [PATCH 2/5] Improving pixel alignment, window on icon --- icons/poi_fuel.svg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/icons/poi_fuel.svg b/icons/poi_fuel.svg index 75b711389..eb1b7c9e5 100644 --- a/icons/poi_fuel.svg +++ b/icons/poi_fuel.svg @@ -1,3 +1,4 @@ - - + + + From e8c98f3acb8b1571478bb2c6ece6f061f695161c Mon Sep 17 00:00:00 2001 From: Will Date: Sun, 3 Dec 2023 07:43:10 -0500 Subject: [PATCH 3/5] Bumping icon to z14 --- src/layer/poi.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/layer/poi.js b/src/layer/poi.js index 8a4daf6f8..adcc34bda 100644 --- a/src/layer/poi.js +++ b/src/layer/poi.js @@ -296,6 +296,7 @@ export const poi = { "hospital", "museum", "police", + ...getSubclasses(iconDefs.fuel), ...getSubclasses(iconDefs.pow_buddhist), ...getSubclasses(iconDefs.pow_christian), ...getSubclasses(iconDefs.pow_hindu), @@ -309,11 +310,7 @@ export const poi = { "tram_stop", ], 15, - [ - ...getSubclasses(iconDefs.fuel), - ...getSubclasses(iconDefs.bar), - ...getSubclasses(iconDefs.coffee), - ], + [...getSubclasses(iconDefs.bar), ...getSubclasses(iconDefs.coffee)], 16, ["clinic", "doctors", "parking"], 17, From 128f06f87f98da43aacb81f190f5fda054332f17 Mon Sep 17 00:00:00 2001 From: Will Date: Mon, 4 Dec 2023 09:03:19 -0500 Subject: [PATCH 4/5] Making fuel icon 1 pixel shorter --- icons/poi_fuel.svg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/icons/poi_fuel.svg b/icons/poi_fuel.svg index eb1b7c9e5..319fc60b0 100644 --- a/icons/poi_fuel.svg +++ b/icons/poi_fuel.svg @@ -1,4 +1,4 @@ - - - + + + From 058ad861baa07d8f0a1a7bd0229ae5c1ea4c6dad Mon Sep 17 00:00:00 2001 From: Will Date: Mon, 4 Dec 2023 09:06:42 -0500 Subject: [PATCH 5/5] Adding fuel icon to no-label group --- src/layer/poi.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layer/poi.js b/src/layer/poi.js index adcc34bda..e7df969d5 100644 --- a/src/layer/poi.js +++ b/src/layer/poi.js @@ -335,7 +335,7 @@ export const poi = { [ "match", ["get", "subclass"], - ["bus_stop", "tram_stop"], + ["bus_stop", "tram_stop", "fuel"], "", label.localizedName, ],