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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29950/src

Modified Files:
	osm2navit.c 
Log Message:
Updated osm2navit for routing

Index: osm2navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osm2navit.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osm2navit.c	1 Nov 2007 15:16:40 -0000	1.1
--- osm2navit.c	1 Nov 2007 22:39:21 -0000	1.2
***************
*** 135,143 ****
  char debug_attr_buffer[1024];
  
  static void
  pad_text_attr(struct attr_bin *a, char *buffer)
  {
  	int l;
! 	l=strlen(buffer);
  	while (l % 4) 
  		buffer[l++]='\0';
--- 135,148 ----
  char debug_attr_buffer[1024];
  
+ struct attr_bin limit_attr = {
+ 	0, attr_limit
+ };
+ int limit_attr_value;
+ 
  static void
  pad_text_attr(struct attr_bin *a, char *buffer)
  {
  	int l;
! 	l=strlen(buffer)+1;
  	while (l % 4) 
  		buffer[l++]='\0';
***************
*** 169,172 ****
--- 174,188 ----
  		return 1;
  	}
+ 	if (! strcmp(k,"oneway")) {
+ 		if (! strcmp(v,"true") || !strcmp(v,"yes")) {
+ 			limit_attr_value=1;
+ 			limit_attr.len=2;
+ 		}
+ 		if (! strcmp(v,"-1")) {
+ 			limit_attr_value=2;
+ 			limit_attr.len=2;
+ 		}
+ 			
+ 	}
  	value_hash=g_hash_table_lookup(key_hash, k);
  	if (! value_hash)
***************
*** 315,318 ****
--- 331,335 ----
  	label_attr.len=0;
  	debug_attr.len=0;
+ 	limit_attr.len=0;
  	c=sscanf(p, "<way id=\"%d\"", &wayid);
  	if (c != 1)
***************
*** 324,328 ****
  
  static void
! write_attr(FILE *out, struct attr_bin *attr, char *buffer)
  {
  	if (attr->len) {
--- 341,345 ----
  
  static void
! write_attr(FILE *out, struct attr_bin *attr, void *buffer)
  {
  	if (attr->len) {
***************
*** 341,344 ****
--- 358,363 ----
  	if (debug_attr.len)
  		alen+=debug_attr.len+1;	
+ 	if (limit_attr.len)
+ 		alen+=limit_attr.len+1;	
  	item.clen=coord_count*2;
  	item.len=item.clen+2+alen;
***************
*** 347,350 ****
--- 366,370 ----
  	write_attr(out, &label_attr, label_attr_buffer);
  	write_attr(out, &debug_attr, debug_attr_buffer);
+ 	write_attr(out, &limit_attr, &limit_attr_value);
  }
  
***************
*** 357,367 ****
  	if (c != 1)
  		return 0;
- #if 0
- 	node_ref_way(ndref);
- #endif
  	ni=node_item_get(ndref);
! 	if (ni) 
  		coord_buffer[coord_count++]=ni->c;
! 	else {
  		len=strlen(p);
  		if (len > 0 && p[len-1]=='\n')
--- 377,390 ----
  	if (c != 1)
  		return 0;
  	ni=node_item_get(ndref);
! 	if (ni) {
! #if 0
  		coord_buffer[coord_count++]=ni->c;
! #else
! 		coord_buffer[coord_count].y=0;
! 		coord_buffer[coord_count++].x=ndref;
! #endif
! 		ni->ref_way++;
! 	} else {
  		len=strlen(p);
  		if (len > 0 && p[len-1]=='\n')
***************
*** 376,379 ****
--- 399,427 ----
  }
  
+ static void
+ save_buffer(char *filename, struct buffer *b)
+ {	
+ 	FILE *f;
+ 	f=fopen(filename,"w+");
+ 	fwrite(b->base, b->size, 1, f);
+ 	fclose(f);
+ }
+ 
+ static void
+ load_buffer(char *filename, struct buffer *b)
+ {
+ 	FILE *f;
+ 	if (b->base) 
+ 		free(b->base);
+ 	b->malloced=0;
+ 	f=fopen(filename,"r");
+ 	fseek(f, 0, SEEK_END);
+ 	b->size=b->malloced=ftell(f);
+ 	fprintf(stderr,"reading %d bytes from %s\n", b->size, filename);
+ 	fseek(f, 0, SEEK_SET);
+ 	b->base=malloc(b->size);
+ 	fread(b->base, b->size, 1, f);
+ 	fclose(f);
+ }
  
  static int
***************
*** 666,671 ****
  }
  
  static int
! phase2(FILE *in)
  {
  	struct item_bin *ib;
--- 714,771 ----
  }
  
+ static void
+ write_item_part(FILE *out, struct item_bin *orig, int first, int last)
+ {
+ 	struct item_bin new;
+ 	struct coord *c=(struct coord *)(orig+1);
+ 	char *attr=(char *)(c+orig->clen/2);
+ 	int attr_len=orig->len-orig->clen-2;
+ 	processed_ways++;
+ 	new.type=orig->type;
+ 	new.clen=(last-first+1)*2;
+ 	new.len=new.clen+attr_len+2;
+ #if 0
+ 	fprintf(stderr,"first %d last %d type 0x%x len %d clen %d attr_len %d\n", first, last, new.type, new.len, new.clen, attr_len);
+ #endif
+ 	fwrite(&new, sizeof(new), 1, out);
+ 	fwrite(c+first, new.clen*4, 1, out);
+ 	fwrite(attr, attr_len*4, 1, out);
+ }
+ 
  static int
! phase2(FILE *in, FILE *out)
! {
! 	struct coord *c;
! 	int i,ccount,last,ndref;
! 	struct item_bin *ib;
! 	struct node_item *ni;
! 
! 	processed_nodes=processed_ways=processed_relations=processed_tiles=0;
! 	sig_alrm(0);
! 	while ((ib=read_item(in))) {
! #if 0
! 		fprintf(stderr,"type 0x%x len %d clen %d\n", ib->type, ib->len, ib->clen);
! #endif
! 		ccount=ib->clen/2;
! 		c=(struct coord *)(ib+1);
! 		last=0;
! 		for (i = 0 ; i < ccount ; i++) {
! 			ndref=c[i].x;
! 			ni=node_item_get(ndref);
! 			c[i]=ni->c;
! 			if (ni->ref_way > 1 && i != 0 && i != ccount-1 && ib->type >= type_street_nopass && ib->type <= type_ferry) {
! 				write_item_part(out, ib, last, i);
! 				last=i;
! 			}
! 		}
! 		write_item_part(out, ib, last, ccount-1);
! 	}
! 	sig_alrm(0);
! 	alarm(0);
! 	return 0;
! }
! 
! static int
! phase3(FILE *in)
  {
  	struct item_bin *ib;
***************
*** 904,908 ****
  
  static int
! phase3(FILE *out)
  {
  	struct zip_eoc eoc = {
--- 1004,1008 ----
  
  static int
! phase4(FILE *out)
  {
  	struct zip_eoc eoc = {
***************
*** 963,983 ****
  int main(int argc, char **argv)
  {
! 	FILE *tmp;
  	char *map=g_strdup(attrmap);
  	build_attrmap(map);
! 	tmp=fopen("tmpfile","w+");
  	fprintf(stderr,"PROGRESS: Phase 1: collecting data\n");
! 	phase1(stdin,tmp);
! 	fclose(tmp);
  	free(node_buffer.base);
  	node_buffer.base=NULL;
  	node_buffer.malloced=0;
  	node_buffer.size=0;
! 	fprintf(stderr,"PROGRESS: Phase 2: generating tiles\n");
! 	tmp=fopen("tmpfile","r");
! 	phase2(tmp);
! 	fclose(tmp);
! 	fprintf(stderr,"PROGRESS: Phase 3: assembling map\n");
! 	phase3(stdout);
  	return 0;
  }
--- 1063,1096 ----
  int main(int argc, char **argv)
  {
! 	FILE *tmp1,*tmp2;
  	char *map=g_strdup(attrmap);
  	build_attrmap(map);
! #if 1
! 	tmp1=fopen("tmpfile1","w+");
  	fprintf(stderr,"PROGRESS: Phase 1: collecting data\n");
! 	phase1(stdin,tmp1);
! 	fclose(tmp1);
! #if 0
! 	save_buffer("coords",&node_buffer);
! #endif
! #else
! 	load_buffer("coords",&node_buffer);
! #endif
! 	tmp1=fopen("tmpfile1","r");
! 	tmp2=fopen("tmpfile2","w+");
! 	fprintf(stderr,"PROGRESS: Phase 2: finding intersections\n");
! 	phase2(tmp1,tmp2);
! 	fclose(tmp2);
! 	fclose(tmp1);
  	free(node_buffer.base);
  	node_buffer.base=NULL;
  	node_buffer.malloced=0;
  	node_buffer.size=0;
! 	fprintf(stderr,"PROGRESS: Phase 3: generating tiles\n");
! 	tmp2=fopen("tmpfile2","r");
! 	phase3(tmp2);
! 	fclose(tmp2);
! 	fprintf(stderr,"PROGRESS: Phase 4: assembling map\n");
! 	phase4(stdout);
  	return 0;
  }

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 234)

navit-cvs-commit — CVS commit mailing list