/[zanavi_public1]/navit/navit/search.h

Diff of /navit/navit/search.h

Parent Directory | Revision Log | View Patch Patch

Revision 26		Revision 27
…		…
19		19
20	#ifndef NAVIT_SEARCH_H	20	#ifndef NAVIT_SEARCH_H
21	#define NAVIT_SEARCH_H	21	#define NAVIT_SEARCH_H
22		22
23	#ifdef __cplusplus	23	#ifdef __cplusplus
24	extern "C" {	24	extern "C"
		25	{
25	#endif	26	#endif
26	struct search_list_common {	27	struct search_list_common
		28	{
27	void *parent;	29	void *parent;
28	struct item unique,item;	30	struct item unique, item;
29	int selected;	31	int selected;
30	struct pcoord *c;	32	struct pcoord *c;
31	char *town_name;	33	char *town_name;
32	char *district_name;	34	char *district_name;
33	char *postal;	35	char *postal;
34	char *postal_mask;	36	char *postal_mask;
35	char *county_name;	37	char *county_name;
36	};	38	};
37		39
38	struct search_list_country {	40	struct search_list_country
		41	{
39	struct search_list_common common;	42	struct search_list_common common;
40	char *car;	43	char *car;
41	char *iso2;	44	char *iso2;
42	char *iso3;	45	char *iso3;
43	char *name;	46	char *name;
44	char *flag;	47	char *flag;
45	};	48	};
46		49
47	struct search_list_town {	50	struct search_list_town
		51	{
48	struct search_list_common common;	52	struct search_list_common common;
49	struct item itemt;	53	struct item itemt;
50	char *county;	54	char *county;
51	};	55	};
52		56
53	struct search_list_street {	57	struct search_list_street
		58	{
54	struct search_list_common common;	59	struct search_list_common common;
55	char *name;	60	char *name;
56	};	61	};
57		62
58	struct search_list_house_number {	63	struct search_list_house_number
		64	{
59	struct search_list_common common;	65	struct search_list_common common;
60	char *house_number;	66	char *house_number;
61	int interpolation;	67	int interpolation;
62	};	68	};
63		69
64	struct search_list_result {	70	struct search_list_result
		71	{
65	int id;	72	int id;
66	struct pcoord *c;	73	struct pcoord *c;
67	struct search_list_country *country;	74	struct search_list_country *country;
68	struct search_list_town *town;	75	struct search_list_town *town;
69	struct search_list_street *street;	76	struct search_list_street *street;
70	struct search_list_house_number *house_number;	77	struct search_list_house_number *house_number;
71	};	78	};
72		79
73
74	/* prototypes */	80	/* prototypes */
75	struct attr;	81	struct attr;
76	struct mapset;	82	struct mapset;
77	struct search_list;	83	struct search_list;
78	struct search_list_result;	84	struct search_list_result;
79	struct jni_object;	85	struct jni_object;
80	struct search_list search_list_new(struct mapset ms);	86	struct search_list search_list_new(struct mapset ms);
81	void search_list_search(struct search_list this_, struct attr search_attr, int partial);	87	void search_list_search(struct search_list this_, struct attr search_attr,
		88	int partial);
82	char search_postal_merge(char mask, char *new_);	89	char search_postal_merge(char mask, char *new_);
83	char search_postal_merge_replace(char mask, char *new_);	90	char search_postal_merge_replace(char mask, char *new_);
84	struct search_list_common search_list_select(struct search_list this_, enum attr_type attr_type, int id, int mode);	91	struct search_list_common search_list_select(struct search_list this_,
		92	enum attr_type attr_type, int id, int mode);
85	struct search_list_result search_list_get_result(struct search_list this_);	93	struct search_list_result search_list_get_result(struct search_list this_);
86	void search_list_destroy(struct search_list *this_);	94	void search_list_destroy(struct search_list *this_);
87	void search_init(void);	95	void search_init(void);
88	GList * search_by_address(GList result_list,struct mapset ms, char addr, int partial, struct jni_object jni, int search_country_flags, char *search_country_string);	96	GList * search_by_address(GList result_list, struct mapset ms, char *addr,
89	void search_full_world(char addr, int partial, int search_order, struct jni_object jni,struct coord_geo *search_center, int search_radius);	97	int partial, struct jni_object *jni, int search_country_flags,
		98	char *search_country_string);
		99	void search_full_world(char *addr, int partial, int search_order,
		100	struct jni_object jni, struct coord_geo search_center,
		101	int search_radius);
90		102
91	/* end of prototypes */	103	/* end of prototypes */
92	#ifdef __cplusplus	104	#ifdef __cplusplus
93	}	105	}
94	#endif	106	#endif

 Legend:



Removed from v.26
 


changed lines


 
Added in v.27
 Legend:



Removed from v.26
 


changed lines


 
Added in v.27
-Removed from v.26
+Added in v.27


Visit the ZANavi Wiki