summaryrefslogtreecommitdiff
path: root/navit/mapset.c
diff options
context:
space:
mode:
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2010-04-10 07:44:06 +0000
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2010-04-10 07:44:06 +0000
commit4499e864295d56c92b3ed417b4f7ec5ab366b728 (patch)
tree52cb406597c3ade5b54d8f659310c50af4155a27 /navit/mapset.c
parent9360836b6ff087491d03998deac7a975da4cda70 (diff)
downloadnavit-4499e864295d56c92b3ed417b4f7ec5ab366b728.tar.gz
Add:core:New map flag to enable/disable searching
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3148 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/mapset.c')
-rw-r--r--navit/mapset.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/navit/mapset.c b/navit/mapset.c
index 41d39b5d8..6a3608e51 100644
--- a/navit/mapset.c
+++ b/navit/mapset.c
@@ -198,6 +198,12 @@ struct map * mapset_next(struct mapset_handle *msh, int active)
else
continue;
}
+ if (active == 3 && map_get_attr(ret, attr_search_active, &active_attr, NULL)) {
+ if (active_attr.u.num)
+ return ret;
+ else
+ continue;
+ }
if (!map_get_attr(ret, attr_active, &active_attr, NULL))
return ret;
if (active_attr.u.num)
@@ -294,6 +300,10 @@ mapset_search_get_item(struct mapset_search *this)
this->map=g_list_next(this->map);
if (! this->map)
break;
+ if (map_get_attr(this->map->data, attr_search_active, &active_attr, NULL)) {
+ if (!active_attr.u.num)
+ continue;
+ }
if (!map_get_attr(this->map->data, attr_active, &active_attr, NULL))
break;
if (active_attr.u.num)