#include <config.h>
-#define _GNU_SOURCE
-
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
/* POI Icon theme. "classic" or "square". Should be made into a configuration option */
static gchar *theme="square";
+static gchar *theme_base=DATADIR "/icons/map-icons";
/* Hash table for caching POI icons */
static GHashTable *poi_icon_hash = NULL;
{ 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" },
{ 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" },
{ 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 }
};
poi_populate_categories(sqlite3 *db)
{
sqlite3_stmt *sql_cat;
-gint i;
+guint i;
sqlite3_prepare_v2(db,"insert or replace into category (cat_id, label, desc, enabled, priority, icon, color)"
" values (?, ?, ?, 1, ?, ?, ?)",
return TRUE;
}
+const gchar *
+poi_get_icon_from_type(node_type_t t)
+{
+guint i;
+
+for (i=0; default_poi_categories[i].name; i++) {
+ if (t==default_poi_categories[i].type)
+ return default_poi_categories[i].icon;
+}
+return NULL;
+}
+
gboolean
poi_db_create(sqlite3 *db)
{
return TRUE;
}
+void
+poi_icon_hash_clear(void)
+{
+#if (GLIB_CHECK_VERSION (2, 12, 0))
+g_hash_table_remove_all(poi_icon_hash);
+#else
+g_hash_table_foreach_remove(poi_icon_hash, gtk_true, NULL);
+#endif
+}
+
void
poi_deinit(sqlite3 *db)
{
+if (poi_icon_hash) {
+ g_hash_table_destroy(poi_icon_hash);
+ poi_icon_hash=NULL;
+}
+
sqlite3_finalize(poisql.select_quick_cat);
sqlite3_finalize(poisql.selall_cat);
sqlite3_finalize(poisql.toggle_cat);
poi_init(sqlite3 **db)
{
if (!poi_icon_hash)
- poi_icon_hash=g_hash_table_new(g_str_hash, g_str_equal);
+ poi_icon_hash=g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
if (!db || !*db)
return FALSE;
if (strlen(icon)==0)
return NULL;
-g_snprintf(buffer, sizeof(buffer), DATADIR "/map-icons/%s.%s/%s.png",
- theme, (big==TRUE) ? "big" : "small", icon);
+g_snprintf(buffer, sizeof(buffer), "%s/%s.%s/%s.png",
+ theme_base, theme, (big==TRUE) ? "big" : "small", icon);
pixbuf=g_hash_table_lookup(poi_icon_hash, buffer);
if (pixbuf)
projects / mapper / blobdiff