#include <config.h>
-#define _GNU_SOURCE
-
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include "settings.h"
#include "poi-gui.h"
#include "osm.h"
-
#include "help.h"
-
-typedef struct _search_query poi_search_query;
-struct _search_query {
- gdouble lat;
- gdouble lon;
- guint cat_id;
- gchar *query;
-};
+#include "osm-db.h"
+#include "search.h"
+#include "dialogs.h"
typedef struct _search_dialog search_dialog;
struct _search_dialog {
GtkWidget *dialog;
- GtkWidget *list;
+ GtkWidget *cmb_type;
GtkWidget *cmb_category;
+ GtkWidget *list;
GtkWidget *search_entry;
+ GtkWidget *label;
GtkListStore *store;
gdouble lat;
gdouble lon;
+ mapper_search_type stype;
};
static search_dialog sd;
+static GtkListStore *search_model=NULL;
static gboolean
search_do_cb(GtkWidget *widget, gpointer data)
{
-gchar *s;
+gchar *st;
guint cid;
-GtkListStore *store;
GtkTreeIter iter;
-search_dialog *sd=(search_dialog *)data;
+guint slen;
+search_dialog *s=(search_dialog *)data;
+gboolean sres=FALSE;
+slen=strlen(gtk_entry_get_text(GTK_ENTRY(s->search_entry)));
-if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(sd->cmb_category), &iter)==TRUE)
- gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(sd->cmb_category)), &iter, 0, &cid, -1);
+if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(s->cmb_category), &iter)==TRUE)
+ gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(s->cmb_category)), &iter, 0, &cid, -1);
else
cid=-1;
-
-if ((strlen(gtk_entry_get_text(sd->search_entry))<2) && (cid==-1)) {
- popup_error(sd->dialog, _("Query string too short. Minimum 2 characters."));
+if (s->stype==SEARCH_TYPE_POI && cid==-1 && slen<2) {
+#ifdef WITH_HILDON
+ hildon_banner_show_information(s->dialog, NULL, _("Query string too short. Minimum 2 characters."));
+#else
+ popup_error(s->dialog, _("Query string too short. Minimum 2 characters."));
+#endif
+ return TRUE;
+} else if (slen<2 && s->stype!=SEARCH_TYPE_POI) {
+#ifdef WITH_HILDON
+ hildon_banner_show_information(s->dialog, NULL, _("Query string too short. Minimum 2 characters."));
+#else
+ popup_error(s->dialog, _("Query string too short. Minimum 2 characters."));
+#endif
return TRUE;
}
-s=g_strdup(gtk_entry_get_text(sd->search_entry));
-g_printf("Search: [%s]\n", s);
-
-#if 0
-store=gtk_tree_view_get_model(GTK_TREE_VIEW(sd->list));
-if (store) {
- gtk_list_store_clear(store);
- g_object_unref(G_OBJECT(store));
+st=g_strdup(gtk_entry_get_text(GTK_ENTRY(s->search_entry)));
+
+switch (s->stype) {
+ case SEARCH_TYPE_POI:
+ MACRO_BANNER_SHOW_INFO(s->dialog, _("Searching POIs..."));
+ sres=poi_search((cid==-1 && slen>0) ? POI_SEARCH_TEXT : (cid!=-1 && slen==0) ? POI_SEARCH_CAT : POI_SEARCH_TEXT_CAT, s->lat, s->lon, st, cid, &s->store);
+ break;
+ case SEARCH_TYPE_WAY:
+ MACRO_BANNER_SHOW_INFO(s->dialog, _("Searching streets..."));
+ sres=osm_way_search(s->lat, s->lon, st, &s->store);
+ break;
+ case SEARCH_TYPE_PLACE:
+ sres=osm_place_search(s->lat, s->lon, st, &s->store);
+ break;
}
-#endif
-if (poi_search((cid==-1) ? POI_SEARCH_TEXT : POI_SEARCH_TEXT_CAT, sd->lat, sd->lon, s, cid, &sd->store)==TRUE) {
- gtk_tree_view_set_model(GTK_TREE_VIEW(sd->list), GTK_TREE_MODEL(sd->store));
- g_object_unref(G_OBJECT(sd->store));
+if (sres==TRUE) {
+ gtk_tree_view_set_model(GTK_TREE_VIEW(s->list), GTK_TREE_MODEL(s->store));
+ g_object_unref(G_OBJECT(s->store));
} else {
- sd->store=NULL;
- gtk_tree_view_set_model(GTK_TREE_VIEW(sd->list), GTK_TREE_MODEL(sd->store));
+ s->store=NULL;
+ gtk_tree_view_set_model(GTK_TREE_VIEW(s->list), GTK_TREE_MODEL(s->store));
}
-g_free(s);
+g_free(st);
return TRUE;
}
static gboolean
-search_goto_cb(GtkWidget *widget, gpointer data)
+search_get_list_item_latlon(GtkWidget *list, gdouble *lat, gdouble *lon)
{
GtkTreeIter iter;
GtkTreeModel *model;
-gdouble lat, lon;
-search_dialog *sd=(search_dialog *)data;
-if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(sd->list)), NULL, &iter)) {
- popup_error(sd->dialog, _("Select one POI from the list."));
- return TRUE;
+if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(list)), NULL, &iter))
+ return FALSE;
+
+model=gtk_tree_view_get_model(GTK_TREE_VIEW(list));
+if (!model)
+ return FALSE;
+
+gtk_tree_model_get(model, &iter, ITEM_LAT, lat, -1);
+gtk_tree_model_get(model, &iter, ITEM_LON, lon, -1);
+return TRUE;
}
-model=gtk_tree_view_get_model(GTK_TREE_VIEW(sd->list));
+static guint
+search_get_list_item_id(GtkWidget *list)
+{
+guint id;
+GtkTreeIter iter;
+GtkTreeModel *model;
+
+if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(list)), NULL, &iter))
+ return 0;
+
+model=gtk_tree_view_get_model(GTK_TREE_VIEW(list));
if (!model)
- return TRUE;
+ return 0;
-gtk_tree_model_get(model, &iter, POI_LAT, &lat, -1);
-gtk_tree_model_get(model, &iter, POI_LON, &lon, -1);
+gtk_tree_model_get(model, &iter, ITEM_ID, &id, -1);
+return id;
+}
-map_center_latlon(lat, lon);
-map_update_location_from_center();
+static void
+search_set_dialog_mode(search_dialog *s)
+{
+s->stype=gtk_combo_box_get_active(GTK_COMBO_BOX(s->cmb_type));
+switch (s->stype) {
+ case SEARCH_TYPE_POI:
+ gtk_widget_show(s->cmb_category);
+ break;
+ case SEARCH_TYPE_WAY:
+ case SEARCH_TYPE_PLACE:
+ gtk_widget_hide(s->cmb_category);
+ break;
+ default:
+ g_assert_not_reached();
+ break;
+}
+}
+static gboolean
+search_type_changed_cb(GtkWidget *widget, gpointer data)
+{
+search_dialog *s=(search_dialog *)data;
+search_set_dialog_mode(s);
+if (s->store)
+ gtk_list_store_clear(s->store);
+s->store=NULL;
+gtk_tree_view_set_model(GTK_TREE_VIEW(s->list), GTK_TREE_MODEL(s->store));
return TRUE;
}
-static gboolean
-search_route_to_cb(GtkWidget *widget, gpointer data)
+static void
+search_item_activated_cb(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer data)
{
+search_dialog *s=(search_dialog *)data;
+gdouble lat, lon;
GtkTreeIter iter;
GtkTreeModel *model;
-search_dialog *sd=(search_dialog *)data;
-if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(sd->list)), NULL, &iter)) {
- popup_error(sd->dialog, _("Select one POI from the list."));
- return TRUE;
-}
+if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)), NULL, &iter))
+ return;
-model=gtk_tree_view_get_model(GTK_TREE_VIEW(sd->list));
+model=gtk_tree_view_get_model(GTK_TREE_VIEW(tree_view));
if (!model)
- return TRUE;
+ return;
-_dest.valid=TRUE;
-gtk_tree_model_get(model, &iter, POI_LAT, &_dest.lat, -1);
-gtk_tree_model_get(model, &iter, POI_LON, &_dest.lon, -1);
+gtk_tree_model_get(model, &iter, ITEM_LAT, &lat, -1);
+gtk_tree_model_get(model, &iter, ITEM_LON, &lon, -1);
-map_update_location_from_center();
-
-return TRUE;
+map_center_latlon(lat, lon);
+g_idle_add_full(G_PRIORITY_HIGH_IDLE,(GSourceFunc)map_update_location_from_center, NULL, NULL);
+#if 0
+gtk_widget_destroy(s->dialog);
+#endif
}
gboolean
-mapper_search_dialog(gdouble lat, gdouble lon)
+mapper_search_dialog(mapper_search_type stype, gdouble lat, gdouble lon)
{
-GtkWidget *sw, *hbox, *label, *btn_search, *btn_goto, *btn_route_to;
+GtkWidget *sw, *hbox, *label, *btn_search;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
-GtkTreeIter iter;
-gboolean selected = FALSE;
+GtkEntryCompletion *search_comp;
+gint res;
-sd.dialog = gtk_dialog_new_with_buttons(_("Search"),
- GTK_WINDOW(_window),
- GTK_DIALOG_MODAL,
- GTK_STOCK_OK,
- GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT, NULL);
+sd.store=NULL;
sd.lat=lat;
sd.lon=lon;
+sd.stype=stype;
-gtk_container_add(GTK_CONTAINER(GTK_DIALOG(sd.dialog)->action_area),
- btn_goto = gtk_button_new_with_label(_("Go")));
+sd.dialog = gtk_dialog_new_with_buttons(_("Search"),
+ GTK_WINDOW(_window),
+ GTK_DIALOG_MODAL,
+ _("Goto"), 1,
+ _("Route to"), 2,
+ _("Edit"), 3,
+ GTK_STOCK_CLOSE, GTK_RESPONSE_REJECT,
+ NULL);
-gtk_container_add(GTK_CONTAINER(GTK_DIALOG(sd.dialog)->action_area),
- btn_route_to = gtk_button_new_with_label(_("Route to")));
+if (search_model==NULL)
+ search_model=gtk_list_store_new(1, G_TYPE_STRING);
gtk_window_set_default_size(GTK_WINDOW(sd.dialog), 500, 300);
label=gtk_label_new(_("Search:"));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+sd.cmb_type=gtk_combo_box_new_text();
+gtk_combo_box_append_text(GTK_COMBO_BOX(sd.cmb_type), "POI");
+gtk_combo_box_append_text(GTK_COMBO_BOX(sd.cmb_type), "Street");
+gtk_combo_box_append_text(GTK_COMBO_BOX(sd.cmb_type), "Place");
+gtk_box_pack_start(GTK_BOX(hbox), sd.cmb_type, FALSE, FALSE, 0);
+
sd.cmb_category = category_combo_new();
gtk_box_pack_start(GTK_BOX(hbox), sd.cmb_category, FALSE, FALSE, 0);
poi_category_combo_populate(sd.cmb_category, 0, TRUE);
sd.search_entry=gtk_entry_new();
+search_comp=gtk_entry_completion_new();
+gtk_entry_completion_set_model(search_comp, GTK_TREE_MODEL(search_model));
+gtk_entry_completion_set_text_column(search_comp, 0);
+gtk_entry_set_completion(GTK_ENTRY(sd.search_entry), search_comp);
gtk_box_pack_start(GTK_BOX(hbox), sd.search_entry, TRUE, TRUE, 0);
btn_search=gtk_button_new_with_label(_("Search"));
sw = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_ETCHED_IN);
-gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(sd.dialog)->vbox), sw, TRUE, TRUE, 0);
-if (store!=NULL) {
- sd.list=gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
- sd.store=store;
- g_object_unref(G_OBJECT(store));
-} else {
- sd.list=gtk_tree_view_new();
- sd.store=NULL;
-}
-gtk_container_add(GTK_CONTAINER(sw), sd.list);
-
+sd.list=gtk_tree_view_new();
gtk_tree_selection_set_mode(gtk_tree_view_get_selection (GTK_TREE_VIEW(sd.list)), GTK_SELECTION_SINGLE);
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(sd.list), TRUE);
-gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(sd.list), TRUE);
-gtk_tree_view_set_search_column (GTK_TREE_VIEW(sd.list), POI_LABEL);
+gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(sd.list), TRUE);
renderer = gtk_cell_renderer_text_new();
-column = gtk_tree_view_column_new_with_attributes(_("Location"), renderer, "text", POI_LATLON, NULL);
+column = gtk_tree_view_column_new_with_attributes(_("Location"), renderer, "text", ITEM_LATLON, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(sd.list), column);
renderer = gtk_cell_renderer_text_new();
-column = gtk_tree_view_column_new_with_attributes(_("Label"), renderer, "text", POI_LABEL, NULL);
-gtk_tree_view_column_set_sort_column_id (column, POI_LABEL);
+column = gtk_tree_view_column_new_with_attributes(_("Distance"), renderer, "text", ITEM_DIST, NULL);
+gtk_tree_view_column_set_sort_column_id (column, ITEM_DIST);
gtk_tree_view_append_column(GTK_TREE_VIEW(sd.list), column);
renderer = gtk_cell_renderer_text_new();
-column = gtk_tree_view_column_new_with_attributes(_("Category"), renderer, "text", POI_CATLAB, NULL);
-gtk_tree_view_column_set_sort_column_id (column, POI_CATLAB);
+column = gtk_tree_view_column_new_with_attributes(_("Label"), renderer, "text", ITEM_LABEL, NULL);
+gtk_tree_view_column_set_sort_column_id (column, ITEM_LABEL);
gtk_tree_view_append_column(GTK_TREE_VIEW(sd.list), column);
+renderer = gtk_cell_renderer_text_new();
+column = gtk_tree_view_column_new_with_attributes(_("Category"), renderer, "text", ITEM_CATLAB, NULL);
+gtk_tree_view_column_set_sort_column_id (column, ITEM_CATLAB);
+gtk_tree_view_append_column(GTK_TREE_VIEW(sd.list), column);
+
+gtk_tree_view_set_search_column (GTK_TREE_VIEW(sd.list), ITEM_LABEL);
+gtk_container_add(GTK_CONTAINER(sw), sd.list);
+
+sd.label=gtk_label_new("");
+gtk_box_pack_start(GTK_BOX(hbox), sd.label, FALSE, FALSE, 0);
+
g_signal_connect(G_OBJECT(btn_search), "clicked", G_CALLBACK(search_do_cb), &sd);
-g_signal_connect(G_OBJECT(btn_goto), "clicked", G_CALLBACK(search_goto_cb), &sd);
-g_signal_connect(G_OBJECT(btn_route_to), "clicked", G_CALLBACK(search_route_to_cb), &sd);
+g_signal_connect(G_OBJECT(sd.cmb_type), "changed", G_CALLBACK(search_type_changed_cb), &sd);
+g_signal_connect(G_OBJECT(sd.list), "row-activated", G_CALLBACK(search_item_activated_cb), &sd);
gtk_widget_show_all(sd.dialog);
-
-while (GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(sd.dialog))) {
- if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(sd.list)), NULL, &iter)) {
- gtk_tree_model_get(GTK_TREE_MODEL(sd.store), &iter, POI_POIID, &(poi->poi_id), -1);
- gtk_tree_model_get(GTK_TREE_MODEL(sd.store), &iter, POI_CATID, &(poi->cat_id), -1);
- gtk_tree_model_get(GTK_TREE_MODEL(sd.store), &iter, POI_LAT, &(poi->lat), -1);
- gtk_tree_model_get(GTK_TREE_MODEL(sd.store), &iter, POI_LON, &(poi->lon), -1);
- gtk_tree_model_get(GTK_TREE_MODEL(sd.store), &iter, POI_LABEL, &(poi->label), -1);
- gtk_tree_model_get(GTK_TREE_MODEL(sd.store), &iter, POI_DESC, &(poi->desc), -1);
- selected = TRUE;
+gtk_combo_box_set_active(GTK_COMBO_BOX(sd.cmb_type), sd.stype);
+search_set_dialog_mode(&sd);
+
+while ((res=gtk_dialog_run(GTK_DIALOG(sd.dialog)))!=GTK_RESPONSE_REJECT) {
+ gdouble lat, lon;
+
+ switch (res) {
+ case 1:
+ if (search_get_list_item_latlon(sd.list, &lat, &lon)==FALSE) {
+ popup_error(sd.dialog, _("Select a location from the list."));
+ } else {
+ map_center_latlon(lat, lon);
+ g_idle_add_full(G_PRIORITY_HIGH_IDLE,(GSourceFunc)map_update_location_from_center, NULL, NULL);
+ }
+ continue;
+ break;
+ case 2:
+ if (search_get_list_item_latlon(sd.list, &_dest.lat, &_dest.lon)==FALSE) {
+ popup_error(sd.dialog, _("Select a location from the list."));
+ } else {
+ _dest.valid=TRUE;
+ g_idle_add_full(G_PRIORITY_HIGH_IDLE,(GSourceFunc)map_update_location_from_center, NULL, NULL);
+ }
+ continue;
+ break;
+ case 3:
+ switch (sd.stype) {
+ case SEARCH_TYPE_POI: {
+ poi_info *p=NULL;
+ guint id;
+
+ id=search_get_list_item_id(sd.list);
+ if (id>0) {
+ p=poi_get_by_id(id);
+ if (p) {
+ gtk_widget_destroy(sd.dialog);
+ poi_edit_dialog(ACTION_EDIT_POI, p);
+ return TRUE; /* XXX: for now, this is not nice.. */
+ } else {
+ popup_error(sd.dialog, _("Failed to fetch POI for editing."));
+ }
+ }
+ }
+ break;
+ default:
+ popup_error(sd.dialog, _("Only POIs can be modified."));
+ break;
+ }
+ continue;
+ break;
+ default:
break;
- } else {
- popup_error(sd.dialog, _("Select one POI from the list."));
+ break;
}
}
gtk_widget_destroy(sd.dialog);
-return selected;
+return TRUE;
}
projects / mapper / blobdiff