Fix:map_binfile:Improve readability of map_parse_country_binfile().

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5369 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 29 insertions, 25 deletions

diff --git a/navit/map/binfile/binfile.c b/navit/map/binfile/binfile.c
index d72915bb1..bac0ed78c 100644
--- a/navit/map/binfile/binfile.c
+++ b/navit/map/binfile/binfile.c
@@ -1691,33 +1691,37 @@ static void
 map_parse_country_binfile(struct map_rect_priv *mr)
 {
 	struct attr at;
-	if (binfile_attr_get(mr->item.priv_data, attr_country_id, &at)) {
-		if (at.u.num == mr->country_id)
-		{
-			if (binfile_attr_get(mr->item.priv_data, attr_zipfile_ref, &at))
-			{
-				if(mr->msp) {
-					struct attr *attr=&mr->msp->search;
-					if(attr->type==attr_town_name || attr->type==attr_district_name || attr->type==attr_town_or_district_name) {
-						struct attr af, al;
-						if(binfile_attr_get(mr->item.priv_data, attr_first_key, &af)) {
-							if(case_cmp(af.u.str,attr->u.str,1)>0) {
-								dbg(1,"Skipping index item with first_key='%s'\n", af.u.str);
-								return;
-							}
-						}
-						if(binfile_attr_get(mr->item.priv_data, attr_last_key, &al)) {
-							if(case_cmp(al.u.str,attr->u.str,1)<0) {
-								dbg(1,"Skipping index item with first_key='%s', last_key='%s'\n", af.u.str, al.u.str);
-								return;
-							}
-						};
-					}
-				}	
-				push_zipfile_tile(mr, at.u.num, 0, 0, 0);
+
+	if (!binfile_attr_get(mr->item.priv_data, attr_country_id, &at))
+		return;
+
+	if( at.u.num != mr->country_id)
+		return;
+
+	if (!binfile_attr_get(mr->item.priv_data, attr_zipfile_ref, &at))
+		return;
+
+	if(mr->msp) 
+	{
+		struct attr *search=&mr->msp->search;
+		if(search->type==attr_town_name || search->type==attr_district_name || search->type==attr_town_or_district_name) {
+			struct attr af, al;
+			if(binfile_attr_get(mr->item.priv_data, attr_first_key, &af)) {
+				if(case_cmp(af.u.str,search->u.str,1)>0) {
+					dbg(1,"Skipping index item with first_key='%s'\n", af.u.str);
+					return;
+				}
+			}
+			if(binfile_attr_get(mr->item.priv_data, attr_last_key, &al)) {
+				if(case_cmp(al.u.str,search->u.str,1)<0) {
+					dbg(1,"Skipping index item with first_key='%s', last_key='%s'\n", af.u.str, al.u.str);
+					return;
+				}
 			}
 		}
-	}
+	}	
+
+	push_zipfile_tile(mr, at.u.num, 0, 0, 0);
 }
 
 static int