summaryrefslogtreecommitdiff
path: root/navit/map
diff options
context:
space:
mode:
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2013-08-26 08:01:42 +0000
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2013-08-26 08:01:42 +0000
commitff98d0233db0b8693b56981332b86a8d46a97ab0 (patch)
treede04ecccc2f855be1c2a96a821172b2da9d8f17d /navit/map
parent669a7320e4164f86821e574f7e92bf15350aff84 (diff)
downloadnavit-ff98d0233db0b8693b56981332b86a8d46a97ab0.tar.gz
Fix:map_binfile:Correctly use house number index if present
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5602 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/map')
-rw-r--r--navit/map/binfile/binfile.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/navit/map/binfile/binfile.c b/navit/map/binfile/binfile.c
index b030097fa..025666cae 100644
--- a/navit/map/binfile/binfile.c
+++ b/navit/map/binfile/binfile.c
@@ -2084,7 +2084,9 @@ binmap_search_new(struct map_priv *map, struct item *item, struct attr *search,
msp->map=map;
msp->mr_item = map_rect_new_binfile(map, NULL);
msp->item = map_rect_get_item_byid_binfile(msp->mr_item, item->id_hi, item->id_lo);
- if (binmap_search_by_index(map, msp->item, &msp->mr) != 3) {
+ if (binmap_search_by_index(map, msp->item, &msp->mr))
+ msp->mode = 1;
+ else {
struct coord c;
if (item_coord_get(msp->item, &c, 1))
{
@@ -2096,9 +2098,9 @@ binmap_search_new(struct map_priv *map, struct item *item, struct attr *search,
msp->parent_name=g_strdup(attr.u.str);
dbg(0,"pn=%s\n",msp->parent_name);
}
- map_rect_destroy_binfile(msp->mr_item);
- msp->mr_item=NULL;
}
+ map_rect_destroy_binfile(msp->mr_item);
+ msp->mr_item=NULL;
if (!msp->mr)
{
break;