Fix:maptool:Another name for faroe islands

[navit-package] / navit / search.h

diff --git a/navit/search.h b/navit/search.h
index 29cf4b3..4b32f5a 100644 (file)
--- a/navit/search.h
+++ b/navit/search.h
@@ -24,15 +24,18 @@
 extern "C" {
 #endif
 struct search_list_common {
-       struct item item;
+       void *parent;
+       struct item unique,item;
        int selected;
        struct pcoord *c;
+       char *town_name;
+       char *district_name;
+       char *postal;
+       char *postal_mask;
 };
 
 struct search_list_country {
-       struct item item;
-       int selected;
-       struct pcoord *c;
+       struct search_list_common common;
        char *car;
        char *iso2;
        char *iso3;
@@ -41,28 +44,28 @@ struct search_list_country {
 };
 
 struct search_list_town {
-       struct item item;
-       int selected;
-       struct pcoord *c;
+       struct search_list_common common;
        struct item itemt;
-       char *postal;
-       char *name;
-       char *district;
+       char *county;
 };
 
 struct search_list_street {
-       struct item item;
-       int selected;
-       struct pcoord *c;
+       struct search_list_common common;
        char *name;
 };
 
+struct search_list_house_number {
+       struct search_list_common common;
+       char *house_number;
+};
+
 struct search_list_result {
        int id;
        struct pcoord *c;
        struct search_list_country *country;
        struct search_list_town *town;
        struct search_list_street *street;
+       struct search_list_house_number *house_number;
 };
 
 /* prototypes */
@@ -72,7 +75,7 @@ struct search_list;
 struct search_list_result;
 struct search_list *search_list_new(struct mapset *ms);
 void search_list_search(struct search_list *this_, struct attr *search_attr, int partial);
-int search_list_select(struct search_list *this_, enum attr_type attr_type, int id, int mode);
+struct search_list_common *search_list_select(struct search_list *this_, enum attr_type attr_type, int id, int mode);
 struct search_list_result *search_list_get_result(struct search_list *this_);
 void search_list_destroy(struct search_list *this_);
 void search_init(void);