Include settings.h so the banner macro hildon version works.

[mapper] / src / poi.c

diff --git a/src/poi.c b/src/poi.c
index eb291e4dad719bc6996806720d4ee8190eabd0b5..107fd92ac1c092c6af0eb9dfe5e975fbbdc755c1 100644 (file)
--- a/src/poi.c
+++ b/src/poi.c
@@ -67,13 +67,15 @@ 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" },
        { NODE_AMENITY_CINEMA, "Cinema", "Place to see movies" , "recreation/cinema", "#9090a0" },
        { NODE_AMENITY_THEATRE, "Theatre", "Place to see people performing" , "recreation/theater", "#9595a5" },
        { NODE_AMENITY_SHOP, "Shopping", "Places to shop or acquire services." , "shopping", "#61ef1b" },
+       { NODE_AMENITY_SHOP_ADULT, "Adult shop", "Shops providing adult items, such as sex toys,pornography and fetish clothing" , "", "#ff0000" },
        { NODE_AMENITY_POW, "Place of Worchip", "" , "religion/church", "#7c5b0b" },
        { NODE_TOURISM_THEME_PARK, "Theme Park", "Place to have fun and ride for example rollercoasters." , "recreation/theme_park", "#8eef1b" },
        { NODE_AMENITY_COLLEGE, "College Campus/Building", "" , "education/college", "#813fdc" },
@@ -82,7 +84,7 @@ static struct _poi_categories default_poi_categories[] = {
        { NODE_AMENITY_TOWNHALL, "Townhall", "" , "", "#408090" },
        { NODE_AMENITY_WC, "WC/Toilets", "" , "public/toilets", "#e1d62c" },
        { NODE_AMENITY_TELEPHONE, "Telephone", "Public telephone" , "public/telephone", "#208060" },
-       { NODE_TOURISM_ATTRACTION, "Attraction", "Something interesting" , "generic", "#005000" },
+       { NODE_TOURISM_ATTRACTION, "Attraction", "Something interesting" , "misc", "#005000" },
 
        { NODE_HISTORIC_MUSEUM, "Museum", "A place where objects of historical, artistic, or scientific interest are exhibited, preserved or studied." , "sightseeing/museum", "#202020" },
        { NODE_HISTORIC_CASTLE, "Castle", "Historical building or group of building used for defense by military forces, whose main structures are walls and towers." , "sightseeing/castle", "#404040" },
@@ -95,31 +97,31 @@ static struct _poi_categories default_poi_categories[] = {
        { NODE_SPORT_SOCCER, "Soccer", "" , "sports/soccer", "#102080" },
        { NODE_SPORT_GOLF, "Golf", "" , "sports/golf", "#102080" },
        { NODE_SPORT_TENNIS, "Tennis", "" , "sports/tennis", "#101080" },
-       { NODE_SPORT_BOWLING, "Bowling", "" , "", "#101080" },
-       { NODE_SPORT_RUGBY, "Rugby", "" , "", "#101080" },
-       { NODE_SPORT_CLIMBING, "Climbing", "" , "", "#101080" },
+       { NODE_SPORT_BOWLING, "Bowling", "" , "sports", "#101080" },
+       { NODE_SPORT_RUGBY, "Rugby", "" , "sports", "#101080" },
+       { NODE_SPORT_CLIMBING, "Climbing", "" , "sports", "#101080" },
        { NODE_SPORT_CYCLING, "Cycling", "" , "sports/bicycle", "#101080" },
-       { NODE_SPORT_MOTOR, "Motor sport", "" , "", "#101080" },
-       { NODE_SPORT_HOCKEY, "Hockey", "" , "", "#5050A0" },
-       { NODE_SPORT_SKATING, "Skating", "" , "", "#5050A0" },
-       { NODE_SPORT_SKATEBOARD, "Skateboard", "" , "", "#101080" },
+       { NODE_SPORT_MOTOR, "Motor sport", "" , "sports", "#101080" },
+       { NODE_SPORT_HOCKEY, "Hockey", "" , "sports", "#5050A0" },
+       { NODE_SPORT_SKATING, "Skating", "" , "sports", "#5050A0" },
+       { NODE_SPORT_SKATEBOARD, "Skateboard", "" , "sports", "#101080" },
        { NODE_SPORT_HORSES, "Horses", "Horse riding or racing" , "sports/riding", "#101080" },
-       { NODE_SPORT_DOG, "Dog racing", "" , "", "#101080" },
-       { NODE_SPORT_BASKETBALL, "Basketball", "" , "", "#101080" },
-       { NODE_SPORT_BASEBALL, "Baseball", "" , "", "#101080" },
+       { NODE_SPORT_DOG, "Dog racing", "" , "sports", "#101080" },
+       { NODE_SPORT_BASKETBALL, "Basketball", "" , "sports", "#101080" },
+       { NODE_SPORT_BASEBALL, "Baseball", "" , "sports", "#101080" },
        { NODE_SPORT_CANOE, "Canoe", "" , "", "#101080" },
-       { NODE_SPORT_CROQUET, "Croquet", "" , "", "#101080" },
-       { NODE_SPORT_CRICKET, "Cricket", "" , "", "#101080" },
-       { NODE_SPORT_SHOOTING, "Shooting", "Shooting range" , "", "#101080" },
-       { NODE_SPORT_PAINTBALL, "Paintball", "Run around and shoot people with paintballs" , "", "#101080" },
-       { NODE_SPORT_TABLE_TENNIS, "Table tennis", "" , "", "#101080" },
-       { NODE_SPORT_PELOTA, "Pelota", "" , "", "#101080" },
+       { NODE_SPORT_CROQUET, "Croquet", "" , "sports", "#101080" },
+       { NODE_SPORT_CRICKET, "Cricket", "" , "sports", "#101080" },
+       { NODE_SPORT_SHOOTING, "Shooting", "Shooting range" , "sports", "#101080" },
+       { NODE_SPORT_PAINTBALL, "Paintball", "Run around and shoot people with paintballs" , "sports", "#101080" },
+       { NODE_SPORT_TABLE_TENNIS, "Table tennis", "" , "sports", "#101080" },
+       { NODE_SPORT_PELOTA, "Pelota", "" , "sports", "#101080" },
        { NODE_SPORT_RACQUET, "Racquet", "" , "sports/racquetball", "#101080" },
-       { NODE_SPORT_BOWLS, "Lawn Bowls", "" , "", "#101080" },
-       { NODE_SPORT_ATHLETICS, "Athletics", "" , "", "#101080" },
+       { NODE_SPORT_BOWLS, "Lawn Bowls", "" , "sports", "#101080" },
+       { NODE_SPORT_ATHLETICS, "Athletics", "" , "sports", "#101080" },
        { NODE_SPORT_OTHER, "Other Sports", "" , "sports/stadium", "#101077" },
 
-       { NODE_AMENITY_GENERIC, "Other", "Miscellaneous category for everything else." , "generic", "#002000" },
+       { NODE_AMENITY_GENERIC, "Other", "Miscellaneous category for everything else." , "misc", "#002000" },
        { NODE_POI_END, NULL, NULL }
 };
 
@@ -152,7 +154,7 @@ return TRUE;
 }
 
 const gchar *
-poi_get_icon_from_type(gint t) 
+poi_get_icon_from_type(node_type_t t) 
 {
 guint i;