Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Distinct food court icon #1170

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+23 −8
Open

Distinct food court icon #1170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd4c102
Create poi_restaurant_circle.svg
wmisener Nov 21, 2024
a32a27d
Merge branch 'osm-americana:main' into wmisener/foodcourt
wmisener Nov 23, 2024
1ebaccd
Food court POI rendering and taginfo
wmisener Nov 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions icons/poi_restaurant_circle.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions scripts/taginfo_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,9 +585,9 @@
"key": "amenity",
"value": "food_court",
"object_types": ["node", "area"],
"description": "Restaurants are marked by an icon representing a knife and fork.",
"description": "Food courts are marked by an icon representing a knife and fork inscribed in a circle.",
"doc_url": "https://openmaptiles.org/schema/#poi",
"icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_restaurant.svg"
"icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_restaurant_circle.svg"
},
{
"key": "amenity",
Expand Down
22 changes: 16 additions & 6 deletions src/layer/poi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ var iconDefs = {
color: Color.poi.consumer,
description: "Coffee shop",
},
fuel: {
food_court: {
classes: {
fuel: ["fuel"],
fast_food: ["food_court"],
},
sprite: "poi_fuel",
sprite: "poi_restaurant_circle",
color: Color.poi.consumer,
description: "Gas station",
description: "Food court",
},
fire_station: {
classes: {
Expand All @@ -91,6 +91,14 @@ var iconDefs = {
color: Color.poi.infrastructure,
description: "Fire station",
},
fuel: {
classes: {
fuel: ["fuel"],
},
sprite: "poi_fuel",
color: Color.poi.consumer,
description: "Gas station",
},
hospital: {
classes: {
hospital: ["hospital"],
Expand Down Expand Up @@ -247,7 +255,7 @@ var iconDefs = {
restaurant: {
classes: {
restaurant: ["restaurant"],
fast_food: ["fast_food", "food_court"],
fast_food: ["fast_food"],
},
sprite: "poi_restaurant",
color: Color.poi.consumer,
Expand Down Expand Up @@ -343,6 +351,7 @@ export const poi = {
...getSubclasses(iconDefs.supermarket),
...getSubclasses(iconDefs.car_shop),
...getSubclasses(iconDefs.car_repair),
...getSubclasses(iconDefs.food_court),
...getSubclasses(iconDefs.hotel),
...getSubclasses(iconDefs.hostel),
...getSubclasses(iconDefs.restaurant),
Expand Down Expand Up @@ -396,6 +405,7 @@ export const poi = {
[
"bus_stop",
"fire_station",
"food_court",
"hospital",
"library",
"museum",
Expand Down Expand Up @@ -451,7 +461,7 @@ export const poi = {
[
"match",
["get", "subclass"],
["bus_stop", "tram_stop", "fuel", "supermarket"],
["bus_stop", "tram_stop", "fuel", "supermarket", "food_court"],
"",
label.localizedName,
],
Expand Down