roadmap-commit — track CVS commits

[Roadmap-commit] roadmap_editor/src roadmap_address.c,1.3,1.4 roadmap_canvas.h,1.4,1.5 roadmap_display.c,1.5,1.6 roadmap_file.h,1.3,1.4 roadmap_layer.h,1.3,1.4 roadmap_line.c,1.2,1.3 roadmap_line.h,1.3,1.4 roadmap_navigate.c,1.8,1.9 roadmap_navigate.h,1.3,1.4 roadmap_plugin.c,1.4,1.5 roadmap_plugin.h,1.4,1.5 roadmap_screen.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-serv30667

Modified Files:
	roadmap_address.c roadmap_canvas.h roadmap_display.c 
	roadmap_file.h roadmap_layer.h roadmap_line.c roadmap_line.h 
	roadmap_navigate.c roadmap_navigate.h roadmap_plugin.c 
	roadmap_plugin.h roadmap_screen.c 
Log Message:
Add initial door to door navigation.

Index: roadmap_display.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_display.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** roadmap_display.c	2 May 2006 12:43:39 -0000	1.5
--- roadmap_display.c	15 May 2006 19:26:39 -0000	1.6
***************
*** 126,129 ****
--- 126,130 ----
      ROADMAP_SIGN(NULL, "Info",  SIGN_CENTER, NULL, "yellow", "black"),
      ROADMAP_SIGN(NULL, "Error", SIGN_CENTER, NULL, "red", "white"),
+     ROADMAP_SIGN("GPS", "Driving Instruction", SIGN_TOP, NULL, "red", "white"),
      ROADMAP_SIGN(NULL, NULL, 0, NULL, NULL, NULL)
  };

Index: roadmap_plugin.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_plugin.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_plugin.h	23 Apr 2006 14:29:47 -0000	1.4
--- roadmap_plugin.h	15 May 2006 19:26:39 -0000	1.5
***************
*** 27,31 ****
--- 27,33 ----
  
  #include "roadmap_canvas.h"
+ #include "roadmap_screen.h"
  
+ #define INVALID_PLUGIN_ID -1
  #define ROADMAP_PLUGIN_ID 0
  
***************
*** 74,77 ****
--- 76,86 ----
  void roadmap_plugin_line_to (const PluginLine *line, RoadMapPosition *pos);
  
+ void roadmap_plugin_get_line_points (const PluginLine *line,
+                                      RoadMapPosition  *from_pos,
+                                      RoadMapPosition  *to_pos,
+                                      int              *first_shape,
+                                      int              *last_shape,
+                                      RoadMapShapeItr  *shape_itr);
+ 
  int roadmap_plugin_get_id (const PluginLine *line);
  

Index: roadmap_line.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_line.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_line.c	8 May 2006 16:07:26 -0000	1.2
--- roadmap_line.c	15 May 2006 19:26:39 -0000	1.3
***************
*** 348,351 ****
--- 348,378 ----
  
  
+ int roadmap_line_shapes (int line, int *first_shape, int *last_shape) {
+ 
+    RoadMapPosition p1;
+ 
+    int square;
+    int first_shape_line;
+    int last_shape_line;
+ 
+    *first_shape = *last_shape = -1;
+    roadmap_point_position (RoadMapLineActive->Line[line].from, &p1);
+    square = roadmap_square_search (&p1);
+ 
+    if (roadmap_shape_in_square (square, &first_shape_line,
+                                         &last_shape_line) > 0) {
+ 
+       if (roadmap_shape_of_line (line, first_shape_line,
+                                        last_shape_line,
+                                        first_shape, last_shape) > 0) {
+ 
+          return 0;
+       }
+    }
+ 
+    return -1;
+ }
+ 
+ 
  void roadmap_line_points (int line, int *from, int *to) {
  

Index: roadmap_address.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_address.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_address.c	12 May 2006 13:16:43 -0000	1.3
--- roadmap_address.c	15 May 2006 19:26:39 -0000	1.4
***************
*** 433,439 ****
  
     context->history = roadmap_history_latest ('A');
! 
     if (context->history) {
!       roadmap_address_set (context);
     }
  }
--- 433,439 ----
  
     context->history = roadmap_history_latest ('A');
! 
     if (context->history) {
!       roadmap_address_set (context);
     }
  }

Index: roadmap_line.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_line.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_line.h	8 May 2006 16:07:26 -0000	1.3
--- roadmap_line.h	15 May 2006 19:26:39 -0000	1.4
***************
*** 33,36 ****
--- 33,37 ----
  int  roadmap_line_long (int index, int *line_id, RoadMapArea *area, int *cfcc);
  
+ int roadmap_line_shapes (int line, int *first_shape, int *last_shape);
  void roadmap_line_points (int line, int *from, int *to);
  void roadmap_line_from (int line, RoadMapPosition *position);

Index: roadmap_plugin.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_plugin.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_plugin.c	23 Apr 2006 14:29:47 -0000	1.4
--- roadmap_plugin.c	15 May 2006 19:26:39 -0000	1.5
***************
*** 33,36 ****
--- 33,38 ----
  #include "roadmap_locator.h"
  #include "roadmap_street.h"
+ #include "roadmap_screen.h"
+ #include "roadmap_shape.h"
  
  #include "roadmap_plugin.h"
***************
*** 199,202 ****
--- 201,248 ----
        
  
+ void roadmap_plugin_get_line_points (const PluginLine *line,
+                                      RoadMapPosition  *from_pos,
+                                      RoadMapPosition  *to_pos,
+                                      int              *first_shape,
+                                      int              *last_shape,
+                                      RoadMapShapeItr  *shape_itr) {
+ 
+    roadmap_plugin_line_from (line, from_pos);
+    roadmap_plugin_line_to (line, to_pos);
+ 
+    if (line->plugin_id == ROADMAP_PLUGIN_ID) {
+ 
+       roadmap_line_shapes (line->line_id, first_shape, last_shape);
+       *shape_itr = roadmap_shape_get_position;
+    } else {
+       RoadMapPluginHooks *hooks = get_hooks (line->plugin_id);
+       
+       if (hooks == NULL) {
+          roadmap_log (ROADMAP_ERROR, "plugin id:%d is missing.",
+                line->plugin_id);
+ 
+          *first_shape = *last_shape = -1;
+          *shape_itr   = NULL;
+          return;
+       }
+ 
+       //FIXME implement for plugins
+ #if 0
+       if (hooks->line_shapes != NULL) {
+          (*hooks->line_shapes) (line, first_shape, last_shape, shape_itr);
+ 
+       } else {
+ #else
+          {
+ #endif   
+          *first_shape = *last_shape = -1;
+          *shape_itr   = NULL;
+       }
+ 
+       return;
+    }
+ }
+ 
+ 
  void roadmap_plugin_line_from (const PluginLine *line, RoadMapPosition *pos) {
  

Index: roadmap_file.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_file.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_file.h	2 May 2006 12:43:53 -0000	1.3
--- roadmap_file.h	15 May 2006 19:26:39 -0000	1.4
***************
*** 39,42 ****
--- 39,43 ----
  typedef HANDLE RoadMapFile; /* WIN32 style. */
  #define ROADMAP_FILE_IS_VALID(f) (f != INVALID_HANDLE_VALUE)
+ #define ROADMAP_INVALID_FILE INVALID_HANDLE_VALUE
  
  #else
***************
*** 46,49 ****
--- 47,51 ----
  typedef int RoadMapFile; /* UNIX style. */
  #define ROADMAP_FILE_IS_VALID(f) (f != (RoadMapFile)-1)
+ #define ROADMAP_INVALID_FILE -1
  
  #endif

Index: roadmap_navigate.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_navigate.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_navigate.h	25 Dec 2005 23:07:36 -0000	1.3
--- roadmap_navigate.h	15 May 2006 19:26:39 -0000	1.4
***************
*** 56,59 ****
--- 56,66 ----
  #define ROADMAP_TRACKING_NULL  {0, PLUGIN_STREET_NULL, 0, 0, 0, 0, PLUGIN_LINE_NULL, {0, 0}, {0, 0, 0}};
  
+ typedef struct {
+    void (*update) (RoadMapPosition *position, PluginLine *current);
+    void (*get_next_line)
+           (PluginLine *current, int direction, PluginLine *next);
+ 
+ } RoadMapNavigateRouteCB;
+ 
  void roadmap_navigate_disable (void);
  void roadmap_navigate_enable  (void);
***************
*** 74,76 ****
--- 81,90 ----
                   RoadMapNeighbour *line, int direction);
  
+ int roadmap_navigate_get_current (RoadMapPosition *position,
+                                    PluginLine *line,
+                                    int *direction);
+ 
+ void roadmap_navigate_route (RoadMapNavigateRouteCB callbacks);
+ void roadmap_navigate_end_route (RoadMapNavigateRouteCB callbacks);
+ 
  #endif // INCLUDE__ROADMAP_NAVIGATE__H

Index: roadmap_canvas.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_canvas.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_canvas.h	2 May 2006 12:41:17 -0000	1.4
--- roadmap_canvas.h	15 May 2006 19:26:39 -0000	1.5
***************
*** 87,90 ****
--- 87,91 ----
  void roadmap_canvas_set_foreground (const char *color);
  void roadmap_canvas_set_thickness  (int thickness);
+ int  roadmap_canvas_get_thickness  (RoadMapPen pen);
  void roadmap_canvas_set_opacity (int opacity);
  

Index: roadmap_navigate.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_navigate.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** roadmap_navigate.c	29 Apr 2006 11:15:52 -0000	1.8
--- roadmap_navigate.c	15 May 2006 19:26:39 -0000	1.9
***************
*** 48,51 ****
--- 48,64 ----
                          ROADMAP_CONFIG_ITEM("Navigation", "Enable");
  
+ typedef struct {
+    RoadMapNavigateRouteCB callbacks;
+    PluginLine current_line;
+    PluginLine next_line;
+    int enabled;
+    
+ } RoadMapNavigateRoute;
+ 
+ #define ROADMAP_NAVIGATE_ROUTE_NULL \
+ { {0}, PLUGIN_LINE_NULL, PLUGIN_LINE_NULL, 0 }
+ 
+ static RoadMapNavigateRoute RoadMapRouteInfo;
+ 
  /* The navigation flag will be set according to the session's content,
   * so that the user selected state is kept from one session to
***************
*** 65,69 ****
  static RoadMapNeighbour RoadMapNeighbourhood[ROADMAP_NEIGHBOURHOUD];
  
- 
  static void roadmap_navigate_trace (const char *format, PluginLine *line) {
      
--- 78,81 ----
***************
*** 281,285 ****
          connected =
              roadmap_fuzzy_connected
!                 (line, previous_line, &tracked->entry);
      } else {
          connected = roadmap_fuzzy_not (0);
--- 293,297 ----
          connected =
              roadmap_fuzzy_connected
!               (line, previous_line, tracked->line_direction, &tracked->entry);
      } else {
          connected = roadmap_fuzzy_not (0);
***************
*** 593,596 ****
--- 605,614 ----
              }
  
+             if (RoadMapRouteInfo.enabled) {
+ 
+                RoadMapRouteInfo.callbacks.update
+                            (&RoadMapLatestPosition,
+                             &RoadMapConfirmedLine.line);
+             }
              return; /* We are on the same street. */
          }
***************
*** 621,624 ****
--- 639,644 ----
      if (roadmap_fuzzy_is_acceptable (best)) {
  
+         PluginLine old_line = RoadMapConfirmedLine.line;
+ 
          if (roadmap_plugin_activate_db
                  (&RoadMapNeighbourhood[found].line) == -1) {
***************
*** 626,642 ****
          }
  
-         if (!roadmap_plugin_same_line
-               (&RoadMapConfirmedLine.line, &RoadMapNeighbourhood[found].line)) {
-             if (PLUGIN_VALID(RoadMapConfirmedLine.line)) {
-                 roadmap_navigate_trace
-                     ("Quit street %N", &RoadMapConfirmedLine.line);
-             }
-             roadmap_navigate_trace
-                 ("Enter street %N, %C|Enter street %N",
-                  &RoadMapNeighbourhood[found].line);
- 
-             roadmap_display_hide ("Approach");
-         }
- 
          RoadMapConfirmedLine   = RoadMapNeighbourhood[found];
          RoadMapConfirmedStreet = nominated;
--- 646,649 ----
***************
*** 657,660 ****
--- 664,689 ----
          }
  
+         if (!roadmap_plugin_same_line
+               (&RoadMapConfirmedLine.line, &old_line)) {
+             if (PLUGIN_VALID(old_line)) {
+                 roadmap_navigate_trace
+                     ("Quit street %N", &old_line);
+             }
+             roadmap_navigate_trace
+                 ("Enter street %N, %C|Enter street %N",
+                  &RoadMapConfirmedLine.line);
+ 
+             roadmap_display_hide ("Approach");
+ 
+             if (RoadMapRouteInfo.enabled) {
+ 
+                RoadMapRouteInfo.callbacks.get_next_line
+                   (&RoadMapConfirmedLine.line,
+                    RoadMapConfirmedStreet.line_direction,
+                    &RoadMapRouteInfo.next_line);
+             }
+         }
+ 
+ 
      } else {
  
***************
*** 683,684 ****
--- 712,757 ----
  }
  
+ 
+ void roadmap_navigate_route (RoadMapNavigateRouteCB callbacks) {
+ 
+    RoadMapRouteInfo.callbacks = callbacks;
+ 
+    if (RoadMapConfirmedStreet.valid) {
+ 
+       RoadMapRouteInfo.current_line = RoadMapConfirmedLine.line;
+ 
+       callbacks.get_next_line (&RoadMapConfirmedLine.line,
+                                RoadMapConfirmedStreet.line_direction,
+                                &RoadMapRouteInfo.next_line);
+    }
+ 
+    RoadMapRouteInfo.enabled = 1;
+ }
+ 
+ 
+ void roadmap_navigate_end_route (RoadMapNavigateRouteCB callbacks) {
+ 
+    RoadMapRouteInfo.enabled = 0;
+ }
+ 
+ 
+ int roadmap_navigate_get_current (RoadMapPosition *position,
+                                    PluginLine *line,
+                                    int *direction) {
+ 
+    *position = RoadMapLatestPosition;
+    
+    if (RoadMapConfirmedStreet.valid) {
+       
+       *line = RoadMapConfirmedLine.line;
+       *direction = RoadMapConfirmedStreet.line_direction;
+       return 0;
+    } else {
+ 
+       line->plugin_id = -1;
+       *direction = ROUTE_DIRECTION_NONE;
+       return -1;
+    }
+ }
+ 
+ 

Index: roadmap_screen.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_screen.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** roadmap_screen.c	8 May 2006 16:07:26 -0000	1.10
--- roadmap_screen.c	15 May 2006 19:26:39 -0000	1.11
***************
*** 1386,1389 ****
--- 1386,1390 ----
  
     RoadMapScreenRotation = 0;
+    roadmap_state_refresh ();
     roadmap_screen_rotate (0);
  }

Index: roadmap_layer.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_layer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_layer.h	23 Apr 2006 14:26:54 -0000	1.3
--- roadmap_layer.h	15 May 2006 19:26:39 -0000	1.4
***************
*** 35,39 ****
  int  roadmap_layer_is_visible (int layer);
  
! RoadMapPen roadmap_layer_get_pen (int layer, int pen_type);
  
  void roadmap_layer_adjust (void);
--- 35,39 ----
  int  roadmap_layer_is_visible (int layer);
  
! RoadMapPen roadmap_layer_get_pen (int layer, int pen_type);
  
  void roadmap_layer_adjust (void);

[Roadmap-commit] roadmap_editor/src roadmap_turns.c,1.1,1.2

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

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

Modified Files:
	roadmap_turns.c 
Log Message:
Do not allow u-turns.

Index: roadmap_turns.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_turns.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_turns.c	22 Mar 2006 08:43:29 -0000	1.1
--- roadmap_turns.c	15 May 2006 19:26:09 -0000	1.2
***************
*** 265,268 ****
--- 265,274 ----
     int i;
  
+    from_line = abs(from_line);
+    to_line = abs(to_line);
+ 
+    /* no U turns */
+    if (from_line == to_line) return 1;
+    
     roadmap_point_position (node, &pos);
  

[Roadmap-commit] roadmap_editor/src roadmap_config.c,1.3,1.4 roadmap_config.h,1.2,1.3

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

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

Modified Files:
	roadmap_config.c roadmap_config.h 
Log Message:
Add password entry widget.

Index: roadmap_config.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_config.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_config.c	2 May 2006 12:42:22 -0000	1.3
--- roadmap_config.c	15 May 2006 19:25:46 -0000	1.4
***************
*** 257,260 ****
--- 257,271 ----
  
  
+ void roadmap_config_declare_password (const char *config,
+                                       RoadMapConfigDescriptor *descriptor,
+                                       const char *default_value) {
+ 
+    RoadMapConfig *file = roadmap_config_search_file (config);
+ 
+    roadmap_config_new_item
+       (file, descriptor, default_value, ROADMAP_CONFIG_PASSWORD);
+ }
+ 
+ 
  RoadMapConfigItem *roadmap_config_declare_enumeration (const char *config,
                                           RoadMapConfigDescriptor *descriptor,

Index: roadmap_config.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_config.h	2 May 2006 12:42:22 -0000	1.2
--- roadmap_config.h	15 May 2006 19:25:46 -0000	1.3
***************
*** 33,36 ****
--- 33,37 ----
  #define ROADMAP_CONFIG_ENUM     1
  #define ROADMAP_CONFIG_COLOR    2
+ #define ROADMAP_CONFIG_PASSWORD 3
  
  
***************
*** 57,60 ****
--- 58,65 ----
           RoadMapConfigDescriptor *descriptor, const char *default_value);
  
+ void roadmap_config_declare_password
+         (const char *file,
+          RoadMapConfigDescriptor *descriptor, const char *default_value);
+ 
  RoadMapConfigItem *roadmap_config_declare_enumeration
          (const char *file,

[Roadmap-commit] roadmap_editor/src roadmap_dialog.h,1.2,1.3 roadmap_preferences.c,1.2,1.3

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

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

Modified Files:
	roadmap_dialog.h roadmap_preferences.c 
Log Message:
Add password entry widget.

Index: roadmap_dialog.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_dialog.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_dialog.h	12 May 2006 13:14:17 -0000	1.2
--- roadmap_dialog.h	15 May 2006 19:22:36 -0000	1.3
***************
*** 78,81 ****
--- 78,84 ----
                                 RoadMapDialogCallback callback);
  
+ /* Add one hidden text entry item to the current dialog. */
+ void roadmap_dialog_new_password (const char *frame, const char *name);
+ 
  /* Add one color selection item to to the current dialog. */
  void roadmap_dialog_new_color (const char *frame, const char *name);

Index: roadmap_preferences.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_preferences.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_preferences.c	12 May 2006 13:17:41 -0000	1.2
--- roadmap_preferences.c	15 May 2006 19:22:36 -0000	1.3
***************
*** 197,200 ****
--- 197,205 ----
           break;
  
+       case ROADMAP_CONFIG_PASSWORD:
+ 
+          roadmap_dialog_new_password (cursor->category, cursor->name);
+          break;
+ 
        default:
           roadmap_log (ROADMAP_FATAL,

[Roadmap-commit] roadmap_editor/src roadmap_fuzzy.c,1.2,1.3 roadmap_fuzzy.h,1.2,1.3

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

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

Modified Files:
	roadmap_fuzzy.c roadmap_fuzzy.h 
Log Message:
Fix connection fuzzy.

Index: roadmap_fuzzy.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_fuzzy.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_fuzzy.h	28 Nov 2005 19:36:34 -0000	1.2
--- roadmap_fuzzy.h	15 May 2006 19:21:06 -0000	1.3
***************
*** 45,48 ****
--- 45,49 ----
                   (const RoadMapNeighbour *street,
                    const RoadMapNeighbour *reference,
+                         int               direction,
                          RoadMapPosition  *connection);
  

Index: roadmap_fuzzy.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_fuzzy.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_fuzzy.c	28 Nov 2005 19:36:34 -0000	1.2
--- roadmap_fuzzy.c	15 May 2006 19:21:06 -0000	1.3
***************
*** 36,39 ****
--- 36,40 ----
  #include "roadmap_locator.h"
  #include "roadmap_plugin.h"
+ #include "roadmap_line_route.h"
  
  #include "roadmap_fuzzy.h"
***************
*** 129,132 ****
--- 130,134 ----
                   (const RoadMapNeighbour *street,
                    const RoadMapNeighbour *reference,
+                         int               direction,
                          RoadMapPosition  *connection) {
  
***************
*** 164,169 ****
              if ((line_point[i].latitude == reference_point[j].latitude) &&
                  (line_point[i].longitude == reference_point[j].longitude)) {
!                 *connection = line_point[i];
!                 return (FUZZY_TRUTH_MAX * 2) / 3;
              }
          }
--- 166,190 ----
              if ((line_point[i].latitude == reference_point[j].latitude) &&
                  (line_point[i].longitude == reference_point[j].longitude)) {
!                
!                if (direction == ROUTE_DIRECTION_AGAINST_LINE) {
! 
!                   if (i == 0) {
!                      /* we are heading out of this road */
! 
!                      return roadmap_fuzzy_false ();
!                   }
! 
!                } else {
! 
!                   if (i == 1) {
!                      /* we are heading out of this road */
! 
!                      return roadmap_fuzzy_false ();
!                   }
!                }
! 
!                *connection = line_point[i];
! 
!                return (FUZZY_TRUTH_MAX * 2) / 3;
              }
          }

[Roadmap-commit] roadmap_editor/src font.ttf,1.1,1.2

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

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

Modified Files:
	font.ttf 
Log Message:
Replace font with FreeSansBold.

Index: font.ttf
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/font.ttf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs8TUPpB and /tmp/cvspnz4Xz differ

[Roadmap-commit] roadmap_editor/src/win32/wince_env/libroadmap libroadmap.vcp,1.8,1.9

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

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2707/libroadmap

Modified Files:
	libroadmap.vcp 
Log Message:
Update evc project files.

Index: libroadmap.vcp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap/libroadmap.vcp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** libroadmap.vcp	29 Apr 2006 10:53:08 -0000	1.8
--- libroadmap.vcp	8 May 2006 16:41:13 -0000	1.9
***************
*** 105,109 ****
  CPP=cl.exe
  # ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
! # ADD CPP /nologo /W3 /Oxs /I "./wince_os" /I "../../wince_os/" /I "../../" /I "l:\shared\roadmap_editor\src" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 105,109 ----
  CPP=cl.exe
  # ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
! # ADD CPP /nologo /W3 /Oxs /I "..\..\.." /I "..\..\..\dglib" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 131,135 ****
  CPP=cl.exe
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
! # ADD CPP /nologo /W3 /Zi /Od /I "./wince_os" /I "../../wince_os/" /I "../../" /I "l:\shared\roadmap_editor\src" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 131,135 ----
  CPP=cl.exe
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
! # ADD CPP /nologo /W3 /Zi /Od /I "..\..\.." /I "..\..\..\dglib" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 183,187 ****
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /I "l:\shared\roadmap_editor\src" /I "l:\shared\roadmap_editor\src\dglib" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 183,187 ----
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /I "..\..\.." /I "..\..\..\dglib" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 209,213 ****
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /Zi /I "l:\shared\roadmap_editor\src" /I "l:\shared\roadmap_editor\src\dglib" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 209,213 ----
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /Zi /I "..\..\.." /I "..\..\..\dglib" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 1964,1967 ****
--- 1964,1968 ----
  	"..\..\..\roadmap_pointer.h"\
  	"..\..\..\roadmap_screen.h"\
+ 	"..\..\..\roadmap_screen_obj.h"\
  	"..\..\..\roadmap_serial.h"\
  	"..\..\..\roadmap_shape.h"\
***************
*** 1969,1972 ****
--- 1970,1974 ----
  	"..\..\..\roadmap_square.h"\
  	"..\..\..\roadmap_street.h"\
+ 	"..\..\..\roadmap_string.h"\
  	"..\..\..\roadmap_trip.h"\
  	"..\..\..\roadmap_types.h"\
***************
*** 4784,4787 ****
--- 4786,4790 ----
  	"..\..\..\roadmap_list.h"\
  	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_message.h"\
  	"..\..\..\roadmap_net.h"\
  	"..\..\..\roadmap_nmea.h"\
***************
*** 4809,4812 ****
--- 4812,4816 ----
  	"..\..\..\roadmap_list.h"\
  	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_message.h"\
  	"..\..\..\roadmap_net.h"\
  	"..\..\..\roadmap_nmea.h"\
***************
*** 4814,4817 ****
--- 4818,4822 ----
  	"..\..\..\roadmap_serial.h"\
  	"..\..\..\roadmap_spawn.h"\
+ 	"..\..\..\roadmap_state.h"\
  	"..\..\..\roadmap_string.h"\
  	"..\..\..\roadmap_types.h"\
***************
*** 5855,5858 ****
--- 5860,5864 ----
  	"..\..\..\roadmap_math.h"\
  	"..\..\..\roadmap_square.h"\
+ 	"..\..\..\roadmap_state.h"\
  	"..\..\..\roadmap_trigonometry.h"\
  	"..\..\..\roadmap_types.h"\
***************
*** 5870,5873 ****
--- 5876,5880 ----
  	"..\..\..\roadmap_math.h"\
  	"..\..\..\roadmap_square.h"\
+ 	"..\..\..\roadmap_state.h"\
  	"..\..\..\roadmap_trigonometry.h"\
  	"..\..\..\roadmap_types.h"\
***************
*** 6976,6991 ****
  DEP_CPP_ROADMAP_ST=\
  	"..\..\..\roadmap.h"\
! 	"..\..\..\roadmap_file.h"\
! 	"..\..\..\roadmap_gps.h"\
! 	"..\..\..\roadmap_io.h"\
! 	"..\..\..\roadmap_list.h"\
! 	"..\..\..\roadmap_net.h"\
! 	"..\..\..\roadmap_serial.h"\
! 	"..\..\..\roadmap_spawn.h"\
! 	"..\..\..\roadmap_states.h"\
! 	"..\..\..\roadmap_string.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
- 	"..\..\win32_serial.h"\
  	
  
--- 6983,6989 ----
  DEP_CPP_ROADMAP_ST=\
  	"..\..\..\roadmap.h"\
! 	"..\..\..\roadmap_state.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
  	
  
***************
*** 6994,7009 ****
  DEP_CPP_ROADMAP_ST=\
  	"..\..\..\roadmap.h"\
! 	"..\..\..\roadmap_file.h"\
! 	"..\..\..\roadmap_gps.h"\
! 	"..\..\..\roadmap_io.h"\
! 	"..\..\..\roadmap_list.h"\
! 	"..\..\..\roadmap_net.h"\
! 	"..\..\..\roadmap_serial.h"\
! 	"..\..\..\roadmap_spawn.h"\
! 	"..\..\..\roadmap_states.h"\
! 	"..\..\..\roadmap_string.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
- 	"..\..\win32_serial.h"\
  	
  
--- 6992,6998 ----
  DEP_CPP_ROADMAP_ST=\
  	"..\..\..\roadmap.h"\
! 	"..\..\..\roadmap_state.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
  	
  

[Roadmap-commit] roadmap_editor/src/win32/wince_env/libwinceguiroadmap libwinceguiroadmap.vcp,1.4,1.5

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

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libwinceguiroadmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2707/libwinceguiroadmap

Modified Files:
	libwinceguiroadmap.vcp 
Log Message:
Update evc project files.

Index: libwinceguiroadmap.vcp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libwinceguiroadmap/libwinceguiroadmap.vcp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** libwinceguiroadmap.vcp	29 Apr 2006 10:53:08 -0000	1.4
--- libwinceguiroadmap.vcp	8 May 2006 16:41:13 -0000	1.5
***************
*** 105,109 ****
  CPP=cl.exe
  # ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
! # ADD CPP /nologo /W3 /Oxs /I "./wince_os" /I "../../" /I "c:\projects\agg23\font_freetype" /I "../../../freetype/include" /I "../../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 105,109 ----
  CPP=cl.exe
  # ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
! # ADD CPP /nologo /W3 /Oxs /I "./wince_os" /I "../../" /I "c:\projects\agg23\font_freetype" /I "../../../freetype/include" /I "../../../" /I "../../../agg23/font_freetype" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 131,135 ****
  CPP=cl.exe
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
! # ADD CPP /nologo /W3 /Zi /Od /I "./wince_os" /I "../../" /I "c:\projects\agg23\font_freetype" /I "../../../freetype/include" /I "../../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 131,135 ----
  CPP=cl.exe
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
! # ADD CPP /nologo /W3 /Zi /Od /I "./wince_os" /I "../../" /I "c:\projects\agg23\font_freetype" /I "../../../freetype/include" /I "../../../" /I "../../../agg23/font_freetype" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 183,187 ****
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /I "c:\projects\agg23\font_freetype" /I "../../../freetype/include" /I "../../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 183,187 ----
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /I "../../../agg23/font_freetype" /I "../../../freetype/include" /I "../../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 209,213 ****
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /Zi /I "c:\projects\agg23\font_freetype" /I "../../../freetype/include" /I "../../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 209,213 ----
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /Zi /I "../../../agg23/font_freetype" /I "../../../freetype/include" /I "../../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 425,428 ****
--- 425,429 ----
  	"..\..\..\agg23\include\agg_math_stroke.h"\
  	"..\..\..\agg23\include\agg_path_storage.h"\
+ 	"..\..\..\agg23\include\agg_pixfmt_rgb.h"\
  	"..\..\..\agg23\include\agg_pixfmt_rgb_packed.h"\
  	"..\..\..\agg23\include\agg_rasterizer_outline.h"\
***************
*** 440,443 ****
--- 441,445 ----
  	"..\..\..\agg23\include\agg_vcgen_stroke.h"\
  	"..\..\..\agg23\include\agg_vertex_sequence.h"\
+ 	"..\..\..\agg23\include\platform\win32\agg_win32_bmp.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
***************
*** 598,604 ****
--- 600,616 ----
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_dialog.h"\
+ 	"..\..\..\roadmap_factory.h"\
+ 	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_main.h"\
+ 	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
  	"..\..\..\roadmap_start.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	{$(INCLUDE)}"aygshell.h"\
  	{$(INCLUDE)}"sipapi.h"\
***************
*** 773,780 ****
--- 785,802 ----
  DEP_CPP_ROADMAP_=\
  	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_factory.h"\
+ 	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_main.h"\
  	"..\..\..\roadmap_messagebox.h"\
+ 	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
  	"..\..\..\roadmap_start.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  

[Roadmap-commit] roadmap_editor/src/gtk2 roadmap_canvas_agg.cpp,1.2,1.3

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

Update of /cvsroot/roadmap/roadmap_editor/src/gtk2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2264

Modified Files:
	roadmap_canvas_agg.cpp 
Log Message:
Convert bitmaps to rgba32.

Index: roadmap_canvas_agg.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/gtk2/roadmap_canvas_agg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_canvas_agg.cpp	29 Apr 2006 10:54:10 -0000	1.2
--- roadmap_canvas_agg.cpp	8 May 2006 16:40:32 -0000	1.3
***************
*** 36,40 ****
  #include <agg_conv_stroke.h>
  #include "util/agg_color_conv_rgb8.h"
- #include "util/agg_color_conv_rgb16.h"
  #include <agg_conv_contour.h>
  #include <agg_conv_transform.h>
--- 36,39 ----
***************
*** 109,112 ****
--- 108,112 ----
  
     if (gdk_pixbuf_get_colorspace (pixbuf) != GDK_COLORSPACE_RGB) {
+       g_object_unref (pixbuf);
        return NULL;
     }
***************
*** 117,121 ****
     int height = gdk_pixbuf_get_height (pixbuf);
  
!    unsigned char *buf = (unsigned char *)malloc (width*height*3);
  
     agg::rendering_buffer tmp_rbuf (gdk_pixbuf_get_pixels (pixbuf),
--- 117,121 ----
     int height = gdk_pixbuf_get_height (pixbuf);
  
!    unsigned char *buf = (unsigned char *)malloc (width*height*4);
  
     agg::rendering_buffer tmp_rbuf (gdk_pixbuf_get_pixels (pixbuf),
***************
*** 124,140 ****
  
     agg::pixfmt_rgb24 tmp_pixfmt (tmp_rbuf);
-    agg::renderer_base<agg::pixfmt_rgb24> tmp_ren(tmp_pixfmt);
  
     RoadMapImage image =  new roadmap_canvas_image();
     
!    /*
!    int stride = ((width * 2 + 3) >> 2) << 2;
!    image->rbuf.attach (buf, width, height, stride);
!    image->ren.attach (image->pixfmt);
!    agg::color_conv(&image->rbuf, &tmp_rbuf, agg::color_conv_rgb24_to_rgb565());
!    */
!    image->rbuf.attach (gdk_pixbuf_get_pixels (pixbuf),
!                                   width, height,
!                                   gdk_pixbuf_get_rowstride (pixbuf));
     return image;
  }
--- 124,137 ----
  
     agg::pixfmt_rgb24 tmp_pixfmt (tmp_rbuf);
  
     RoadMapImage image =  new roadmap_canvas_image();
     
!    image->rbuf.attach (buf,
!                        width, height,
!                        width * 4);
!    agg::color_conv(&image->rbuf, &tmp_rbuf, agg::color_conv_rgb24_to_rgba32());
!    
!    g_object_unref (pixbuf);
! 
     return image;
  }

[Roadmap-commit] roadmap_editor/src/win32 roadmap_canvas_agg.cpp,1.2,1.3

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

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

Modified Files:
	roadmap_canvas_agg.cpp 
Log Message:
Convert bitmaps to rgba32.

Index: roadmap_canvas_agg.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_canvas_agg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_canvas_agg.cpp	2 May 2006 12:59:21 -0000	1.2
--- roadmap_canvas_agg.cpp	8 May 2006 16:37:55 -0000	1.3
***************
*** 49,53 ****
  #include "agg_pixfmt_rgb_packed.h"
  #include "agg_path_storage.h"
! #include "platform/win32/agg_win32_bmp.h"
  
  extern "C" {
--- 49,54 ----
  #include "agg_pixfmt_rgb_packed.h"
  #include "agg_path_storage.h"
! #include "util/agg_color_conv_rgb8.h"
! #include "platform/win32/agg_win32_bmp.h"
  
  extern "C" {
***************
*** 224,268 ****
  }
  
! RoadMapImage roadmap_canvas_agg_load_image (const char *path, const char *file_name) {
! 
!    char *full_name = roadmap_path_join (path, file_name);
! 
!    agg::pixel_map pmap_tmp;
!    if(!pmap_tmp.load_from_bmp(full_name)) {
!       free(full_name);
!       return NULL;
!    }
! 
!    free(full_name);
! 
!    if (pmap_tmp.bpp() != 24) {
!       return NULL;
!    }
!    
!    int width = pmap_tmp.width();
!    int height = pmap_tmp.height();
!    int stride = pmap_tmp.stride();
! 
!    unsigned char *buf = (unsigned char *)malloc (stride * height);
!    memcpy (buf, pmap_tmp.buf(), stride * height);
! 
!    //agg::rendering_buffer tmp_rbuf (pmap_tmp.buf(),
!    //                              width, height,
!    //                               pmap_tmp.stride());
! 
!    //agg::pixfmt_rgb24 tmp_pixfmt (tmp_rbuf);
!    //agg::renderer_base<agg::pixfmt_rgb24> tmp_ren(tmp_pixfmt);
! 
!    RoadMapImage image =  new roadmap_canvas_image();
!    
!    /*
!    int stride = ((width * 2 + 3) >> 2) << 2;
!    image->rbuf.attach (buf, width, height, stride);
!    image->ren.attach (image->pixfmt);
!    agg::color_conv(&image->rbuf, &tmp_rbuf, agg::color_conv_rgb24_to_rgb565());
!    */
!    image->rbuf.attach (buf,
!                        width, height,
!                        -stride);
!    return image;
! }
--- 225,261 ----
  }
  
! RoadMapImage roadmap_canvas_agg_load_image (const char *path, const char *file_name) {
! 
!    char *full_name = roadmap_path_join (path, file_name);
! 
!    agg::pixel_map pmap_tmp;
!    if(!pmap_tmp.load_from_bmp(full_name)) {
!       free(full_name);
!       return NULL;
!    }
! 
!    free(full_name);
! 
!    if (pmap_tmp.bpp() != 24) {
!       return NULL;
!    }
!    
!    int width = pmap_tmp.width();
!    int height = pmap_tmp.height();
!    int stride = pmap_tmp.stride();
! 
!    unsigned char *buf = (unsigned char *)malloc (width * height * 4);
! 
!    agg::rendering_buffer tmp_rbuf (pmap_tmp.buf(),
!                                    width, height,
!                                    -pmap_tmp.stride());
! 
!    RoadMapImage image =  new roadmap_canvas_image();
!    
!    image->rbuf.attach (buf,
!                        width, height,
!                        width * 4);
! 
!    agg::color_conv(&image->rbuf, &tmp_rbuf, agg::color_conv_bgr24_to_rgba32());
!    return image;
! }

[Roadmap-commit] roadmap_editor/src/agg23 roadmap_canvas.cpp,1.4,1.5

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

Update of /cvsroot/roadmap/roadmap_editor/src/agg23
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32662

Modified Files:
	roadmap_canvas.cpp 
Log Message:
Fix text drawing.

Index: roadmap_canvas.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/agg23/roadmap_canvas.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_canvas.cpp	2 May 2006 15:09:57 -0000	1.4
--- roadmap_canvas.cpp	8 May 2006 16:37:09 -0000	1.5
***************
*** 431,437 ****
        int y = centers[i].y;
        
-       ras.reset ();
- 
-       
        agg::ellipse e( x, y, r, r);
        path.add_path(e);
--- 431,434 ----
***************
*** 613,616 ****
--- 610,614 ----
           ResumeCAPAll();
  #endif
+          ras.reset();
           ras.add_path(tr);
           agg::render_scanlines(ras, sl, ren_solid);
***************
*** 687,693 ****
  }
  
- #include "agg_span_interpolator_linear.h"
- #include "agg_span_image_filter_rgb.h"
- 
  void roadmap_canvas_draw_image (RoadMapImage image, RoadMapGuiPoint *pos,
                                  int opacity, int mode) {
--- 685,688 ----

[Roadmap-commit] roadmap_editor/src/agg23/include agg_pixfmt_rgb_packed.h,1.3,1.4

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

Update of /cvsroot/roadmap/roadmap_editor/src/agg23/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32134

Modified Files:
	agg_pixfmt_rgb_packed.h 
Log Message:
Add cover support for rgb_packed .

Index: agg_pixfmt_rgb_packed.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/agg23/include/agg_pixfmt_rgb_packed.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** agg_pixfmt_rgb_packed.h	2 May 2006 12:52:57 -0000	1.3
--- agg_pixfmt_rgb_packed.h	8 May 2006 16:36:23 -0000	1.4
***************
*** 1070,1079 ****
          {
              typedef typename SrcPixelFormatRenderer::order_type src_order;
              const value_type* psrc = (const value_type*)psrc_;
              pixel_type* pdst = (pixel_type*)m_rbuf->row(ydst) + xdst;
              do 
              {
!                 value_type alpha = base_mask;
!                 if(alpha)
                  {
                      if(alpha == base_mask && cover == 255)
--- 1070,1083 ----
          {
              typedef typename SrcPixelFormatRenderer::order_type src_order;
+ 
              const value_type* psrc = (const value_type*)psrc_;
              pixel_type* pdst = (pixel_type*)m_rbuf->row(ydst) + xdst;
              do 
              {
!                 value_type alpha = psrc[src_order::A];
!                 if(alpha && !
! 			(psrc[src_order::R] == 255 &&
! 			 psrc[src_order::G] == 255 &&
! 			 psrc[src_order::B] == 255))
                  {
                      if(alpha == base_mask && cover == 255)
***************
*** 1085,1097 ****
                      else
                      {
                          m_blender.blend_pix(pdst, 
                                              psrc[src_order::R],
                                              psrc[src_order::G],
                                              psrc[src_order::B],
!                                             cover,
                                              cover);
                      }
                  }
!                 psrc += 3;
                  ++pdst;
              }
--- 1089,1104 ----
                      else
                      {
+ 			if (alpha == base_mask) {
+ 				alpha = cover;
+ 			}
                          m_blender.blend_pix(pdst, 
                                              psrc[src_order::R],
                                              psrc[src_order::G],
                                              psrc[src_order::B],
!                                             alpha,
                                              cover);
                      }
                  }
!                 psrc += 4;
                  ++pdst;
              }

[Roadmap-commit] roadmap_editor/src roadmap_canvas_agg.h,1.2,1.3

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

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

Modified Files:
	roadmap_canvas_agg.h 
Log Message:
Convert bitmaps to rgba32.

Index: roadmap_canvas_agg.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_canvas_agg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_canvas_agg.h	2 May 2006 12:41:17 -0000	1.2
--- roadmap_canvas_agg.h	8 May 2006 16:23:17 -0000	1.3
***************
*** 26,35 ****
  
  #include "roadmap_gui.h"
! #include "agg_pixfmt_rgb.h"
  #include "agg_pixfmt_rgb_packed.h"
  
  struct roadmap_canvas_image {
     agg::rendering_buffer rbuf;
!    agg::pixfmt_bgr24 pixfmt;
  
     roadmap_canvas_image():pixfmt(rbuf) {}
--- 26,35 ----
  
  #include "roadmap_gui.h"
! #include "agg_pixfmt_rgba.h"
  #include "agg_pixfmt_rgb_packed.h"
  
  struct roadmap_canvas_image {
     agg::rendering_buffer rbuf;
!    agg::pixfmt_rgba32 pixfmt;
  
     roadmap_canvas_image():pixfmt(rbuf) {}

[Roadmap-commit] roadmap_editor/src roadmap_line.c,1.1.1.1,1.2 roadmap_line.h,1.2,1.3 roadmap_screen.c,1.9,1.10 roadmap_screen.h,1.5,1.6 roadmap_street.c,1.4,1.5

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

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

Modified Files:
	roadmap_line.c roadmap_line.h roadmap_screen.c 
	roadmap_screen.h roadmap_street.c 
Log Message:
Fix long lines issue.
This changes the DB schema by adding a new section.

Index: roadmap_line.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_line.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_line.c	15 Oct 2005 22:18:50 -0000	1.1.1.1
--- roadmap_line.c	8 May 2006 16:07:26 -0000	1.2
***************
*** 68,71 ****
--- 68,74 ----
     int                  LineBySquare2Count;
  
+    RoadMapLongLine     *LongLines;
+    int                  LongLinesCount;
+ 
  } RoadMapLineContext;
  
***************
*** 81,84 ****
--- 84,88 ----
     roadmap_db *square1_table;
     roadmap_db *square2_table;
+    roadmap_db *long_lines_table;
  
  
***************
*** 94,97 ****
--- 98,102 ----
     square2_table = roadmap_db_get_subsection (root, "bysquare2");
     index2_table  = roadmap_db_get_subsection (root, "index2");
+    long_lines_table  = roadmap_db_get_subsection (root, "longlines");
  
     context->Line = (RoadMapLine *) roadmap_db_get_data (line_table);
***************
*** 133,136 ****
--- 138,151 ----
     }
  
+    context->LongLines =
+       (RoadMapLongLine *) roadmap_db_get_data (long_lines_table);
+    context->LongLinesCount = roadmap_db_get_count (long_lines_table);
+ 
+    if (roadmap_db_get_size (long_lines_table) !=
+        context->LongLinesCount * sizeof(RoadMapLongLine)) {
+       roadmap_log (ROADMAP_ERROR, "invalid long lines structure");
+       goto roadmap_line_map_abort;
+    }
+ 
     return context;
  
***************
*** 346,347 ****
--- 361,373 ----
  
  
+ int roadmap_line_long (int index, int *line_id, RoadMapArea *area, int *cfcc) {
+ 
+    if (index >= RoadMapLineActive->LongLinesCount) return 0;
+ 
+    *line_id = RoadMapLineActive->LongLines[index].line;
+    *area = RoadMapLineActive->LongLines[index].area;
+    *cfcc = RoadMapLineActive->LongLines[index].cfcc;
+ 
+    return 1;
+ }
+ 

Index: roadmap_street.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_street.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_street.c	12 Dec 2005 20:35:42 -0000	1.4
--- roadmap_street.c	8 May 2006 16:07:26 -0000	1.5
***************
*** 45,49 ****
  #include "roadmap_dictionary.h"
  
- 
  static char *RoadMapStreetType = "RoadMapStreetContext";
  static char *RoadMapZipType    = "RoadMapZipContext";
--- 45,48 ----
***************
*** 1077,1080 ****
--- 1076,1152 ----
  
  
+ static int roadmap_street_get_closest_in_long_lines
+               (const RoadMapPosition *position, int cfcc,
+                RoadMapNeighbour *neighbours, int count, int max) {
+ 
+    int index = 0;
+    int found;
+    int first_shape_line;
+    int last_shape_line;
+    int first_shape;
+    int last_shape;
+    int line_cfcc;
+    RoadMapArea area;
+    int line;
+    int previous_square = -1;
+ 
+    RoadMapNeighbour this;
+ 
+    int fips = roadmap_locator_active ();
+ 
+    while (roadmap_line_long (index++, &line, &area, &line_cfcc)) {
+       int shape_count = 0;
+       int real_square;
+       RoadMapPosition reference_position;
+       RoadMapPosition to_position;
+ 
+       if (cfcc != line_cfcc) continue;
+ 
+       if (!roadmap_math_is_visible (&area)) {
+          continue;
+       }
+ 
+       roadmap_line_to (line, &to_position);
+ 
+       if (roadmap_math_point_is_visible (&to_position)) {
+          continue;
+       }
+ 
+       roadmap_line_from (line, &reference_position);
+       real_square = roadmap_square_search (&reference_position);
+ 
+       if (real_square != previous_square) {
+          shape_count =
+             roadmap_shape_in_square
+             (real_square, &first_shape_line, &last_shape_line);
+          previous_square = real_square;
+       }
+ 
+       if (roadmap_plugin_override_line (line, cfcc, fips)) continue;
+ 
+       if (shape_count > 0 &&
+             roadmap_shape_of_line (line, first_shape_line,
+                last_shape_line,
+                &first_shape, &last_shape) > 0) {
+ 
+          found =
+             roadmap_street_get_distance_with_shape
+             (position, line, cfcc, first_shape, last_shape, &this);
+ 
+       } else {
+          found =
+             roadmap_street_get_distance_no_shape
+             (position, line, cfcc, &this);
+       }
+ 
+       if (found) {
+          count = roadmap_street_replace (neighbours, count, max, &this);
+       }
+    }
+ 
+    return count;
+ }
+ 
+ 
  int roadmap_street_get_closest
         (const RoadMapPosition *position,
***************
*** 1120,1123 ****
--- 1192,1202 ----
           }
        }
+ 
+       for (i = 0; i < categories_count; ++i) {
+ 
+          count =
+             roadmap_street_get_closest_in_long_lines
+             (position, categories[i], neighbours, count, max);
+       }
     }
  

Index: roadmap_screen.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_screen.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** roadmap_screen.h	2 May 2006 12:48:21 -0000	1.5
--- roadmap_screen.h	8 May 2006 16:07:26 -0000	1.6
***************
*** 106,112 ****
  #define DBG_TIME_TEXT_ONE_LETTER 11
  #define DBG_TIME_TEXT_GET_GLYPH 12
! #define DBG_TIME_TEXT_ONE_RAS 13
  
! #define DBG_TIME_LAST_COUNTER 14
  
  void dbg_time_start(int type);
--- 106,114 ----
  #define DBG_TIME_TEXT_ONE_LETTER 11
  #define DBG_TIME_TEXT_GET_GLYPH 12
! #define DBG_TIME_TEXT_ONE_RAS 13
! #define DBG_TIME_DRAW_LONG_LINES 14
! #define DBG_TIME_FIND_LONG_LINES 15
  
! #define DBG_TIME_LAST_COUNTER 16
  
  void dbg_time_start(int type);

Index: roadmap_screen.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_screen.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** roadmap_screen.c	2 May 2006 12:48:20 -0000	1.9
--- roadmap_screen.c	8 May 2006 16:07:26 -0000	1.10
***************
*** 50,54 ****
  #include "roadmap_trip.h"
  #include "roadmap_canvas.h"
! #include "roadmap_screen_obj.h"
  #include "roadmap_state.h"
  #include "roadmap_pointer.h"
--- 50,54 ----
  #include "roadmap_trip.h"
  #include "roadmap_canvas.h"
! #include "roadmap_screen_obj.h"
  #include "roadmap_state.h"
  #include "roadmap_pointer.h"
***************
*** 793,796 ****
--- 793,943 ----
  
  
+ static int roadmap_screen_draw_long_lines (int pen_type) {
+ 
+    int last_cfcc = -1;
+    int index = 0;
+    int real_line;
+    int real_square;
+    int cfcc;
+    int first_shape_line;
+    int last_shape_line;
+    int first_shape;
+    int last_shape;
+    RoadMapPen layer_pen;
+    int fips = roadmap_locator_active ();
+    int total_length;
+    int *total_length_ptr;
+    int angle;
+    RoadMapGuiPoint seg_middle;
+    RoadMapArea area;
+    int last_real_square = -1;
+    RoadMapArea edges = {0, 0, 0, 0};
+ 
+    int drawn = 0;
+ 
+    dbg_time_start(DBG_TIME_DRAW_LONG_LINES);
+ 
+    roadmap_log_push ("roadmap_screen_draw_long_lines");
+ 
+    if (RoadMapScreen3dHorizon || (pen_type != 0) || RoadMapScreenDragging) {
+       /* we do labels only for the first pen */
+       total_length_ptr = 0;
+    } else {
+       total_length_ptr = &total_length;
+    }
+ 
+    while (roadmap_line_long (index++, &real_line, &area, &cfcc)) {
+          RoadMapPosition position;
+          RoadMapPosition to_position;
+ 
+          if (!roadmap_math_is_visible (&area)) {
+             continue;
+          }
+ 
+          if (last_cfcc != cfcc) {
+             layer_pen = roadmap_layer_get_pen (cfcc, pen_type);
+             last_cfcc = cfcc;
+          }
+ 
+          roadmap_line_to (real_line, &to_position);
+ 
+          if (roadmap_math_point_is_visible (&to_position)) {
+             continue;
+ 
+          } else {
+             int to_square;
+             RoadMapArea to_edges;
+ 
+             to_square = roadmap_square_search (&to_position);
+             roadmap_square_edges (to_square, &to_edges);
+ 
+             if (roadmap_math_is_visible (&to_edges)) {
+                continue;
+             }
+          }
+ 
+          roadmap_line_from (real_line, &position);
+ 
+          /* Optimization: search for the square only if the new line does not
+           * belong to the same square as the line before.
+           */
+          if ((position.longitude <  edges.west) ||
+              (position.longitude >= edges.east) ||
+              (position.latitude <  edges.south) ||
+              (position.latitude >= edges.north)) {
+             real_square = roadmap_square_search (&position);
+          }
+ 
+          if (real_square != last_real_square) {
+ 
+             roadmap_square_edges (real_square, &edges);
+ 
+             last_real_square = real_square;
+ 
+             if (roadmap_math_is_visible (&edges)) {
+ 
+                continue;
+             }
+ 
+             if (roadmap_shape_in_square
+                                  (real_square,
+                                   &first_shape_line, &last_shape_line) <= 0) {
+ 
+                first_shape_line = last_shape_line = -1;
+                first_shape = last_shape = -1;
+             }
+          }
+ 
+ 
+          if (roadmap_math_is_visible (&edges)) {
+             continue;
+          }
+ 
+          if (!roadmap_plugin_override_line (real_line, cfcc, fips)) {
+ 
+             RoadMapPosition from;
+             RoadMapPosition to;
+             RoadMapPen pen;
+ 
+             if (first_shape_line >= 0) {
+ 
+                first_shape = last_shape = -1;
+                roadmap_shape_of_line (real_line,
+                      first_shape_line, last_shape_line,
+                      &first_shape, &last_shape);
+             }
+ 
+ 
+             /* Check if a plugin wants to override the pen */
+             if (!roadmap_plugin_override_pen
+                   (real_line, cfcc, fips, pen_type, &pen)) {
+                pen = layer_pen;
+             }
+ 
+             if (pen == NULL) continue;
+ 
+             roadmap_line_from (real_line, &from);
+             roadmap_line_to (real_line, &to);
+ 
+             roadmap_screen_draw_one_line
+                (&from, &to, 0, &from, first_shape, last_shape,
+                 roadmap_shape_get_position, pen, total_length_ptr, &seg_middle, &angle);
+ 
+             if (total_length_ptr) {
+ 
+                PluginLine l = {ROADMAP_PLUGIN_ID, real_line, cfcc, fips};
+                roadmap_label_add (&seg_middle, angle, total_length, &l);
+             }
+ 
+             drawn += 1;
+          }
+    }
+ 
+    roadmap_log_pop ();
+    dbg_time_end(DBG_TIME_DRAW_LONG_LINES);
+    return drawn;
+ }
+ 
+ 
  static void roadmap_screen_draw_object
                 (const char *name,
***************
*** 942,968 ****
          count = roadmap_square_view (in_view, ROADMAP_MAX_VISIBLE);
  
!         if (count > 0) {
  
!             roadmap_screen_draw_polygons ();
  
!             for (k = 0; k < max_pen; ++k) {
  
!                int layer_count;
!                int layers[256];
!                int pen_type = k;
  
!                roadmap_screen_reset_square_mask();
  
!                layer_count = roadmap_layer_visible_lines (layers, 256, k);
!                if (!layer_count) continue;
  
!                if (use_only_main_pen) {
!                   pen_type = -1;
!                }
  
!                for (j = count - 1; j >= 0; --j) {
!                   roadmap_screen_repaint_square (in_view[j], pen_type, layer_count, layers);
!                }
!             }
          }
  
--- 1089,1114 ----
          count = roadmap_square_view (in_view, ROADMAP_MAX_VISIBLE);
  
!         roadmap_screen_draw_polygons ();
  
!         for (k = 0; k < max_pen; ++k) {
  
!            int layer_count;
!            int layers[256];
!            int pen_type = k;
  
!            roadmap_screen_reset_square_mask();
  
!            layer_count = roadmap_layer_visible_lines (layers, 256, k);
!            if (!layer_count) continue;
  
!            if (use_only_main_pen) {
!               pen_type = -1;
!            }
  
!            for (j = count - 1; j >= 0; --j) {
!               roadmap_screen_repaint_square (in_view[j], pen_type, layer_count, layers);
!            }
  
!            roadmap_screen_draw_long_lines (k);
          }
  
***************
*** 982,987 ****
  
         roadmap_trip_format_messages ();
!     
!        roadmap_screen_obj_draw ();
  
         if (roadmap_config_match (&RoadMapConfigMapSigns, "yes")) {
--- 1128,1133 ----
  
         roadmap_trip_format_messages ();
!     
!        roadmap_screen_obj_draw ();
  
         if (roadmap_config_match (&RoadMapConfigMapSigns, "yes")) {
***************
*** 1582,1586 ****
  static unsigned long dbg_time_tmp[DBG_TIME_LAST_COUNTER];
  
! #ifdef __WIN32
  void dbg_time_start(int type) {
     dbg_time_tmp[type] = GetTickCount();
--- 1728,1732 ----
  static unsigned long dbg_time_tmp[DBG_TIME_LAST_COUNTER];
  
! #ifdef _WIN32
  void dbg_time_start(int type) {
     dbg_time_tmp[type] = GetTickCount();

Index: roadmap_line.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_line.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_line.h	28 Nov 2005 19:36:34 -0000	1.2
--- roadmap_line.h	8 May 2006 16:07:26 -0000	1.3
***************
*** 31,34 ****
--- 31,35 ----
  int  roadmap_line_in_square2 (int square, int cfcc, int *first, int *last);
  int  roadmap_line_get_from_index2 (int index);
+ int  roadmap_line_long (int index, int *line_id, RoadMapArea *area, int *cfcc);
  
  void roadmap_line_points (int line, int *from, int *to);

[Roadmap-commit] roadmap_editor/src roadmap_state.c,1.1,1.2

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

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

Modified Files:
	roadmap_state.c 
Log Message:
Fix header inclusion.

Index: roadmap_state.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_state.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_state.c	29 Apr 2006 11:28:12 -0000	1.1
--- roadmap_state.c	8 May 2006 14:10:01 -0000	1.2
***************
*** 34,38 ****
  #include "roadmap_types.h"
  
! #include "roadmap_states.h"
  
  
--- 34,38 ----
  #include "roadmap_types.h"
  
! #include "roadmap_state.h"
  
  

[Roadmap-commit] roadmap_editor/src roadmap_line_route.c,1.1,1.2

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

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

Modified Files:
	roadmap_line_route.c 
Log Message:
Update file header.

Index: roadmap_line_route.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_line_route.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_line_route.c	12 Dec 2005 20:35:41 -0000	1.1
--- roadmap_line_route.c	8 May 2006 13:58:36 -0000	1.2
***************
*** 22,35 ****
   *
   * SYNOPSYS:
-  *
-  *   int  roadmap_line_in_square (int square, int cfcc, int *first, int *last);
-  *   int  roadmap_line_in_square2 (int square, int cfcc, int *first, int *last);
-  *   int  roadmap_line_get_from_index2 (int index);
-  *   void roadmap_line_from (int line, RoadMapPosition *position);
-  *   void roadmap_line_to   (int line, RoadMapPosition *position);
-  *
-  *   int  roadmap_line_count (void);
-  *
-  * These functions are used to retrieve the points that make the lines.
   */
  
--- 22,25 ----

[Roadmap-commit] roadmap_editor/src roadmap_gps.c,1.7,1.8

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

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

Modified Files:
	roadmap_gps.c 
Log Message:
Fix Active satellite message.

Index: roadmap_gps.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_gps.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** roadmap_gps.c	2 May 2006 15:07:55 -0000	1.7
--- roadmap_gps.c	8 May 2006 13:57:46 -0000	1.8
***************
*** 178,183 ****
     int i;
  
-    roadmap_message_set ('c', "%d", RoadMapGpsActiveSatelliteCount);
- 
     for (i = 0; i < ROADMAP_GPS_CLIENTS; ++i) {
  
--- 178,181 ----
***************
*** 198,201 ****
--- 196,201 ----
     int i;
  
+    roadmap_message_set ('c', "%d", RoadMapGpsActiveSatelliteCount);
+ 
     for (i = 0; i < ROADMAP_GPS_CLIENTS; ++i) {
  
***************
*** 270,273 ****
--- 270,276 ----
     roadmap_message_set ('h', "%.2f", RoadMapGpsQuality.dilution_horizontal);
  
+    RoadMapGpsActiveSatelliteCount = fields->gga.count;
+    roadmap_message_set ('c', "%d", fields->gga.count);
+ 
     if (fields->gga.quality == ROADMAP_NMEA_QUALITY_INVALID) {
  

[Roadmap-commit] roadmap_editor/src objects,1.2,1.3

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

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

Modified Files:
	objects 
Log Message:
Update the icons opacity.

Index: objects
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/objects,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** objects	2 May 2006 12:40:36 -0000	1.2
--- objects	8 May 2006 13:54:19 -0000	1.3
***************
*** 10,14 ****
  I rm_zoom1.bmp
  P 215 100
! O 128
  A zoom1
  B -4 -4 28 28
--- 10,14 ----
  I rm_zoom1.bmp
  P 215 100
! O 160
  A zoom1
  B -4 -4 28 28
***************
*** 18,22 ****
  I rm_zoomin.bmp
  P 215 135
! O 128
  A zoomin
  B -4 -4 28 28
--- 18,22 ----
  I rm_zoomin.bmp
  P 215 135
! O 160
  A zoomin
  B -4 -4 28 28
***************
*** 25,29 ****
  I rm_zoomout.bmp
  P 215 170
! O 128
  A zoomout
  B -4 -4 28 28
--- 25,29 ----
  I rm_zoomout.bmp
  P 215 170
! O 160
  A zoomout
  B -4 -4 28 28
***************
*** 32,36 ****
  I rm_gps.bmp
  P 215 205
! O 128
  A gps
  B -4 -4 28 28
--- 32,36 ----
  I rm_gps.bmp
  P 215 205
! O 160
  A gps
  B -4 -4 28 28
***************
*** 47,51 ****
  I rm_2d.bmp
  P 1 205
! O 128
  A toggleview
  B -4 -4 28 28
--- 47,51 ----
  I rm_2d.bmp
  P 1 205
! O 160
  A toggleview
  B -4 -4 28 28

[Roadmap-commit] roadmap_editor/src buildmap_line.c,1.2,1.3 buildmap_line.h,1.1.1.1,1.2 buildmap_shape.c,1.3,1.4 buildmap_square.c,1.2,1.3 buildmap_square.h,1.1.1.1,1.2 roadmap_db_line.h,1.1.1.1,1.2

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

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

Modified Files:
	buildmap_line.c buildmap_line.h buildmap_shape.c 
	buildmap_square.c buildmap_square.h roadmap_db_line.h 
Log Message:
Fix long lines issue.
This changes the DB schema by adding a new section.

Index: buildmap_line.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/buildmap_line.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildmap_line.c	28 Nov 2005 19:36:34 -0000	1.2
--- buildmap_line.c	8 May 2006 13:53:42 -0000	1.3
***************
*** 67,71 ****
  } BuildMapLine;
  
- 
  static int LineCount = 0;
  static int LineCrossingCount = 0;
--- 67,70 ----
***************
*** 77,84 ****
--- 76,139 ----
  static int *SortedLine2 = NULL;
  
+ #define MAX_LONG_LINES 500
+ static RoadMapLongLine LongLines[MAX_LONG_LINES];
+ static int LongLinesCount;
+ static RoadMapHash *LongLinesHash = NULL;
+ 
+ static void buildmap_shape_update_long_line (RoadMapLongLine *line,
+                                              int longitude, int latitude) {
+    if (line->area.west > longitude) {
+       line->area.west = longitude;
+    }
+    if (line->area.east < longitude) {
+       line->area.east = longitude;
+    }
+    if (line->area.north < latitude) {
+       line->area.north = latitude;
+    }
+    if (line->area.south > latitude) {
+       line->area.south = latitude;
+    }
+ }
+ 
+ 
+ static BuildMapLine *buildmap_line_get_record (int line) {
+ 
+    if ((line < 0) || (line > LineCount)) {
+       buildmap_fatal (0, "invalid line index %d", line);
+    }
+ 
+    return Line[line/BUILDMAP_BLOCK] + (line % BUILDMAP_BLOCK);
+ }
+ 
+ 
+ static BuildMapLine *buildmap_line_get_record_sorted (int line) {
+ 
+    if ((line < 0) || (line > LineCount)) {
+       buildmap_fatal (0, "invalid line index %d", line);
+    }
+ 
+    if (SortedLine == NULL) {
+       buildmap_fatal (0, "lines not sorted yet");
+    }
+ 
+    line = SortedLine[line];
+ 
+    return Line[line/BUILDMAP_BLOCK] + (line % BUILDMAP_BLOCK);
+ }
+ 
+ 
+ static int buildmap_line_get_cfcc_sorted (int line) {
+ 
+    BuildMapLine *this_line = buildmap_line_get_record_sorted (line);
+ 
+    return this_line->cfcc;
+ }
+ 
  
  void buildmap_line_initialize (void) {
  
     LineById = roadmap_hash_new ("LineById", BUILDMAP_BLOCK);
+    LongLinesHash = roadmap_hash_new ("LongLines", MAX_LONG_LINES);
  
     Line[0] = calloc (BUILDMAP_BLOCK, sizeof(BuildMapLine));
***************
*** 88,91 ****
--- 143,148 ----
  
     LineCount = 0;
+ 
+    LongLinesCount = 0;
  }
  
***************
*** 129,171 ****
  
  
! int  buildmap_line_find_sorted (int tlid) {
  
!    int index;
!    BuildMapLine *this_line;
  
!    if (SortedLine == NULL) {
!       buildmap_fatal (0, "lines not sorted yet");
!    }
  
!    for (index = roadmap_hash_get_first (LineById, tlid);
!         index >= 0;
!         index = roadmap_hash_get_next (LineById, index)) {
  
!       this_line = Line[index / BUILDMAP_BLOCK] + (index % BUILDMAP_BLOCK);
  
!       if (this_line->tlid == tlid) {
!          return this_line->sorted;
        }
-    }
  
!    return -1;
! }
  
  
! static BuildMapLine *buildmap_line_get_record (int line) {
  
!    if ((line < 0) || (line > LineCount)) {
!       buildmap_fatal (0, "invalid line index %d", line);
     }
  
-    return Line[line/BUILDMAP_BLOCK] + (line % BUILDMAP_BLOCK);
  }
  
  
! static BuildMapLine *buildmap_line_get_record_sorted (int line) {
  
!    if ((line < 0) || (line > LineCount)) {
!       buildmap_fatal (0, "invalid line index %d", line);
!    }
  
     if (SortedLine == NULL) {
--- 186,251 ----
  
  
! void buildmap_line_test_long (int line, int longitude, int latitude) {
!    RoadMapLongLine *this_long_line;
!    int from;
!    int to;
  
!    buildmap_line_get_points_sorted (line, &from, &to);
  
!    if (buildmap_square_is_long_line (from, to, longitude, latitude)) {
!       int index;
  
!       this_long_line = NULL;
  
!       for (index = roadmap_hash_get_first (LongLinesHash, line);
!             index >= 0;
!             index = roadmap_hash_get_next (LongLinesHash, index)) {
  
!          this_long_line = LongLines + index;
! 
!          if (this_long_line->line == line) {
!             
!             buildmap_shape_update_long_line
!                      (this_long_line, longitude, latitude);
!             break;
!          } else {
!             this_long_line = NULL;
!          }
        }
  
!       if (this_long_line == NULL) {
  
+          if (LongLinesCount == MAX_LONG_LINES) {
+             buildmap_fatal (0, "Too many long lines.");
+          }
  
!          this_long_line = LongLines + LongLinesCount;
  
!          this_long_line->line = line;
!          this_long_line->cfcc = buildmap_line_get_cfcc_sorted (line);
!          this_long_line->area.west = this_long_line->area.east = longitude;
!          this_long_line->area.north = this_long_line->area.south = latitude;
!          buildmap_shape_update_long_line
!                   (this_long_line,
!                    buildmap_point_get_longitude_sorted (from),
!                    buildmap_point_get_latitude_sorted (from));
! 
!          buildmap_shape_update_long_line
!                   (this_long_line,
!                    buildmap_point_get_longitude_sorted (to),
!                    buildmap_point_get_latitude_sorted (to));
! 
!          roadmap_hash_add (LongLinesHash, line, LongLinesCount);
!          LongLinesCount++;
!       }
     }
  
  }
  
  
! int  buildmap_line_find_sorted (int tlid) {
  
!    int index;
!    BuildMapLine *this_line;
  
     if (SortedLine == NULL) {
***************
*** 173,179 ****
     }
  
!    line = SortedLine[line];
  
!    return Line[line/BUILDMAP_BLOCK] + (line % BUILDMAP_BLOCK);
  }
  
--- 253,268 ----
     }
  
!    for (index = roadmap_hash_get_first (LineById, tlid);
!         index >= 0;
!         index = roadmap_hash_get_next (LineById, index)) {
  
!       this_line = Line[index / BUILDMAP_BLOCK] + (index % BUILDMAP_BLOCK);
! 
!       if (this_line->tlid == tlid) {
!          return this_line->sorted;
!       }
!    }
! 
!    return -1;
  }
  
***************
*** 398,401 ****
--- 487,491 ----
     RoadMapLineBySquare *db_square1;
     RoadMapLineBySquare *db_square2;
+    RoadMapLongLine *db_long_lines;
  
     buildmap_db *root;
***************
*** 404,407 ****
--- 494,498 ----
     buildmap_db *index2_table;
     buildmap_db *square2_table;
+    buildmap_db *long_lines_table;
  
  
***************
*** 432,439 ****
--- 523,534 ----
              (root, "bysquare2", square_count, sizeof(RoadMapLineBySquare));
  
+    long_lines_table = buildmap_db_add_child
+             (root, "longlines", LongLinesCount, sizeof(RoadMapLongLine));
+ 
     db_lines   = (RoadMapLine *) buildmap_db_get_data (data_table);
     db_square1 = (RoadMapLineBySquare *) buildmap_db_get_data (square1_table);
     db_index2  = (int *) buildmap_db_get_data (index2_table);
     db_square2 = (RoadMapLineBySquare *) buildmap_db_get_data (square2_table);
+    db_long_lines = (RoadMapLongLine *) buildmap_db_get_data (long_lines_table);
  
  
***************
*** 541,544 ****
--- 636,642 ----
        db_square2[square_current].last = LineCrossingCount - 1;
     }
+ 
+    memcpy (db_long_lines, LongLines, LongLinesCount * sizeof (RoadMapLongLine));
+ 
  }
  

Index: buildmap_shape.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/buildmap_shape.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildmap_shape.c	1 Dec 2005 12:25:42 -0000	1.3
--- buildmap_shape.c	8 May 2006 13:53:42 -0000	1.4
***************
*** 77,81 ****
  static int *SortedShape = NULL;
  
- 
  void buildmap_shape_initialize (void) {
  
--- 77,80 ----
***************
*** 127,130 ****
--- 126,131 ----
     }
  
+    buildmap_line_test_long (line, longitude, latitude);
+       
     /* This shape was not known yet: create a new one. */
  

Index: roadmap_db_line.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_db_line.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_db_line.h	15 Oct 2005 22:19:01 -0000	1.1.1.1
--- roadmap_db_line.h	8 May 2006 13:53:42 -0000	1.2
***************
*** 51,54 ****
--- 51,62 ----
  } RoadMapLineBySquare;
  
+ typedef struct {
+ 
+    int line;
+    unsigned char cfcc;
+ 
+    RoadMapArea area;
+ } RoadMapLongLine;
+ 
  #endif // _ROADMAP_DB_LINE__H_
  

Index: buildmap_square.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/buildmap_square.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** buildmap_square.h	15 Oct 2005 22:18:58 -0000	1.1.1.1
--- buildmap_square.h	8 May 2006 13:53:42 -0000	1.2
***************
*** 36,39 ****
--- 36,42 ----
           (int square, int *longitude, int *latitude);
  
+ int buildmap_square_is_long_line (int from_point, int to_point,
+ 		  		                      int longitude, int latitude);
+ 
  void buildmap_square_save    (void);
  void buildmap_square_summary (void);

Index: buildmap_line.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/buildmap_line.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** buildmap_line.h	15 Oct 2005 22:18:52 -0000	1.1.1.1
--- buildmap_line.h	8 May 2006 13:53:42 -0000	1.2
***************
*** 38,41 ****
--- 38,43 ----
  void buildmap_line_sort          (void);
  
+ void buildmap_line_test_long (int line, int longitude, int latitude);
+    
  void buildmap_line_save    (void);
  void buildmap_line_summary (void);

Index: buildmap_square.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/buildmap_square.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildmap_square.c	28 Nov 2005 19:36:34 -0000	1.2
--- buildmap_square.c	8 May 2006 13:53:42 -0000	1.3
***************
*** 51,54 ****
--- 51,55 ----
  
  #include "buildmap.h"
+ #include "buildmap_point.h"
  #include "buildmap_line.h"
  #include "buildmap_square.h"
***************
*** 124,131 ****
         (Square[index].maxlatitude < latitude)) {
  
!       buildmap_fatal (0, "point %d (%dx%d) does not fit in any square",
!                          index,
!                          longitude,
!                          latitude);
     }
  
--- 125,129 ----
         (Square[index].maxlatitude < latitude)) {
  
!       return -1;
     }
  
***************
*** 217,220 ****
--- 215,225 ----
  
     squareid = buildmap_square_search (longitude, latitude);
+    
+    if (squareid == -1) {
+       buildmap_fatal (0, "point %d (%dx%d) does not fit in any square",
+             index,
+             longitude,
+             latitude);
+    }
  
     Square[squareid].count += 1;
***************
*** 235,238 ****
--- 240,247 ----
     }
  
+    if (Square[squareid].count == 0) {
+       return -1;
+    }
+ 
     return Square[squareid].sorted;
  }
***************
*** 267,270 ****
--- 276,305 ----
  
  
+ int buildmap_square_is_long_line (int from_point, int to_point,
+ 		  		                      int longitude, int latitude) {
+ 
+    int shape_square;
+ 
+    shape_square = buildmap_square_search (longitude, latitude);
+ 
+    if (shape_square == -1) {
+       return 1;
+    }
+ 
+    shape_square = buildmap_square_get_sorted (shape_square);
+ 
+    if (shape_square == -1) {
+       return 1;
+    }
+ 
+    if ((shape_square != buildmap_point_get_square_sorted (from_point)) &&
+          (shape_square != buildmap_point_get_square_sorted (to_point))) {
+       return 1;
+    }
+ 
+    return 0;
+ }
+ 
+ 
  void buildmap_square_sort (void) {
  

[Roadmap-commit] roadmap/src roadmap_trip.c,1.45,1.46

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

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

Modified Files:
	roadmap_trip.c 
Log Message:
change name of variable "near" to "goal" -- apparently some
compiler (on wince?) makes "near" a reserved word.


Index: roadmap_trip.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_trip.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** roadmap_trip.c	10 Feb 2006 09:00:55 -0000	1.45
--- roadmap_trip.c	5 May 2006 19:45:53 -0000	1.46
***************
*** 1654,1659 ****
  
              /* If we got close (within 2x), but never quite there. */
!             waypoint *near= RoadMapTripNext;
!             int distance = roadmap_math_distance (&gps->map, &near->pos);
  
              if (distance > waypoint_size * 2) {
--- 1654,1659 ----
  
              /* If we got close (within 2x), but never quite there. */
!             waypoint *goal = RoadMapTripNext;
!             int distance = roadmap_math_distance (&gps->map, &goal->pos);
  
              if (distance > waypoint_size * 2) {
***************
*** 1663,1667 ****
                   */
                  int dist1, dist2;
!                 if (near == RoadMapTripStart) {
                          /* We've left the bigger circle, we're on
                           * our way. */
--- 1663,1667 ----
                   */
                  int dist1, dist2;
!                 if (goal == RoadMapTripStart) {
                          /* We've left the bigger circle, we're on
                           * our way. */
***************
*** 1670,1679 ****
                      /* Distance to the previous segment. */
                      dist1 = roadmap_math_get_distance_from_segment
!                         (&gps->map, &near->pos,
!                             &(roadmap_trip_prev(near))->pos, NULL, NULL);
                      /* Distance to the next segment. */
                      dist2 = roadmap_math_get_distance_from_segment
!                         (&gps->map, &near->pos,
!                             &(roadmap_trip_next(near))->pos, NULL, NULL);
                      if (dist2 < dist1) {
                          /* We've left the bigger circle, and
--- 1670,1679 ----
                      /* Distance to the previous segment. */
                      dist1 = roadmap_math_get_distance_from_segment
!                         (&gps->map, &goal->pos,
!                             &(roadmap_trip_prev(goal))->pos, NULL, NULL);
                      /* Distance to the next segment. */
                      dist2 = roadmap_math_get_distance_from_segment
!                         (&gps->map, &goal->pos,
!                             &(roadmap_trip_next(goal))->pos, NULL, NULL);
                      if (dist2 < dist1) {
                          /* We've left the bigger circle, and

[Roadmap-commit] roadmap_editor/src/win32 install.inf,1.5,1.6

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

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

Modified Files:
	install.inf 
Log Message:
Add comsplit.dll

Index: install.inf
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/install.inf,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** install.inf	29 Apr 2006 14:55:38 -0000	1.5
--- install.inf	2 May 2006 15:25:16 -0000	1.6
***************
*** 15,19 ****
  
  [DefaultInstall.ARM]
! CopyFiles = Files.Config, Files.Maps, Files.ARM, Files.Icons
  
  [SourceDisksNames]
--- 15,19 ----
  
  [DefaultInstall.ARM]
! CopyFiles = Files.Config, Files.Maps, Files.ARM, Files.Icons, Files.Dll
  
  [SourceDisksNames]
***************
*** 27,30 ****
--- 27,31 ----
  3 = ,"ARM files",,L:\shared\roadmap_editor\src\win32\wince_env\Roadmap\ARMV4Rel
  4 = ,"ARM files",,L:\shared\roadmap_editor\src\win32\wince_env\RoadGPS\ARMV4Rel
+ 8 = ,"ARMDll files",,C:\Projects\ComSplit\ARMV4Rel
  
  [SourceDisksFiles]
***************
*** 60,63 ****
--- 61,65 ----
  Roadmap.exe = 3
  RoadGPS.exe = 4
+ ComSplit.dll = 8
  
  [DestinationDirs]
***************
*** 67,70 ****
--- 69,73 ----
  Files.ARM = 0,%InstallDir%
  Files.Icons = 0,%InstallDir%\icons
+ Files.Dll = 0,\Windows
  DefaultDestDir = 0,%InstallDir%
  
***************
*** 110,111 ****
--- 113,117 ----
  RoadGPS.exe,,,0
  
+ [Files.Dll]
+ ComSplit.dll,,,0
+ 

[Roadmap-commit] roadmap_editor/src/win32 roadmap_main.cpp,1.10,1.11 roadmap_win32.h,1.4,1.5

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

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

Modified Files:
	roadmap_main.cpp roadmap_win32.h 
Log Message:
RoadGPS should use a virtual serial port if RoadMap is running.

Index: roadmap_win32.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_win32.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_win32.h	2 May 2006 12:57:21 -0000	1.4
--- roadmap_win32.h	2 May 2006 15:10:26 -0000	1.5
***************
*** 20,23 ****
--- 20,24 ----
  LPWSTR ConvertToWideChar(LPCSTR string, UINT nCodePage);
  char* ConvertToMultiByte(const LPCWSTR s, UINT nCodePage);
+ const char *roadmap_main_get_virtual_serial (void);
  
  #endif /* _ROADMAP_WIN32_H_ */

Index: roadmap_main.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_main.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** roadmap_main.cpp	2 May 2006 12:56:30 -0000	1.10
--- roadmap_main.cpp	2 May 2006 15:10:26 -0000	1.11
***************
*** 61,65 ****
  };
  static	RoadMapCallback menu_callbacks[MAX_MENU_ITEMS] = {0};
! static	RoadMapCallback	tool_callbacks[MAX_TOOL_ITEMS] = {0};
  
  // timer stuff
--- 61,65 ----
  };
  static	RoadMapCallback menu_callbacks[MAX_MENU_ITEMS] = {0};
! static	RoadMapCallback tool_callbacks[MAX_TOOL_ITEMS] = {0};
  
  // timer stuff
***************
*** 77,84 ****
  // varibles used across this module
  static RoadMapKeyInput	RoadMapMainInput = NULL;
! static HWND				RoadMapMainMenuBar = NULL;
! static HMENU			RoadMapCurrentSubMenu = NULL;
! static HWND				RoadMapMainToolbar = NULL;
! static HANDLE        VirtualSerialHandle = 0;
  
  // Global Variables:
--- 77,85 ----
  // varibles used across this module
  static RoadMapKeyInput	RoadMapMainInput = NULL;
! static HWND				   RoadMapMainMenuBar = NULL;
! static HMENU			   RoadMapCurrentSubMenu = NULL;
! static HWND				   RoadMapMainToolbar = NULL;
! static HANDLE           VirtualSerialHandle = 0;
! static const char *RoadMapMainVirtualSerial;
  
  // Global Variables:
***************
*** 96,102 ****
  // class name definition
  #ifdef _ROADGPS
! static TCHAR szWindowClass[] = _T("RoadGPSClass");
  #else
! static TCHAR szWindowClass[] = _T("RoadMapClass");
  #endif
  
--- 97,105 ----
  // class name definition
  #ifdef _ROADGPS
! static TCHAR szWindowClass[] = _T("RoadGPSClass");
! static TCHAR szOtherWindowClass[] = _T("RoadMapClass");
  #else
! static TCHAR szWindowClass[] = _T("RoadMapClass");
! static TCHAR szOtherWindowClass[] = _T("RoadGPSClass");
  #endif
  
***************
*** 120,123 ****
--- 123,134 ----
     if ((index < 0) || (index > 9)) return;
  
+ #ifdef _ROADGPS
+    if (FindWindow(szOtherWindowClass, NULL) != NULL) {
+       /* RoadMap or RoadGPS is already running */
+       RoadMapMainVirtualSerial = virtual_port;
+       return;
+    }
+ #endif
+ 
  	RegCreateKeyEx(HKEY_LOCAL_MACHINE, _T("Drivers\\RoadMap"),
  		0, NULL, REG_OPTION_NON_VOLATILE, 0, NULL, &key, &resp);
***************
*** 129,133 ****
  	
  	//res = RegisterDevice(_T("COM"), 4, _T("ComSplit.dll"), 0);
! 	VirtualSerialHandle = ActivateDevice(_T("RoadMap"), NULL);
  
     if (VirtualSerialHandle == 0) {
--- 140,144 ----
  	
  	//res = RegisterDevice(_T("COM"), 4, _T("ComSplit.dll"), 0);
! 	VirtualSerialHandle = ActivateDevice(_T("Drivers\\RoadMap"), NULL);
  
     if (VirtualSerialHandle == 0) {
***************
*** 136,139 ****
--- 147,154 ----
  }
  
+ 
+ const char *roadmap_main_get_virtual_serial (void) {
+    return RoadMapMainVirtualSerial;
+ }
  
  // our main function
***************
*** 449,453 ****
  		SHHandleWMSettingChange(hWnd, wParam, lParam, &s_sai);
  		break;
! 
     case WM_KILLFOCUS:
        roadmap_screen_freeze ();
--- 464,469 ----
  		SHHandleWMSettingChange(hWnd, wParam, lParam, &s_sai);
  		break;
! 
! #ifndef _ROADGPS
     case WM_KILLFOCUS:
        roadmap_screen_freeze ();
***************
*** 457,461 ****
        roadmap_screen_unfreeze ();
        break;
! 
  	case WM_USER_READ:
  		{
--- 473,477 ----
        roadmap_screen_unfreeze ();
        break;
! #endif
  	case WM_USER_READ:
  		{

[Roadmap-commit] roadmap_editor/src/agg23 roadmap_canvas.cpp,1.3,1.4

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

Update of /cvsroot/roadmap/roadmap_editor/src/agg23
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30517

Modified Files:
	roadmap_canvas.cpp 
Log Message:
Use pen color for text.

Index: roadmap_canvas.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/agg23/roadmap_canvas.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_canvas.cpp	2 May 2006 13:01:26 -0000	1.3
--- roadmap_canvas.cpp	2 May 2006 15:09:57 -0000	1.4
***************
*** 568,572 ****
  #endif
     
!    ren_solid.color(agg::rgba8(0, 0, 0));
     dbg_time_end(DBG_TIME_TEXT_CNV);
     
--- 568,572 ----
  #endif
     
!    ren_solid.color(CurrentPen->color);
     dbg_time_end(DBG_TIME_TEXT_CNV);
     

[Roadmap-commit] roadmap_editor/src roadmap_label.c,1.2,1.3

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

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

Modified Files:
	roadmap_label.c 
Log Message:
Add a configurable pen for a label color.

Index: roadmap_label.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_label.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_label.c	23 Apr 2006 13:15:21 -0000	1.2
--- roadmap_label.c	2 May 2006 15:08:44 -0000	1.3
***************
*** 31,34 ****
--- 31,35 ----
  #include "roadmap_math.h"
  #include "roadmap_plugin.h"
+ #include "roadmap_canvas.h"
  
  #include "roadmap_label.h"
***************
*** 40,45 ****
--- 41,50 ----
                          ROADMAP_CONFIG_ITEM("Labels", "MinFeatureSize");
  
+ static RoadMapConfigDescriptor RoadMapConfigLabelsColor =
+                         ROADMAP_CONFIG_ITEM("Labels", "Color");
+ 
  static labelCacheObj RoadMapLabelCache;
  static int RoadMapLabelCacheFull = 0;
+ static RoadMapPen RoadMapLabelPen;
  
  static int rect_overlap (RoadMapGuiRect *a, RoadMapGuiRect *b) {
***************
*** 166,169 ****
--- 171,176 ----
     labelCacheMemberObj *cachePtr=NULL;
  
+    roadmap_canvas_select_pen (RoadMapLabelPen);
+ 
     for(l=0; l<RoadMapLabelCache.numlabels; l++) {
  
***************
*** 260,263 ****
--- 267,277 ----
         ("preferences", &RoadMapConfigMinFeatureSize,  "25");
  
+    roadmap_config_declare
+        ("preferences", &RoadMapConfigLabelsColor,  "#000000");
+ 
+    RoadMapLabelPen = roadmap_canvas_create_pen ("labels.main");
+    roadmap_canvas_set_foreground
+       (roadmap_config_get (&RoadMapConfigLabelsColor));
+     
     return 0;
  }

[Roadmap-commit] roadmap_editor/src roadmap_gps.c,1.6,1.7

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

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

Modified Files:
	roadmap_gps.c 
Log Message:
RoadGPS should use a virtual serial port if RoadMap is running.

Index: roadmap_gps.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_gps.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** roadmap_gps.c	2 May 2006 12:45:01 -0000	1.6
--- roadmap_gps.c	2 May 2006 15:07:55 -0000	1.7
***************
*** 688,694 ****
     url = roadmap_gps_source ();
  
!    if (url == NULL) {
! 
!       url = roadmap_config_get (&RoadMapConfigGPSSource);
  
        if (url == NULL) {
--- 688,700 ----
     url = roadmap_gps_source ();
  
!    if (url == NULL) {
! #ifdef _WIN32
!       url = roadmap_main_get_virtual_serial ();
!       if (!url) {
!          url = roadmap_config_get (&RoadMapConfigGPSSource);
!       }
! #else
!       url = roadmap_config_get (&RoadMapConfigGPSSource);
! #endif
  
        if (url == NULL) {