Add header and cast properly.

[mapper] / src / osm-db.h

diff --git a/src/osm-db.h b/src/osm-db.h
index dccc2ed747c37a86f426d8299f6f2b59c5e5d6bf..d7c836972f1fc015f53bc15578a08bb7431ee445 100644 (file)
--- a/src/osm-db.h
+++ b/src/osm-db.h
@@ -26,14 +26,38 @@
 
 #define OSM_RANGE_WAY (20000)
 
+/** Generic search item list indexes */
+typedef enum {
+       ITEM_ID,
+       ITEM_CATID,
+       ITEM_LAT,
+       ITEM_LON,
+       ITEM_DIST,
+       ITEM_LATLON,
+       ITEM_LABEL,
+       ITEM_DESC,
+       ITEM_CATLAB,
+       ITEM_ICON,
+       ITEM_COLOR,
+       ITEM_NUM_COLUMNS
+} item_list_id;
+
+typedef enum {
+        OSM_NODE_NEXT,
+        OSM_NODE_PREV,
+} osm_node_direction;
+
 gboolean osm_init(sqlite3 **db);
 void osm_deinit(void);
 
+GSList *osm_get_route_node(guint nid, osm_node_direction d);
+
 void osm_set_way_range_from_speed(gfloat speed);
 void osm_set_way_range(guint sr);
 
 gboolean osm_way_search(gdouble lat, gdouble lon, gchar *text, GtkListStore **store);
 
+void osm_db_enable_mainloop(sqlite3 *db, gboolean eml);
 void osm_progress_set_widget(sqlite3 *db, GtkProgressBar *w);
 gboolean osm_db_prepare(sqlite3 *db);
 
@@ -47,9 +71,10 @@ gboolean osm_find_nearest_place(node_type_t type, gint lat, gint lon, osm_place
 osm_way *osm_find_nearest_way(gint lat, gint lon);
 gboolean osm_way_distance(gint lat, gint lon, osm_way_node *f, osm_way_node *t, gdouble *d);
 
+gboolean osm_place_search(gdouble lat, gdouble lon, gchar *text, GtkListStore **store);
 gboolean osm_place_get(guint32 id, gint lat, gint lon, osm_place **nr);
 
-gboolean osm_get_location_data(gint lat, gint lon, osm_location *map_loc);
+gboolean osm_get_location_data(gint lat, gint lon, gfloat heading, osm_location *map_loc);
 
 osm_way_node *osm_way_node_new(guint id, gint lat, gint lon, gint flags);