roadmap-commit — track CVS commits

[Roadmap-commit] roadmap_editor/src/win32 roadmap_net.c,1.3,1.4

[Ehud S. <esh...@us...>]

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

Modified Files:
	roadmap_net.c 
Log Message:
Add timeout for receive and send.
Fix indent.

Index: roadmap_net.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_net.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_net.c	16 Jul 2006 12:29:21 -0000	1.3
--- roadmap_net.c	3 Sep 2006 18:17:46 -0000	1.4
***************
*** 36,143 ****
  
  RoadMapSocket roadmap_net_connect (const char *protocol,
! 						 const char *name, int default_port)
  {
! 	SOCKET fd;
! 	char *hostname;
! 	char *separator = strchr (name, ':');
  
! 	struct hostent *host;
! 	struct sockaddr_in addr;
  
! 	addr.sin_family = AF_INET;
  
! 	hostname = strdup(name);
! 	roadmap_check_allocated(hostname);
  
! 	if (separator != NULL) {
  #if 0
! 		struct servent *service;
! 		service = getservbyname(separator+1, "tcp");
  #else
! 		void *service = NULL;
  #endif
! 		if (service == NULL) {
  
! 			if (isdigit(separator[1])) {
  
! 				addr.sin_port = htons((unsigned short)atoi(separator+1));
  
! 				if (addr.sin_port == 0) {
! 					roadmap_log (ROADMAP_ERROR, "invalid port in '%s'", name);
! 					goto connection_failure;
! 				}
  
! 			} else {
! 				roadmap_log (ROADMAP_ERROR, "invalid service in '%s'", name);
! 				goto connection_failure;
! 			}
  
! 		} else {
  #if 0
! 			addr.sin_port = service->s_port;
  #endif
! 		}
  
! 		*(strchr(hostname, ':')) = 0;
  
  
! 	} else {
! 		addr.sin_port = htons((unsigned short)default_port);
! 	}
  
  
! 	host = gethostbyname(hostname);
  
! 	if (host == NULL) {
! 		if (isdigit(hostname[0])) {
! 			addr.sin_addr.s_addr = inet_addr(hostname);
! 			if (addr.sin_addr.s_addr == INADDR_NONE) {
! 				roadmap_log (ROADMAP_ERROR, "invalid IP address '%s'",
! 					hostname);
! 				goto connection_failure;
! 			}
! 		} else {
! 			roadmap_log (ROADMAP_ERROR, "invalid host name '%s'", hostname);
! 			goto connection_failure;
! 		}
! 	} else {
! 		memcpy (&addr.sin_addr, host->h_addr, host->h_length);
! 	}
  
  
! 	if (strcmp (protocol, "udp") == 0) {
! 		fd = socket (PF_INET, SOCK_DGRAM, 0);
! 	} else if (strcmp (protocol, "tcp") == 0) {
! 		fd = socket (PF_INET, SOCK_STREAM, 0);
! 	} else {
! 		roadmap_log (ROADMAP_ERROR, "unknown protocol %s", protocol);
! 		goto connection_failure;
! 	}
  
! 	if (fd == SOCKET_ERROR) {
! 		roadmap_log (ROADMAP_ERROR, "cannot create socket, errno = %d", WSAGetLastError());
! 		goto connection_failure;
! 	}
  
! 	/* FIXME: this way of establishing the connection is kind of dangerous
! 	* if the server process is not local: we might fail only after a long
! 	* delay that will disable RoadMap for a while.
! 	*/
! 	if (connect (fd, (struct sockaddr *) &addr, sizeof(addr)) == SOCKET_ERROR) {
  
! 		/* This is not a local error: the remote application might be
! 		* unavailable. This is not our fault, don't cry.
! 		*/
! 		closesocket(fd);
! 		goto connection_failure;
! 	}
  
! 	return fd;
  
  
  connection_failure:
  
! 	free(hostname);
! 	return -1;
  }
  
--- 36,143 ----
  
  RoadMapSocket roadmap_net_connect (const char *protocol,
!                    const char *name, int default_port)
  {
!    SOCKET fd;
!    char *hostname;
!    char *separator = strchr (name, ':');
  
!    struct hostent *host;
!    struct sockaddr_in addr;
  
!    addr.sin_family = AF_INET;
  
!    hostname = strdup(name);
!    roadmap_check_allocated(hostname);
  
!    if (separator != NULL) {
  #if 0
!       struct servent *service;
!       service = getservbyname(separator+1, "tcp");
  #else
!       void *service = NULL;
  #endif
!       if (service == NULL) {
  
!          if (isdigit(separator[1])) {
  
!             addr.sin_port = htons((unsigned short)atoi(separator+1));
  
!             if (addr.sin_port == 0) {
!                roadmap_log (ROADMAP_ERROR, "invalid port in '%s'", name);
!                goto connection_failure;
!             }
  
!          } else {
!             roadmap_log (ROADMAP_ERROR, "invalid service in '%s'", name);
!             goto connection_failure;
!          }
  
!       } else {
  #if 0
!          addr.sin_port = service->s_port;
  #endif
!       }
  
!       *(strchr(hostname, ':')) = 0;
  
  
!    } else {
!       addr.sin_port = htons((unsigned short)default_port);
!    }
  
  
!    host = gethostbyname(hostname);
  
!    if (host == NULL) {
!       if (isdigit(hostname[0])) {
!          addr.sin_addr.s_addr = inet_addr(hostname);
!          if (addr.sin_addr.s_addr == INADDR_NONE) {
!             roadmap_log (ROADMAP_ERROR, "invalid IP address '%s'",
!                hostname);
!             goto connection_failure;
!          }
!       } else {
!          roadmap_log (ROADMAP_ERROR, "invalid host name '%s'", hostname);
!          goto connection_failure;
!       }
!    } else {
!       memcpy (&addr.sin_addr, host->h_addr, host->h_length);
!    }
  
  
!    if (strcmp (protocol, "udp") == 0) {
!       fd = socket (PF_INET, SOCK_DGRAM, 0);
!    } else if (strcmp (protocol, "tcp") == 0) {
!       fd = socket (PF_INET, SOCK_STREAM, 0);
!    } else {
!       roadmap_log (ROADMAP_ERROR, "unknown protocol %s", protocol);
!       goto connection_failure;
!    }
  
!    if (fd == SOCKET_ERROR) {
!       roadmap_log (ROADMAP_ERROR, "cannot create socket, errno = %d", WSAGetLastError());
!       goto connection_failure;
!    }
  
!    /* FIXME: this way of establishing the connection is kind of dangerous
!    * if the server process is not local: we might fail only after a long
!    * delay that will disable RoadMap for a while.
!    */
!    if (connect (fd, (struct sockaddr *) &addr, sizeof(addr)) == SOCKET_ERROR) {
  
!       /* This is not a local error: the remote application might be
!       * unavailable. This is not our fault, don't cry.
!       */
!       closesocket(fd);
!       goto connection_failure;
!    }
  
!    return fd;
  
  
  connection_failure:
  
!    free(hostname);
!    return -1;
  }
  
***************
*** 145,160 ****
  int roadmap_net_send (RoadMapSocket socket, const void *data, int length)
  {
!    int sent = 0;
  
!    while (sent < length) {
  
!       int res = send(socket, data, length, 0);
  
!       if (res <= 0) return -1;
  
!       sent += res;
     }
  
!    return sent;
  }
  
--- 145,189 ----
  int roadmap_net_send (RoadMapSocket socket, const void *data, int length)
  {
!    int total = length;
!    fd_set fds;
!    struct timeval recv_timeout;
  
!    FD_ZERO(&fds);
!    FD_SET(socket, &fds);
  
!    recv_timeout.tv_sec = 60;
!    recv_timeout.tv_usec = 0;
  
!    while (length > 0) {
!       int res;
  
!       res = select(0, NULL, &fds, NULL, &recv_timeout);
! 
!       if(!res) {
!          roadmap_log (ROADMAP_ERROR,
!                "Timeout waiting for select in roadmap_net_send");
!          return -1;
!       }
! 
!       if(res < 0) {
!          roadmap_log (ROADMAP_ERROR,
!                "Error waiting on select in roadmap_net_send, LastError = %d",
!                       WSAGetLastError());
!          return -1;
!       }
! 
!       res = send(socket, data, length, 0);
! 
!       if (res < 0) {
!          roadmap_log (ROADMAP_ERROR, "Error sending data, LastError = %d",
!                       WSAGetLastError());
!          return -1;
!       }
! 
!       length -= res;
!       data = (char *)data + res;
     }
  
!    return total;
  }
  
***************
*** 162,170 ****
  int roadmap_net_receive (RoadMapSocket socket, void *data, int size)
  {
! 	int res;
! 	res = recv(socket, data, size, 0);
  
! 	if (res == 0) return -1;
! 	else return res;
  }
  
--- 191,223 ----
  int roadmap_net_receive (RoadMapSocket socket, void *data, int size)
  {
!    int res;
!    fd_set fds;
!    struct timeval recv_timeout;
! 
!    FD_ZERO(&fds);
!    FD_SET(socket, &fds);
! 
!    recv_timeout.tv_sec = 30;
!    recv_timeout.tv_usec = 0;
! 
!    res = select(0, &fds, NULL, NULL, &recv_timeout);
! 
!    if(!res) {
!       roadmap_log (ROADMAP_ERROR,
!             "Timeout waiting for select in roadmap_net_send");
!       return -1;
!    }
! 
!    if(res < 0) {
!       roadmap_log (ROADMAP_ERROR,
!             "Error waiting on select in roadmap_net_send, LastError = %d",
!                    WSAGetLastError());
!       return -1;
!    }
  
!    res = recv(socket, data, size, 0);
! 
!    if (res == 0) return -1;
!    else return res;
  }
  
***************
*** 172,176 ****
  void roadmap_net_close (RoadMapSocket socket)
  {
! 	closesocket(socket);
  }
  
--- 225,229 ----
  void roadmap_net_close (RoadMapSocket socket)
  {
!    closesocket(socket);
  }
  
***************
*** 178,208 ****
  RoadMapSocket roadmap_net_listen(int port)
  {
! 	struct sockaddr_in addr;
! 	SOCKET fd;
! 	int res;
  
! 	memset(&addr, 0, sizeof(addr));
  
! 	addr.sin_family = AF_INET;
! 	addr.sin_port = htons((short)port);
  
! 	fd = socket (PF_INET, SOCK_STREAM, 0);
! 	if (fd == INVALID_SOCKET) return fd;
  
! 	res = bind(fd, (struct sockaddr*)&addr, sizeof(addr));
  
! 	if (res == SOCKET_ERROR) {
! 		closesocket(fd);
! 		return INVALID_SOCKET;
! 	}
  
! 	res = listen(fd, 10);
  
! 	if (res == SOCKET_ERROR) {
! 		closesocket(fd);
! 		return INVALID_SOCKET;
! 	}
! 	
! 	return fd;
  }
  
--- 231,261 ----
  RoadMapSocket roadmap_net_listen(int port)
  {
!    struct sockaddr_in addr;
!    SOCKET fd;
!    int res;
  
!    memset(&addr, 0, sizeof(addr));
  
!    addr.sin_family = AF_INET;
!    addr.sin_port = htons((short)port);
  
!    fd = socket (PF_INET, SOCK_STREAM, 0);
!    if (fd == INVALID_SOCKET) return fd;
  
!    res = bind(fd, (struct sockaddr*)&addr, sizeof(addr));
  
!    if (res == SOCKET_ERROR) {
!       closesocket(fd);
!       return INVALID_SOCKET;
!    }
  
!    res = listen(fd, 10);
  
!    if (res == SOCKET_ERROR) {
!       closesocket(fd);
!       return INVALID_SOCKET;
!    }
!    
!    return fd;
  }
  
***************
*** 210,214 ****
  RoadMapSocket roadmap_net_accept(RoadMapSocket server_socket)
  {
! 	return accept(server_socket, NULL, NULL);
  }
  
--- 263,267 ----
  RoadMapSocket roadmap_net_accept(RoadMapSocket server_socket)
  {
!    return accept(server_socket, NULL, NULL);
  }
  
***************
*** 306,310 ****
  int roadmap_net_unique_id(unsigned char *buffer, unsigned int size)
  {
! 	return 16;
  }
  #endif
--- 359,363 ----
  int roadmap_net_unique_id(unsigned char *buffer, unsigned int size)
  {
!    return 16;
  }
  #endif

[Roadmap-commit] roadmap_editor/src/navigate navigate_main.c, 1.13, 1.14

[Ehud S. <esh...@us...>]

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

Modified Files:
	navigate_main.c 
Log Message:
Add speed view.

Index: navigate_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/navigate/navigate_main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** navigate_main.c	18 Aug 2006 17:52:50 -0000	1.13
--- navigate_main.c	3 Sep 2006 18:15:40 -0000	1.14
***************
*** 312,315 ****
--- 312,316 ----
     int ETA;
     char str[100];
+    RoadMapGpsPosition pos;
  
     (*NextMessageUpdate) ();
***************
*** 335,338 ****
--- 336,345 ----
     sprintf (str, "%d:%02d", ETA / 3600, ETA / 60);
     roadmap_message_set ('T', str);
+ 
+    roadmap_navigate_get_current (&pos, NULL, NULL);
+    roadmap_message_set ('S', "%3d %s",
+          roadmap_math_to_speed_unit(pos.speed),
+          roadmap_lang_get(roadmap_math_speed_unit()));
+ 
  }
  
***************
*** 743,747 ****
              roadmap_lang_get ("Length"),
              length/1000.0,
!             roadmap_lang_get ("km"),
              roadmap_lang_get ("Time"),
              track_time/60.0,
--- 750,754 ----
              roadmap_lang_get ("Length"),
              length/1000.0,
!             roadmap_lang_get ("Km"),
              roadmap_lang_get ("Time"),
              track_time/60.0,

[Roadmap-commit] roadmap_editor/src/icons/bmp rm_menu.bmp,1.1,1.2

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/icons/bmp
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1066

Modified Files:
	rm_menu.bmp 
Log Message:
Commit new menu icon by Avi Romano.

Index: rm_menu.bmp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/icons/bmp/rm_menu.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvswd4WVm and /tmp/cvsPvtZkO differ

[Roadmap-commit] roadmap_editor/src/editor/track editor_track_main.c, 1.14, 1.15 editor_track_main.h, 1.5, 1.6 editor_track_unknown.c, 1.7, 1.8

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/editor/track
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv672

Modified Files:
	editor_track_main.c editor_track_main.h editor_track_unknown.c 
Log Message:
On GPS timeout, set a new line as a connection line (yellow).

Index: editor_track_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/track/editor_track_main.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** editor_track_main.c	9 Aug 2006 07:30:27 -0000	1.14
--- editor_track_main.c	3 Sep 2006 18:13:48 -0000	1.15
***************
*** 58,61 ****
--- 58,62 ----
  #define GPS_POINTS_DISTANCE "10m"
  #define MAX_POINTS_IN_SEGMENT 10000
+ #define GPS_TIME_GAP 4 /* 4 seconds */
  
  typedef struct {
***************
*** 493,497 ****
  
        if ((i < (count -1)) || (start_point != (end_point -1))) {
!          create_new_line (start_point, end_point, -1, end_node_id, 4);
        }
  
--- 494,507 ----
  
        if ((i < (count -1)) || (start_point != (end_point -1))) {
!          int line_id =
!             create_new_line (start_point, end_point, -1, end_node_id, 4);
!          if ((line_id != -1) && (type == TRACK_ROAD_CONNECTION)) {
!             int cfcc;
!             int flags;
! 
!             editor_line_get (line_id, NULL, NULL, NULL, &cfcc, &flags);
!             editor_line_modify_properties
!                (line_id, cfcc, flags | ED_LINE_CONNECTION);
!          }
        }
  
***************
*** 503,507 ****
  
  
! static void track_rec_locate_point(int point_id, int force_unknown) {
  
     int i;
--- 513,517 ----
  
  
! static void track_rec_locate_point(int point_id, int point_type) {
  
     int i;
***************
*** 509,513 ****
     TrackNewSegment new_segments[10];
  
!    assert (!force_unknown || cur_active_line);
  
     if (!cur_active_line) {
--- 519,523 ----
     TrackNewSegment new_segments[10];
  
!    assert (!(point_type & POINT_UNKNOWN) || cur_active_line);
  
     if (!cur_active_line) {
***************
*** 534,538 ****
              for (i=0; i<points_count; i++) {
  
!                track_rec_locate_point (i, 1);
              }
           }
--- 544,548 ----
              for (i=0; i<points_count; i++) {
  
!                track_rec_locate_point (i, POINT_UNKNOWN|point_type);
              }
           }
***************
*** 548,552 ****
                  new_segments,
                  sizeof(new_segments) / sizeof(new_segments[0]),
!                 force_unknown);
  
        if (count) {
--- 558,562 ----
                  new_segments,
                  sizeof(new_segments) / sizeof(new_segments[0]),
!                 point_type);
  
        if (count) {
***************
*** 572,576 ****
           for (i=0; i<points_count; i++) {
  
!             track_rec_locate_point (i, 0);
           }
        }
--- 582,586 ----
           for (i=0; i<points_count; i++) {
  
!             track_rec_locate_point (i, point_type);
           }
        }
***************
*** 584,591 ****
--- 594,603 ----
  
     static struct GPSFilter *filter;
+    static time_t last_gps_time;
     const RoadMapGpsPosition *filtered_gps_point;
     RoadMapPosition context_save_pos;
     int context_save_zoom;
     int point_id;
+    int point_type = 0;
     int res;
     
***************
*** 594,601 ****
        filter = editor_track_filter_new 
           (roadmap_math_distance_convert ("1000m", NULL),
!           600, /* 10 minutes */
            roadmap_math_distance_convert ("10m", NULL));
     }
  
     roadmap_math_get_context (&context_save_pos, &context_save_zoom);
     roadmap_math_set_context ((RoadMapPosition *)gps_position, 20);
--- 606,615 ----
        filter = editor_track_filter_new 
           (roadmap_math_distance_convert ("1000m", NULL),
!           60, /* 1 minute */
            roadmap_math_distance_convert ("10m", NULL));
     }
  
+    if (points_count == 0) last_gps_time = 0;
+ 
     roadmap_math_get_context (&context_save_pos, &context_save_zoom);
     roadmap_math_set_context ((RoadMapPosition *)gps_position, 20);
***************
*** 615,618 ****
--- 629,650 ----
     }
  
+    if (last_gps_time && (last_gps_time + GPS_TIME_GAP < gps_time)) {
+       if (cur_active_line) {
+          if (points_count > 2) {
+             TrackNewSegment segment;
+             segment.point_id = points_count - 1;
+             segment.type = TRACK_ROAD_REG;
+             end_unknown_segments (&segment, 1);
+          } else {
+             editor_track_end ();
+          }
+       }
+       point_type = POINT_GAP;
+    } else {
+       point_type = 0;
+    }
+ 
+    last_gps_time = gps_time;
+ 
     while ((filtered_gps_point = editor_track_filter_get (filter)) != NULL) {
  
***************
*** 628,634 ****
        roadmap_fuzzy_set_cycle_params (40, 150);
        
!       track_rec_locate_point (point_id, 0);
     }
  
  restore:
     editor_track_util_release_focus ();
--- 660,674 ----
        roadmap_fuzzy_set_cycle_params (40, 150);
        
!       track_rec_locate_point (point_id, point_type);
     }
  
+    if ((point_type == POINT_GAP) && cur_active_line) {
+       TrackNewSegment segment;
+ 
+       segment.point_id = points_count - 1;
+       segment.type = TRACK_ROAD_CONNECTION;
+ 
+       end_unknown_segments (&segment, 1);
+    }
  restore:
     editor_track_util_release_focus ();

Index: editor_track_main.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/track/editor_track_main.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** editor_track_main.h	22 May 2006 20:56:29 -0000	1.5
--- editor_track_main.h	3 Sep 2006 18:13:48 -0000	1.6
***************
*** 47,50 ****
--- 47,54 ----
  #define TRACK_ROAD_TURN       2
  #define TRACK_ROAD_ROUNDABOUT 3
+ #define TRACK_ROAD_CONNECTION 4
+ 
+ #define POINT_UNKNOWN         0x1
+ #define POINT_GAP             0x2
  
  void editor_track_initialize (void);

Index: editor_track_unknown.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/track/editor_track_unknown.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** editor_track_unknown.c	17 Jul 2006 06:31:49 -0000	1.7
--- editor_track_unknown.c	3 Sep 2006 18:13:48 -0000	1.8
***************
*** 232,236 ****
                         const RoadMapGpsPosition *gps_position,
                         TrackNewSegment *new_segment,
!                        int max) {
  
     static int last_straight_line_point = -1;
--- 232,237 ----
                         const RoadMapGpsPosition *gps_position,
                         TrackNewSegment *new_segment,
!                        int max,
!                        int road_type) {
  
     static int last_straight_line_point = -1;
***************
*** 261,265 ****
               last_straight_azymuth) > 60)) {
        
!       new_segment[0].type = TRACK_ROAD_REG;
        new_segment[0].point_id = point_id - 1;
  
--- 262,266 ----
               last_straight_azymuth) > 60)) {
        
!       new_segment[0].type = road_type;
        new_segment[0].point_id = point_id - 1;
  
***************
*** 309,313 ****
        assert (middle1 > 0);
        if (middle1 > 0) {
!          new_segment[0].type = TRACK_ROAD_REG;
           new_segment[0].point_id = middle1;
        }
--- 310,314 ----
        assert (middle1 > 0);
        if (middle1 > 0) {
!          new_segment[0].type = road_type;
           new_segment[0].point_id = middle1;
        }
***************
*** 332,336 ****
                         const RoadMapGpsPosition *gps_position,
                         TrackNewSegment *new_segment,
!                        int max) {
  
     RoadMapPosition intersection;
--- 333,338 ----
                         const RoadMapGpsPosition *gps_position,
                         TrackNewSegment *new_segment,
!                        int max,
!                        int road_type) {
  
     RoadMapPosition intersection;
***************
*** 348,352 ****
        if (is_roundabout (loop_start_point, point_id)) {
           
!          new_segment[0].type = TRACK_ROAD_REG;
           new_segment[0].point_id = loop_start_point;
  
--- 350,354 ----
        if (is_roundabout (loop_start_point, point_id)) {
           
!          new_segment[0].type = road_type;
           new_segment[0].point_id = loop_start_point;
  
***************
*** 357,361 ****
        } else {
  
!          new_segment[0].type = TRACK_ROAD_REG;
           new_segment[0].point_id = point_id;
  
--- 359,363 ----
        } else {
  
!          new_segment[0].type = road_type;
           new_segment[0].point_id = point_id;
  
***************
*** 372,383 ****
                                  const RoadMapGpsPosition *gps_position,
                                  TrackNewSegment *new_segment,
!                                 int max) {
  
     int count;
     
!    count = detect_loop (point_id, gps_position, new_segment, max);
     if (count) return count;
  
!    count = detect_turn (point_id, gps_position, new_segment, max);
     return count;
  }
--- 374,391 ----
                                  const RoadMapGpsPosition *gps_position,
                                  TrackNewSegment *new_segment,
!                                 int max,
!                                 int point_type) {
  
     int count;
     
!    int road_type = TRACK_ROAD_REG;
!    if (point_type & POINT_GAP) {
!       road_type = TRACK_ROAD_CONNECTION;
!    }
! 
!    count = detect_loop (point_id, gps_position, new_segment, max, road_type);
     if (count) return count;
  
!    count = detect_turn (point_id, gps_position, new_segment, max, road_type);
     return count;
  }
***************
*** 390,394 ****
                                         TrackNewSegment *new_segment,
                                         int max_segments,
!                                        int force) {
  
     RoadMapFuzzy best;
--- 398,402 ----
                                         TrackNewSegment *new_segment,
                                         int max_segments,
!                                        int point_type) {
  
     RoadMapFuzzy best;
***************
*** 398,405 ****
     int count;
     
!    if (force) {
        /* this point is already known to be unknown */
        return detect_road_segment
!                (point_id, gps_position, new_segment, max_segments);
     }
  
--- 406,413 ----
     int count;
     
!    if (point_type & POINT_UNKNOWN) {
        /* this point is already known to be unknown */
        return detect_road_segment
!                (point_id, gps_position, new_segment, max_segments, point_type);
     }
  
***************
*** 438,442 ****
  
  
!       new_segment->type = TRACK_ROAD_REG;
        new_segment->point_id = point_id;
  
--- 446,454 ----
  
  
!       if (point_type & POINT_GAP) {
!          new_segment->type = TRACK_ROAD_CONNECTION;
!       } else {
!          new_segment->type = TRACK_ROAD_REG;
!       }
        new_segment->point_id = point_id;
  
***************
*** 450,454 ****
        /* point is unknown, see if we can detect a road segment */
  
!       return detect_road_segment (point_id, gps_position, new_segment, max_segments);
     }
  }
--- 462,467 ----
        /* point is unknown, see if we can detect a road segment */
  
!       return detect_road_segment
!                (point_id, gps_position, new_segment, max_segments, point_type);
     }
  }

[Roadmap-commit] roadmap_editor/src/editor/static editor_dialog.c, 1.9, 1.10

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/editor/static
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31912

Modified Files:
	editor_dialog.c 
Log Message:
I18n.

Index: editor_dialog.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/static/editor_dialog.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** editor_dialog.c	9 Aug 2006 07:29:04 -0000	1.9
--- editor_dialog.c	3 Sep 2006 18:10:41 -0000	1.10
***************
*** 61,65 ****
  } DialogSelectedLines;
  
! static const char *def_values[2] = {"", "Other"};
  
  /* NOTE: This function modifies the street_range parameter */
--- 61,65 ----
  } DialogSelectedLines;
  
! static const char *def_values[2] = {"", ""};
  
  /* NOTE: This function modifies the street_range parameter */
***************
*** 201,205 ****
  static void editor_dialog_city_cb (const char *name, void *context) {
  
!    if (roadmap_dialog_get_data ("General", "City") == def_values[1]) {
  
        roadmap_dialog_set_data ("General", "City", def_values[0]);
--- 201,205 ----
  static void editor_dialog_city_cb (const char *name, void *context) {
  
!    if (!strcmp(roadmap_dialog_get_data ("General", "City"), def_values[1])) {
  
        roadmap_dialog_set_data ("General", "City", def_values[0]);
***************
*** 688,691 ****
--- 688,697 ----
        int i;
        char **categories;
+       static const char *lang_categories[ROADMAP_ROAD_LAST - ROADMAP_ROAD_FIRST + 1];
+ 
+       if (!def_values[1][0]) {
+          def_values[1] = roadmap_lang_get ("Search");
+       }
+ 
        /*
        char *direction_txts[] =
***************
*** 711,718 ****
        for (i=0; i<count; i++) {
           values[i] = i;
        }
  
        roadmap_dialog_new_choice ("General", "Road type", count,
!                                  (const char **)categories,
                                   (void**)values, NULL);
        free (values);
--- 717,725 ----
        for (i=0; i<count; i++) {
           values[i] = i;
+          lang_categories[i] = roadmap_lang_get (categories[i]);
        }
  
        roadmap_dialog_new_choice ("General", "Road type", count,
!                                  (const char **)lang_categories,
                                   (void**)values, NULL);
        free (values);
***************
*** 732,736 ****
  
        roadmap_dialog_add_button ("Cancel", editor_segments_cancel);
!       roadmap_dialog_add_button ("OK", editor_segments_apply);
  
        roadmap_dialog_complete (roadmap_preferences_use_keyboard ());
--- 739,743 ----
  
        roadmap_dialog_add_button ("Cancel", editor_segments_cancel);
!       roadmap_dialog_add_button ("Ok", editor_segments_apply);
  
        roadmap_dialog_complete (roadmap_preferences_use_keyboard ());
***************
*** 779,786 ****
     }
  
!    snprintf (str, sizeof(str), "%d meters", total_length);
     roadmap_dialog_set_data ("Info", "Length", str);
  
!    snprintf (str, sizeof(str), "%d seconds", total_time);
     roadmap_dialog_set_data ("Info", "Time", str);
  }
--- 786,795 ----
     }
  
!    snprintf (str, sizeof(str), "%d %s",
!              total_length, roadmap_lang_get("meters"));
     roadmap_dialog_set_data ("Info", "Length", str);
  
!    snprintf (str, sizeof(str), "%d %s",
!              total_time, roadmap_lang_get("seconds"));
     roadmap_dialog_set_data ("Info", "Time", str);
  }

[Roadmap-commit] roadmap_editor/src/editor/export editor_sync.c, 1.2, 1.3 editor_upload.c, 1.5, 1.6

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/editor/export
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31475

Modified Files:
	editor_sync.c editor_upload.c 
Log Message:
Various fixes.

Index: editor_sync.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_sync.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** editor_sync.c	9 Aug 2006 07:27:14 -0000	1.2
--- editor_sync.c	3 Sep 2006 18:09:39 -0000	1.3
***************
*** 43,46 ****
--- 43,47 ----
  #include "editor_export.h"
  #include "editor_download.h"
+ #include "../editor_main.h"
  #include "editor_sync.h"
  
***************
*** 191,194 ****
--- 192,199 ----
     time_t map_time_t;
  
+    if (!editor_is_enabled ()) {
+       return 0;
+    }
+ 
     roadmap_download_progress (0);
     roadmap_dialog_set_data ("Sync", "Progress status",
***************
*** 241,244 ****
--- 246,252 ----
     res = editor_download_update_map (&SyncDownloadCallbackFunctions);
  
+    if (res == -1) {
+       roadmap_messagebox ("Download Error", roadmap_lang_get("Error downloading map update"));
+    }
  end_sync:
     roadmap_dialog_hide ("Sync process");

Index: editor_upload.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_upload.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** editor_upload.c	9 Aug 2006 07:27:14 -0000	1.5
--- editor_upload.c	3 Sep 2006 18:09:39 -0000	1.6
***************
*** 473,477 ****
  
        if (uploaded <= 0) {
!          (*callbacks->error) ("Receive error after %d data bytes", loaded);
           goto cancel_upload;
        }
--- 473,477 ----
  
        if (uploaded <= 0) {
!          (*callbacks->error) ("Send error after %d data bytes", loaded);
           goto cancel_upload;
        }

[Roadmap-commit] roadmap_editor/src/editor/db editor_db.c, 1.7, 1.8 editor_marker.c, 1.2, 1.3

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/editor/db
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31057

Modified Files:
	editor_db.c editor_marker.c 
Log Message:
Various fixes.

Index: editor_db.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/db/editor_db.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** editor_db.c	18 Aug 2006 17:44:17 -0000	1.7
--- editor_db.c	3 Sep 2006 18:08:26 -0000	1.8
***************
*** 334,337 ****
--- 334,343 ----
     roadmap_path_create (path);
  
+    if (roadmap_file_exists (path, name)) {
+       editor_log (ROADMAP_ERROR, "Trying to create a new database which already exists! '%s/%s'", path, name);
+       editor_log_pop ();
+       return -1;
+    }
+       
     if (buildmap_db_open (path, name) == -1) {
        editor_log (ROADMAP_ERROR, "Can't create new database: %s/%s",

Index: editor_marker.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/db/editor_marker.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** editor_marker.c	18 Aug 2006 17:44:17 -0000	1.2
--- editor_marker.c	3 Sep 2006 18:08:26 -0000	1.3
***************
*** 100,105 ****
  
  int  editor_marker_count(void) {
! 
!    if (!ActiveMarkersDB) return 0;
  
     return ActiveMarkersDB->num_items;
--- 100,105 ----
  
  int  editor_marker_count(void) {
! 
!    if (!ActiveMarkersDB) return 0;
  
     return ActiveMarkersDB->num_items;

[Roadmap-commit] roadmap_editor/src/editor editor_main.c, 1.16, 1.17

[Ehud S. <esh...@us...>]

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

Modified Files:
	editor_main.c 
Log Message:
Bump version.

Index: editor_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** editor_main.c	18 Aug 2006 17:38:43 -0000	1.16
--- editor_main.c	3 Sep 2006 18:07:08 -0000	1.17
***************
*** 47,51 ****
  int EditorPluginID = -1;
  
! const char *EDITOR_VERSION = "0.8.0 pre7";
  
  void editor_main_check_map (void) {
--- 47,51 ----
  int EditorPluginID = -1;
  
! const char *EDITOR_VERSION = "0.8.0 pre8";
  
  void editor_main_check_map (void) {
***************
*** 88,92 ****
     update_range_initialize  ();
     editor_notes_initialize  ();
-    editor_main_set (1);
  
     EditorPluginID = editor_plugin_register ();
--- 88,91 ----

[Roadmap-commit] roadmap_editor/src roadmap_navigate.c,1.15,1.16

[Ehud S. <esh...@us...>]

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

Modified Files:
	roadmap_navigate.c 
Log Message:
Various fixes.

Index: roadmap_navigate.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_navigate.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** roadmap_navigate.c	18 Aug 2006 17:26:51 -0000	1.15
--- roadmap_navigate.c	3 Sep 2006 18:06:09 -0000	1.16
***************
*** 837,840 ****
--- 837,842 ----
     *position = RoadMapLatestGpsPosition;
     
+    if (!line || !direction) return 0;
+ 
     if (RoadMapConfirmedStreet.valid) {
        

[Roadmap-commit] roadmap_editor/src roadmap_start.c,1.28,1.29

[Ehud S. <esh...@us...>]

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

Modified Files:
	roadmap_start.c 
Log Message:
Modify quick menu.

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_start.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** roadmap_start.c	18 Aug 2006 17:30:51 -0000	1.28
--- roadmap_start.c	3 Sep 2006 18:05:25 -0000	1.29
***************
*** 735,752 ****
  
     "address",
-    "updaterange",
-    "addeditnote",
-    "viewmarkers",
-    RoadMapFactorySeparator,
-    "sync",
     RoadMapFactorySeparator,
     "detectreceiver",
     "preferences",
     "about",
  
     NULL,
  };
  
- 
  #ifndef UNDER_CE
  static char const *RoadMapStartKeyBinding[] = {
--- 735,747 ----
  
     "address",
     RoadMapFactorySeparator,
     "detectreceiver",
     "preferences",
     "about",
+    "quit",
  
     NULL,
  };
  
  #ifndef UNDER_CE
  static char const *RoadMapStartKeyBinding[] = {
***************
*** 1212,1216 ****
  
     editor_main_initialize ();
-    editor_main_check_map ();
     navigate_main_initialize ();
  
--- 1207,1210 ----

[Roadmap-commit] roadmap_editor/src roadmap_screen_obj.c,1.5,1.6

[Ehud S. <esh...@us...>]

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

Modified Files:
	roadmap_screen_obj.c 
Log Message:
Wide screen support.

Index: roadmap_screen_obj.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_screen_obj.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** roadmap_screen_obj.c	17 Jul 2006 06:30:51 -0000	1.5
--- roadmap_screen_obj.c	3 Sep 2006 18:05:04 -0000	1.6
***************
*** 46,49 ****
--- 46,59 ----
  #include "roadmap_screen_obj.h"
  
+ typedef struct {
+    const char   *name;
+    int           min_screen_height;
+ } ObjectFile;
+ 
+ static ObjectFile RoadMapObjFiles[] = {
+    {"objects",      300},
+    {"objects_wide", 200}
+ };
+ 
  #define MAX_STATES 9
  
***************
*** 477,484 ****
     const char *cursor;
     RoadMapFileContext file;
  
!    for (cursor = roadmap_file_map ("config", "objects", NULL, "r", &file);
          cursor != NULL;
!         cursor = roadmap_file_map ("config", "objects", cursor, "r", &file)) {
  
        roadmap_screen_obj_load (roadmap_file_base(file), roadmap_file_size(file));
--- 487,513 ----
     const char *cursor;
     RoadMapFileContext file;
+    unsigned int i;
+    int height = roadmap_canvas_height ();
+    const char *object_name = NULL;
  
!    for (i=0; i<sizeof(RoadMapObjFiles)/sizeof(RoadMapObjFiles[0]); i++) {
! 
!       if (height >= RoadMapObjFiles[i].min_screen_height) {
!          object_name = RoadMapObjFiles[i].name;
!          break;
!       }
!    }
! 
!    if (!object_name) {
!       roadmap_log
!          (ROADMAP_ERROR, "Can't find object file for screen height: %d",
!           height);
!       return;
!    }
! 
! 
!    for (cursor = roadmap_file_map ("config", object_name, NULL, "r", &file);
          cursor != NULL;
!         cursor = roadmap_file_map ("config", object_name, cursor, "r", &file)) {
  
        roadmap_screen_obj_load (roadmap_file_base(file), roadmap_file_size(file));
***************
*** 488,494 ****
     }
  
!    for (cursor = roadmap_file_map ("user", "objects", NULL, "r", &file);
          cursor != NULL;
!         cursor = roadmap_file_map ("user", "objects", cursor, "r", &file)) {
  
        roadmap_screen_obj_load (roadmap_file_base(file), roadmap_file_size(file));
--- 517,523 ----
     }
  
!    for (cursor = roadmap_file_map ("user", object_name, NULL, "r", &file);
          cursor != NULL;
!         cursor = roadmap_file_map ("user", object_name, cursor, "r", &file)) {
  
        roadmap_screen_obj_load (roadmap_file_base(file), roadmap_file_size(file));

[Roadmap-commit] roadmap_editor/src roadmap_download.c,1.10,1.11

[Ehud S. <esh...@us...>]

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

Modified Files:
	roadmap_download.c 
Log Message:
Stop download if an error is encountered.

Index: roadmap_download.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_download.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** roadmap_download.c	9 Aug 2006 07:06:02 -0000	1.10
--- roadmap_download.c	3 Sep 2006 18:03:58 -0000	1.11
***************
*** 507,511 ****
              }
           } else {
!             error = 1;
           }
           roadmap_download_unblock (fips);
--- 507,514 ----
              }
           } else {
!             error = 1;
! 
!             /* empty queue */
!             RoadMapDownloadQueueConsumer = RoadMapDownloadQueueProducer - 1;
           }
           roadmap_download_unblock (fips);

[Roadmap-commit] roadmap_editor/src roadmap_factory.c, 1.3, 1.4 roadmap_locator.c, 1.10, 1.11

[Ehud S. <esh...@us...>]

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

Modified Files:
	roadmap_factory.c roadmap_locator.c 
Log Message:
Various fixes.

Index: roadmap_factory.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_factory.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_factory.c	9 Aug 2006 07:07:49 -0000	1.3
--- roadmap_factory.c	3 Sep 2006 18:03:01 -0000	1.4
***************
*** 328,335 ****
              /* Separate the name of the key from the name of the action. */
  
!             for (p = separator; *p <= ' '; --p) *p = 0;
  
              p = separator + strlen(ROADMAP_MAPPED_TO);
!             while (*p <= ' ') ++p;
              this_action = roadmap_factory_find_action (actions, p);
  
--- 328,335 ----
              /* Separate the name of the key from the name of the action. */
  
!             for (p = separator; *p && (*p <= ' '); --p) *p = 0;
  
              p = separator + strlen(ROADMAP_MAPPED_TO);
!             while (*p && (*p <= ' ')) ++p;
              this_action = roadmap_factory_find_action (actions, p);
  

Index: roadmap_locator.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_locator.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** roadmap_locator.c	16 Jul 2006 12:23:25 -0000	1.10
--- roadmap_locator.c	3 Sep 2006 18:03:01 -0000	1.11
***************
*** 64,68 ****
  static int RoadMapCountyCacheSize = 0;
  
! static int RoadMapActiveCounty = -1;
  
  static int RoadMapUsdirActive = 0;
--- 64,68 ----
  static int RoadMapCountyCacheSize = 0;
  
! static int RoadMapActiveCounty = -2;
  
  static int RoadMapUsdirActive = 0;

[Roadmap-commit] roadmap_editor/src roadmap_address.c, 1.9, 1.10 roadmap_geocode.c, 1.3, 1.4

[Ehud S. <esh...@us...>]

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

Modified Files:
	roadmap_address.c roadmap_geocode.c 
Log Message:
I18n.

Index: roadmap_geocode.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_geocode.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_geocode.c	12 May 2006 13:16:43 -0000	1.3
--- roadmap_geocode.c	3 Sep 2006 18:01:31 -0000	1.4
***************
*** 36,39 ****
--- 36,40 ----
  #include "roadmap_locator.h"
  #include "roadmap_trip.h"
+ #include "roadmap_lang.h"
  #include "roadmap_preferences.h"
  
***************
*** 76,90 ****
     case ROADMAP_US_NOSTATE:
  
!       RoadMapGeocodeError = "No state with that name could be found";
        return 0;
  
     case ROADMAP_US_NOCITY:
  
!       RoadMapGeocodeError = "No city with that name could be found";
        return 0;
  
     default:
  
!       RoadMapGeocodeError = "No related map could not be found";
        return 0;
     }
--- 77,94 ----
     case ROADMAP_US_NOSTATE:
  
!       RoadMapGeocodeError =
!          roadmap_lang_get ("No state with that name could be found");
        return 0;
  
     case ROADMAP_US_NOCITY:
  
!       RoadMapGeocodeError =
!          roadmap_lang_get ("No city with that name could be found");
        return 0;
  
     default:
  
!       RoadMapGeocodeError =
!          roadmap_lang_get ("No related map could not be found");
        return 0;
     }
***************
*** 94,106 ****
        switch (count) {
        case ROADMAP_STREET_NOADDRESS:
!          RoadMapGeocodeError = "No such address could be found on that street";
           break;
        case ROADMAP_STREET_NOCITY:
!          RoadMapGeocodeError = "No city with that name could be found";
           break;
        case ROADMAP_STREET_NOSTREET:
!          RoadMapGeocodeError = "No street with that name could be found";
        default:
!          RoadMapGeocodeError = "The address could not be found";
        }
        return 0;
--- 98,114 ----
        switch (count) {
        case ROADMAP_STREET_NOADDRESS:
!          RoadMapGeocodeError =
!             roadmap_lang_get ("No such address could be found on that street");
           break;
        case ROADMAP_STREET_NOCITY:
!          RoadMapGeocodeError =
!             roadmap_lang_get ("No city with that name could be found");
           break;
        case ROADMAP_STREET_NOSTREET:
!          RoadMapGeocodeError =
!          roadmap_lang_get ("No street with that name could be found");
        default:
!          RoadMapGeocodeError =
!          roadmap_lang_get ("The address could not be found");
        }
        return 0;
***************
*** 194,198 ****
  
        free (results);
!       RoadMapGeocodeError = "No valid street was found";
  
     } else {
--- 202,211 ----
  
        free (results);
!       if (number_image[0] != 0) {
!          RoadMapGeocodeError =
!             roadmap_lang_get ("No such address could be found on that street");
!       } else {
!          RoadMapGeocodeError = roadmap_lang_get ("No valid street was found");
!       }
  
     } else {

Index: roadmap_address.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_address.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** roadmap_address.c	18 Aug 2006 17:19:06 -0000	1.9
--- roadmap_address.c	3 Sep 2006 18:01:31 -0000	1.10
***************
*** 245,249 ****
                                      state);
     if (count <= 0) {
!       roadmap_messagebox ("Warning", roadmap_geocode_last_error());
        free (selections);
        return;
--- 245,250 ----
                                      state);
     if (count <= 0) {
!       roadmap_messagebox (roadmap_lang_get ("Warning"),
!                           roadmap_geocode_last_error());
        free (selections);
        return;

[Roadmap-commit] roadmap_editor/src roadmap_friends.c, 1.1.1.1, 1.2 roadmap_ghost.c, 1.1.1.1, 1.2

[Ehud S. <esh...@us...>]

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

Modified Files:
	roadmap_friends.c roadmap_ghost.c 
Log Message:
Started port for win32.



Index: roadmap_friends.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_friends.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_friends.c	15 Oct 2005 22:19:03 -0000	1.1.1.1
--- roadmap_friends.c	3 Sep 2006 18:00:15 -0000	1.2
***************
*** 123,131 ****
  #include <stdio.h>
  #include <stdlib.h>
  #include <unistd.h>
! 
! #include <sys/select.h>
  
  #include "roadmap.h"
  
  
--- 123,137 ----
  #include <stdio.h>
  #include <stdlib.h>
+ #include <time.h>
+ 
+ #ifdef _WIN32
+ #include <windows.h>
+ #else
  #include <unistd.h>
! #include <sys/select.h>
! #endif
  
  #include "roadmap.h"
+ #include "roadmap_net.h"
  
  
***************
*** 204,208 ****
     }
  
!    snprintf (buffer, sizeof(buffer), "POS: %s %s %.6f %.6f %d %d %d",
               friends_local_name, friends_local_name,
               coordinate_to_friends (argv[3], argv[4]),
--- 210,214 ----
     }
  
!    snprintf (buffer, sizeof(buffer), "POS: %s %s %.6f %.6f %ld %d %d",
               friends_local_name, friends_local_name,
               coordinate_to_friends (argv[3], argv[4]),
***************
*** 235,239 ****
     char id[30];
     char name[40];
-    char lat[40];
     double latitude;
     double longitude;
--- 241,244 ----
***************
*** 259,263 ****
     if (strcmp (name, friends_local_name) != 0) {
  
!       int i;
        int available = -1;
  
--- 264,268 ----
     if (strcmp (name, friends_local_name) != 0) {
  
!       int i = friends_count;
        int available = -1;
  

Index: roadmap_ghost.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_ghost.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_ghost.c	15 Oct 2005 22:18:53 -0000	1.1.1.1
--- roadmap_ghost.c	3 Sep 2006 18:00:15 -0000	1.2
***************
*** 38,42 ****
  #include <stdlib.h>
  
! #include "roadmap.h"
  
  
--- 38,43 ----
  #include <stdlib.h>
  
! #include "roadmap.h"
! #include "roadmap_net.h"
  
  
***************
*** 44,48 ****
      char data[256];
  };
! 
  
  int main(int argc, char *argv[]) {
--- 45,54 ----
      char data[256];
  };
! 
! static void send_buffer (RoadMapSocket s, char *buffer) {
! 
!    if (roadmap_net_send(s, buffer, strlen(buffer)) < 0) exit(-1);
! }
! 
  
  int main(int argc, char *argv[]) {
***************
*** 58,65 ****
     int previous = -1;
     int delay_cursor = 0;
!    int delay_length = 0;
  
     struct delay_buffer *delay_line = NULL;
! 
  
     if (argc > 1 && strncmp (argv[1], "--driver=", 9) == 0) {
--- 64,75 ----
     int previous = -1;
     int delay_cursor = 0;
!    int delay_length = 0;
!    RoadMapSocket roadmap_socket;
  
     struct delay_buffer *delay_line = NULL;
! 
!    roadmap_socket = roadmap_net_connect ("tcp", "localhost", 2007);
! 
!    if (!ROADMAP_NET_IS_VALID(roadmap_socket)) exit(-1);
  
     if (argc > 1 && strncmp (argv[1], "--driver=", 9) == 0) {
***************
*** 69,76 ****
     config_length = strlen(config);
  
!    printf ("$PXRMADD,%s,%s,Friend\n", driver, driver);
!    printf ("$PXRMSUB,RMC\n");
!    printf ("%s10\n", config, driver);
!    fflush(stdout);
  
     for(;;) {
--- 79,90 ----
     config_length = strlen(config);
  
!    snprintf (buffer, sizeof(buffer), "$PXRMADD,%s,%s,Friend\n", driver, driver);
!    send_buffer (roadmap_socket, buffer);
! 
!    strcpy (buffer, "$PXRMSUB,RMC\n");
!    send_buffer (roadmap_socket, buffer);
! 
!    snprintf (buffer, sizeof(buffer), "%s10\n", config, driver);
!    send_buffer (roadmap_socket, buffer);
  
     for(;;) {
***************
*** 78,82 ****
        /* Retrieve the data from RoadMap. ------------------------------- */
  
!       received = read (0, buffer, sizeof(buffer));
  
        if (received <= 0) {
--- 92,96 ----
        /* Retrieve the data from RoadMap. ------------------------------- */
  
!       received = roadmap_net_receive (roadmap_socket, buffer, sizeof(buffer));
  
        if (received <= 0) {
***************
*** 145,154 ****
           if (p == NULL) continue;
  
!          printf ("$PXRMMOV,%s%s", driver, p);
!          fflush (stdout);
!       }
! 
!       if (ferror(stdout)) {
!          exit(0); /* RoadMap closed the pipe. */
        }
     }
--- 159,164 ----
           if (p == NULL) continue;
  
!          snprintf (buffer, sizeof(buffer), "$PXRMMOV,%s%s", driver, p);
!          send_buffer (roadmap_socket, buffer);
        }
     }

[Roadmap-commit] roadmap_editor/src roadmap_gps.c,1.11,1.12

[Ehud S. <esh...@us...>]

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

Modified Files:
	roadmap_gps.c 
Log Message:
Change GPS source field to an edit box.



Index: roadmap_gps.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_gps.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** roadmap_gps.c	13 Jul 2006 06:34:25 -0000	1.11
--- roadmap_gps.c	3 Sep 2006 17:59:12 -0000	1.12
***************
*** 629,632 ****
--- 629,633 ----
           }
  
+ /*         
           if (!source_item) {
              source_item = roadmap_config_declare_enumeration
***************
*** 635,643 ****
              roadmap_config_add_enumeration_value (source_item, name);
           }
        }
  
        if (!source_item) {
!          roadmap_config_declare_enumeration
!             ("preferences", &RoadMapConfigGPSSource, "COM1:", NULL);
        }
  
--- 636,645 ----
              roadmap_config_add_enumeration_value (source_item, name);
           }
+ */         
        }
  
        if (!source_item) {
!          roadmap_config_declare
!             ("preferences", &RoadMapConfigGPSSource, "COM1:");
        }
  

[Roadmap-commit] roadmap_editor/src preferences,1.1.1.1,1.2

[Ehud S. <esh...@us...>]

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

Modified Files:
	preferences 
Log Message:
Update preferences for win32.



Index: preferences
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/preferences,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** preferences	15 Oct 2005 22:18:53 -0000	1.1.1.1
--- preferences	3 Sep 2006 17:58:26 -0000	1.2
***************
*** 20,21 ****
--- 20,26 ----
  Shapes.Declutter: 1300
  Display.Rotate: yes
+ Map.Background: #ffffcc
+ General.Toolbar: no
+ Accuracy.Confidence: 250
+ Accuracy.Street: 35
+ Help.Browser: \windows\iexplore

[Roadmap-commit] roadmap_editor/src lang,1.1,1.2

[Ehud S. <esh...@us...>]

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

Modified Files:
	lang 
Log Message:
Update Hebrew translation.



Index: lang
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/lang,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lang	18 Aug 2006 17:35:02 -0000	1.1
--- lang	3 Sep 2006 17:57:55 -0000	1.2
***************
*** 41,45 ****
  Can't find a route.=לא ניתן לחשב מסלול אל היעד הרצוי. אנא פנה לאתר הפרוייקט על מנת לתקן את הבעיה.
  Route found=נמצא מסלול
! km=ק"מ
  minutes=דקות
  Can't find a road near departure point.=לא ניתן למצוא כביש ליד נקודת המוצא.
--- 41,47 ----
  Can't find a route.=לא ניתן לחשב מסלול אל היעד הרצוי. אנא פנה לאתר הפרוייקט על מנת לתקן את הבעיה.
  Route found=נמצא מסלול
! m=מ'
! Km=ק"מ
! Kmh=קמ"ש
  minutes=דקות
  Can't find a road near departure point.=לא ניתן למצוא כביש ליד נקודת המוצא.
***************
*** 64,68 ****
  Yes=כן
  No=לא
! The calculated route may have incorrect trun instructions.=המסלול שנמצא הינו משוער וייתכן שיש בו פניות שאינן אפשריות.
  Estimated=משוער
  Left=שמאל
--- 66,70 ----
  Yes=כן
  No=לא
! The calculated route may have incorrect turn instructions.=המסלול שנמצא הינו משוער וייתכן שיש בו פניות שאינן אפשריות.
  Estimated=משוער
  Left=שמאל
***************
*** 77,78 ****
--- 79,92 ----
  Add a voice note=הוסף הערה קולית
  About=אודות
+ General=כללי
+ Info=מידע
+ Road type=סוג הכביש
+ Freeways=בין עירוני
+ Ramps=מחלף
+ Highways=רחוב ראשי
+ Streets=רחוב משני
+ Trails=כביש עפר
+ Error downloading map update=עדכון המפה נכשל. אנא וודא שהמכשיר מחובר לרשת האינטרנט.
+ No city with that name could be found=לא ניתן למצוא עיר בשם זה
+ No street with that name could be found=לא ניתן למצוא רחוב בשם זה
+ No such address could be found on that street=מספר הבית אינו קיים ברחוב זה

[Roadmap-commit] roadmap_editor/src quick.menu,NONE,1.1

[Ehud S. <esh...@us...>]

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

Added Files:
	quick.menu 
Log Message:
Import quick menu file.



--- NEW FILE: quick.menu ---
address
updaterange
addeditnote
viewmarkers
-
sync
-
detectreceiver
preferences
about

[Roadmap-commit] roadmap_editor/src objects_wide,NONE,1.1

[Ehud S. <esh...@us...>]

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

Added Files:
	objects_wide 
Log Message:
Import objects file for wide screen.



--- NEW FILE: objects_wide ---
N Compass
I Compass
I Compass_fixed
P 20 20
S orientation_mode
B -20 -16 20 16
A toggleorientation

N zoom1_button
I rm_zoom1.bmp
P -61 -115
O 160
A zoom1
B -4 -4 28 28
S zoom_reset

N zoomin_button
I rm_zoomin.bmp
P -61 -80
O 160
A zoomin
B -4 -4 28 28

N zoomout_button
I rm_zoomout.bmp
P -26 -80
O 160
A zoomout
B -4 -4 28 28

N gps_button
I rm_gps.bmp
P -61 -45
O 160
A gps
B -4 -4 28 28
S GPS_focus

N quit_button
I rm_quit.bmp
P -20 -167
A quit
B -4 -4 20 20

N full_screen
I rm_full.bmp
P -20 -115
A full
B -4 -4 20 20

N view_button
I rm_3d.bmp
I rm_2d.bmp
P -26 -45
O 160
A toggleview
B -4 -4 28 28
S view_mode

N gps_reception
I Reception_na
I Reception_none
I Reception_poor
I Reception_good
P 19 56
S GPS_reception
R

N menu_button
I rm_menu.bmp
P 1 77
O 160
A quickmenu
B -4 -4 28 28

[Roadmap-commit] roadmap/src roadmap_log.c,1.16,1.17

[Paul F. <pg...@us...>]

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

Modified Files:
	roadmap_log.c 
Log Message:
show log stack transitions during DEBUG operation


Index: roadmap_log.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_log.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** roadmap_log.c	29 Jun 2006 01:29:29 -0000	1.16
--- roadmap_log.c	24 Aug 2006 16:02:35 -0000	1.17
***************
*** 85,88 ****
--- 85,91 ----
  void roadmap_log_push (const char *description) {
  
+ #ifdef DEBUG
+    roadmap_log(ROADMAP_DEBUG, "push of %s", description);
+ #endif
     if (RoadMapLogStackCursor < ROADMAP_LOG_STACK_SIZE) {
        RoadMapLogStack[RoadMapLogStackCursor++] = description;
***************
*** 94,97 ****
--- 97,104 ----
     if (RoadMapLogStackCursor > 0) {
        RoadMapLogStackCursor -= 1;
+ #ifdef DEBUG
+       roadmap_log(ROADMAP_DEBUG, "pop of %s",
+ 	 RoadMapLogStack[RoadMapLogStackCursor]);
+ #endif
     }
  }

[Roadmap-commit] roadmap/src roadmap_label.c,1.17,1.18

[Paul F. <pg...@us...>]

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

Modified Files:
	roadmap_label.c 
Log Message:
simplify poly debug, and add ifdef for labeling roads with their lineid


Index: roadmap_label.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_label.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** roadmap_label.c	24 Aug 2006 13:28:09 -0000	1.17
--- roadmap_label.c	24 Aug 2006 15:29:34 -0000	1.18
***************
*** 60,63 ****
--- 60,64 ----
  
  #define POLY_OUTLINE 0
+ #define LABEL_USING_LINEID 0
  
  #define MIN(a, b) (a) < (b) ? (a) : (b)
***************
*** 209,216 ****
     roadmap_math_rotate_point (&poly[3], p, angle);
  
- #if POLY_OUTLINE
-    { int lines = 4; roadmap_canvas_draw_multiple_lines(1, &lines, poly, 1); }
- #endif
- 
     compute_bbox(poly, &c->bbox);
  
--- 210,213 ----
***************
*** 471,475 ****
--- 468,478 ----
                 cPtr->text = "";
              } else {
+ #if LABEL_USING_LINEID
+                char buf[40];
+                sprintf(buf, "%d", cPtr->line.line_id);
+                cPtr->text = strdup(buf);
+ #else
                 cPtr->text = strdup(properties.street);
+ #endif
              }
              cPtr->street = properties.plugin_street;
***************
*** 531,536 ****
              }
           }
  #if POLY_OUTLINE
!          else {
              int lines = 4;
              roadmap_canvas_draw_multiple_lines(1, &lines, cPtr->poly, 1);
--- 534,540 ----
              }
           }
+ 
  #if POLY_OUTLINE
!          {
              int lines = 4;
              roadmap_canvas_draw_multiple_lines(1, &lines, cPtr->poly, 1);

[Roadmap-commit] roadmap/src roadmap_label.c,1.16,1.17

[Paul F. <pg...@us...>]

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

Modified Files:
	roadmap_label.c 
Log Message:
eliminate "flip-flop" label display behavior, caused by
inadvertent reordering of the cache via the "unused" list.  also
rename some variables for clarity.


Index: roadmap_label.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_label.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** roadmap_label.c	13 Aug 2006 15:24:17 -0000	1.16
--- roadmap_label.c	24 Aug 2006 13:28:09 -0000	1.17
***************
*** 29,37 ****
   *     the cache clean, but that may not be enough if we get many labels.
   *
!  *   - New lables consume space from the label cache. It would be better if
   *     we could scan the old labels list when a label is added and just
   *     update its age. This will save us labels cache entries. It may
   *     require the usage of a hash table for doing the scan efficiently.
   *
   * SYNOPSYS:
   *
--- 29,44 ----
   *     the cache clean, but that may not be enough if we get many labels.
   *
!  *   - New labels consume space from the label cache. It would be better if
   *     we could scan the old labels list when a label is added and just
   *     update its age. This will save us labels cache entries. It may
   *     require the usage of a hash table for doing the scan efficiently.
   *
+  *   - Currently we keep in the cache labels and lines whose labels
+  *     were not drawn, just in case they can be drawn next time.  These
+  *     also consume space, though it's not wasted.  If we've hit the
+  *     "cache full" condition, we should consider splicing the "undrawn"
+  *     list onto the "spares" list rather than onto the cache, to free
+  *     up cache entries.
+  *
   * SYNOPSYS:
   *
***************
*** 85,89 ****
     short gen;    /* combination "drawn" flag and generation marker */
  
!    unsigned char invalid;
  
  } roadmap_label;
--- 92,96 ----
     short gen;    /* combination "drawn" flag and generation marker */
  
!    unsigned char notext;
  
  } roadmap_label;
***************
*** 317,321 ****
     }
  
!    cPtr->invalid = 0;
     cPtr->text = NULL;
  
--- 324,328 ----
     }
  
!    cPtr->notext = 0;
     cPtr->text = NULL;
  
***************
*** 334,339 ****
  
     /* the "generation" of a label is refreshed when it is re-added.
!     * later, labels cache entries more than a generation old will
!     * be discarded.
      */
     cPtr->gen = RoadMapLabelGeneration;
--- 341,345 ----
  
     /* the "generation" of a label is refreshed when it is re-added.
!     * later, labels cache entries can be aged, and discarded.
      */
     cPtr->gen = RoadMapLabelGeneration;
***************
*** 351,355 ****
     RoadMapListItem *item2, *tmp2;
     RoadMapListItem *end;
!    RoadMapList unused_labels;
     int width, ascent, descent;
     RoadMapGuiRect r;
--- 357,361 ----
     RoadMapListItem *item2, *tmp2;
     RoadMapListItem *end;
!    RoadMapList undrawn_labels;
     int width, ascent, descent;
     RoadMapGuiRect r;
***************
*** 361,366 ****
  #define NEWLIST 1
     int label_center_y;
  
!    ROADMAP_LIST_INIT(&unused_labels);
     roadmap_canvas_select_pen (RoadMapLabelPen);
  
--- 367,373 ----
  #define NEWLIST 1
     int label_center_y;
+    int cannot_label;
  
!    ROADMAP_LIST_INIT(&undrawn_labels);
     roadmap_canvas_select_pen (RoadMapLabelPen);
  
***************
*** 400,404 ****
                     /* Found a new version of this existing line */
  
!                    if (cPtr->invalid) {
                       cPtr->gen = ncPtr->gen;
  
--- 407,411 ----
                     /* Found a new version of this existing line */
  
!                    if (cPtr->notext) {
                       cPtr->gen = ncPtr->gen;
  
***************
*** 451,457 ****
           }
  
!          if ((cPtr->gen != RoadMapLabelGeneration) || cPtr->invalid) {
!             roadmap_list_insert
!                (&unused_labels, roadmap_list_remove(&cPtr->link));
              continue;
           }
--- 458,464 ----
           }
  
!          if ((cPtr->gen != RoadMapLabelGeneration) || cPtr->notext) {
!             roadmap_list_append
!                (&undrawn_labels, roadmap_list_remove(&cPtr->link));
              continue;
           }
***************
*** 470,480 ****
  
           if (!*cPtr->text) {
!             cPtr->invalid = 1;
  
!             /* We keep the invalid lines in the cache to avoid repeating
               * all these tests just to find that it's invalid, again!
               */
              roadmap_list_append
!                (&unused_labels, roadmap_list_remove(&cPtr->link));
              continue;
           }
--- 477,487 ----
  
           if (!*cPtr->text) {
!             cPtr->notext = 1;
  
!             /* We keep the no-label lines in the cache to avoid repeating
               * all these tests just to find that it's invalid, again!
               */
              roadmap_list_append
!                (&undrawn_labels, roadmap_list_remove(&cPtr->link));
              continue;
           }
***************
*** 492,499 ****
              if ((width * width / 16) > cPtr->featuresize_sq) {
                 /* Keep this one in the cache as the feature size may change
!                 * in the next run.
                  */
                 roadmap_list_append
!                   (&unused_labels, roadmap_list_remove(&cPtr->link));
                 continue;
              }
--- 499,507 ----
              if ((width * width / 16) > cPtr->featuresize_sq) {
                 /* Keep this one in the cache as the feature size may change
!                 * in the next run.  Keeping it is cheaper than looking it
!                 * up again.
                  */
                 roadmap_list_append
!                   (&undrawn_labels, roadmap_list_remove(&cPtr->link));
                 continue;
              }
***************
*** 540,548 ****
                 midpt.y > roadmap_canvas_height()) {
  
!             /* Keep this one in the cache as the feature size may change
!              * in the next run.
               */
              roadmap_list_append
!                (&unused_labels, roadmap_list_remove(&cPtr->link));
              continue;
           }
--- 548,557 ----
                 midpt.y > roadmap_canvas_height()) {
  
!             /* Keep this one in the cache -- it may move further on-screen
!              * in the next run.  Keeping it is cheaper than looking it
!              * up again.
               */
              roadmap_list_append
!                (&undrawn_labels, roadmap_list_remove(&cPtr->link));
              continue;
           }
***************
*** 555,558 ****
--- 564,569 ----
              end = item;
  
+          cannot_label = 0;
+ 
           ROADMAP_LIST_FOR_EACH_FROM_TO
                  ( RoadMapLabelCache.list_first, end, item2, tmp2) {
***************
*** 566,570 ****
              /* street already labelled */
              if(roadmap_plugin_same_street(&cPtr->street, &ocPtr->street)) {
!                cPtr->gen = 0;  /* label is a duplicate */
                 break;
              }
--- 577,581 ----
              /* street already labelled */
              if(roadmap_plugin_same_street(&cPtr->street, &ocPtr->street)) {
!                cannot_label++;  /* label is a duplicate */
                 break;
              }
***************
*** 576,580 ****
                 /* if labels are horizontal, bbox check is sufficient */
                 if(!angles) {
!                   cPtr->gen = 0;
                    break;
                 }
--- 587,591 ----
                 /* if labels are horizontal, bbox check is sufficient */
                 if(!angles) {
!                   cannot_label++;
                    break;
                 }
***************
*** 586,590 ****
                 aang = abs(cPtr->angle);
                 if (aang < 4 || aang > 86) {
!                   cPtr->gen = 0;
                    break;
                 }
--- 597,601 ----
                 aang = abs(cPtr->angle);
                 if (aang < 4 || aang > 86) {
!                   cannot_label++;
                    break;
                 }
***************
*** 592,596 ****
                 aang = abs(ocPtr->angle);
                 if (aang < 4 || aang > 86) {
!                   cPtr->gen = 0;
                    break;
                 }
--- 603,607 ----
                 aang = abs(ocPtr->angle);
                 if (aang < 4 || aang > 86) {
!                   cannot_label++;
                    break;
                 }
***************
*** 598,602 ****
                 /* otherwise we do the full poly check */
                 if (poly_overlap (ocPtr, cPtr)) {
!                   cPtr->gen = 0;
                    break;
                 }
--- 609,613 ----
                 /* otherwise we do the full poly check */
                 if (poly_overlap (ocPtr, cPtr)) {
!                   cannot_label++;
                    break;
                 }
***************
*** 604,614 ****
           }
  
!          if(cPtr->gen == 0) {
              /* Keep this one in the cache as we may need it for the next
!              * run.
               */
-             cPtr->gen = RoadMapLabelGeneration;
              roadmap_list_append
!                (&unused_labels, roadmap_list_remove(&cPtr->link));
              continue; /* next label */
           }
--- 615,624 ----
           }
  
!          if(cannot_label) {
              /* Keep this one in the cache as we may need it for the next
!              * run.  Keeping it is cheaper than looking it up again.
               */
              roadmap_list_append
!                (&undrawn_labels, roadmap_list_remove(&cPtr->link));
              continue; /* next label */
           }
***************
*** 628,632 ****
     } /* next list */
  
!    ROADMAP_LIST_SPLICE (&RoadMapLabelCache, &unused_labels);
     RoadMapLabelGeneration++;
     return 0;
--- 638,642 ----
     } /* next list */
  
!    ROADMAP_LIST_SPLICE (&RoadMapLabelCache, &undrawn_labels);
     RoadMapLabelGeneration++;
     return 0;

[Roadmap-commit] roadmap/src roadmap_screen.c,1.71,1.72

[Pascal F M. <pas...@us...>]

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

Modified Files:
	roadmap_screen.c 
Log Message:
Fix the order of parameters, as signaled by Sandor.

Index: roadmap_screen.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_screen.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** roadmap_screen.c	17 Aug 2006 13:43:57 -0000	1.71
--- roadmap_screen.c	22 Aug 2006 21:31:37 -0000	1.72
***************
*** 706,710 ****
              /* Check if the plugin wants to override the pen. */
              if (! roadmap_plugin_override_pen
!                      (line, layer, fips, pen_index, &pen)) {
                 pen = layer_pen;
              }
--- 706,710 ----
              /* Check if the plugin wants to override the pen. */
              if (! roadmap_plugin_override_pen
!                      (line, layer, pen_index, fips, &pen)) {
                 pen = layer_pen;
              }
***************
*** 818,822 ****
              /* Check if a plugin wants to override the pen */
              if (! roadmap_plugin_override_pen
!                       (real_line, layer, fips, pen_index, &pen)) {
                 pen = layer_pen;
              }
--- 818,822 ----
              /* Check if a plugin wants to override the pen */
              if (! roadmap_plugin_override_pen
!                       (real_line, layer, pen_index, fips, &pen)) {
                 pen = layer_pen;
              }

[Roadmap-commit] roadmap/src roadmap_plugin.c,1.2,1.3

[Pascal F M. <pas...@us...>]

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

Modified Files:
	roadmap_plugin.c 
Log Message:
Update the plugin count, as suggested by Sandor, but in a more careful way.

Index: roadmap_plugin.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_plugin.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_plugin.c	26 Jun 2006 19:59:53 -0000	1.2
--- roadmap_plugin.c	22 Aug 2006 21:27:59 -0000	1.3
***************
*** 55,58 ****
--- 55,59 ----
        if (hooks[i] == NULL) {
           hooks[i] = hook;
+ 	 PluginCount = i;
           return i;
        }