#include <glib.h>
#include <sqlite3.h>
+#include "osm.h"
+
+/** Category list **/
+typedef enum {
+ CAT_ID,
+ CAT_ENABLED,
+ CAT_LABEL,
+ CAT_DESC,
+ CAT_POI_CNT,
+ CAT_ICON,
+ CAT_NUM_COLUMNS
+} CategoryList;
+
typedef enum {
POI_TYPE_POINT=0,
POI_TYPE_LANDMARK=1,
poi_info *poi_new(void);
void poi_free(poi_info *p);
-gboolean poi_get_list_near_unit(guint unitx, guint unity, guint range, GtkListStore **store, guint *num_poi);
-gboolean poi_get_list_inside(gdouble lat1, gdouble lon1, gdouble lat2, gdouble lon2, GtkListStore **store, guint *num_poi);
-
-poi_info *poi_get_by_id(guint id);
-
gboolean poi_update(poi_info *p);
gboolean poi_add(poi_info *p);
gboolean poi_delete(guint id);
+poi_info *poi_get_by_id(guint id);
-gboolean poi_search(poi_search_type pst, gdouble lat, gdouble lon, gchar *text, guint cat, GtkListStore **store);
-poi_info *poi_find_nearest(gdouble lat, gdouble lon);
+GtkListStore *poi_list_store_new(void);
+
+gboolean poi_get_list_near(gdouble lat, gdouble lon, gfloat range, GtkListStore *store, guint *num_poi);
+gboolean poi_get_list_inside(gdouble lat1, gdouble lon1, gdouble lat2, gdouble lon2, GtkListStore *store, guint *num_poi);
+gboolean poi_search(poi_search_type pst, gdouble lat, gdouble lon, gchar *text, guint cat, GtkListStore *store);
-gboolean poi_get_list_near_unit(guint unitx, guint unity, guint range, GtkListStore **store, guint *num_poi);
+poi_info *poi_find_nearest(gdouble lat, gdouble lon);
poi_category *poi_category_new(void);
void poi_category_free(poi_category *c);
gboolean poi_category_delete(guint id);
gboolean poi_category_update(guint cat_id, poi_category *c);
gboolean poi_category_toggle(guint cat_id, gboolean cat_enabled);
-
GtkListStore *poi_category_generate_store(void);
+GdkPixbuf *poi_get_icon(const gchar *icon, gboolean big);
+const gchar *poi_get_icon_from_type(node_type_t t);
+void poi_icon_hash_clear(void);
+
#endif