diff options
| author | geoghegan <geoghegan@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-05-05 22:16:29 +0000 |
|---|---|---|
| committer | geoghegan <geoghegan@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-05-05 22:16:29 +0000 |
| commit | 7bca037928a81bcdd2e0acbfc40eeb3d3da00e1d (patch) | |
| tree | e1abaf4a4c47ddf7feea9f7b5ca25ef2cb1c7487 /navit | |
| parent | ee73e265f2360eb0f165b3346a32dde08684c999 (diff) | |
| download | navit-7bca037928a81bcdd2e0acbfc40eeb3d3da00e1d.tar.gz | |
Add:Core:Adds in county_name from OSM data to the common search list (along with associated header entry)
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4468 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit')
| -rw-r--r-- | navit/search.c | 5 | ||||
| -rw-r--r-- | navit/search.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/navit/search.c b/navit/search.c index 7600d9511..0fc584abc 100644 --- a/navit/search.c +++ b/navit/search.c @@ -198,6 +198,10 @@ search_list_common_new(struct item *item, struct search_list_common *common) common->town_name=map_convert_string(item->map, attr.u.str); else common->town_name=NULL; + if (item_attr_get(item, attr_county_name, &attr)) + common->county_name=map_convert_string(item->map, attr.u.str); + else + common->county_name=NULL; if (item_attr_get(item, attr_district_name, &attr)) common->district_name=map_convert_string(item->map, attr.u.str); else @@ -219,6 +223,7 @@ search_list_common_destroy(struct search_list_common *common) { map_convert_free(common->town_name); map_convert_free(common->district_name); + map_convert_free(common->county_name); map_convert_free(common->postal); map_convert_free(common->postal_mask); } diff --git a/navit/search.h b/navit/search.h index 49c9363ac..c61aca8f5 100644 --- a/navit/search.h +++ b/navit/search.h @@ -32,6 +32,7 @@ struct search_list_common { char *district_name; char *postal; char *postal_mask; + char *county_name; }; struct search_list_country { |