Add explicit Restaurant category

diff --git a/src/osm-db-import.c b/src/osm-db-import.c
index a7bffb10989b0494de183aac1110db5995b64b0a..fc940049551b2d09a172c0287cf874344320e457 100644 (file)
--- a/src/osm-db-import.c
+++ b/src/osm-db-import.c
@@ -119,7 +119,7 @@ struct _nodeinfo {
        { "amenity", "biergarten",      NODE_AMENITY_PUB },
        { "amenity", "cafe",            NODE_AMENITY_CAFE },
        { "amenity", "fast_food",       NODE_AMENITY_FOOD },
-       { "amenity", "restaurant",      NODE_AMENITY_FOOD },
+       { "amenity", "restaurant",      NODE_AMENITY_RESTAURANT },
 
        { "amenity", "telephone",       NODE_AMENITY_TELEPHONE },
        { "amenity", "toilets",         NODE_AMENITY_WC },

diff --git a/src/osm.h b/src/osm.h
index 244788fc4e56e1fdcb20022993c16a34adeef739..d2fbc146a2aab0bf23800555d217e2b2ee819947 100644 (file)
--- a/src/osm.h
+++ b/src/osm.h
@@ -74,6 +74,7 @@ typedef enum {
        NODE_TOURISM_CARAVAN_SITE=281,
        NODE_TOURISM_PICNIC_SITE=282,
 
+       NODE_AMENITY_RESTAURANT=300,
        NODE_AMENITY_FOOD=301,
        NODE_AMENITY_PUB=302,
 

diff --git a/src/poi.c b/src/poi.c
index dbfba0248dcf04c2314ad67ef7844b7c25d02a46..107fd92ac1c092c6af0eb9dfe5e975fbbdc755c1 100644 (file)
--- a/src/poi.c
+++ b/src/poi.c
@@ -67,7 +67,8 @@ static struct _poi_categories default_poi_categories[] = {
        { NODE_TOURISM_CAMP_SITE, "Camp site", "Place to go camping" , "accommodation/camping", "#90f080" },
        { NODE_TOURISM_CARAVAN_SITE, "Caravan site", "" , "accommodation/camping/caravan", "#90ff80" },
        { NODE_TOURISM_PICNIC_SITE, "Picnic", "Place to have a Picnic" , "recreation/picnic", "#a5f8e5" },
-       { NODE_AMENITY_FOOD, "Restaurant, Fast food", "Places to eat or drink." , "food/fastfood", "#e5960d" },
+       { NODE_AMENITY_FOOD, "Fast food", "Places to eat or drink." , "food/fastfood", "#e5960d" },
+       { NODE_AMENITY_RESTAURANT, "Restaurant", "Fancy places to eat or drink." , "food/restaurant", "#e5960d" },
        { NODE_AMENITY_PUB, "Pub", "Place to drink." , "food/pub", "#f5960d" },
        { NODE_AMENITY_NIGHTCLUB, "Disco, Club", "Place to drink, party and dance." , "food/bar", "#f59c1d" },
        { NODE_AMENITY_CAFE, "Cafe", "Place to drink coffe or tee and eat." , "food/cafe", "#ff960d" },