roadmap-commit — track CVS commits

[Roadmap-commit] roadmap_editor/src/editor/static update_range.c, 1.2, 1.3

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

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

Modified Files:
	update_range.c 
Log Message:
Add markers export.

Index: update_range.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/static/update_range.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** update_range.c	10 Aug 2006 20:54:07 -0000	1.2
--- update_range.c	18 Aug 2006 17:47:12 -0000	1.3
***************
*** 27,30 ****
--- 27,31 ----
  
  #include <string.h>
+ #include <stdlib.h>
  
  #include "roadmap.h"
***************
*** 35,38 ****
--- 36,40 ----
  #include "roadmap_locator.h"
  #include "roadmap_county.h"
+ #include "roadmap_math.h"
  #include "roadmap_adjust.h"
  #include "roadmap_plugin.h"
***************
*** 56,60 ****
  #endif
  
! static int update_range_export (const char *note) {
  
     return 0;
--- 58,169 ----
  #endif
  
! #define STREET_PREFIX "Street"
! #define CITY_PREFIX   "City"
! #define UPDATE_LEFT   "Update left"
! #define UPDATE_RIGHT  "Update right"
! 
! static RoadMapGpsPosition CurrentGpsPoint;
! static RoadMapPosition    CurrentFixedPosition;
! 
! static int extract_field(const char *note, const char *field_name,
!                          char *field, int size) {
! 
!    const char *lang_field_name = roadmap_lang_get (field_name);
! 
!    /* Save space for string termination */
!    size--;
! 
!    while (*note) {
!       if (!strncmp (field_name, note, strlen(field_name)) ||
!           !strncmp (lang_field_name, note, strlen(lang_field_name))) {
! 
!          const char *end;
! 
!          while (*note && (*note != ':')) note++;
!          if (!*note) break;
!          note++;
! 
!          while (*note && (*note == ' ')) note++;
! 
!          end = note;
! 
!          while (*end && (*end != NEW_LINE[0])) end++;
! 
!          if (note == end) {
!             field[0] = '\0';
!             return 0;
!          }
! 
!          if ((end - note) < size) size = end - note;
!          strncpy(field, note, size);
!          field[size] = '\0';
! 
!          return 0;
!       }
! 
!       while (*note && (*note != NEW_LINE[strlen(NEW_LINE)-1])) note++;
!       if (*note) note++;
!    }
! 
!    return -1;
! }
! 
! 
! static int update_range_export(int marker,
!                                const char **description,
!                                const char  *keys[MAX_ATTR],
!                                char        *values[MAX_ATTR],
!                                int         *count) {
!    
!    char field[100];
!    const char *note = editor_marker_note (marker);
!    *count = 0;
!    *description = NULL;
!    
!    if (extract_field (note, STREET_PREFIX, field, sizeof(field)) == -1) {
!       roadmap_log (ROADMAP_ERROR, "Update range - Can't find street name.");
!       return -1;
!    } else {
!       keys[*count] = "street";
!       values[*count] = strdup(field);
!       (*count)++;
!    }
! 
!    if (extract_field (note, CITY_PREFIX, field, sizeof(field)) == -1) {
!       roadmap_log (ROADMAP_ERROR, "Update range - Can't find city name.");
!       return -1;
!    } else {
!       keys[*count] = "city";
!       values[*count] = strdup(field);
!       (*count)++;
!    }
! 
!    if (extract_field (note, UPDATE_LEFT, field, sizeof(field)) != -1) {
!       if (atoi(field) <= 0) {
!          roadmap_log (ROADMAP_ERROR, "Update range - Left range is invalid.");
!          return -1;
!       } else {
!          keys[*count] = "left";
!          values[*count] = strdup(field);
!          (*count)++;
!       }
!    }
! 
!    if (extract_field (note, UPDATE_RIGHT, field, sizeof(field)) != -1) {
!       if (atoi(field) <= 0) {
!          roadmap_log (ROADMAP_ERROR, "Update range - Right range is invalid.");
!          return -1;
!       } else {
!          keys[*count] = "right";
!          values[*count] = strdup(field);
!          (*count)++;
!       }
!    }
! 
!    if (*count < 2) {
!       roadmap_log (ROADMAP_ERROR,
!                      "Update range - No range updates were found.");
!       return -1;
!    }
  
     return 0;
***************
*** 62,69 ****
  
  
! static const char *update_range_verify
!                      (unsigned char *flags, const char *note) {
  
!                         return 0;
  }
  
--- 171,215 ----
  
  
! static int update_range_verify(int marker,
!                                unsigned char *flags,
!                                const char **note) {
  
!    char field[100]; 
!    int found_update = 0;
!    
!    if (extract_field (*note, STREET_PREFIX, field, sizeof(field)) == -1) {
!       roadmap_messagebox ("Error", "Can't find street name.");
!       return -1;
!    }
! 
!    if (extract_field (*note, CITY_PREFIX, field, sizeof(field)) == -1) {
!       roadmap_messagebox ("Error", "Can't find city name.");
!       return -1;
!    }
! 
!    if (extract_field (*note, UPDATE_LEFT, field, sizeof(field)) != -1) {
!       if (atoi(field) <= 0) {
!          roadmap_messagebox ("Error", "Left range is invalid.");
!          return -1;
!       }
! 
!       found_update++;
!    }
! 
!    if (extract_field (*note, UPDATE_RIGHT, field, sizeof(field)) != -1) {
!       if (atoi(field) <= 0) {
!          roadmap_messagebox ("Error", "Right range is invalid.");
!          return -1;
!       }
! 
!       found_update++;
!    }
! 
!    if (!found_update) {
!       roadmap_messagebox ("Error", "No range updates were found.");
!       return -1;
!    }
! 
!    return 0;
  }
  
***************
*** 77,85 ****
  
  
! static int get_estimated_range (PluginLine *line, RoadMapGpsPosition *pos,
!                                 int direction,
!                                 int fraddl, int toaddl,
!                                 int fraddr, int toaddr,
!                                 int *left, int *right) {
  
  
--- 223,232 ----
  
  
! static int get_estimated_range(const PluginLine *line,
!                                const RoadMapPosition *pos,
!                                int direction,
!                                int fraddl, int toaddl,
!                                int fraddr, int toaddr,
!                                int *left, int *right) {
  
  
***************
*** 89,93 ****
  
     point_length =
!       roadmap_plugin_calc_length ((RoadMapPosition *)pos, line, &total_length);
  
     rel = 1.0 * point_length / total_length;
--- 236,240 ----
  
     point_length =
!       roadmap_plugin_calc_length (pos, line, &total_length);
  
     rel = 1.0 * point_length / total_length;
***************
*** 107,112 ****
   
  
! static int fill_dialog (PluginLine *line, RoadMapGpsPosition *pos,
!                         int direction) {
  
     const char *street_name;
--- 254,259 ----
   
  
! static int fill_dialog(PluginLine *line, RoadMapPosition *pos,
!                        int direction) {
  
     const char *street_name;
***************
*** 127,131 ****
        editor_street_get_properties (line->line_id, &properties);
  
!       street_name = editor_street_get_street_fename (&properties);
  
        city_name = editor_street_get_street_city
--- 274,278 ----
        editor_street_get_properties (line->line_id, &properties);
  
!       street_name = editor_street_get_street_name (&properties);
  
        city_name = editor_street_get_street_city
***************
*** 144,148 ****
        roadmap_street_get_properties (line->line_id, &properties);
  
!       street_name = roadmap_street_get_street_fename (&properties);
  
        city_name = roadmap_street_get_street_city
--- 291,295 ----
        roadmap_street_get_properties (line->line_id, &properties);
  
!       street_name = roadmap_street_get_street_name (&properties);
  
        city_name = roadmap_street_get_street_city
***************
*** 155,182 ****
     }
  
!    roadmap_dialog_set_data ("Update", "Street", street_name);
!    roadmap_dialog_set_data ("Update", "City", city_name);
  
     get_estimated_range
           (line, pos, direction, fraddl, toaddl, fraddr, toaddr, &left, &right);
  
!    snprintf(str, sizeof(str), "%d", left);
!    roadmap_dialog_set_data ("Update", "Left", str);
!    snprintf(str, sizeof(str), "%d", right);
!    roadmap_dialog_set_data ("Update", "Right", str);
  
!    roadmap_dialog_set_data ("Update", "Update left", "");
!    roadmap_dialog_set_data ("Update", "Update right", "");
     return 0;
  }
  
  
! static void update_range_apply (const char *name, void *context) {
  
     const char *updated_left =
!       roadmap_dialog_get_data ("Update", "Update left");
  
     const char *updated_right =
!       roadmap_dialog_get_data ("Update", "Update right");
  
     if (!*updated_left && !*updated_right) {
--- 302,332 ----
     }
  
!    roadmap_dialog_set_data ("Update", STREET_PREFIX, street_name);
! 
!    if (!city_name) city_name = "";
!    roadmap_dialog_set_data ("Update", CITY_PREFIX, city_name);
  
     get_estimated_range
           (line, pos, direction, fraddl, toaddl, fraddr, toaddr, &left, &right);
  
!    snprintf(str, sizeof(str), "%s:%d  %s:%d",
!          roadmap_lang_get ("Left"), left,
!          roadmap_lang_get ("Right"), right);
  
!    roadmap_dialog_set_data ("Update", "Estimated", str);
! 
!    roadmap_dialog_set_data ("Update", UPDATE_LEFT, "");
!    roadmap_dialog_set_data ("Update", UPDATE_RIGHT, "");
     return 0;
  }
  
  
! static void update_range_apply(const char *name, void *context) {
  
     const char *updated_left =
!       roadmap_dialog_get_data ("Update", UPDATE_LEFT);
  
     const char *updated_right =
!       roadmap_dialog_get_data ("Update", UPDATE_RIGHT);
  
     if (!*updated_left && !*updated_right) {
***************
*** 186,195 ****
     } else {
        char note[100];
-       RoadMapGpsPosition *gps_pos = (RoadMapGpsPosition *)context;
-       RoadMapPosition position;
        int fips;
  
!       roadmap_adjust_position (gps_pos, &position);
!       if (roadmap_county_by_position (&position, &fips, 1) < 1) {
           roadmap_messagebox ("Error", "Can't locate county");
           return;
--- 336,342 ----
     } else {
        char note[100];
        int fips;
  
!       if (roadmap_county_by_position (&CurrentFixedPosition, &fips, 1) < 1) {
           roadmap_messagebox ("Error", "Can't locate county");
           return;
***************
*** 207,214 ****
        }
  
        if (*updated_left) {
  
!          snprintf(note, sizeof(note), "%s: %s%s",
!                   roadmap_lang_get ("Update left"), updated_left, NEW_LINE);
        }
  
--- 354,372 ----
        }
  
+       snprintf(note, sizeof(note), "%s: %s%s",
+                roadmap_lang_get (STREET_PREFIX), 
+                (char *)roadmap_dialog_get_data ("Update", STREET_PREFIX),
+                NEW_LINE);
+ 
+       snprintf(note + strlen(note), sizeof(note) - strlen(note),
+                "%s: %s%s", roadmap_lang_get (CITY_PREFIX), 
+                (char *)roadmap_dialog_get_data ("Update", CITY_PREFIX),
+                NEW_LINE);
+ 
        if (*updated_left) {
  
!          snprintf(note + strlen(note), sizeof(note) - strlen(note),
!                   "%s: %s%s", roadmap_lang_get (UPDATE_LEFT), updated_left,
!                   NEW_LINE);
        }
  
***************
*** 216,225 ****
  
           snprintf(note + strlen(note), sizeof(note) - strlen(note),
!                   "%s: %s%s", roadmap_lang_get ("Update right"), updated_right,
                    NEW_LINE);
        }
  
!       if (editor_marker_add (gps_pos->longitude, gps_pos->latitude,
!                              gps_pos->steering, UpdateRangeMarkerType,
                               ED_MARKER_UPLOAD, note) == -1) {
  
--- 374,386 ----
  
           snprintf(note + strlen(note), sizeof(note) - strlen(note),
!                   "%s: %s%s", roadmap_lang_get (UPDATE_RIGHT), updated_right,
                    NEW_LINE);
        }
  
!       if (editor_marker_add (CurrentFixedPosition.longitude,
!                              CurrentFixedPosition.latitude,
!                              CurrentGpsPoint.steering,
!                              time(NULL),
!                              UpdateRangeMarkerType,
                               ED_MARKER_UPLOAD, note) == -1) {
  
***************
*** 232,236 ****
  
  
! static void update_range_cancel (const char *name, void *context) {
  
     roadmap_dialog_hide (name);
--- 393,397 ----
  
  
! static void update_range_cancel(const char *name, void *context) {
  
     roadmap_dialog_hide (name);
***************
*** 238,248 ****
  
  
! void update_range_dialog (void) {
  
!    static RoadMapGpsPosition pos;
     PluginLine line;
     int direction;
  
!    if (roadmap_navigate_get_current (&pos, &line, &direction) == -1) {
  
        roadmap_messagebox ("Error", "Can't find current street.");
--- 399,411 ----
  
  
! void update_range_dialog(void) {
  
!    RoadMapPosition from;
!    RoadMapPosition to;
     PluginLine line;
     int direction;
  
!    if (roadmap_navigate_get_current
!          (&CurrentGpsPoint, &line, &direction) == -1) {
  
        roadmap_messagebox ("Error", "Can't find current street.");
***************
*** 250,263 ****
     }
  
!    if (roadmap_dialog_activate ("Update street range", &pos)) {
  
!       roadmap_dialog_new_label ("Update", "Street");
!       roadmap_dialog_new_label ("Update", "City");
!       roadmap_dialog_new_label ("Update", "Estimated range");
!       roadmap_dialog_new_label ("Update", "Left");
!       roadmap_dialog_new_label ("Update", "Right");
  
!       roadmap_dialog_new_entry ("Update", "Update left", NULL);
!       roadmap_dialog_new_entry ("Update", "Update right", NULL);
  
        roadmap_dialog_add_button ("Cancel", update_range_cancel);
--- 413,436 ----
     }
  
!    roadmap_plugin_line_from (&line, &from);
!    roadmap_plugin_line_to   (&line, &to);
  
!    if (roadmap_math_get_distance_from_segment
!             ((RoadMapPosition *)&CurrentGpsPoint, &from, &to,
!              &CurrentFixedPosition, NULL) > 100) {
  
!       roadmap_messagebox ("Error", "Can't find a road near point.");
!       return;
!    }
! 
! 
!    if (roadmap_dialog_activate ("Update street range", NULL)) {
! 
!       roadmap_dialog_new_label ("Update", STREET_PREFIX);
!       roadmap_dialog_new_label ("Update", CITY_PREFIX);
!       roadmap_dialog_new_label ("Update", "Estimated");
! 
!       roadmap_dialog_new_entry ("Update", UPDATE_LEFT, NULL);
!       roadmap_dialog_new_entry ("Update", UPDATE_RIGHT, NULL);
  
        roadmap_dialog_add_button ("Cancel", update_range_cancel);
***************
*** 267,275 ****
     }
  
!    fill_dialog (&line, &pos, direction);
  }
  
  
! void update_range_initialize (void) {
     UpdateRangeMarkerType = editor_marker_reg_type (&UpdateRangeMarker);
  }
--- 440,448 ----
     }
  
!    fill_dialog (&line, &CurrentFixedPosition, direction);
  }
  
  
! void update_range_initialize(void) {
     UpdateRangeMarkerType = editor_marker_reg_type (&UpdateRangeMarker);
  }

[Roadmap-commit] roadmap_editor/src/editor/export editor_export.c, 1.15, 1.16

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

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

Modified Files:
	editor_export.c 
Log Message:
Add markers export.

Index: editor_export.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_export.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** editor_export.c	9 Aug 2006 07:27:13 -0000	1.15
--- editor_export.c	18 Aug 2006 17:45:33 -0000	1.16
***************
*** 57,60 ****
--- 57,61 ----
  #include "../db/editor_override.h"
  #include "../db/editor_route.h"
+ #include "../db/editor_marker.h"
  
  #include "../track/editor_track_main.h"
***************
*** 75,79 ****
                    ROADMAP_CONFIG_ITEM("FreeMap", "Upload file after export");
  
! static void editor_export_upload (const char *filename) {
  
     if (roadmap_config_match(&RoadMapConfigAutoUpload, "yes")) {
--- 76,80 ----
                    ROADMAP_CONFIG_ITEM("FreeMap", "Upload file after export");
  
! static void editor_export_upload(const char *filename) {
  
     if (roadmap_config_match(&RoadMapConfigAutoUpload, "yes")) {
***************
*** 83,87 ****
  
  
! static void export_write (ExportStream *stream, char *format, ...) {
  
     char buf[1024];
--- 84,88 ----
  
  
! static void export_write(ExportStream *stream, char *format, ...) {
  
     char buf[1024];
***************
*** 159,163 ****
  
  
! static int create_export_stream (ExportStream *stream, const char *name) {
  
     FILE *file;
--- 160,164 ----
  
  
! static int create_export_stream(ExportStream *stream, const char *name) {
  
     FILE *file;
***************
*** 219,224 ****
  
  
! static void add_trkpts (ExportStream *stream,
!                         int trkseg) {
  
     RoadMapPosition trkseg_pos;
--- 220,224 ----
  
  
! static void add_trkpts(ExportStream *stream, int trkseg) {
  
     RoadMapPosition trkseg_pos;
***************
*** 255,259 ****
  
  
! static const char *cfcc2type (int cfcc) {
  
     char **categories;
--- 255,259 ----
  
  
! static const char *cfcc2type(int cfcc) {
  
     char **categories;
***************
*** 266,270 ****
  
  
! static void add_attribute (ExportStream *stream, const char *name, const char *value) {
  
     char str[500];
--- 266,273 ----
  
  
! static void add_attribute(ExportStream *stream,
!                           const char *ns,
!                           const char *name,
!                           const char *value) {
  
     char str[500];
***************
*** 308,325 ****
     *itr = 0;
  
!    export_write (stream, "<%s>%s</%s>\n", name, str, name);
  }
  
  
! static void add_line_data (ExportStream *stream,
!                            int line_id,
!                            int plugin_id,
!                            int cfcc,
!                            int flags,
!                            int trkseg_flags,
!                            RoadMapPosition *line_from,
!                            RoadMapPosition *line_to,
!                            time_t start_time,
!                            time_t end_time) {
  
     EditorStreetProperties properties;
--- 311,426 ----
     *itr = 0;
  
!    if (ns) {
!       export_write (stream, "<%s:%s>%s</%s:%s>\n", ns, name, str, ns, name);
!    } else {
!       export_write (stream, "<%s>%s</%s>\n", name, str, name);
!    }
  }
  
  
! static void open_waypoint(ExportStream *stream, int lon, int lat, int ele,
!                           int steering, time_t time, const char *type,
!                           const char *note) {
!    
!    if (!note) note = "";
! 
!    export_write (stream, "<wpt lat=\"%d.%06d\" lon=\"%d.%06d\">\n",
!             lat / 1000000, lat % 1000000, lon / 1000000, lon % 1000000);
! 
!    if (ele != NO_ELEVATION) {
!       export_write (stream, "<ele>%d</ele>\n", ele);
!    }
!    
!    add_timestamp (stream, time);
! 
!    while (steering < 0) steering += 360;
!    while (steering > 360) steering -= 360;
!    export_write (stream, "<magvar>%d</magvar>\n", steering);
! 
!    add_attribute (stream, NULL, "desc", note);
!    export_write (stream, "<type>%s</type>\n", type);
! }
! 
! 
! static void close_waypoint(ExportStream *stream) {
! 
!    export_write (stream, "</wpt>\n");
! }
! 
! 
! static int export_markers(ExportStream *stream, const char *name) {
! 
!    int count = editor_marker_count();
!    int exported = 0;
!    int i;
! 
!    for (i=0; i<count; i++) {
!       int flags = editor_marker_flags (i);
!       RoadMapPosition pos;
!       time_t marker_time;
!       int steering;
!       const char *description;
!       const char *keys[MAX_ATTR];
!       char       *values[MAX_ATTR];
!       int attr_count;
! 
!       if (!(flags & ED_MARKER_DIRTY) || !(flags & ED_MARKER_UPLOAD)) continue;
! 
!       if (editor_marker_export
!             (i, &description, keys, values, &attr_count) == -1) {
!          continue;
!       }
! 
!       if (stream->type == NULL_STREAM) {
!          
!          if (create_export_stream (stream, name) != 0) {
!             return 0;
!          }
!       }
! 
!       editor_marker_position (i, &pos, &steering);
!       marker_time = editor_marker_time (i);
!       
!       open_waypoint (stream, pos.longitude, pos.latitude, NO_ELEVATION,
!                      steering, marker_time,
!                      editor_marker_type (i),
!                      description);
! 
!       if (attr_count > 0) {
!          int j;
! 
!          export_write (stream, "<extensions>\n");
! 
!          for (j=0; j<attr_count; j++) {
!    
!             add_attribute (stream, "freemap", keys[j], values[j]);
! 
!             free(values[j]);
!          }
! 
!          export_write (stream, "</extensions>\n");
!       }
! 
!       close_waypoint (stream);
! 
!       editor_marker_update (i, flags & ~ED_MARKER_DIRTY,
!                             editor_marker_note (i));
!       exported++;
!    }
! 
!    return exported;
! }
!       
! 
! static void add_line_data(ExportStream *stream,
!                           int line_id,
!                           int plugin_id,
!                           int cfcc,
!                           int flags,
!                           int trkseg_flags,
!                           RoadMapPosition *line_from,
!                           RoadMapPosition *line_to,
!                           time_t start_time,
!                           time_t end_time) {
  
     EditorStreetProperties properties;
***************
*** 391,403 ****
        editor_street_get_properties (line_id, &properties);
  
!       add_attribute (stream, "road_type", cfcc2type (cfcc));
     
!       add_attribute (stream, "street_name",
           editor_street_get_street_fename (&properties));
     
!       add_attribute (stream, "text2speech",
           editor_street_get_street_t2s (&properties));
  
!       add_attribute (stream, "city_name",
           editor_street_get_street_city
              (&properties, ED_STREET_LEFT_SIDE));
--- 492,504 ----
        editor_street_get_properties (line_id, &properties);
  
!       add_attribute (stream, NULL, "road_type", cfcc2type (cfcc));
     
!       add_attribute (stream, NULL, "street_name",
           editor_street_get_street_fename (&properties));
     
!       add_attribute (stream, NULL, "text2speech",
           editor_street_get_street_t2s (&properties));
  
!       add_attribute (stream, NULL, "city_name",
           editor_street_get_street_city
              (&properties, ED_STREET_LEFT_SIDE));
***************
*** 542,552 ****
     if (trkseg == -1) {
  
        if (callbacks) (*callbacks->progress) (50);
!       if (!export_dirty_lines (&stream, name)) {
  
           if (callbacks) {
              (*callbacks->progress) (100);
           } else {
!             editor_log (ROADMAP_INFO, "No trksegs are available for export.");
              roadmap_messagebox ("Export Error", "No new data to export.");
           }
--- 643,659 ----
     if (trkseg == -1) {
  
+       int exported = 0;
+ 
        if (callbacks) (*callbacks->progress) (50);
! 
!       exported  = export_markers (&stream, name);
!       exported += export_dirty_lines (&stream, name);
! 
!       if (!exported) {
  
           if (callbacks) {
              (*callbacks->progress) (100);
           } else {
!             editor_log (ROADMAP_INFO, "No data is available for export.");
              roadmap_messagebox ("Export Error", "No new data to export.");
           }
***************
*** 558,561 ****
--- 665,670 ----
           return 0;
        }
+ 
+       if (callbacks) (*callbacks->progress) (100);
        close_export_stream (&stream);
        
***************
*** 570,573 ****
--- 679,684 ----
     }
  
+    export_markers (&stream, name);
+ 
     estimated_lines = editor_line_get_count ();
     exported = 0;
***************
*** 672,675 ****
--- 783,787 ----
  
     export_dirty_lines (&stream, name);
+ 
     if (callbacks) (*callbacks->progress) (100);
     close_export_stream (&stream);
***************
*** 685,689 ****
  
  
! void editor_export_reset_dirty () {
     
     int count;
--- 797,801 ----
  
  
! void editor_export_reset_dirty(void) {
     
     int count;
***************
*** 723,728 ****
  
  
! static void editor_export_file_dialog_ok
!                            (const char *filename, const char *mode) {
  
     editor_export_data (filename, NULL);
--- 835,840 ----
  
  
! static void editor_export_file_dialog_ok(const char *filename,
!                                          const char *mode) {
  
     editor_export_data (filename, NULL);
***************
*** 730,734 ****
  
  
! void editor_export_gpx (void) {
                                  
     roadmap_fileselection_new ("Export data",
--- 842,846 ----
  
  
! void editor_export_gpx(void) {
                                  
     roadmap_fileselection_new ("Export data",
***************
*** 739,743 ****
  }
  
! int editor_export_empty (int fips) {
     
     int trkseg;
--- 851,855 ----
  }
  
! int editor_export_empty(int fips) {
     
     int trkseg;
***************
*** 773,777 ****
  
  
! void editor_export_initialize (void) {
     roadmap_config_declare_enumeration
         ("preferences", &RoadMapConfigAutoUpload, "no", "yes", NULL);
--- 885,890 ----
  
  
! void editor_export_initialize(void) {
! 
     roadmap_config_declare_enumeration
         ("preferences", &RoadMapConfigAutoUpload, "no", "yes", NULL);

[Roadmap-commit] roadmap_editor/src/editor/db editor_db.c, 1.6, 1.7 editor_marker.c, 1.1, 1.2 editor_marker.h, 1.1, 1.2

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

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

Modified Files:
	editor_db.c editor_marker.c editor_marker.h 
Log Message:
Add voice notes.
Add markers export.

Index: editor_db.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/db/editor_db.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** editor_db.c	10 Aug 2006 20:53:39 -0000	1.6
--- editor_db.c	18 Aug 2006 17:44:17 -0000	1.7
***************
*** 556,559 ****
--- 556,579 ----
     if (roadmap_file_exists (path, name)) {
  
+       char **files;
+       char **cursor;
+       char *directory;
+ 
+       /* Delete notes wav files */
+       /* FIXME this is broken for multiple counties */
+       directory = roadmap_path_join (roadmap_path_user (), "markers");
+       files = roadmap_path_list (directory, ".wav");
+ 
+       for (cursor = files; *cursor != NULL; ++cursor) {
+ 
+          char *full_name = roadmap_path_join (directory, *cursor);
+          roadmap_file_remove (NULL, full_name);
+ 
+          free (full_name);
+       }
+ 
+       free (directory);
+ 
+       /* Remove the actual editor file */
        roadmap_file_remove (path, name);
     }

Index: editor_marker.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/db/editor_marker.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editor_marker.h	10 Aug 2006 20:53:39 -0000	1.1
--- editor_marker.h	18 Aug 2006 17:44:17 -0000	1.2
***************
*** 25,48 ****
  #define INCLUDE__EDITOR_MARKER__H
  
  #include "roadmap_types.h"
  #include "roadmap_dbread.h"
  #include "editor_dictionary.h"
  
! #define ED_MARKER_UPLOAD  0x1
! #define ED_MARKER_DELETED 0x2
  
  typedef struct editor_marker_type {
     const char *name;
!    int (*export_marker) (const char *note);
!    const char *(*update_marker) (unsigned char *flags, const char *note);
  } EditorMarkerType;
  
  typedef struct editor_db_marker_s {
!    int longitude;
!    int latitude;
!    short steering;
!    unsigned char type;
!    unsigned char flags;
!    EditorString note;
  } editor_db_marker;
  
--- 25,56 ----
  #define INCLUDE__EDITOR_MARKER__H
  
+ #include <time.h>
  #include "roadmap_types.h"
  #include "roadmap_dbread.h"
  #include "editor_dictionary.h"
  
! #define ED_MARKER_DIRTY   0x1
! #define ED_MARKER_UPLOAD  0x2
! #define ED_MARKER_DELETED 0x4
! #define MAX_ATTR 5
  
  typedef struct editor_marker_type {
     const char *name;
!    int (*export_marker)(int          marker,
!                         const char **note,
!                         const char  *keys[MAX_ATTR],
!                         char        *values[MAX_ATTR],
!                         int         *count);
!    int (*update_marker)(int marker, unsigned char *flags, const char **note);
  } EditorMarkerType;
  
  typedef struct editor_db_marker_s {
!    int            longitude;
!    int            latitude;
!    short          steering;
!    time_t         time;
!    unsigned char  type;
!    unsigned char  flags;
!    EditorString   note;
  } editor_db_marker;
  
***************
*** 51,54 ****
--- 59,63 ----
                         int latitude,
                         int steering,
+                        time_t time,
                         unsigned char type,
                         unsigned char flags,
***************
*** 56,70 ****
     
  int  editor_marker_count (void);
- void editor_marker_position (int marker,
-                              RoadMapPosition *position, int *steering);
  
! const char *editor_marker_type (int marker);
! const char *editor_marker_note (int marker);
  
! unsigned char editor_marker_flags (int marker);
  
! void editor_marker_update (int marker, unsigned char flags, const char *note);
  
! int editor_marker_reg_type (EditorMarkerType *type);
  
  extern roadmap_db_handler EditorMarkersHandler;
--- 65,91 ----
     
  int  editor_marker_count (void);
  
! void editor_marker_position(int marker,
!                             RoadMapPosition *position,
!                             int *steering);
  
! time_t      editor_marker_time(int marker);
! const char *editor_marker_type(int marker);
! const char *editor_marker_note(int marker);
  
! unsigned char editor_marker_flags(int marker);
  
! void editor_marker_update(int marker, unsigned char flags, const char *note);
! 
! int editor_marker_reg_type(EditorMarkerType *type);
! 
! void editor_marker_voice_file (int marker, char *file, int size);
! 
! int editor_marker_export(int marker, const char **description,
!                          const char *keys[MAX_ATTR],
!                          char       *values[MAX_ATTR],
!                          int *count);
! 
! int editor_marker_verify(int marker, unsigned char *flags, const char **note);
  
  extern roadmap_db_handler EditorMarkersHandler;

Index: editor_marker.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/db/editor_marker.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editor_marker.c	10 Aug 2006 20:53:39 -0000	1.1
--- editor_marker.c	18 Aug 2006 17:44:17 -0000	1.2
***************
*** 32,35 ****
--- 32,36 ----
  
  #include "roadmap.h"
+ #include "roadmap_path.h"
  
  #include "../editor_log.h"
***************
*** 59,68 ****
  
  
! int editor_marker_add (int longitude,
!                        int latitude,
!                        int steering,
!                        unsigned char type,
!                        unsigned char flags,
!                        const char *note) {
     
     editor_db_marker marker;
--- 60,70 ----
  
  
! int editor_marker_add(int longitude,
!                       int latitude,
!                       int steering,
!                       time_t time,
!                       unsigned char type,
!                       unsigned char flags,
!                       const char *note) {
     
     editor_db_marker marker;
***************
*** 72,77 ****
     marker.latitude  = latitude;
     marker.steering  = steering;
     marker.type      = type;
!    marker.flags     = flags;
  
     if (note == NULL) {
--- 74,80 ----
     marker.latitude  = latitude;
     marker.steering  = steering;
+    marker.time      = time;
     marker.type      = type;
!    marker.flags     = flags | ED_MARKER_DIRTY;
  
     if (note == NULL) {
***************
*** 96,100 ****
  
  
! int  editor_marker_count (void) {
  
     return ActiveMarkersDB->num_items;
--- 99,105 ----
  
  
! int  editor_marker_count(void) {
! 
!    if (!ActiveMarkersDB) return 0;
  
     return ActiveMarkersDB->num_items;
***************
*** 102,107 ****
  
  
! void editor_marker_position (int marker,
!                              RoadMapPosition *position, int *steering) {
  
     editor_db_marker *marker_st =
--- 107,112 ----
  
  
! void editor_marker_position(int marker,
!                             RoadMapPosition *position, int *steering) {
  
     editor_db_marker *marker_st =
***************
*** 116,120 ****
  
  
! const char *editor_marker_type (int marker) {
     
     editor_db_marker *marker_st =
--- 121,125 ----
  
  
! const char *editor_marker_type(int marker) {
     
     editor_db_marker *marker_st =
***************
*** 126,130 ****
     
  
! const char *editor_marker_note (int marker) {
     
     editor_db_marker *marker_st =
--- 131,135 ----
     
  
! const char *editor_marker_note(int marker) {
     
     editor_db_marker *marker_st =
***************
*** 141,145 ****
  
  
! unsigned char editor_marker_flags (int marker) {
     
     editor_db_marker *marker_st =
--- 146,160 ----
  
  
! time_t editor_marker_time(int marker) {
!    
!    editor_db_marker *marker_st =
!       editor_db_get_item (ActiveMarkersDB, marker, 0, 0);
!    assert(marker_st != NULL);
! 
!    return marker_st->time;
! }
! 
! 
! unsigned char editor_marker_flags(int marker) {
     
     editor_db_marker *marker_st =
***************
*** 151,166 ****
  
  
! void editor_marker_update (int marker, unsigned char flags,
!                            const char *note) {
  
     editor_db_marker *marker_st =
        editor_db_get_item (ActiveMarkersDB, marker, 0, 0);
-    assert(marker_st != NULL);
  
!    marker_st->flags = flags;
  
     if (note == NULL) {
!       marker_st->note = ROADMAP_INVALID_STRING;
! 
     } else if ((marker_st->note == ROADMAP_INVALID_STRING) ||
                 strcmp(editor_dictionary_get (ActiveNoteDictionary,
--- 166,183 ----
  
  
! void editor_marker_update(int marker, unsigned char flags,
!                           const char *note) {
  
     editor_db_marker *marker_st =
        editor_db_get_item (ActiveMarkersDB, marker, 0, 0);
  
!    int dirty = 0;
!    assert(marker_st != NULL);
  
     if (note == NULL) {
!       if (marker_st->note != ROADMAP_INVALID_STRING) {
!          dirty++;
!          marker_st->note = ROADMAP_INVALID_STRING;
!       }
     } else if ((marker_st->note == ROADMAP_INVALID_STRING) ||
                 strcmp(editor_dictionary_get (ActiveNoteDictionary,
***************
*** 168,178 ****
                        note)) {
  
        marker_st->note = editor_dictionary_add
                             (ActiveNoteDictionary, note, strlen(note));
     }
  }
  
  
! int editor_marker_reg_type (EditorMarkerType *type) {
  
     int id = MarkerTypesCount;
--- 185,205 ----
                        note)) {
  
+       dirty++;
        marker_st->note = editor_dictionary_add
                             (ActiveNoteDictionary, note, strlen(note));
     }
+ 
+    if ((marker_st->flags & ~ED_MARKER_DIRTY) !=
+                   (flags & ~ED_MARKER_DIRTY)) {
+       dirty++;
+    }
+ 
+    marker_st->flags = flags;
+ 
+    if (dirty) marker_st->flags |= ED_MARKER_DIRTY;
  }
  
  
! int editor_marker_reg_type(EditorMarkerType *type) {
  
     int id = MarkerTypesCount;
***************
*** 186,187 ****
--- 213,260 ----
  }
  
+ 
+ void editor_marker_voice_file(int marker, char *file, int size) {
+    char *path = roadmap_path_join (roadmap_path_user (), "markers");
+    char file_name[100];
+    char *full_name;
+ 
+    roadmap_path_create (path);
+    snprintf (file_name, sizeof(file_name), "voice_%d.wav", marker);
+ 
+    full_name = roadmap_path_join (path, file_name);
+    strncpy (file, full_name, size);
+    file[size-1] = '\0';
+ 
+    roadmap_path_free (full_name);
+    roadmap_path_free (path);
+ }
+ 
+ 
+ int editor_marker_export(int marker, const char **description,
+                          const char *keys[MAX_ATTR],
+                          char       *values[MAX_ATTR],
+                          int *count) {
+    
+    editor_db_marker *marker_st =
+       editor_db_get_item (ActiveMarkersDB, marker, 0, 0);
+    
+    assert(marker_st != NULL);
+    
+    return MarkerTypes[marker_st->type]->export_marker (marker,
+                                                        description,
+                                                        keys,
+                                                        values,
+                                                        count);
+ }
+ 
+ 
+ int editor_marker_verify(int marker, unsigned char *flags, const char **note) {
+ 
+    editor_db_marker *marker_st =
+       editor_db_get_item (ActiveMarkersDB, marker, 0, 0);
+    
+    assert(marker_st != NULL);
+    
+    return MarkerTypes[marker_st->type]->update_marker (marker, flags, note);
+ }
+ 

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

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

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

Modified Files:
	editor_screen.c 
Log Message:
Draw markers.

Index: editor_screen.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_screen.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** editor_screen.c	10 Aug 2006 20:53:08 -0000	1.16
--- editor_screen.c	18 Aug 2006 17:39:32 -0000	1.17
***************
*** 103,106 ****
--- 103,107 ----
  static RoadMapHash *LinesDrawnHash;
  
+ static RoadMapScreenSubscriber screen_prev_after_refresh = NULL;
  
  static void init_lines_drawn (void) {
***************
*** 524,564 ****
  
  
- void editor_screen_initialize (void) {
-     
-    int i;
-    int j;
-    int k;
-    char name[80];
- 
-    /* FIXME should only create pens for road class */
- 
-    for (i=1; i<MAX_LAYERS; ++i) 
-       for (j=0; j<MAX_PEN_LAYERS; j++) 
-          for (k=0; k<MAX_ROAD_STATES; k++) {
- 
-             editor_pen *pen = &EditorPens[i][j][k];
- 
-             pen->in_use = 0;
- 
-             snprintf (name, sizeof(name), "EditorPen%d", i*100+j*10+k);
-             pen->pen = roadmap_canvas_create_pen (name);
-             roadmap_canvas_set_foreground (editor_screen_get_pen_color(j,k));
-             roadmap_canvas_set_thickness (1);
-          }
- 
-    EditorTrackPens[0].pen = roadmap_canvas_create_pen ("EditorTrack0");
-    roadmap_canvas_set_foreground ("black");
-    roadmap_canvas_set_thickness (1);
-    EditorTrackPens[1].pen = roadmap_canvas_create_pen ("EditorTrack1");
-    roadmap_canvas_set_foreground ("blue");
-    roadmap_canvas_set_thickness (1);
- }
- 
- 
  static void editor_screen_draw_markers (void) {
     RoadMapArea screen;
!    int count = editor_marker_count ();
!    int i;
  
     roadmap_math_screen_edges (&screen);
  
--- 525,538 ----
  
  
  static void editor_screen_draw_markers (void) {
     RoadMapArea screen;
!    int count;
!    int i;
  
+    int fips = roadmap_locator_active ();
+    if (editor_db_activate(fips) == -1) return;
+ 
+    count = editor_marker_count ();
+    
     roadmap_math_screen_edges (&screen);
  
***************
*** 578,581 ****
--- 552,567 ----
  
  
+ static void editor_screen_after_refresh (void) {
+ 
+    if (editor_is_enabled()) {
+       editor_screen_draw_markers ();
+    }
+ 
+    if (screen_prev_after_refresh) {
+       (*screen_prev_after_refresh) ();
+    }
+ }
+ 
+ 
  static void editor_screen_draw_square
                (int square, int fips, int min_cfcc, int pen_type) {
***************
*** 747,752 ****
  
        }
- 
-       editor_screen_draw_markers ();
     }
  
--- 733,736 ----
***************
*** 791,792 ****
--- 775,813 ----
  }
  
+ 
+ void editor_screen_initialize (void) {
+     
+    int i;
+    int j;
+    int k;
+    char name[80];
+ 
+    /* FIXME should only create pens for road class */
+ 
+    for (i=1; i<MAX_LAYERS; ++i) 
+       for (j=0; j<MAX_PEN_LAYERS; j++) 
+          for (k=0; k<MAX_ROAD_STATES; k++) {
+ 
+             editor_pen *pen = &EditorPens[i][j][k];
+ 
+             pen->in_use = 0;
+ 
+             snprintf (name, sizeof(name), "EditorPen%d", i*100+j*10+k);
+             pen->pen = roadmap_canvas_create_pen (name);
+             roadmap_canvas_set_foreground (editor_screen_get_pen_color(j,k));
+             roadmap_canvas_set_thickness (1);
+          }
+ 
+    EditorTrackPens[0].pen = roadmap_canvas_create_pen ("EditorTrack0");
+    roadmap_canvas_set_foreground ("black");
+    roadmap_canvas_set_thickness (1);
+    EditorTrackPens[1].pen = roadmap_canvas_create_pen ("EditorTrack1");
+    roadmap_canvas_set_foreground ("blue");
+    roadmap_canvas_set_thickness (1);
+ 
+    screen_prev_after_refresh = 
+       roadmap_screen_subscribe_after_refresh (editor_screen_after_refresh);
+ }
+ 
+ 
+ 

[Roadmap-commit] roadmap_editor/src/editor editor_plugin.c, 1.5, 1.6 editor_plugin.h, 1.1, 1.2

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

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

Modified Files:
	editor_plugin.c editor_plugin.h 
Log Message:
Disable editor override when doing route navigation.

Index: editor_plugin.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_plugin.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** editor_plugin.c	23 Apr 2006 13:21:18 -0000	1.5
--- editor_plugin.c	18 Aug 2006 17:39:09 -0000	1.6
***************
*** 43,46 ****
--- 43,48 ----
  
  
+ static int EditorPluginOverrideStatus = 1;
+ 
  static int editor_plugin_override_line (int line, int cfcc, int fips) {
  
***************
*** 49,52 ****
--- 51,56 ----
     }
  
+    if (!EditorPluginOverrideStatus) return 0;
+ 
     if (editor_override_line_get_flags (line) & ED_LINE_DELETED) {
        return 1;
***************
*** 170,171 ****
--- 174,181 ----
  }
  
+ 
+ void editor_plugin_set_override (int status) {
+ 
+    EditorPluginOverrideStatus = status;
+ }
+ 

Index: editor_plugin.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_plugin.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editor_plugin.h	28 Nov 2005 19:47:50 -0000	1.1
--- editor_plugin.h	18 Aug 2006 17:39:09 -0000	1.2
***************
*** 27,30 ****
--- 27,31 ----
  int editor_plugin_register (void);
  void editor_plugin_unregister (int plugin_id);
+ void editor_plugin_set_override (int status);
  
  #endif // INCLUDE__EDITOR_PLUGIN__H

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

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

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

Modified Files:
	editor_main.c 
Log Message:
Notes markers.


Index: editor_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** editor_main.c	10 Aug 2006 20:53:08 -0000	1.15
--- editor_main.c	18 Aug 2006 17:38:43 -0000	1.16
***************
*** 37,40 ****
--- 37,41 ----
  #include "editor_screen.h"
  #include "static/update_range.h"
+ #include "static/notes.h"
  #include "track/editor_track_main.h"
  #include "export/editor_upload.h"
***************
*** 46,50 ****
  int EditorPluginID = -1;
  
! const char *EDITOR_VERSION = "0.8.0 pre4";
  
  void editor_main_check_map (void) {
--- 47,51 ----
  int EditorPluginID = -1;
  
! const char *EDITOR_VERSION = "0.8.0 pre7";
  
  void editor_main_check_map (void) {
***************
*** 86,89 ****
--- 87,91 ----
     editor_track_initialize  ();
     update_range_initialize  ();
+    editor_notes_initialize  ();
     editor_main_set (1);
  

[Roadmap-commit] roadmap_editor/src/dglib sp-template.c,1.1,1.2

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

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

Modified Files:
	sp-template.c 
Log Message:
Use the clip option when returning the list of nodes.

Index: sp-template.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/dglib/sp-template.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sp-template.c	22 Mar 2006 08:51:51 -0000	1.1
--- sp-template.c	18 Aug 2006 17:35:57 -0000	1.2
***************
*** 73,77 ****
  
  static dglSPReport_s * DGL_SP_CACHE_REPORT_FUNC(
! 							dglGraph_s * pgraph, dglSPCache_s * pCache, dglInt32_t nStart, dglInt32_t nDestination
  							)
  {
--- 73,79 ----
  
  static dglSPReport_s * DGL_SP_CACHE_REPORT_FUNC(
! 							dglGraph_s * pgraph, dglSPCache_s * pCache, dglInt32_t nStart, dglInt32_t nDestination,
! 						dglSPClip_fn		fnClip,
! 						void * 				pvClipArg
  							)
  {
***************
*** 142,146 ****
  		}
  
! 		if ( arc.nFrom == nStart ) break;
  	}
  
--- 144,160 ----
  		}
  
! 		if ( arc.nFrom == nStart ) {
! 			if ( fnClip ) {
! 				dglSPClipInput_s 	clipInput;
! 				dglSPClipOutput_s	clipOutput;
! 				clipInput.pnPrevEdge 	= NULL;
! 				clipInput.pnNodeFrom 	= &nStart;
! 				clipInput.pnEdge		= pEdge;
! 				clipInput.pnNodeTo		= pDestination;
! 				clipInput.nFromDistance = 0;
! 				if (fnClip( pgraph , & clipInput , & clipOutput , pvClipArg ) ) continue;
! 			}
! 			break;
! 		}
  	}
  
***************
*** 323,327 ****
  	else {
  		if ( ppReport ) {
! 			if ( (*ppReport = DGL_SP_CACHE_REPORT_FUNC( pgraph, pCache, nStart, nDestination )) != NULL ) {
  				return 1;
  			}
--- 337,341 ----
  	else {
  		if ( ppReport ) {
! 			if ( (*ppReport = DGL_SP_CACHE_REPORT_FUNC( pgraph, pCache, nStart, nDestination, fnClip, pvClipArg )) != NULL ) {
  				return 1;
  			}
***************
*** 541,545 ****
  
  	if ( ppReport ) {
! 		*ppReport = DGL_SP_CACHE_REPORT_FUNC( pgraph, pCache, nStart, nDestination );
  		if ( *ppReport == NULL ) {
  			nRet = -pgraph->iErrno;
--- 555,559 ----
  
  	if ( ppReport ) {
! 		*ppReport = DGL_SP_CACHE_REPORT_FUNC( pgraph, pCache, nStart, nDestination, fnClip, pvClipArg );
  		if ( *ppReport == NULL ) {
  			nRet = -pgraph->iErrno;

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

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

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

Added Files:
	lang 
Log Message:
Hebrew translation.

--- NEW FILE: lang ---
(This appears to be a binary file; contents omitted.)

[Roadmap-commit] roadmap_editor/src/zlib - New directory

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

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

Log Message:
Directory /cvsroot/roadmap/roadmap_editor/src/zlib added to the repository

[Roadmap-commit] roadmap_editor/src/sound - New directory

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

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

Log Message:
Directory /cvsroot/roadmap/roadmap_editor/src/sound added to the repository

[Roadmap-commit] roadmap_editor/src roadmap_screen.c, 1.20, 1.21 roadmap_screen.h, 1.7, 1.8

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

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

Modified Files:
	roadmap_screen.c roadmap_screen.h 
Log Message:
Save current screen position on shutdown.

Index: roadmap_screen.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_screen.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** roadmap_screen.h	5 Jun 2006 09:17:28 -0000	1.7
--- roadmap_screen.h	18 Aug 2006 17:32:44 -0000	1.8
***************
*** 37,40 ****
--- 37,41 ----
  
  void roadmap_screen_initialize (void);
+ void roadmap_screen_shutdown   (void);
  
  void roadmap_screen_set_initial_position (void);

Index: roadmap_screen.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_screen.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** roadmap_screen.c	11 Aug 2006 18:12:40 -0000	1.20
--- roadmap_screen.c	18 Aug 2006 17:32:44 -0000	1.21
***************
*** 62,74 ****
  
  
- static RoadMapConfigDescriptor RoadMapConfigDeltaX =
-                         ROADMAP_CONFIG_ITEM("Delta", "X");
- 
- static RoadMapConfigDescriptor RoadMapConfigDeltaY =
-                         ROADMAP_CONFIG_ITEM("Delta", "Y");
- 
- static RoadMapConfigDescriptor RoadMapConfigDeltaRotate =
-                         ROADMAP_CONFIG_ITEM("Delta", "Rotate");
- 
  static RoadMapConfigDescriptor RoadMapConfigAccuracyMouse =
                          ROADMAP_CONFIG_ITEM("Accuracy", "Mouse");
--- 62,65 ----
***************
*** 1245,1252 ****
     RoadMapScreenDeltaY = 0;
     RoadMapScreenRotation = 0;
- 
-    roadmap_config_set_integer (&RoadMapConfigDeltaX, 0);
-    roadmap_config_set_integer (&RoadMapConfigDeltaY, 0);
-    roadmap_config_set_integer (&RoadMapConfigDeltaRotate, 0);
  }
  
--- 1236,1239 ----
***************
*** 1259,1265 ****
     RoadMapScreenDeltaY += dy;
  
-    roadmap_config_set_integer (&RoadMapConfigDeltaX, RoadMapScreenDeltaX);
-    roadmap_config_set_integer (&RoadMapConfigDeltaY, RoadMapScreenDeltaY);
- 
     center.x = (RoadMapScreenWidth / 2) + dx;
     center.y = (RoadMapScreenHeight / 2) + dy;
--- 1246,1249 ----
***************
*** 1425,1429 ****
     if (roadmap_math_set_orientation (calculated_rotation)) {
        RoadMapScreenRotation = rotation;
-       roadmap_config_set_integer (&RoadMapConfigDeltaRotate, rotation);
        roadmap_screen_repaint ();
     }
--- 1409,1412 ----
***************
*** 1547,1554 ****
  void roadmap_screen_initialize (void) {
  
-    roadmap_config_declare ("session", &RoadMapConfigDeltaX, "0");
-    roadmap_config_declare ("session", &RoadMapConfigDeltaY, "0");
-    roadmap_config_declare ("session", &RoadMapConfigDeltaRotate, "0");
- 
     roadmap_config_declare
         ("preferences", &RoadMapConfigAccuracyMouse,  "20");
--- 1530,1533 ----
***************
*** 1597,1600 ****
--- 1576,1589 ----
  
  
+ void roadmap_screen_shutdown (void) {
+    RoadMapGpsPosition point;
+    point.longitude = RoadMapScreenCenter.longitude;
+    point.latitude  = RoadMapScreenCenter.latitude;
+    point.steering  = RoadMapScreenRotation;
+ 
+    roadmap_trip_set_mobile ("Hold", &point);
+ }
+ 
+ 
  void roadmap_screen_set_initial_position (void) {
  
***************
*** 1603,1611 ****
      roadmap_layer_initialize();
  
-     RoadMapScreenDeltaX = roadmap_config_get_integer (&RoadMapConfigDeltaX);
-     RoadMapScreenDeltaY = roadmap_config_get_integer (&RoadMapConfigDeltaY);
-     RoadMapScreenRotation =
-        roadmap_config_get_integer (&RoadMapConfigDeltaRotate);
- 
      RoadMapBackground = roadmap_canvas_create_pen ("Map.Background");
      roadmap_canvas_set_foreground
--- 1592,1595 ----

[Roadmap-commit] roadmap_editor/src roadmap_trip.c, 1.9, 1.10 roadmap_trip.h, 1.4, 1.5

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

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

Modified Files:
	roadmap_trip.c roadmap_trip.h 
Log Message:
Add const definition.

Index: roadmap_trip.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_trip.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** roadmap_trip.c	11 Aug 2006 18:13:06 -0000	1.9
--- roadmap_trip.c	18 Aug 2006 17:31:32 -0000	1.10
***************
*** 330,334 ****
  
  
! static void roadmap_trip_set_dialog (RoadMapPosition *position) {
  
      static RoadMapPosition point_position;
--- 330,334 ----
  
  
! static void roadmap_trip_set_dialog (const RoadMapPosition *position) {
  
      static RoadMapPosition point_position;
***************
*** 686,690 ****
  
  
! void roadmap_trip_set_point (const char *name, RoadMapPosition *position) {
  
      if (name == NULL) {
--- 686,691 ----
  
  
! void roadmap_trip_set_point (const char *name,
!                              const RoadMapPosition *position) {
  
      if (name == NULL) {

Index: roadmap_trip.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_trip.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_trip.h	11 Jun 2006 10:58:58 -0000	1.4
--- roadmap_trip.h	18 Aug 2006 17:31:32 -0000	1.5
***************
*** 32,36 ****
         TRIP_FOCUS_NO_GPS = 0};
  
! void  roadmap_trip_set_point (const char *name, RoadMapPosition *position);
  
  void  roadmap_trip_set_mobile (const char *name,
--- 32,37 ----
         TRIP_FOCUS_NO_GPS = 0};
  
! void  roadmap_trip_set_point (const char *name,
!                               const RoadMapPosition *position);
  
  void  roadmap_trip_set_mobile (const char *name,

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

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

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

Modified Files:
	roadmap_start.c 
Log Message:
Create action list for key binding configuration.

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_start.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** roadmap_start.c	11 Aug 2006 18:14:47 -0000	1.27
--- roadmap_start.c	18 Aug 2006 17:30:51 -0000	1.28
***************
*** 81,84 ****
--- 81,85 ----
  #include "editor/static/update_range.h"
  #include "editor/static/edit_marker.h"
+ #include "editor/static/notes.h"
  #include "editor/export/editor_export.h"
  #include "editor/export/editor_upload.h"
***************
*** 524,531 ****
--- 525,577 ----
        "View / Edit markers", edit_markers_dialog},
  
+    {"addquicknote", "Add a quick note", NULL, NULL,
+       "Add a quick note", editor_notes_add_quick},
+ 
+    {"addeditnote", "Add a note", NULL, NULL,
+       "Add a note and open edit dialog", editor_notes_add_edit},
+ 
+    {"addvoicenote", "Add a voice note", NULL, NULL,
+       "Add a voice note", editor_notes_add_voice},
+ 
     {NULL, NULL, NULL, NULL, NULL, NULL}
  };
  
  
+ static const char *RoadMapStartCfgActions[] = {
+ 
+    "preferences",
+    "mutevoice",
+    "enablevoice",
+    "quit",
+    "zoomin",
+    "zoomout",
+    "zoom1",
+    "up",
+    "left",
+    "right",
+    "down",
+    "toggleview",
+    "toggleorientation",
+    "IncHorizon",
+    "DecHorizon",
+    "clockwise",
+    "counterclockwise",
+    "hold",
+    "address",
+    "destination",
+    "gps",
+    "location",
+    "full",
+    "sync",
+    "quickmenu",
+    "updaterange",
+    "viewmarkers",
+    "addquicknote",
+    "addeditnote",
+    "addvoicenote",
+    NULL
+ };
+ 
+ 
  static const char *RoadMapStartMenu[] = {
  
***************
*** 690,693 ****
--- 736,740 ----
     "address",
     "updaterange",
+    "addeditnote",
     "viewmarkers",
     RoadMapFactorySeparator,
***************
*** 696,699 ****
--- 743,747 ----
     "detectreceiver",
     "preferences",
+    "about",
  
     NULL,
***************
*** 774,778 ****
        char *separator;
        const RoadMapAction *this_action;
!       const RoadMapAction *actions = RoadMapStartActions;
        RoadMapConfigItem *item;
  
--- 822,826 ----
        char *separator;
        const RoadMapAction *this_action;
!       const char **cfg_actions = RoadMapStartCfgActions;
        RoadMapConfigItem *item;
  
***************
*** 798,804 ****
  
              item = roadmap_config_declare_enumeration
!                    ("preferences", &config, this_action->label_long, NULL);
  
-             if (strcmp(this_action->label_long, roadmap_config_get (&config))) {
                 new_config = roadmap_config_get (&config);
              }
--- 846,855 ----
  
              item = roadmap_config_declare_enumeration
!                    ("preferences", &config,
!                     roadmap_lang_get (this_action->label_long), NULL);
! 
!             if (strcmp(roadmap_lang_get (this_action->label_long),
!                      roadmap_config_get (&config))) {
  
                 new_config = roadmap_config_get (&config);
              }
***************
*** 815,830 ****
           }
  
!          while (actions->name) {
!             if (new_config && !strcmp(new_config, actions->label_long)) {
!                new_config = actions->name;
              }
  
!             roadmap_config_add_enumeration_value (item, actions->label_long);
!             actions++;
           }
  
           if (new_config != NULL) {
              char str[100];
!             snprintf(str, sizeof(str), "%s %s %s", text, ROADMAP_MAPPED_TO, new_config);
              *keys = strdup(str);
           }
--- 866,887 ----
           }
  
!          while (*cfg_actions) {
!             const RoadMapAction *cfg_action =
!                         roadmap_start_find_action (*cfg_actions);
!             if (new_config &&
!                   !strcmp(new_config,
!                           roadmap_lang_get (cfg_action->label_long))) {
!                new_config = cfg_action->name;
              }
  
!             roadmap_config_add_enumeration_value
!                      (item, roadmap_lang_get (cfg_action->label_long));
!             cfg_actions++;
           }
  
           if (new_config != NULL) {
              char str[100];
!             snprintf(str, sizeof(str), "%s %s %s", text, ROADMAP_MAPPED_TO,
!                                                    new_config);
              *keys = strdup(str);
           }
***************
*** 1054,1057 ****
--- 1111,1115 ----
  static void roadmap_start_usage (const char *section) {
  
+    roadmap_factory_keymap (RoadMapStartActions, RoadMapStartKeyBinding);
     roadmap_factory_usage (section, RoadMapStartActions);
  }
***************
*** 1147,1151 ****
  
     roadmap_driver_activate ();
-    roadmap_gps_open ();
  
     roadmap_help_initialize ();
--- 1205,1208 ----
***************
*** 1164,1167 ****
--- 1221,1226 ----
     }
  
+    roadmap_gps_open ();
+ 
     roadmap_locator_declare (&roadmap_start_no_download);
     roadmap_main_set_periodic (200, roadmap_start_periodic);
***************
*** 1175,1180 ****
      roadmap_sound_shutdown ();
      roadmap_history_save ();
!     roadmap_config_save (0);
      roadmap_start_save_trip ();
      roadmap_db_end ();
      roadmap_gps_shutdown ();
--- 1234,1240 ----
      roadmap_sound_shutdown ();
      roadmap_history_save ();
!     roadmap_screen_shutdown ();
      roadmap_start_save_trip ();
+     roadmap_config_save (0);
      roadmap_db_end ();
      roadmap_gps_shutdown ();

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

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

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

Modified Files:
	roadmap_navigate.c 
Log Message:
Disable editor override when doing route navigation.

Index: roadmap_navigate.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_navigate.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** roadmap_navigate.c	9 Aug 2006 07:09:51 -0000	1.14
--- roadmap_navigate.c	18 Aug 2006 17:26:51 -0000	1.15
***************
*** 43,46 ****
--- 43,49 ----
  #include "roadmap_adjust.h"
  
+ //FIXME remove when navigation will support plugin lines
+ #include "editor/editor_plugin.h"
+ 
  #include "roadmap_navigate.h"
  
***************
*** 141,145 ****
  
  
!     roadmap_log_push ("roadmap_navigate_retrieve_line");
  
      if (roadmap_math_point_is_visible (position)) {
--- 144,148 ----
  
  
!     roadmap_log_push ("roadmap_navigate_get_neighbours");
  
      if (roadmap_math_point_is_visible (position)) {
***************
*** 663,666 ****
--- 666,673 ----
      /* We must search again for the best street match. */
  
+     //FIXME remove when navigation will support plugin lines
+     if (RoadMapRouteInfo.enabled) {
+        editor_plugin_set_override (0);
+     }
      count = roadmap_navigate_get_neighbours
                  (&RoadMapLatestPosition, roadmap_fuzzy_max_distance(),
***************
*** 710,713 ****
--- 717,725 ----
      }
  
+     //FIXME remove when navigation will support plugin lines
+     if (RoadMapRouteInfo.enabled) {
+        editor_plugin_set_override (1);
+     }
+ 
      if (roadmap_fuzzy_is_acceptable (best)) {
  

[Roadmap-commit] roadmap_editor/src roadmap_list.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-serv27166

Modified Files:
	roadmap_list.h 
Log Message:
Fix newline.

Index: roadmap_list.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_list.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_list.h	11 Aug 2006 18:13:06 -0000	1.2
--- roadmap_list.h	18 Aug 2006 17:21:55 -0000	1.3
***************
*** 49,53 ****
   * always unsafe.  So the current situation is my fault.  -pgf ]
   */
! 
  #include "roadmap.h"
  
--- 49,53 ----
   * always unsafe.  So the current situation is my fault.  -pgf ]
   */
! 
  #include "roadmap.h"
  

[Roadmap-commit] roadmap_editor/src roadmap_lang.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-serv27129

Modified Files:
	roadmap_lang.c 
Log Message:
RTL support.

Index: roadmap_lang.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_lang.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_lang.c	27 Jul 2006 14:18:46 -0000	1.1
--- roadmap_lang.c	18 Aug 2006 17:21:26 -0000	1.2
***************
*** 50,53 ****
--- 50,54 ----
  static RoadMapHash *RoadMapLangHash;
  static int RoadMapLangLoaded = 0;
+ static int RoadMapLangRTL = 0;
  
  
***************
*** 157,160 ****
--- 158,162 ----
  
     RoadMapLangLoaded = roadmap_lang_load (p);
+    RoadMapLangRTL = (strcasecmp(roadmap_lang_get ("RTL"), "Yes") == 0);
  }
  
***************
*** 184,188 ****
  
  int roadmap_lang_rtl (void) {
!    return 1;
  }
  
--- 186,190 ----
  
  int roadmap_lang_rtl (void) {
!    return RoadMapLangRTL;
  }
  

[Roadmap-commit] roadmap_editor/src roadmap_dialog.h,1.6,1.7

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

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

Modified Files:
	roadmap_dialog.h 
Log Message:
Allow setting a focus on a specific field.

Index: roadmap_dialog.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_dialog.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** roadmap_dialog.h	10 Aug 2006 20:49:48 -0000	1.6
--- roadmap_dialog.h	18 Aug 2006 17:20:59 -0000	1.7
***************
*** 140,143 ****
--- 140,145 ----
  void  roadmap_dialog_protect  (const char *frame, const char *name);
  
+ void  roadmap_dialog_set_focus (const char *frame, const char *name);
+ 
  #ifndef ROADMAP_DIALOG_NO_LANG
  #include "roadmap_lang.h"
***************
*** 264,267 ****
--- 266,275 ----
  }
           
+ static __inline void roadmap_dialog_set_focus_i
+                      (const char *frame, const char *name) {
+ 
+    roadmap_dialog_set_focus (roadmap_lang_get (frame), roadmap_lang_get (name));
+ }
+          
  #define roadmap_dialog_activate      roadmap_dialog_activate_i
  #define roadmap_dialog_hide          roadmap_dialog_hide_i
***************
*** 282,285 ****
--- 290,294 ----
  #define roadmap_dialog_set_progress  roadmap_dialog_set_progress_i
  #define roadmap_dialog_protect       roadmap_dialog_protect_i
+ #define roadmap_dialog_set_focus     roadmap_dialog_set_focus_i
  #endif
  

[Roadmap-commit] roadmap_editor/src roadmap_address.c, 1.8, 1.9 roadmap_address.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-serv26230

Modified Files:
	roadmap_address.c roadmap_address.h 
Log Message:
Add navigate button to the Address dialog.

Index: roadmap_address.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_address.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** roadmap_address.c	10 Aug 2006 20:49:28 -0000	1.8
--- roadmap_address.c	18 Aug 2006 17:19:06 -0000	1.9
***************
*** 53,56 ****
--- 53,57 ----
  static int RoadMapAddressSearchCount;
  static char *RoadMapAddressSearchNames[MAX_NAMES];
+ static RoadMapAddressNav RoadMapAddressNavigate;
  
  typedef struct {
***************
*** 59,62 ****
--- 60,64 ----
      
      int   use_zip;
+     int   navigate;
  
      RoadMapGeocode *selections;
***************
*** 74,78 ****
  } RoadMapAddressSearch;
  
! static void roadmap_address_done (RoadMapGeocode *selected) {
  
      PluginStreet street;
--- 76,81 ----
  } RoadMapAddressSearch;
  
! static void roadmap_address_done (RoadMapGeocode *selected,
!                                   RoadMapAddressDialog *context) {
  
      PluginStreet street;
***************
*** 92,103 ****
         (&line, ROADMAP_PLUGIN_ID, selected->line, -1, selected->fips);
  
-     roadmap_display_activate
-        ("Selected Street", &line, &selected->position, &street);
- 
      roadmap_trip_set_point ("Selection", &selected->position);
      roadmap_trip_set_point ("Address", &selected->position);
-     roadmap_trip_set_focus ("Address");
  
!     roadmap_screen_refresh ();
  }
  
--- 95,116 ----
         (&line, ROADMAP_PLUGIN_ID, selected->line, -1, selected->fips);
  
      roadmap_trip_set_point ("Selection", &selected->position);
      roadmap_trip_set_point ("Address", &selected->position);
  
!     if (!context->navigate || !RoadMapAddressNavigate) {
!        
!        roadmap_dialog_hide (context->title);
! 
!        roadmap_trip_set_focus ("Address");
! 
!        roadmap_display_activate
!           ("Selected Street", &line, &selected->position, &street);
!        
!        roadmap_screen_refresh ();
!     } else {
!        if ((*RoadMapAddressNavigate) (&selected->position, &line, 0) != -1) {
!          roadmap_dialog_hide (context->title);
!        }
!     }
  }
  
***************
*** 111,115 ****
  
     if (selected != NULL) {
!       roadmap_address_done (selected);
     }
  }
--- 124,128 ----
  
     if (selected != NULL) {
!       roadmap_address_done (selected, data);
     }
  }
***************
*** 198,202 ****
  
  
! static void roadmap_address_ok (const char *name, void *data) {
  
     int i;
--- 211,215 ----
  
  
! static void roadmap_address_show (const char *name, void *data) {
  
     int i;
***************
*** 244,249 ****
     roadmap_history_add ('A', argv);
  
-    roadmap_dialog_hide (name);
- 
     if (count > 1) {
  
--- 257,260 ----
***************
*** 261,265 ****
     } else {
  
!       roadmap_address_done (selections);
  
        free (selections[0].name);
--- 272,276 ----
     } else {
  
!       roadmap_address_done (selections, context);
  
        free (selections[0].name);
***************
*** 269,275 ****
  
  
! static void roadmap_address_cancel (const char *name, void *data) {
  
!    roadmap_dialog_hide (name);
  }
  
--- 280,290 ----
  
  
! static void roadmap_address_navigate (const char *name, void *data) {
  
!    RoadMapAddressDialog *context = (RoadMapAddressDialog *) data;
! 
!    context->navigate = 1;
! 
!    roadmap_address_show (name, data);
  }
  
***************
*** 411,418 ****
     if (roadmap_dialog_activate (context->title, context)) {
  
-       roadmap_dialog_new_entry ("Address", "Number", NULL);
-       roadmap_dialog_new_choice ("Address", "Street",
-             sizeof(def_values) / sizeof(char **),
-             def_values, (void **)def_values, roadmap_address_other_cb);
        if (context->use_zip) {
           roadmap_dialog_new_entry ("Address", "Zip", NULL);
--- 426,429 ----
***************
*** 422,431 ****
                 def_values, (void **)def_values, roadmap_address_other_cb);
        }
        roadmap_dialog_new_entry ("Address", "State", NULL);
  
        roadmap_dialog_add_button ("Back", roadmap_address_before);
        roadmap_dialog_add_button ("Next", roadmap_address_after);
!       roadmap_dialog_add_button ("OK", roadmap_address_ok);
!       roadmap_dialog_add_button ("Cancel", roadmap_address_cancel);
  
        roadmap_dialog_complete (roadmap_preferences_use_keyboard());
--- 433,446 ----
                 def_values, (void **)def_values, roadmap_address_other_cb);
        }
+       roadmap_dialog_new_choice ("Address", "Street",
+             sizeof(def_values) / sizeof(char **),
+             def_values, (void **)def_values, roadmap_address_other_cb);
+       roadmap_dialog_new_entry ("Address", "Number", NULL);
        roadmap_dialog_new_entry ("Address", "State", NULL);
  
        roadmap_dialog_add_button ("Back", roadmap_address_before);
        roadmap_dialog_add_button ("Next", roadmap_address_after);
!       roadmap_dialog_add_button ("Show", roadmap_address_show);
!       roadmap_dialog_add_button ("Navigate", roadmap_address_navigate);
  
        roadmap_dialog_complete (roadmap_preferences_use_keyboard());
***************
*** 437,440 ****
--- 452,457 ----
     }
  
+    context->navigate = 0;
+ 
     context->history = roadmap_history_latest ('A');
  
***************
*** 482,485 ****
--- 499,503 ----
     roadmap_dialog_set_data  (".search", "Name", "");
     roadmap_dialog_set_data  (".search", "found", "");
+    roadmap_dialog_set_focus (".search", "Name");
  
     roadmap_address_search_populate ("Search Address", context);
***************
*** 489,493 ****
  void roadmap_address_location_by_city (void) {
  
!    static RoadMapAddressDialog context = {"Location", 0, NULL, NULL};
  
     roadmap_address_dialog (&context);
--- 507,511 ----
  void roadmap_address_location_by_city (void) {
  
!    static RoadMapAddressDialog context = {"Location", 0, 0, NULL, NULL};
  
     roadmap_address_dialog (&context);
***************
*** 496,502 ****
  void roadmap_address_location_by_zip (void) {
  
!    static RoadMapAddressDialog context = {"Location by ZIP", 1, NULL, NULL};
  
     roadmap_address_dialog (&context);
  }
  
--- 514,524 ----
  void roadmap_address_location_by_zip (void) {
  
!    static RoadMapAddressDialog context = {"Location by ZIP", 1, 0, NULL, NULL};
  
     roadmap_address_dialog (&context);
  }
  
+ void roadmap_address_register_nav (RoadMapAddressNav navigate) {
+    RoadMapAddressNavigate = navigate;
+ }
+ 

Index: roadmap_address.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_address.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_address.h	12 May 2006 13:16:43 -0000	1.2
--- roadmap_address.h	18 Aug 2006 17:19:07 -0000	1.3
***************
*** 25,29 ****
--- 25,36 ----
  #define INCLUDE__ROADMAP_ADDRESS__H
  
+ #include "roadmap.h"
+ #include "roadmap_plugin.h"
+ 
  typedef void (*RoadMapAddressSearchCB) (const char *result, void *context);
+ typedef int  (*RoadMapAddressNav) (const RoadMapPosition *point,
+                                    const PluginLine *line,
+                                    int direction);
+ 
  void roadmap_address_destination_by_city (void);
  void roadmap_address_location_by_city (void);
***************
*** 32,34 ****
--- 39,43 ----
                                      void *data);
  
+ void roadmap_address_register_nav (RoadMapAddressNav navigate);
+ 
  #endif // INCLUDE__ROADMAP_ADDRESS__H

[Roadmap-commit] roadmap_editor/src Makefile.win32,1.1,1.2

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

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

Modified Files:
	Makefile.win32 
Log Message:
Generic win32 support.

Index: Makefile.win32
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/Makefile.win32,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.win32	13 Jul 2006 06:49:38 -0000	1.1
--- Makefile.win32	18 Aug 2006 17:17:39 -0000	1.2
***************
*** 92,96 ****
  
  
! CFLAGS=$(MODECFLAGS) $(SQLCFLAGS) $(ROADMAP_USE_SHAPEFILES) -I/usr/local/include -I$(PWD) -I./dglib -DROADMAP_USE_POSTGRES
  LDFLAGS=$(MODELDFLAGS) $(SQLLDFLAGS) $(SHAPELDFLAGS) -lpq -L ./dglib
  
--- 92,96 ----
  
  
! CFLAGS=$(MODECFLAGS) $(SQLCFLAGS) $(ROADMAP_USE_SHAPEFILES) -I/usr/local/include -I$(PWD) -I./dglib -DROADMAP_USE_POSTGRES -D_WIN32_IE=0x500 -I./zlib
  LDFLAGS=$(MODELDFLAGS) $(SQLLDFLAGS) $(SHAPELDFLAGS) -lpq -L ./dglib
  
***************
*** 159,162 ****
--- 159,163 ----
            roadmap_help.c \
            roadmap_label.c \
+           roadmap_lang.c \
            roadmap_start.c
  
***************
*** 168,171 ****
--- 169,173 ----
            roadmap_help.c \
            roadgps_screen.c \
+           roadmap_lang.c \
            roadgps_logger.c
  
***************
*** 179,184 ****
--- 181,190 ----
               editor/editor_screen.c \
               editor/static/editor_dialog.c \
+              editor/static/notes.c \
+              editor/static/edit_marker.c \
+              editor/static/update_range.c \
               editor/db/editor_street.c \
               editor/db/editor_point.c \
+              editor/db/editor_marker.c \
               editor/db/editor_shape.c \
               editor/db/editor_line.c \
***************
*** 193,196 ****
--- 199,203 ----
               editor/export/editor_download.c \
               editor/export/editor_upload.c \
+              editor/export/editor_sync.c \
               editor/db/editor_trkseg.c \
               editor/track/editor_track_filter.c \

[Roadmap-commit] roadmap_editor/src Makefile,1.20,1.21

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

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

Modified Files:
	Makefile 
Log Message:
Notes markers.


Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Makefile	10 Aug 2006 20:51:10 -0000	1.20
--- Makefile	18 Aug 2006 17:16:57 -0000	1.21
***************
*** 178,181 ****
--- 178,182 ----
               editor/static/update_range.c \
               editor/static/edit_marker.c \
+              editor/static/notes.c \
               editor/db/editor_street.c \
               editor/db/editor_point.c \

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

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

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

Modified Files:
	roadmap_screen.c 
Log Message:
remove errant debug lines


Index: roadmap_screen.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_screen.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** roadmap_screen.c	15 Aug 2006 01:34:13 -0000	1.70
--- roadmap_screen.c	17 Aug 2006 13:43:57 -0000	1.71
***************
*** 1077,1081 ****
     RoadMapScreenOrientationDynamic = 
  	roadmap_config_match(&RoadMapConfigMapDynamicOrientation, "on");
- roadmap_log (ROADMAP_WARNING, "init dyn %d", RoadMapScreenOrientationDynamic);
  
     roadmap_math_set_size (RoadMapScreenWidth, RoadMapScreenHeight);
--- 1077,1080 ----
***************
*** 1342,1346 ****
     
     RoadMapScreenOrientationDynamic = ! RoadMapScreenOrientationDynamic;
- roadmap_log (ROADMAP_WARNING, "dyn now %d", RoadMapScreenOrientationDynamic);
  
     RoadMapScreenRotation = 0;
--- 1341,1344 ----

[Roadmap-commit] roadmap/src roadmap_factory.c,1.20,1.21

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

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

Modified Files:
	roadmap_factory.c 
Log Message:
remove newlines from log messages


Index: roadmap_factory.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_factory.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** roadmap_factory.c	7 Dec 2005 00:05:29 -0000	1.20
--- roadmap_factory.c	16 Aug 2006 20:45:43 -0000	1.21
***************
*** 303,307 ****
  
        if (fields[1] != NULL) {
!          roadmap_log (ROADMAP_DEBUG, "assigning long label '%s' to %s\n",
                       fields[1], this_action->name);
           this_action->label_long = fields[1];
--- 303,307 ----
  
        if (fields[1] != NULL) {
!          roadmap_log (ROADMAP_DEBUG, "assigning long label '%s' to %s",
                       fields[1], this_action->name);
           this_action->label_long = fields[1];
***************
*** 309,313 ****
  
        if (fields[2] != NULL) {
!          roadmap_log (ROADMAP_DEBUG, "assigning terse label '%s' to %s\n",
                       fields[2], this_action->name);
           this_action->label_terse = fields[2];
--- 309,313 ----
  
        if (fields[2] != NULL) {
!          roadmap_log (ROADMAP_DEBUG, "assigning terse label '%s' to %s",
                       fields[2], this_action->name);
           this_action->label_terse = fields[2];
***************
*** 315,319 ****
  
        if (fields[3] != NULL) {
!          roadmap_log (ROADMAP_DEBUG, "assigning tip '%s' to %s\n",
                       fields[3], this_action->name);
           this_action->tip = fields[3];
--- 315,319 ----
  
        if (fields[3] != NULL) {
!          roadmap_log (ROADMAP_DEBUG, "assigning tip '%s' to %s",
                       fields[3], this_action->name);
           this_action->tip = fields[3];

[Roadmap-commit] roadmap README,1.98,1.99

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

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

Modified Files:
	README 
Log Message:
clarify meaning of '&' shortcut in maps path, and fix a few typos


Index: README
===================================================================
RCS file: /cvsroot/roadmap/roadmap/README,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** README	16 Aug 2006 13:59:59 -0000	1.98
--- README	16 Aug 2006 15:38:15 -0000	1.99
***************
*** 207,211 ****
    One reason for RoadMap to support a list of directories is to define a
    default system-wide configuration, and at the same time to allow a specific
!   user to install it's own setup. Another reason (for the map files on a PDA)
    is to let the users choose the type of hardware storage that is convenient
    for them.
--- 207,211 ----
    One reason for RoadMap to support a list of directories is to define a
    default system-wide configuration, and at the same time to allow a specific
!   user to install their own setup. Another reason (for the map files on a PDA)
    is to let the users choose the type of hardware storage that is convenient
    for them.
***************
*** 233,237 ****
           * /usr/share/roadmap and
  
!          * ~/.roadmap.
           
    These directories are searched sequentially: any configuration item found
--- 233,238 ----
           * /usr/share/roadmap and
  
!          * ~/.roadmap (which can be referred to as '&' in other
!          path references).
           
    These directories are searched sequentially: any configuration item found
***************
*** 251,255 ****
    to the configuration is written there. The items in the user configuration
    take precedence over the "default" configuration as defined in the "shared"
!   directories.
  
    The directory <<~/.roadmap>> has two subdirectories: <<trips>> and <<maps>>.
--- 252,257 ----
    to the configuration is written there. The items in the user configuration
    take precedence over the "default" configuration as defined in the "shared"
!   directories.  This directory can be referred to with the shorthand '&'
!   in other parts of the roadmap config.
  
    The directory <<~/.roadmap>> has two subdirectories: <<trips>> and <<maps>>.
***************
*** 270,274 ****
    convenient.
  
!   Theses user configuration directories are created when needed, if they do
    not exist.
  
--- 272,276 ----
    convenient.
  
!   These user configuration directories are created when needed, if they do
    not exist.
  
***************
*** 331,335 ****
    UNIX systems:
    
!          * ~/.roadmap/maps,
  
           * /var/lib/roadmap (preferred path) and
--- 333,337 ----
    UNIX systems:
    
!          * ~/.roadmap/maps,   (also known as "&/maps")
  
           * /var/lib/roadmap (preferred path) and
***************
*** 653,657 ****
     the downloaded ZIP files, invokes the buildmap tool and then cleans
     up the TIGER files. Last, rdmgenmaps invokes the buildus tool to generate
!    the US states & counties catalog. The main purpose of rdmgenmaps is really
     to keep the TIGER files in compressed form, considering their huge size..
  
--- 655,659 ----
     the downloaded ZIP files, invokes the buildmap tool and then cleans
     up the TIGER files. Last, rdmgenmaps invokes the buildus tool to generate
!    the US states and counties catalog. The main purpose of rdmgenmaps is really
     to keep the TIGER files in compressed form, considering their huge size..
  
***************
*** 669,673 ****
  
     The <<buildus>> tool creates a catalog of maps that is used by RoadMap
!    to combine all states & counties into a giant US map. It looks for:
  
        [[a]] the file AllSt.txt and
--- 671,675 ----
  
     The <<buildus>> tool creates a catalog of maps that is used by RoadMap
!    to combine all states and counties into a giant US map. It looks for:
  
        [[a]] the file AllSt.txt and
***************
*** 2185,2189 ****
  
           <<Comment:>> chooses whether streets are labelled at startup.
! 	 	      They can still be toggled by command.
  
      [Map.Signs] Enable/disable the map sprites and street signs.
--- 2187,2191 ----
  
           <<Comment:>> chooses whether streets are labelled at startup.
!                       They can still be toggled by command.
  
      [Map.Signs] Enable/disable the map sprites and street signs.

[Roadmap-commit] roadmap/src roadmap_display.c, 1.26, 1.27 roadmap_math.c, 1.37, 1.38 roadmap_math.h, 1.28, 1.29 roadmap_trip.c, 1.54, 1.55

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

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

Modified Files:
	roadmap_display.c roadmap_math.c roadmap_math.h roadmap_trip.c 
Log Message:
add support for a display message in the top left corner, beside the
compass.  no content by default.
add support for %x and %y in display messages, which represent the
width and height of the screen in trip units.  so 
    Display.Top Left: %x x %y
will yield a box that says "35.6 Mi x 23.2 Mi".


Index: roadmap_trip.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_trip.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** roadmap_trip.c	13 Aug 2006 15:24:17 -0000	1.54
--- roadmap_trip.c	16 Aug 2006 14:00:00 -0000	1.55
***************
*** 1396,1417 ****
  }
  
- static void roadmap_trip_set_distance(char which, int distance)
- {
-     int distance_far;
- 
-     distance_far = roadmap_math_to_trip_distance_tenths (distance);
- 
-     if (distance_far > 0) {
-         roadmap_message_set (which, "%d.%d %s",
-                              distance_far/10,
-                              distance_far%10,
-                              roadmap_math_trip_unit ());
-     } else {
-         roadmap_message_set (which, "%d %s",
-                              distance,
-                              roadmap_math_distance_unit ());
-     }
- }
- 
  static void roadmap_trip_set_directions
          (int dist_to_next, int suppress_dist, waypoint *next) {
--- 1396,1399 ----
***************
*** 1452,1456 ****
          roadmap_message_unset ('Y');
      } else {
!         roadmap_trip_set_distance('Y', dist_to_next + rest_of_distance);
      }
  
--- 1434,1438 ----
          roadmap_message_unset ('Y');
      } else {
!         roadmap_math_trip_set_distance('Y', dist_to_next + rest_of_distance);
      }
  
***************
*** 1591,1595 ****
      distance_to_destination =
          roadmap_math_distance (&gps->map, &RoadMapTripDest->pos);
!     roadmap_trip_set_distance('D', distance_to_destination);
  
      roadmap_log (ROADMAP_DEBUG,
--- 1573,1577 ----
      distance_to_destination =
          roadmap_math_distance (&gps->map, &RoadMapTripDest->pos);
!     roadmap_math_trip_set_distance('D', distance_to_destination);
  
      roadmap_log (ROADMAP_DEBUG,
***************
*** 1693,1697 ****
          }
  
!         roadmap_trip_set_distance ('W', distance_to_next);
  
      }
--- 1675,1679 ----
          }
  
!         roadmap_math_trip_set_distance ('W', distance_to_next);
  
      }

Index: roadmap_display.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_display.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** roadmap_display.c	13 Jul 2006 15:47:53 -0000	1.26
--- roadmap_display.c	16 Aug 2006 13:59:59 -0000	1.27
***************
*** 62,65 ****
--- 62,68 ----
                          ROADMAP_CONFIG_ITEM("Display", "Top Right");
  
+ RoadMapConfigDescriptor RoadMapConfigDisplayTopLeft =
+                         ROADMAP_CONFIG_ITEM("Display", "Top Left");
+ 
  static RoadMapConfigDescriptor RoadMapConfigConsoleBackground =
                          ROADMAP_CONFIG_ITEM("Console", "Background");
***************
*** 578,581 ****
--- 581,587 ----
      format = roadmap_config_get (item);
  
+     if (!format || !format[0])
+ 	return;
+ 
      if (! roadmap_message_format (text, sizeof(text), format)) {
          return;
***************
*** 588,593 ****
          frame[0].x = frame[2].x - width - 6;
      } else {
!         frame[0].x = 5;
!         frame[2].x = frame[0].x + width + 6;
      }
      frame[1].x = frame[0].x;
--- 594,603 ----
          frame[0].x = frame[2].x - width - 6;
      } else {
! 	if (corner & ROADMAP_CANVAS_BOTTOM) {
!             frame[0].x = 5;
! 	} else { /* leave room for compass */
!             frame[0].x = 45;
! 	}
! 	frame[2].x = frame[0].x + width + 6;
      }
      frame[1].x = frame[0].x;
***************
*** 661,664 ****
--- 671,678 ----
           &RoadMapConfigDisplayTopRight);
  
+     roadmap_display_console_box
+         (ROADMAP_CANVAS_TOP|ROADMAP_CANVAS_LEFT,
+          &RoadMapConfigDisplayTopLeft);
+ 
      for (sign = RoadMapStreetSign; sign->title != NULL; ++sign) {
  
***************
*** 697,700 ****
--- 711,716 ----
      roadmap_config_declare
          ("preferences", &RoadMapConfigDisplayTopRight, "In %Y, %X|%X");
+     roadmap_config_declare
+         ("preferences", &RoadMapConfigDisplayTopLeft, "");
  
      roadmap_config_declare

Index: roadmap_math.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_math.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** roadmap_math.h	2 Jul 2006 16:24:02 -0000	1.28
--- roadmap_math.h	16 Aug 2006 14:00:00 -0000	1.29
***************
*** 108,111 ****
--- 108,113 ----
  int  roadmap_math_to_trip_distance_tenths (int distance);
  
+ void roadmap_math_trip_set_distance(char which, int distance);
+ 
  int  roadmap_math_to_speed_unit (int knots);
  

Index: roadmap_math.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_math.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** roadmap_math.c	19 Jul 2006 18:30:23 -0000	1.37
--- roadmap_math.c	16 Aug 2006 13:59:59 -0000	1.38
***************
*** 44,47 ****
--- 44,48 ----
  #include "roadmap_state.h"
  #include "roadmap_config.h"
+ #include "roadmap_message.h"
  
  #include "roadmap_trigonometry.h"
***************
*** 306,309 ****
--- 307,317 ----
     RoadMapContext.upright_screen.east  = position.longitude;
  
+    roadmap_math_trip_set_distance
+ 	    ('x', RoadMapContext.width * RoadMapContext.zoom_x *
+ 		    RoadMapContext.units->unit_per_longitude);
+    roadmap_math_trip_set_distance
+    	    ('y', RoadMapContext.height * RoadMapContext.zoom_y *
+ 		    RoadMapContext.units->unit_per_latitude);
+ 
     roadmap_math_set_orientation (orientation);
  }
***************
*** 1075,1079 ****
     roadmap_math_release_focus ();
  #ifdef DEBUG
! roadmap_log (ROADMAP_ERROR, "visibility: north=%d south=%d east=%d west=%d\n",
          RoadMapContext.current_screen.north,
          RoadMapContext.current_screen.south,
--- 1083,1087 ----
     roadmap_math_release_focus ();
  #ifdef DEBUG
! roadmap_log (ROADMAP_DEBUG, "visibility: north=%d south=%d east=%d west=%d\n",
          RoadMapContext.current_screen.north,
          RoadMapContext.current_screen.south,
***************
*** 1164,1170 ****
--- 1172,1180 ----
      }
      
+ #ifdef DEBUG
      roadmap_log (ROADMAP_DEBUG,
                      "azymuth for (x=%f, y=%f): %d",
                      x, y, result);
+ #endif
      return result;
  }
***************
*** 1306,1309 ****
--- 1316,1337 ----
  }
  
+ void roadmap_math_trip_set_distance(char which, int distance)
+ {
+     int distance_far;
+ 
+     distance_far = roadmap_math_to_trip_distance_tenths (distance);
+ 
+     if (distance_far > 0) {
+         roadmap_message_set (which, "%d.%d %s",
+                              distance_far/10,
+                              distance_far%10,
+                              roadmap_math_trip_unit ());
+     } else {
+         roadmap_message_set (which, "%d %s",
+                              distance,
+                              roadmap_math_distance_unit ());
+     }
+ }
+ 
  
  int  roadmap_math_get_distance_from_segment

[Roadmap-commit] roadmap README,1.97,1.98

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

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

Modified Files:
	README 
Log Message:
add support for a display message in the top left corner, beside the
compass.  no content by default.
add support for %x and %y in display messages, which represent the
width and height of the screen in trip units.  so 
    Display.Top Left: %x x %y
will yield a box that says "35.6 Mi x 23.2 Mi".


Index: README
===================================================================
RCS file: /cvsroot/roadmap/roadmap/README,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** README	11 Aug 2006 19:47:07 -0000	1.97
--- README	16 Aug 2006 13:59:59 -0000	1.98
***************
*** 944,951 ****
     selects the street with the highest fuzzy value.
  
!    RoadMap can also display 3 messages at the following corners of the map:
!    bottom left, bottom right and top right (the top left corner is already
!    used to show the orientation of the map). These messages can be defined
!    by the user using RoadMap's specific format strings (see section
     "Configuring the RoadMap text and voice messages").
  
--- 944,951 ----
     selects the street with the highest fuzzy value.
  
!    RoadMap can also display four messages at each of the corners of the
!    map:  the message at top left will be shifted to leave room for the
!    compass, which shows map orientation.  These messages can be defined by
!    the user using RoadMap's specific format strings (see section
     "Configuring the RoadMap text and voice messages").
  
***************
*** 1870,1873 ****
--- 1870,1877 ----
  |  #: | the street number range to the selected or current street block.
  *-----+-----------------------------------------------------------------+
+ |  x: | Distance from one side of the screen to the other.
+ *-----+-----------------------------------------------------------------+
+ |  y: | Distance from the top to the bottom of the screen.
+ *-----+-----------------------------------------------------------------+
     
     Note that the time is always shown using the military format: HH:MM.
***************
*** 2118,2121 ****
--- 2122,2131 ----
           <<Default:>> ETA: %A|%T
  
+     [Display.Top Left] Defines the message on the top left corner.
+ 
+          <<Format:>> RoadMap format string
+ 
+          <<Default:>> <empty>
+ 
      [Display.Duration] The time during which a selection or message is shown.