X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpoi.c;h=7613ef04742e605a39c3d59c37e9c59ada97ab3d;hb=4c3fa14525e44c67b9b3fbf00f86fb24afd44c97;hp=56611216d16708bbb5ca0b100ac28133f00fcbf7;hpb=636a612be3acd2b039da2170527b91a231c81ce3;p=mapper

diff --git a/src/poi.c b/src/poi.c
index 5661121..7613ef0 100644
--- a/src/poi.c
+++ b/src/poi.c
@@ -27,6 +27,7 @@
 #include "osm.h"
 #include "osm-db.h"
 #include "latlon.h"
+#include "image-cache.h"
 
 static sqlite3 *poidb;
 
@@ -34,8 +35,7 @@ static sqlite3 *poidb;
 static gchar *theme="square";
 static gchar *theme_base=DATADIR "/icons/map-icons";
 
-/* Hash table for caching POI icons */
-static GHashTable *poi_icon_hash = NULL;
+static ImageCache *poi_ic=NULL;
 
 struct _poi_categories {
 	node_type_t type;
@@ -131,9 +131,8 @@ poi_populate_categories(sqlite3 *db)
 sqlite3_stmt *sql_cat;
 guint i;
 
-sqlite3_prepare_v2(db,"insert or replace into category (cat_id, label, desc, enabled, priority, icon, color)"
-			" values (?, ?, ?, 1, ?, ?, ?)", 
-			-1, &sql_cat, NULL);
+DB_PREP(db,"insert or replace into category (cat_id, label, desc, enabled, priority, icon, color)"
+			" values (?, ?, ?, 1, ?, ?, ?)", sql_cat);
 
 for (i=0; default_poi_categories[i].name; i++) {
 	sqlite3_bind_int(sql_cat, 1, default_poi_categories[i].type);
@@ -171,8 +170,7 @@ poi_db_create(sqlite3 *db)
 gchar **pszResult;
 guint nRow, nColumn;
 
-if (SQLITE_OK != sqlite3_get_table(db, "select label from poi limit 1",
-				   &pszResult, &nRow, &nColumn, NULL)) {
+if (SQLITE_OK != sqlite3_get_table(db, "select label from poi limit 1", &pszResult, &nRow, &nColumn, NULL)) {
 	gchar *create_sql;
 
 	g_printerr("Creating initial POI tables\n");
@@ -243,138 +241,109 @@ typedef enum {
 gboolean
 poi_db_prepare(sqlite3 *db)
 {
-	/* Select POIs inside given minmax lat,lon */
-	if (sqlite3_prepare_v2(db,
-			"select " 
-			POI_BASE_SQL_FIELDS
-			" from poi p, category c "
-			" where p.lat between ? and ? "
-			" and p.lon between ? and ? "
-			" and c.enabled=1 and p.cat_id=c.cat_id order by c.priority limit 500",
-			-1, &poisql.select_poi, NULL)!=SQLITE_OK)
-	return FALSE;
-
-	/* Get POI with given ID */
-	if (sqlite3_prepare_v2(db,
-			"select "
-			POI_BASE_SQL_FIELDS
-			" from poi p, category c "
-			" where p.poi_id = ? "
-			" and p.cat_id=c.cat_id",
-			-1, &poisql.select_poi_by_id, NULL)!=SQLITE_OK)
-	return FALSE;
-
-	/* Search POIs by label and any category */
-	if (sqlite3_prepare_v2(db,
-			"select "
-			POI_BASE_SQL_FIELDS
-			" from poi p, category c "
-			" where p.lat between ? and ? "
-			" and p.lon between ? and ? "
-			" and c.enabled=1 and p.cat_id = c.cat_id and (p.label like $NAME or p.postal_code like $NAME) order by p.label, c.label",
-			-1, &poisql.select_poi_search, NULL)!=SQLITE_OK)
-	return FALSE;
-
-	/* Search POI by label and category */
-	if (sqlite3_prepare_v2(db,
-			"select "
-			POI_BASE_SQL_FIELDS
-			" from poi p, category c "
-			" where p.lat between ? and ? "
-			" and p.lon between ? and ? "
-			" and c.enabled=1 and p.cat_id = c.cat_id and (p.label like $NAME or p.postal_code like $NAME) and c.cat_id = ? order by p.label",
-			-1, &poisql.select_poi_search_cat, NULL)!=SQLITE_OK)
-	return FALSE;
-
-	/* Search POIs by category */
-	if (sqlite3_prepare_v2(db,
-			"select "
-			POI_BASE_SQL_FIELDS
-			" from poi p, category c "
-			" where p.lat between ? and ? "
-			" and p.lon between ? and ? "
-			" and c.enabled=1 and p.cat_id=c.cat_id and c.cat_id=? order by p.label",
-			-1, &poisql.select_poi_by_cat, NULL)!=SQLITE_OK)
-	return FALSE;
-
-	/* Select any nearest POI */
-	if (sqlite3_prepare_v2(db,
-			"select "
-			POI_MINI_SQL_FIELDS
-			" from poi p, category c "
-			" where c.enabled = 1 and p.cat_id = c.cat_id "
-			" and p.lat between $LAT-0.10 and $LAT+0.10 "
-			" and p.lon between $LON-0.10 and $LAT+0.10 "
-			" order by (($LAT - p.lat) * ($LAT - p.lat) "
-			"+ ($LON - p.lon) * ($LON - p.lon)) limit 1",
-			-1, &poisql.select_nearest_poi, NULL)!=SQLITE_OK)
-	return FALSE;
-
-	/* Insert POI */
-	sqlite3_prepare_v2(db,  "insert into poi (lat, lon, label, desc, url, postal_code, cat_id, addtime, public, source)"
-							" values (?, ?, ?, ?, ?, ?, ?, ?, 1, ?)", -1, &poisql.insert_poi, NULL);
-	/* update poi */
-	sqlite3_prepare_v2(db, "update poi set label=?, desc=?, cat_id=? where poi_id=?", -1, &poisql.update_poi, NULL);
-	/* delete from poi */
-	sqlite3_prepare_v2(db, "delete from poi where poi_id=?", -1, &poisql.delete_poi, NULL);
-	/* delete from poi by cat_id */
-	sqlite3_prepare_v2(db, "delete from poi where cat_id=?", -1, &poisql.delete_poi_by_catid, NULL);
-
-	/* select from category */
-	sqlite3_prepare_v2(db,
-			"select c.label, c.desc, c.enabled"
-			" from category c where c.cat_id = ?",
-			-1, &poisql.select_cat, NULL);
-	/* insert into category */
-	sqlite3_prepare_v2(db,
-			"insert into category (label, desc, enabled)"
-			" values (?, ?, ?)", -1, &poisql.insert_cat, NULL);
-	/* update category */
-	sqlite3_prepare_v2(db,
-			"update category set label = ?, desc = ?,"
-			" enabled = ? where poi_id = ?",
-			-1, &poisql.update_cat, NULL);
-	/* delete from category */
-	sqlite3_prepare_v2(db,"delete from category where cat_id = ?",
-			-1, &poisql.delete_cat, NULL);
-	/* enable category */
-	sqlite3_prepare_v2(db,
-			"update category set enabled = ?"
-			" where cat_id = ?", -1, &poisql.toggle_cat, NULL);
-	/* select all category */
-	sqlite3_prepare_v2(db,
-			"select c.cat_id, c.label, c.desc, c.enabled, c.icon, c.color,"
-			" count(p.poi_id)"
-			" from category c"
-			" left outer join poi p on c.cat_id = p.cat_id"
-			" group by c.cat_id, c.label, c.desc, c.enabled "
-			" order by c.priority,c.label", -1, &poisql.selall_cat, NULL);
-
-	/* Select quick categories */
-	sqlite3_prepare_v2(db,
-			"select c.cat_id, c.label, c.icon, c.color"
-			" from category c where c.enabled=1 "
-			" order by c.priority,c.label limit 9", -1, &poisql.select_quick_cat, NULL);
-
-	return TRUE;
+/* Select POIs inside given minmax lat,lon */
+DB_PREP(db,	"select " 
+		POI_BASE_SQL_FIELDS
+		" from poi p, category c "
+		" where p.lat between ? and ? "
+		" and p.lon between ? and ? "
+		" and c.enabled=1 and p.cat_id=c.cat_id order by c.priority limit 500",
+		poisql.select_poi);
+
+/* Get POI with given ID */
+DB_PREP(db,	"select "
+		POI_BASE_SQL_FIELDS
+		" from poi p, category c "
+		" where p.poi_id = ? "
+		" and p.cat_id=c.cat_id",
+		poisql.select_poi_by_id);
+
+/* Search POIs by label and any category */
+DB_PREP(db,	"select "
+		POI_BASE_SQL_FIELDS
+		" from poi p, category c "
+		" where p.lat between ? and ? "
+		" and p.lon between ? and ? "
+		" and c.enabled=1 and p.cat_id = c.cat_id and (p.label like $NAME or p.postal_code like $NAME) order by p.label, c.label",
+		poisql.select_poi_search);
+
+/* Search POI by label and category */
+DB_PREP(db,	"select "
+		POI_BASE_SQL_FIELDS
+		" from poi p, category c "
+		" where p.lat between ? and ? "
+		" and p.lon between ? and ? "
+		" and c.enabled=1 and p.cat_id = c.cat_id and (p.label like $NAME or p.postal_code like $NAME) and c.cat_id = ? order by p.label",
+		poisql.select_poi_search_cat);
+
+/* Search POIs by category */
+DB_PREP(db,	"select "
+		POI_BASE_SQL_FIELDS
+		" from poi p, category c "
+		" where p.lat between ? and ? "
+		" and p.lon between ? and ? "
+		" and c.enabled=1 and p.cat_id=c.cat_id and c.cat_id=? order by p.label",
+		poisql.select_poi_by_cat);
+
+/* Select any nearest POI */
+DB_PREP(db,	"select "
+		POI_MINI_SQL_FIELDS
+		" from poi p, category c "
+		" where c.enabled = 1 and p.cat_id = c.cat_id "
+		" and p.lat between $LAT-0.10 and $LAT+0.10 "
+		" and p.lon between $LON-0.10 and $LAT+0.10 "
+		" order by (($LAT - p.lat) * ($LAT - p.lat) "
+		"+ ($LON - p.lon) * ($LON - p.lon)) limit 1",
+		poisql.select_nearest_poi);
+
+/* Insert POI */
+DB_PREP(db, "insert into poi (lat, lon, label, desc, url, postal_code, cat_id, addtime, public, source)"
+			" values (?, ?, ?, ?, ?, ?, ?, ?, 1, ?)", poisql.insert_poi);
+/* update poi */
+DB_PREP(db, "update poi set label=?, desc=?, cat_id=? where poi_id=?", poisql.update_poi);
+/* delete from poi */
+DB_PREP(db, "delete from poi where poi_id=?", poisql.delete_poi);
+/* delete from poi by cat_id */
+DB_PREP(db, "delete from poi where cat_id=?", poisql.delete_poi_by_catid);
+
+/* select from category */
+DB_PREP(db,	"select c.label, c.desc, c.enabled from category c where c.cat_id = ?", poisql.select_cat);
+/* insert into category */
+DB_PREP(db,	"insert into category (label, desc, enabled) values (?, ?, ?)", poisql.insert_cat);
+/* update category */
+DB_PREP(db,	"update category set label = ?, desc = ?, enabled = ? where cat_id = ?", poisql.update_cat);
+/* delete from category */
+DB_PREP(db,"delete from category where cat_id = ?",	poisql.delete_cat);
+/* enable category */
+DB_PREP(db,	"update category set enabled = ? where cat_id = ?", poisql.toggle_cat);
+/* select all category */
+DB_PREP(db,	"select c.cat_id, c.label, c.desc, c.enabled, c.icon, c.color,"
+		" count(p.poi_id)"
+		" from category c"
+		" left outer join poi p on c.cat_id = p.cat_id"
+		" group by c.cat_id, c.label, c.desc, c.enabled "
+		" order by c.priority,c.label", 
+		poisql.selall_cat);
+/* Select quick categories */
+DB_PREP(db,	"select c.cat_id, c.label, c.icon, c.color"
+		" from category c where c.enabled=1 "
+		" order by c.priority,c.label limit 9", 
+		poisql.select_quick_cat);
+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
+image_cache_clear(poi_ic);
 }
 
 void
 poi_deinit(sqlite3 *db)
 {
-if (poi_icon_hash) {
-	g_hash_table_destroy(poi_icon_hash);
-	poi_icon_hash=NULL;
+if (poi_ic) {
+	image_cache_free(poi_ic);
+	poi_ic=NULL;
 }
 
 sqlite3_finalize(poisql.select_quick_cat);
@@ -397,12 +366,12 @@ sqlite3_finalize(poisql.select_poi_search_cat);
 gboolean
 poi_init(sqlite3 **db)
 {
-if (!poi_icon_hash)
-	poi_icon_hash=g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-
 if (!db || !*db)
 	return FALSE;
 
+if (!poi_ic)
+	poi_ic=image_cache_new(128);
+
 poidb=*db;
 poi_db_create(poidb);
 if (poi_db_prepare(poidb)==FALSE) {
@@ -442,7 +411,7 @@ if (p->cat_desc)
 g_slice_free(poi_info, p);
 }
 
-static GtkListStore *
+GtkListStore *
 poi_list_store_new(void) {
 return gtk_list_store_new(ITEM_NUM_COLUMNS, 
 			G_TYPE_INT,	/* POI ID */
@@ -595,7 +564,7 @@ return TRUE;
 }
 
 gboolean
-poi_search(poi_search_type pst, gdouble lat, gdouble lon, gchar *text, guint cat, GtkListStore **store)
+poi_search(poi_search_type pst, gdouble lat, gdouble lon, gchar *text, guint cat, GtkListStore *store)
 {
 GtkTreeIter iter;
 sqlite3_stmt *sql=NULL;
@@ -608,6 +577,7 @@ if (!poidb)
 	return FALSE;
 
 g_return_val_if_fail(poisql.select_poi, FALSE);
+g_return_val_if_fail(store, FALSE);
 
 g_printf("POI Search: [%s] around %.6f %.6f (%d %d)\n", text, lat, lon, cat, pst);
 
@@ -670,8 +640,6 @@ if (SQLITE_OK != sqlite3_bind_double(sql, 1, lat-range) ||
 	return FALSE;
 }
 
-*store = poi_list_store_new();
-
 while (SQLITE_ROW == sqlite3_step(sql)) {
 	gdouble rlat, rlon, dist;
 
@@ -681,8 +649,8 @@ while (SQLITE_ROW == sqlite3_step(sql)) {
 	lon_format(_degformat, rlon, tmp2);
 	dist=calculate_distance(lat, lon, rlat, rlon) * UNITS_CONVERT[_units];
 
-	gtk_list_store_append(*store, &iter);
-	gtk_list_store_set(*store, &iter,
+	gtk_list_store_append(store, &iter);
+	gtk_list_store_set(store, &iter,
 		ITEM_ID, sqlite3_column_int(sql, 2),
 		ITEM_CATID, sqlite3_column_int(sql, 5),
 		ITEM_LAT, rlat, 
@@ -705,9 +673,9 @@ return TRUE;
 }
 
 gboolean
-poi_get_list_inside(gdouble lat1, gdouble lon1, gdouble lat2, gdouble lon2, GtkListStore **store, guint *num_poi)
+poi_get_list_inside(gdouble lat1, gdouble lon1, gdouble lat2, gdouble lon2, GtkListStore *store, guint *num_poi)
 {
-static active=FALSE;
+static gboolean active=FALSE;
 GtkTreeIter iter;
 gchar tmp1[16], tmp2[16];
 
@@ -717,21 +685,20 @@ if (!_db)
 	return FALSE;
 
 g_return_val_if_fail(poisql.select_poi, FALSE);
+g_return_val_if_fail(store, FALSE);
 
 if (active)
 	return FALSE;
 
 active=TRUE;
 if (SQLITE_OK != sqlite3_bind_double(poisql.select_poi, 1, lat1) ||
-    SQLITE_OK != sqlite3_bind_double(poisql.select_poi, 2, lat2) ||
-    SQLITE_OK != sqlite3_bind_double(poisql.select_poi, 3, lon1) ||
-    SQLITE_OK != sqlite3_bind_double(poisql.select_poi, 4, lon2)) {
+	SQLITE_OK != sqlite3_bind_double(poisql.select_poi, 2, lat2) ||
+	SQLITE_OK != sqlite3_bind_double(poisql.select_poi, 3, lon1) ||
+	SQLITE_OK != sqlite3_bind_double(poisql.select_poi, 4, lon2)) {
 	g_printerr("Failed to bind values for poisql.select_poi\n");
 	return FALSE;
 }
 
-*store = poi_list_store_new();
-
 while (SQLITE_ROW == sqlite3_step(poisql.select_poi)) {
 	gdouble lat, lon, dist=0;
 
@@ -740,8 +707,8 @@ while (SQLITE_ROW == sqlite3_step(poisql.select_poi)) {
 	lat_format(_degformat, lat, tmp1);
 	lon_format(_degformat, lon, tmp2);
 
-	gtk_list_store_append(*store, &iter);
-	gtk_list_store_set(*store, &iter,
+	gtk_list_store_append(store, &iter);
+	gtk_list_store_set(store, &iter,
 		ITEM_ID, sqlite3_column_int(poisql.select_poi, 2),
 		ITEM_CATID, sqlite3_column_int(poisql.select_poi, 5),
 		ITEM_LAT, lat,
@@ -763,18 +730,14 @@ return TRUE;
 }
 
 gboolean
-poi_get_list_near_unit(guint unitx, guint unity, guint range, GtkListStore **store, guint *num_poi)
+poi_get_list_near(gdouble lat, gdouble lon, gfloat range, GtkListStore *store, guint *num_poi)
 {
 gdouble lat1, lon1, lat2, lon2;
-guint x, y;
-
-x=unitx-pixel2unit(3*range);
-y=unity+pixel2unit(3*range);
-unit2latlon(x, y, lat1, lon1);
 
-x=unitx+pixel2unit(3*range);
-y=unity-pixel2unit(3*range);
-unit2latlon(x, y, lat2, lon2); 
+lat1=lat-range;
+lon1=lon-range;
+lat2=lat+range;
+lon2=lon+range;
 
 return poi_get_list_inside(lat1, lon1, lat2, lon2, store, num_poi);
 }
@@ -903,13 +866,10 @@ return NULL;
 }
 
 GdkPixbuf *
-poi_get_icon(gchar *icon, gboolean big)
+poi_get_icon(const gchar *icon, gboolean big)
 {
-static guint hit=0;
-static guint miss=0;
-gchar buffer[256];
-GdkPixbuf *pixbuf;
-GError *error = NULL;
+gchar buffer[128];
+gchar key[32];
 
 if (icon==NULL)
 	return NULL;
@@ -917,23 +877,10 @@ if (icon==NULL)
 if (strlen(icon)==0)
 	return NULL;
 
-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) {
-	hit++;
-	return pixbuf;
-}
-miss++;
-
-pixbuf=gdk_pixbuf_new_from_file(buffer, &error);
-
-if (error)
-	return NULL;
+g_snprintf(buffer, sizeof(buffer), "%s/%s.%s/%s.png", theme_base, theme, (big==TRUE) ? "big" : "small", icon);
+g_snprintf(key, sizeof(key), "%s:%s:%s", theme, (big==TRUE) ? "big" : "small", icon);
 
-g_hash_table_insert(poi_icon_hash, g_strdup(buffer), pixbuf);
-return pixbuf;
+return image_cache_get(poi_ic, key, buffer);
 }
 
 GtkListStore *