From b97ca662dd895e01e111359f83b627260466de23 Mon Sep 17 00:00:00 2001 From: Will Date: Thu, 11 Jan 2024 06:22:11 -0500 Subject: [PATCH 1/4] Adding vehicle POI icons --- icons/poi_car_repair.svg | 4 ++++ icons/poi_car_shop.svg | 4 ++++ icons/poi_taxi.svg | 5 +++++ src/layer/poi.js | 35 ++++++++++++++++++++++++++++++++++- 4 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 icons/poi_car_repair.svg create mode 100644 icons/poi_car_shop.svg create mode 100644 icons/poi_taxi.svg diff --git a/icons/poi_car_repair.svg b/icons/poi_car_repair.svg new file mode 100644 index 000000000..042bff803 --- /dev/null +++ b/icons/poi_car_repair.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/poi_car_shop.svg b/icons/poi_car_shop.svg new file mode 100644 index 000000000..cfcf82ba7 --- /dev/null +++ b/icons/poi_car_shop.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/poi_taxi.svg b/icons/poi_taxi.svg new file mode 100644 index 000000000..c8dcb2193 --- /dev/null +++ b/icons/poi_taxi.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/layer/poi.js b/src/layer/poi.js index c2447533d..6059fdd24 100644 --- a/src/layer/poi.js +++ b/src/layer/poi.js @@ -35,6 +35,30 @@ var iconDefs = { color: Color.poi.transport, description: "Bus stop", }, + car_repair: { + classes: { + car: ["car_repair"], + }, + sprite: "poi_car_repair", + color: Color.poi.consumer, + description: "Car mechanic", + }, + car_shop: { + classes: { + car: ["car"], + }, + sprite: "poi_car_shop", + color: Color.poi.consumer, + description: "Car dealership", + }, + taxi: { + classes: { + office: ["taxi"], + }, + sprite: "poi_taxi", + color: Color.poi.transport, + description: "Taxi stand", + }, coffee: { classes: { cafe: ["cafe"], @@ -259,6 +283,8 @@ export const poi = { ...getSubclasses(iconDefs.bar), ...getSubclasses(iconDefs.coffee), ...getSubclasses(iconDefs.supermarket), + ...getSubclasses(iconDefs.car_shop), + ...getSubclasses(iconDefs.car_repair), ], Color.poi.consumer, [ @@ -266,6 +292,7 @@ export const poi = { "bus_stop", ...getSubclasses(iconDefs.railway_station), ...getSubclasses(iconDefs.railway_stop), + ...getSubclasses(iconDefs.taxi), ], Color.poi.transport, ["museum"], @@ -320,7 +347,13 @@ export const poi = { "tram_stop", ], 15, - [...getSubclasses(iconDefs.bar), ...getSubclasses(iconDefs.coffee)], + [ + ...getSubclasses(iconDefs.bar), + ...getSubclasses(iconDefs.coffee), + ...getSubclasses(iconDefs.car_shop), + ...getSubclasses(iconDefs.car_repair), + ...getSubclasses(iconDefs.taxi), + ], 16, ["clinic", "doctors", "parking"], 17, From 1e7b889bfaa72948830baada27a6d3757ecaa010 Mon Sep 17 00:00:00 2001 From: Will Date: Thu, 11 Jan 2024 20:43:17 -0500 Subject: [PATCH 2/4] Updating taginfo with vehicle icons --- scripts/taginfo_template.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json index 868967ced..043e7fae9 100644 --- a/scripts/taginfo_template.json +++ b/scripts/taginfo_template.json @@ -399,6 +399,14 @@ "doc_url": "https://openmaptiles.org/schema/#poi", "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_school.svg" }, + { + "key": "amenity", + "value": "taxi", + "object_types": ["node", "area"], + "description": "Taxi stands are marked by an icon representing the front view of a taxi cab.", + "doc_url": "https://openmaptiles.org/schema/#poi", + "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_taxi.svg" + }, { "key": "amenity", "value": "kindergarten", @@ -632,6 +640,22 @@ "doc_url": "https://openmaptiles.org/schema/#poi", "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_taoist.svg" }, + { + "key": "shop", + "value": "car", + "object_types": ["node", "area"], + "description": "Car dealerships are marked by an icon representing a front facing vehicle.", + "doc_url": "https://openmaptiles.org/schema/#poi", + "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_car_shop.svg" + }, + { + "key": "shop", + "value": "car_repair", + "object_types": ["node", "area"], + "description": "Car dealerships are marked by an icon representing a front facing vehicle with a wrench above it.", + "doc_url": "https://openmaptiles.org/schema/#poi", + "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_car_repair.svg" + }, { "key": "shop", "value": "supermarket", From 7b984830ccd331086873e183d0c312dcb97efc74 Mon Sep 17 00:00:00 2001 From: Will Date: Thu, 11 Jan 2024 20:44:03 -0500 Subject: [PATCH 3/4] Updating sample locations with NoVA car-centric intersection --- test/sample_locations.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/sample_locations.json b/test/sample_locations.json index 2ff11454f..2505eb3dd 100644 --- a/test/sample_locations.json +++ b/test/sample_locations.json @@ -55,5 +55,13 @@ "width": 400, "height": 400 } + }, + { + "location": "16/38.896954/-77.108406", + "name": "virginia_", + "viewport": { + "width": 400, + "height": 400 + } } ] From 60cd926159ecd4f1587f3009e08de74726ff0367 Mon Sep 17 00:00:00 2001 From: Will Date: Thu, 11 Jan 2024 20:45:56 -0500 Subject: [PATCH 4/4] Updating typo in taginfo --- scripts/taginfo_template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json index 043e7fae9..7ca152068 100644 --- a/scripts/taginfo_template.json +++ b/scripts/taginfo_template.json @@ -652,7 +652,7 @@ "key": "shop", "value": "car_repair", "object_types": ["node", "area"], - "description": "Car dealerships are marked by an icon representing a front facing vehicle with a wrench above it.", + "description": "Car mechanic shops are marked by an icon representing a front facing vehicle with a wrench above it.", "doc_url": "https://openmaptiles.org/schema/#poi", "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_car_repair.svg" },