[Roadmap-commit] roadmap/src buildmap_osm_text.c,1.1,1.2

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1319

Modified Files:
	buildmap_osm_text.c 
Log Message:
Fix silly error.


Index: buildmap_osm_text.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_osm_text.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buildmap_osm_text.c	4 Aug 2008 17:44:07 -0000	1.1
--- buildmap_osm_text.c	7 Sep 2008 15:54:04 -0000	1.2
***************
*** 505,509 ****
  	int		fromlon, tolon, fromlat, tolat;
  	int		j;
! 	static int	lineid = 1;
  
  	if (WayInvalid)
--- 505,509 ----
  	int		fromlon, tolon, fromlat, tolat;
  	int		j;
! 	static int	lineid = 0;
  
  	if (WayInvalid)
***************
*** 530,534 ****
  		static int cenid = 0;
  		int line;
- 		static int lineid = 0;
  
  		/*
--- 530,533 ----
***************
*** 590,594 ****
  		to_point = buildmap_osm_text_point_get(WayNodes[nWayNodes-1]);
  
! 		line = buildmap_line_add(++lineid, WayLayer, from_point, to_point);
  
  		/* Street name */
--- 589,594 ----
  		to_point = buildmap_osm_text_point_get(WayNodes[nWayNodes-1]);
  
! 		lineid++;
! 		line = buildmap_line_add(lineid, WayLayer, from_point, to_point);
  
  		/* Street name */
***************
*** 663,674 ****
          line_index = buildmap_line_find_sorted(lineid);
  
- #if 0
- 	if (line_index != 25) {
- 		buildmap_info("Shapes skipped for line %d", line_index);
- 		continue;
- 	} else {
- 		buildmap_info("Shapes generated for line %d", line_index);
- 	}
- #endif
          if (line_index >= 0) {
  	    lons = shapes[i].lons;
--- 663,666 ----
***************
*** 678,686 ****
              for (j = 1; j < count - 1; j++) {
                  buildmap_shape_add (line_index, i, lineid, j - 1, lons[j], lats[j]);
- #if 0
- 		if (line_index == 25)
- 		buildmap_info("buildmap_shape_add(%d,%d,%d,%d,%d,%d)",
- 				line_index, i, lineid, j - 1, lons[j], lats[j]);
- #endif
              }
          }
--- 670,673 ----