navit-cvs-commit Mailing List for Navit (Page 31)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5380
          http://navit.svn.sourceforge.net/navit/?rev=5380&view=rev
Author:   mdankov
Date:     2013-02-16 22:41:22 +0000 (Sat, 16 Feb 2013)
Log Message:
-----------
Add:maptool:Experimental feature to not include excessive administrative sublevels to admin centres. For example, Moscow actually is not in Tverskoy district of itself.

Modified Paths:
--------------
    trunk/navit/navit/maptool/boundaries.c
    trunk/navit/navit/maptool/maptool.h
    trunk/navit/navit/maptool/osm.c

Modified: trunk/navit/navit/maptool/boundaries.c
===================================================================

--- trunk/navit/navit/maptool/boundaries.c	2013-02-16 13:00:58 UTC (rev 5379)
+++ trunk/navit/navit/maptool/boundaries.c	2013-02-16 22:41:22 UTC (rev 5380)
@@ -97,10 +97,21 @@
 				osm_warning("relation",item_bin_get_relationid(ib),0,"Country Boundary doesn't contain an ISO3166-1 tag\n");
 		}
 		while ((member=item_bin_get_attr(ib, attr_osm_member, member))) {
-			long long wayid;
+			long long osm_id;
 			int read=0;
-			if (sscanf(member,"2:"LONGLONG_FMT":%n",&wayid,&read) >= 1) {
-				char *rolestr=member+read;
+			int member_type;
+			char *rolestr;
+
+			if (sscanf(member,"%d:"LONGLONG_FMT":%n",&member_type,&osm_id,&read) < 2)
+				continue;
+				
+			rolestr=member+read;
+			
+			if(member_type==1) {
+					if(!strcmp(rolestr,"admin_centre") || !strcmp(rolestr,"admin_center"))
+						boundary->admin_centre=osm_id;
+				}
+			if(member_type==2) {
 				enum geom_poly_segment_type role;
 				if (!strcmp(rolestr,"outer") || !strcmp(rolestr,"exclave"))
 					role=geom_poly_segment_type_way_outer;
@@ -110,10 +121,10 @@
 					role=geom_poly_segment_type_way_unknown;
 				else {
 					osm_warning("relation",item_bin_get_relationid(ib),0,"Unknown role %s in member ",rolestr);
-					osm_warning("way",wayid,1,"\n");
+					osm_warning("way",osm_id,1,"\n");
 					role=geom_poly_segment_type_none;
 				}
-				relations_add_func(relations, relations_func, boundary, (gpointer)role, 2, wayid);
+				relations_add_func(relations, relations_func, boundary, (gpointer)role, 2, osm_id);
 			}
 		}
 		boundary->ib=item_bin_dup(ib);

Modified: trunk/navit/navit/maptool/maptool.h
===================================================================
--- trunk/navit/navit/maptool/maptool.h	2013-02-16 13:00:58 UTC (rev 5379)
+++ trunk/navit/navit/maptool/maptool.h	2013-02-16 22:41:22 UTC (rev 5380)
@@ -125,6 +125,7 @@
 	GList *segments,*sorted_segments;
 	GList *children;
 	struct rect r;
+	osmid admin_centre;
 };
 
 char *osm_tag_value(struct item_bin *ib, char *key);

Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c	2013-02-16 13:00:58 UTC (rev 5379)
+++ trunk/navit/navit/maptool/osm.c	2013-02-16 22:41:22 UTC (rev 5380)
@@ -1820,7 +1820,7 @@
 {
 	GList *l,*matches=boundary_find_matches(bl, c);
 	struct boundary *match=NULL;
-
+	
 	l=matches;
 	while (l) {
 		struct boundary *b=l->data;
@@ -1834,17 +1834,27 @@
 		}
 		l=g_list_next(l);
 	}
+
 	if (match) {
 		if (match && match->country && match->country->admin_levels) {
+			char *nodeid=item_bin_get_attr(ib, attr_osm_nodeid, NULL);
+			long long node_id;
+			int end=strlen(match->country->admin_levels)+3;
+			int a;
+			int max_adm_level=end;
+
+			if(nodeid)
+				if(sscanf(nodeid,LONGLONG_FMT,&node_id)<1)
+					node_id=0;
+
 			l=matches;
 			while (l) {
 				struct boundary *b=l->data;
 				char *admin_level=osm_tag_value(b->ib, "admin_level");
 				char *postal=osm_tag_value(b->ib, "postal_code");
 				if (admin_level) {
-					int a=atoi(admin_level);
-					int end=strlen(match->country->admin_levels)+3;
 					char *name;
+					a=atoi(admin_level);
 					if (a > 2 && a < end) {
 						enum attr_type attr_type=attr_none;
 						switch(match->country->admin_levels[a-3]) {
@@ -1869,9 +1879,21 @@
 					attrs[0].type=attr_town_postal;
 					attrs[0].u.str=postal;
 				}
+				if(b->admin_centre && b->admin_centre==node_id) {
+					if(!max_adm_level || max_adm_level<a)
+						max_adm_level=a;
+				}
+				
 				l=g_list_next(l);
 			}
+
+			/* Administrative centres are not to be contained in their own districts. */
+			if(experimental && max_adm_level>0)
+				for(a=end-1;a>max_adm_level;a--)
+					attrs[a-2].type=type_none;
 		}
+		
+				
 		return match->country; 
 	} else
 		return NULL;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2007	Jan	Feb	Mar	Apr	May	Jun	Jul (4)	Aug (59)	Sep (43)	Oct (95)	Nov (135)	Dec (108)
2008	Jan (229)	Feb (141)	Mar (59)	Apr (70)	May (64)	Jun (87)	Jul (57)	Aug (108)	Sep (74)	Oct (203)	Nov (141)	Dec (108)
2009	Jan (114)	Feb (91)	Mar (101)	Apr (69)	May (54)	Jun (82)	Jul (49)	Aug (109)	Sep (81)	Oct (93)	Nov (100)	Dec (79)
2010	Jan (46)	Feb (36)	Mar (135)	Apr (103)	May (116)	Jun (130)	Jul (52)	Aug (31)	Sep (46)	Oct (48)	Nov (98)	Dec (110)
2011	Jan (234)	Feb (184)	Mar (150)	Apr (43)	May (53)	Jun (52)	Jul (112)	Aug (72)	Sep (79)	Oct (23)	Nov (6)	Dec (30)
2012	Jan (39)	Feb (37)	Mar (49)	Apr (60)	May (63)	Jun (38)	Jul (33)	Aug (24)	Sep (20)	Oct (14)	Nov (23)	Dec (50)
2013	Jan (30)	Feb (32)	Mar (27)	Apr (41)	May (59)	Jun (21)	Jul (10)	Aug (73)	Sep (23)	Oct (60)	Nov (14)	Dec (15)
2014	Jan (4)	Feb (8)	Mar (11)	Apr (6)	May (27)	Jun (4)	Jul (29)	Aug (62)	Sep (11)	Oct (17)	Nov (58)	Dec (9)
2015	Jan (23)	Feb (3)	Mar (26)	Apr (47)	May (8)	Jun (28)	Jul (10)	Aug (3)	Sep	Oct	Nov	Dec

navit-cvs-commit Mailing List for Navit (Page 31)

navit-cvs-commit — CVS commit mailing list