roadmap-commit — track CVS commits

[Roadmap-commit] roadmap_editor/src/gtk2 roadmap_dialog.c,1.4,1.5

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

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

Modified Files:
	roadmap_dialog.c 
Log Message:
Dialogs can now contain a progress bar and an image.
This is only a stub for gtk2.

Index: roadmap_dialog.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/gtk2/roadmap_dialog.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_dialog.c	27 Jul 2006 14:23:05 -0000	1.4
--- roadmap_dialog.c	9 Aug 2006 07:33:10 -0000	1.5
***************
*** 403,406 ****
--- 403,418 ----
  
  
+ void roadmap_dialog_new_progress (const char *frame, const char *name) {
+ 
+    GtkWidget *w = gtk_entry_new ();
+    name = "Progress";
+    RoadMapDialogItem child = roadmap_dialog_new_item (frame, name, w, 0);
+    child->widget_type = ROADMAP_WIDGET_ENTRY;
+ }
+ 
+ 
+ void roadmap_dialog_new_image (const char *frame, const char *name) {}
+ 
+ 
  void roadmap_dialog_new_password (const char *frame, const char *name) {
  
***************
*** 867,868 ****
--- 879,897 ----
  }
  
+ void  roadmap_dialog_set_progress (const char *frame, const char *name,
+                                    int progress) {
+    RoadMapDialogItem this_frame;
+    RoadMapDialogItem this_item;
+    int i;
+    char data[100];
+ 
+    this_frame  = roadmap_dialog_get (RoadMapDialogCurrent, frame);
+    this_item   = roadmap_dialog_get (this_frame, name);
+ 
+    if (this_item->widget_type != ROADMAP_WIDGET_ENTRY) return;
+ 
+    snprintf(data, sizeof(data), "%d", progress);
+ 
+    gtk_entry_set_text (GTK_ENTRY(this_item->w), (const char *)data);
+ }
+ 

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

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

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

Modified Files:
	roadmap_main.c 
Log Message:
Keyboard handling and configuration for wince.

Index: roadmap_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/gtk2/roadmap_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_main.c	28 Nov 2005 19:36:34 -0000	1.2
--- roadmap_main.c	9 Aug 2006 07:32:16 -0000	1.3
***************
*** 254,258 ****
  
  
! void roadmap_main_set_keyboard (RoadMapKeyInput callback) {
     RoadMapMainInput = callback;
  }
--- 254,259 ----
  
  
! void roadmap_main_set_keyboard (struct RoadMapFactoryKeyMap *bindings,
!                                 RoadMapKeyInput callback) {
     RoadMapMainInput = callback;
  }

[Roadmap-commit] roadmap_editor/src/gtk2 roadmap_messagebox.c, 1.1.1.1, 1.2

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

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

Modified Files:
	roadmap_messagebox.c 
Log Message:
I18n

Index: roadmap_messagebox.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/gtk2/roadmap_messagebox.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_messagebox.c	15 Oct 2005 22:19:09 -0000	1.1.1.1
--- roadmap_messagebox.c	9 Aug 2006 07:31:48 -0000	1.2
***************
*** 34,37 ****
--- 34,38 ----
  #include "roadmap.h"
  #include "roadmap_start.h"
+ #include "roadmap_lang.h"
  
  #include "roadmap_messagebox.h"
***************
*** 59,62 ****
--- 60,66 ----
  #endif
  
+    title = roadmap_lang_get (title);
+    text  = roadmap_lang_get (text);
+ 
     label = gtk_label_new(text);
  

[Roadmap-commit] roadmap_editor/src/gtk2 roadmap_canvas_agg.cpp, 1.5, 1.6

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

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

Modified Files:
	roadmap_canvas_agg.cpp 
Log Message:
Add an interface to release an image.

Index: roadmap_canvas_agg.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/gtk2/roadmap_canvas_agg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** roadmap_canvas_agg.cpp	15 May 2006 19:51:04 -0000	1.5
--- roadmap_canvas_agg.cpp	9 Aug 2006 07:31:32 -0000	1.6
***************
*** 152,155 ****
--- 152,162 ----
  
  
+ void roadmap_canvas_agg_free_image (RoadMapImage image) {
+    
+    free (image->rbuf.buf());
+    delete image;
+ }
+ 
+ 
  static gint roadmap_canvas_configure
                 (GtkWidget *widget, GdkEventConfigure *event) {

[Roadmap-commit] roadmap_editor/src/editor/track editor_track_main.c, 1.13, 1.14 editor_track_util.c, 1.12, 1.13

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

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

Modified Files:
	editor_track_main.c editor_track_util.c 
Log Message:
Fix fuzzify bug.

Index: editor_track_util.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/track/editor_track_util.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** editor_track_util.c	17 Jul 2006 06:31:49 -0000	1.12
--- editor_track_util.c	9 Aug 2006 07:30:27 -0000	1.13
***************
*** 177,180 ****
--- 177,181 ----
                            NULL,
                            &result,
+                           0,
                            steering);
  
***************
*** 651,654 ****
--- 652,656 ----
                    previous_line,
                    neighbourhood+i,
+                   0,
                    gps_position->steering);
        
***************
*** 676,680 ****
                    previous_line,
                    neighbourhood+i,
!                   gps_position->steering - 180);
        
        if (!roadmap_fuzzy_is_good (result)) {
--- 678,683 ----
                    previous_line,
                    neighbourhood+i,
!                   1,
!                   gps_position->steering);
        
        if (!roadmap_fuzzy_is_good (result)) {

Index: editor_track_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/track/editor_track_main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** editor_track_main.c	10 Jun 2006 08:27:29 -0000	1.13
--- editor_track_main.c	9 Aug 2006 07:30:27 -0000	1.14
***************
*** 214,217 ****
--- 214,218 ----
     int line_id;
     NodeNeighbour end_node = NODE_NEIGHBOUR_NULL;
+    int road_type = 0;
  
     editor_log_push ("add_road_connection");
***************
*** 254,257 ****
--- 255,267 ----
         &end_node);
  
+    if ((cur_node.plugin_id == ROADMAP_PLUGIN_ID) &&
+        (end_node.plugin_id == ROADMAP_PLUGIN_ID)) {
+ 
+       /* This a known connection road */
+       road_type = 0;
+    } else {
+       road_type = ED_LINE_CONNECTION;
+    }
+ 
     if (end_node.plugin_id == ROADMAP_PLUGIN_ID) {
        end_node.id = editor_point_roadmap_to_editor (end_node.id);
***************
*** 261,274 ****
     line_id = create_new_line (0, end_point, -1, end_node.id, 4);
  
!    if (line_id != -1) {
!       int cfcc;
!       int flags;
  
!       editor_line_get (line_id, NULL, NULL, NULL, &cfcc, &flags);
!       editor_line_modify_properties
!          (line_id, cfcc, flags | ED_LINE_CONNECTION);
!    }
  
!    track_reset_points (end_point);
  
     return 0;
--- 271,287 ----
     line_id = create_new_line (0, end_point, -1, end_node.id, 4);
  
!    if (road_type == ED_LINE_CONNECTION) {
  
!       if (line_id != -1) {
!          int cfcc;
!          int flags;
  
!          editor_line_get (line_id, NULL, NULL, NULL, &cfcc, &flags);
!          editor_line_modify_properties
!             (line_id, cfcc, flags | ED_LINE_CONNECTION);
!       }
! 
!       track_reset_points (end_point);
!    }
  
     return 0;

[Roadmap-commit] roadmap_editor/src/editor/track editor_track_known.c, 1.6, 1.7

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

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

Modified Files:
	editor_track_known.c 
Log Message:
Fix resolver bug.

Index: editor_track_known.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/track/editor_track_known.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** editor_track_known.c	11 Jun 2006 10:59:36 -0000	1.6
--- editor_track_known.c	9 Aug 2006 07:30:08 -0000	1.7
***************
*** 356,359 ****
--- 356,360 ----
                              confirmed_line,
                              confirmed_line,
+                             0,
                              gps_position->steering);
        }
***************
*** 395,398 ****
--- 396,407 ----
           RoadMapTracking candidate;
  
+          if (roadmap_plugin_same_line (&RoadMapNeighbourhood[found].line,
+                                        &confirmed_line->line)) {
+             /* We don't have any candidates other than the current line */
+             return 0;
+          }
+ 
+          /* We have two candidates here */
+ 
           /* current line */
           KnownCandidates[0].entries[0].street = *confirmed_street;
***************
*** 407,410 ****
--- 416,420 ----
                                   (&candidate, confirmed_street,
                                    confirmed_line, RoadMapNeighbourhood+found,
+                                   0,
                                    gps_position->steering);
           KnownCandidates[1].entries[0].street = candidate;
***************
*** 433,436 ****
--- 443,447 ----
                       confirmed_line,
                       RoadMapNeighbourhood+i,
+                      0,
                       gps_position->steering);
        
***************
*** 465,469 ****
        }
  
!       return 0;
     }
  
--- 476,486 ----
        }
  
!       if (KnownCandidatesCount > 1) {
! 
!          return 0;
!       } else {
!          /* We only got one candidate so fall through to use it */
!          KnownCandidatesCount = 0;
!       }
     }
  

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

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

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

Modified Files:
	editor_dialog.c 
Log Message:
Add a missing const.
Use keyboard.

Index: editor_dialog.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/static/editor_dialog.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** editor_dialog.c	16 Jul 2006 12:25:31 -0000	1.8
--- editor_dialog.c	9 Aug 2006 07:29:04 -0000	1.9
***************
*** 41,44 ****
--- 41,45 ----
  #include "roadmap_locator.h"
  #include "roadmap_address.h"
+ #include "roadmap_preferences.h"
  
  #include "../db/editor_db.h"
***************
*** 60,64 ****
  } DialogSelectedLines;
  
! static char *def_values[2] = {"", "Other"};
  
  /* NOTE: This function modifies the street_range parameter */
--- 61,65 ----
  } DialogSelectedLines;
  
! static const char *def_values[2] = {"", "Other"};
  
  /* NOTE: This function modifies the street_range parameter */
***************
*** 636,641 ****
        roadmap_dialog_set_data ("General", "City", r_city);
     }
! 
!    roadmap_dialog_set_data ("General", "Direction", (void *)direction);
     
     if (strlen(l_zip)) {
--- 637,642 ----
        roadmap_dialog_set_data ("General", "City", r_city);
     }
! 
!    roadmap_dialog_set_data ("General", "Direction", (void *)direction);
     
     if (strlen(l_zip)) {
***************
*** 712,716 ****
        }
  
!       roadmap_dialog_new_choice ("General", "Road type", count, categories,
                                   (void**)values, NULL);
        free (values);
--- 713,718 ----
        }
  
!       roadmap_dialog_new_choice ("General", "Road type", count,
!                                  (const char **)categories,
                                   (void**)values, NULL);
        free (values);
***************
*** 732,736 ****
        roadmap_dialog_add_button ("OK", editor_segments_apply);
  
!       roadmap_dialog_complete (0); /* No need for a keyboard. */
     }
  
--- 734,738 ----
        roadmap_dialog_add_button ("OK", editor_segments_apply);
  
!       roadmap_dialog_complete (roadmap_preferences_use_keyboard ());
     }
  

[Roadmap-commit] roadmap_editor/src/editor/static update_range.c, NONE, 1.1 update_range.h, NONE, 1.1

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

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

Added Files:
	update_range.c update_range.h 
Log Message:
Add street range update dialog.

--- NEW FILE: update_range.h ---
/* update_range.h - Street range entry
 *
 * LICENSE:
 *
 *   Copyright 2006 Ehud Shabtai
 *
 *   This file is part of RoadMap.
 *
 *   RoadMap is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 *   RoadMap is distributed in the hope that it will be useful,
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *   GNU General Public License for more details.
 *
 *   You should have received a copy of the GNU General Public License
 *   along with RoadMap; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#ifndef INCLUDE__UPDATE_RANGE__H
#define INCLUDE__UPDATE_RANGE__H

void update_range_dialog (void);

#endif // INCLUDE__UPDATE_RANGE__H


--- NEW FILE: update_range.c ---
/* update_range.c - Street range entry
 *
 * LICENSE:
 *
 *   Copyright 2006 Ehud Shabtai
 *
 *   This file is part of RoadMap.
 *
 *   RoadMap is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 *   RoadMap is distributed in the hope that it will be useful,
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *   GNU General Public License for more details.
 *
 *   You should have received a copy of the GNU General Public License
 *   along with RoadMap; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * SYNOPSYS:
 *
 *   See update_range.h
 */

#include "roadmap.h"
#include "roadmap_dialog.h"
#include "roadmap_line.h"
#include "roadmap_line_route.h"
#include "roadmap_gps.h"
#include "roadmap_locator.h"
#include "roadmap_plugin.h"
#include "roadmap_preferences.h"
#include "roadmap_navigate.h"
#include "roadmap_messagebox.h"

#include "../db/editor_db.h"
#include "../db/editor_line.h"
#include "../db/editor_street.h"
#include "../editor_main.h"
#include "../editor_log.h"

#include "update_range.h"


static int get_estimated_range (PluginLine *line, RoadMapGpsPosition *pos,
                                int direction,
                                int fraddl, int toaddl,
                                int fraddr, int toaddr,
                                int *left, int *right) {


   int total_length;
   int point_length;
   double rel;

   point_length =
      roadmap_plugin_calc_length ((RoadMapPosition *)pos, line, &total_length);

   rel = 1.0 * point_length / total_length;

   *left  = fraddl + (int) ((toaddl - fraddl + 1) / 2 * rel) * 2;
   *right = fraddr + (int) ((toaddr - fraddr + 1) / 2 * rel) * 2;

   if (direction == ROUTE_DIRECTION_AGAINST_LINE) {
      int tmp = *left;

      *left = *right;
      *right = tmp;
   }
      
   return 0;
}
 

static int fill_dialog (PluginLine *line, RoadMapGpsPosition *pos,
                        int direction) {

   const char *street_name;
   const char *city_name;
   int fraddl;
   int toaddl;
   int fraddr;
   int toaddr;
   int left;
   int right;
   char str[100];

   if (line->plugin_id == EditorPluginID) {
      EditorStreetProperties properties;

      if (editor_db_activate (line->fips) == -1) return -1;

      editor_street_get_properties (line->line_id, &properties);

      street_name = editor_street_get_street_fename (&properties);

      city_name = editor_street_get_street_city
                        (&properties, ED_STREET_LEFT_SIDE);

      editor_street_get_street_range
         (&properties, ED_STREET_LEFT_SIDE, &fraddl, &toaddl);
      editor_street_get_street_range
         (&properties, ED_STREET_RIGHT_SIDE, &fraddr, &toaddr);

   } else {
      RoadMapStreetProperties properties;

      if (roadmap_locator_activate (line->fips) < 0) return -1;

      roadmap_street_get_properties (line->line_id, &properties);

      street_name = roadmap_street_get_street_fename (&properties);

      city_name = roadmap_street_get_street_city
                        (&properties, ROADMAP_STREET_LEFT_SIDE);

      roadmap_street_get_street_range
         (&properties, ROADMAP_STREET_LEFT_SIDE, &fraddl, &toaddl);
      roadmap_street_get_street_range
         (&properties, ROADMAP_STREET_RIGHT_SIDE, &fraddr, &toaddr);
   }

   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);
   return 0;
}


static void update_range_cancel (const char *name, void *context) {

   roadmap_dialog_hide (name);
}


static void update_range_apply (const char *name, void *context) {

   roadmap_dialog_hide (name);
}


void update_range_dialog (void) {

   RoadMapGpsPosition pos;
   PluginLine line;
   int direction;

   if (roadmap_navigate_get_current (&pos, &line, &direction) == -1) {

      roadmap_messagebox ("Error", "Can't find current street.");
      return;
   }

   if (roadmap_dialog_activate ("Update street range", NULL)) {

      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);
      roadmap_dialog_add_button ("OK", update_range_apply);

      roadmap_dialog_complete (roadmap_preferences_use_keyboard ());
   }

   fill_dialog (&line, &pos, direction);
}

[Roadmap-commit] roadmap_editor/src/editor/export editor_download.c, 1.1, 1.2 editor_download.h, 1.1, 1.2 editor_export.c, 1.14, 1.15 editor_export.h, 1.5, 1.6 editor_sync.c, 1.1, 1.2 editor_sync.h, 1.1, 1.2 editor_upload.c, 1.4, 1.5 editor_upload.h, 1.2, 1.3

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

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

Modified Files:
	editor_download.c editor_download.h editor_export.c 
	editor_export.h editor_sync.c editor_sync.h editor_upload.c 
	editor_upload.h 
Log Message:
New synchronization dialog.

Index: editor_export.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_export.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** editor_export.c	17 Jul 2006 06:32:58 -0000	1.14
--- editor_export.c	9 Aug 2006 07:27:13 -0000	1.15
***************
*** 43,46 ****
--- 43,47 ----
  #include "roadmap_fileselection.h"
  #include "roadmap_messagebox.h"
+ #include "roadmap_download.h"
  #include "roadmap_config.h"
  
***************
*** 59,62 ****
--- 60,64 ----
  #include "../track/editor_track_main.h"
  #include "editor_upload.h"
+ #include "editor_sync.h"
  #include "editor_export.h"
  
***************
*** 500,504 ****
   
  
! int editor_export_data(const char *name, int ui) {
     
     ExportStream stream;
--- 502,506 ----
   
  
! int editor_export_data(const char *name, RoadMapDownloadCallbacks *callbacks) {
     
     ExportStream stream;
***************
*** 508,511 ****
--- 510,515 ----
     int current_trk_open = 0;
     int fips;
+    int exported;
+    int estimated_lines;
  
     stream.type = NULL_STREAM;
***************
*** 513,518 ****
     fips = roadmap_locator_active ();
  
     if (fips < 0) {
!       if (!ui) {
           fips = 77001;
        } else {
--- 517,524 ----
     fips = roadmap_locator_active ();
  
+    if (callbacks) (*callbacks->size) (100);
+ 
     if (fips < 0) {
!       if (callbacks) {
           fips = 77001;
        } else {
***************
*** 524,528 ****
  
     if (editor_db_activate (fips) == -1) {
!       if (ui) {
           roadmap_messagebox ("Export Error", "No editor data to export.");
        }
--- 530,534 ----
  
     if (editor_db_activate (fips) == -1) {
!       if (!callbacks) {
           roadmap_messagebox ("Export Error", "No editor data to export.");
        }
***************
*** 536,541 ****
     if (trkseg == -1) {
  
        if (!export_dirty_lines (&stream, name)) {
!          if (ui) {
              editor_log (ROADMAP_INFO, "No trksegs are available for export.");
              roadmap_messagebox ("Export Error", "No new data to export.");
--- 542,551 ----
     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.");
***************
*** 550,554 ****
        close_export_stream (&stream);
        
!       if (ui) {
           editor_export_upload (name);
        }
--- 560,564 ----
        close_export_stream (&stream);
        
!       if (!callbacks) {
           editor_export_upload (name);
        }
***************
*** 560,563 ****
--- 570,575 ----
     }
  
+    estimated_lines = editor_line_get_count ();
+    exported = 0;
     while (trkseg != -1) {
        
***************
*** 650,653 ****
--- 662,667 ----
  
  next_trkseg:
+       if (exported < estimated_lines) exported++;
+       if (callbacks) (*callbacks->progress) (85 * exported / estimated_lines);
        trkseg = editor_trkseg_next_in_global (trkseg);
     }
***************
*** 658,666 ****
  
     export_dirty_lines (&stream, name);
     close_export_stream (&stream);
  
     editor_trkseg_reset_next_export ();
  
!    if (ui) {
        editor_export_upload (name);
     }
--- 672,681 ----
  
     export_dirty_lines (&stream, name);
+    if (callbacks) (*callbacks->progress) (100);
     close_export_stream (&stream);
  
     editor_trkseg_reset_next_export ();
  
!    if (!callbacks) {
        editor_export_upload (name);
     }
***************
*** 711,715 ****
                             (const char *filename, const char *mode) {
  
!    editor_export_data (filename, 1);
  }
  
--- 726,730 ----
                             (const char *filename, const char *mode) {
  
!    editor_export_data (filename, NULL);
  }
  

Index: editor_upload.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_upload.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** editor_upload.c	27 Jul 2006 14:22:11 -0000	1.4
--- editor_upload.c	9 Aug 2006 07:27:14 -0000	1.5
***************
*** 137,147 ****
  
  
! #if 0
! static RoadMapDownloadCallbacks RoadMapUploadCallbackFunctions = {
!    roadmap_upload_request,
!    roadmap_upload_progress,
!    roadmap_upload_error
  };
! #endif
  
  static int editor_http_send (RoadMapSocket socket,
--- 137,146 ----
  
  
! static RoadMapDownloadCallbacks EditorUploadCallbackFunctions = {
!    editor_upload_request,
!    editor_upload_progress,
!    editor_upload_error
  };
! 
  
  static int editor_http_send (RoadMapSocket socket,
***************
*** 415,419 ****
                               const char *file_name,
                               const char *user_name,
!                              const char *password) {
  
     RoadMapSocket fd;
--- 414,419 ----
                               const char *file_name,
                               const char *user_name,
!                              const char *password,
!                              RoadMapDownloadCallbacks *callbacks) {
  
     RoadMapSocket fd;
***************
*** 423,431 ****
     char buffer[ROADMAP_HTTP_MAX_CHUNK];
     char digest_hex[100];
  
!    RoadMapFile file = roadmap_file_open (file_name, "r");
  
     if (!ROADMAP_NET_IS_VALID(file)) {
!       editor_upload_error ("Can't open file: %s\n", file_name);
        return -1;
     }
--- 423,434 ----
     char buffer[ROADMAP_HTTP_MAX_CHUNK];
     char digest_hex[100];
+    RoadMapFile file;
  
!    if (!callbacks) callbacks = &EditorUploadCallbackFunctions;
! 
!    file = roadmap_file_open (file_name, "r");
  
     if (!ROADMAP_NET_IS_VALID(file)) {
!       (*callbacks->error) ("Can't open file: %s\n", file_name);
        return -1;
     }
***************
*** 433,442 ****
     size = roadmap_file_length (NULL, file_name);
  
!    editor_upload_request (size);
     RoadMapUploadCurrentName = file_name;
  
     if (!user_name[0]) {
        unsigned char digest[16];
!       if (roadmap_net_unique_id (digest, sizeof(digest)) != sizeof(digest)) {
           roadmap_file_close (file);
           return -1;
--- 436,448 ----
     size = roadmap_file_length (NULL, file_name);
  
!    if ( !(*callbacks->size) (size)) {
!       roadmap_file_close (file);
!       return -1;
!    }
     RoadMapUploadCurrentName = file_name;
  
     if (!user_name[0]) {
        unsigned char digest[16];
!       if (roadmap_net_unique_id (digest, sizeof(digest)) != sizeof(digest)) {
           roadmap_file_close (file);
           return -1;
***************
*** 450,455 ****
  
     fd = editor_http_send_header
!          (target, file_name, size, user_name, password, editor_upload_error);
!    if (!ROADMAP_NET_IS_VALID(fd)) {
        roadmap_file_close (file);
        return -1;
--- 456,461 ----
  
     fd = editor_http_send_header
!          (target, file_name, size, user_name, password, callbacks->error);
!    if (!ROADMAP_NET_IS_VALID(fd)) {
        roadmap_file_close (file);
        return -1;
***************
*** 457,461 ****
  
     uploaded = 0;
!    editor_upload_progress (uploaded);
  
     loaded = uploaded;
--- 463,467 ----
  
     uploaded = 0;
!    (*callbacks->progress) (uploaded);
  
     loaded = uploaded;
***************
*** 467,497 ****
  
        if (uploaded <= 0) {
!          editor_upload_error ("Receive error after %d data bytes", loaded);
           goto cancel_upload;
        }
        loaded += uploaded;
  
!    editor_upload_progress (loaded);
     }
  
!    editor_http_send (fd, editor_upload_error, "\r\n-----------------------------10424402741337131014341297293--\r\n");
  
     loaded = sizeof(buffer);
     if (!editor_http_decode_response
!              (fd, buffer, &loaded, editor_upload_error)) {
        goto cancel_upload;
     }
  
!    roadmap_net_close (fd);
     roadmap_file_close (file);
     roadmap_dialog_hide ("Uploading");
     buffer[loaded] = 0;
  
!    roadmap_messagebox ("Upload done.", buffer);
     return 0;
  
  cancel_upload:
  
!    roadmap_net_close (fd);
     roadmap_file_close (file);
     roadmap_dialog_hide ("Uploading");
--- 473,505 ----
  
        if (uploaded <= 0) {
!          (*callbacks->error) ("Receive error after %d data bytes", loaded);
           goto cancel_upload;
        }
        loaded += uploaded;
  
!       (*callbacks->progress) (loaded);
     }
  
!    editor_http_send (fd, callbacks->error, "\r\n-----------------------------10424402741337131014341297293--\r\n");
  
     loaded = sizeof(buffer);
     if (!editor_http_decode_response
!              (fd, buffer, &loaded, callbacks->error)) {
        goto cancel_upload;
     }
  
!    roadmap_net_close (fd);
     roadmap_file_close (file);
     roadmap_dialog_hide ("Uploading");
     buffer[loaded] = 0;
  
!    if (callbacks == &EditorUploadCallbackFunctions) {
!       roadmap_messagebox ("Upload done.", buffer);
!    }
     return 0;
  
  cancel_upload:
  
!    roadmap_net_close (fd);
     roadmap_file_close (file);
     roadmap_dialog_hide ("Uploading");
***************
*** 521,525 ****
     roadmap_dialog_hide (name);
  
!    editor_post_file (target, filename, username, password);
  }
  
--- 529,533 ----
     roadmap_dialog_hide (name);
  
!    editor_post_file (target, filename, username, password, NULL);
  }
  
***************
*** 591,595 ****
  
  
! int editor_upload_auto (const char *filename) {
  
     return editor_post_file (
--- 599,604 ----
  
  
! int editor_upload_auto (const char *filename,
!                         RoadMapDownloadCallbacks *callbacks) {
  
     return editor_post_file (
***************
*** 597,601 ****
              filename, 
              roadmap_config_get (&RoadMapConfigUser),
!             roadmap_config_get (&RoadMapConfigPassword));
  }
  
--- 606,611 ----
              filename, 
              roadmap_config_get (&RoadMapConfigUser),
!             roadmap_config_get (&RoadMapConfigPassword),
!             callbacks);
  }
  

Index: editor_upload.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_upload.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** editor_upload.h	16 Jul 2006 12:25:08 -0000	1.2
--- editor_upload.h	9 Aug 2006 07:27:14 -0000	1.3
***************
*** 25,32 ****
  #define INCLUDE__EDITOR_UPLOAD__H
  
  void editor_upload_initialize (void);
  void editor_upload_select     (void);
  void editor_upload_file       (const char *filename);
! int  editor_upload_auto       (const char *filename);
  
  #endif // INCLUDE__EDITOR_UPLOAD__H
--- 25,36 ----
  #define INCLUDE__EDITOR_UPLOAD__H
  
+ #include "roadmap_download.h"
+ 
  void editor_upload_initialize (void);
  void editor_upload_select     (void);
  void editor_upload_file       (const char *filename);
! 
! int  editor_upload_auto       (const char *filename,
!                                RoadMapDownloadCallbacks *callbacks);
  
  #endif // INCLUDE__EDITOR_UPLOAD__H

Index: editor_export.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_export.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** editor_export.h	16 Jul 2006 12:25:08 -0000	1.5
--- editor_export.h	9 Aug 2006 07:27:13 -0000	1.6
***************
*** 25,33 ****
  #define INCLUDE__EDITOR_EXPORT__H
  
! int editor_export_data(const char *name, int ui);
! void editor_export_gpx (void);
! void editor_export_reset_dirty (void);
! int editor_export_empty (int fips);
! void editor_export_initialize (void);
  
  #endif // INCLUDE__EDITOR_EXPORT__H
--- 25,35 ----
  #define INCLUDE__EDITOR_EXPORT__H
  
! #include "editor_sync.h"
! 
! int editor_export_data(const char *name, RoadMapDownloadCallbacks *callbacks);
! void editor_export_gpx(void);
! void editor_export_reset_dirty(void);
! int editor_export_empty(int fips);
! void editor_export_initialize(void);
  
  #endif // INCLUDE__EDITOR_EXPORT__H

Index: editor_sync.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_sync.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editor_sync.h	16 Jul 2006 12:25:08 -0000	1.1
--- editor_sync.h	9 Aug 2006 07:27:14 -0000	1.2
***************
*** 25,28 ****
--- 25,30 ----
  #define INCLUDE__EDITOR_SYNC_H
  
+ typedef void (*SyncProgressCallback) (int progress);
+ 
  int export_sync (void);
  

Index: editor_download.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_download.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editor_download.c	13 Jul 2006 06:38:53 -0000	1.1
--- editor_download.c	9 Aug 2006 07:27:13 -0000	1.2
***************
*** 35,38 ****
--- 35,39 ----
  
  #include "../editor_main.h"
+ #include "navigate/navigate_main.h"
  #include "../db/editor_db.h"
  #include "editor_export.h"
***************
*** 42,45 ****
--- 43,47 ----
  
     editor_main_set (1);
+    navigate_main_reload_data ();
     roadmap_download_subscribe_when_done (NULL);
     roadmap_screen_unfreeze ();
***************
*** 47,51 ****
  }
  
! static int editor_download_map (int mode) {
  
     static int *fips = NULL;
--- 49,53 ----
  }
  
! static int editor_download_map (RoadMapDownloadCallbacks *callbacks) {
  
     static int *fips = NULL;
***************
*** 72,76 ****
     if (count == 0) {
  
!       if (mode == EDITOR_DOWNLOAD_AUTO) {
           fips[0] = 77001;
           count = 1;
--- 74,78 ----
     if (count == 0) {
  
!       if (callbacks) {
           fips[0] = 77001;
           count = 1;
***************
*** 85,89 ****
        if (!editor_export_empty (fips[i])) {
  
!          if (mode == EDITOR_DOWNLOAD_NORMAL) {
              roadmap_messagebox("Info", "You must first export your data.");
           }
--- 87,91 ----
        if (!editor_export_empty (fips[i])) {
  
!          if (!callbacks) {
              roadmap_messagebox("Info", "You must first export your data.");
           }
***************
*** 105,111 ****
        editor_db_close (fips[i]);
        editor_db_delete (fips[i]);
!       res =
!          roadmap_download_get_county (fips[i], i ? 0 : 1,
!                                       mode == EDITOR_DOWNLOAD_NORMAL ? 1 : 0);
  
        if (res != 0) return -1;
--- 107,111 ----
        editor_db_close (fips[i]);
        editor_db_delete (fips[i]);
!       res = roadmap_download_get_county (fips[i], i ? 0 : 1, callbacks);
  
        if (res != 0) return -1;
***************
*** 116,122 ****
  
  
! int editor_download_update_map (int mode) {
  
!    return editor_download_map (mode);
  }
  
--- 116,122 ----
  
  
! int editor_download_update_map (RoadMapDownloadCallbacks *callbacks) {
  
!    return editor_download_map (callbacks);
  }
  

Index: editor_sync.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_sync.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editor_sync.c	16 Jul 2006 12:25:08 -0000	1.1
--- editor_sync.c	9 Aug 2006 07:27:14 -0000	1.2
***************
*** 27,30 ****
--- 27,31 ----
  
  #include <stdlib.h>
+ #include <stdarg.h>
  #include <string.h>
  #include <time.h>
***************
*** 35,38 ****
--- 36,41 ----
  #include "roadmap_locator.h"
  #include "roadmap_metadata.h"
+ #include "roadmap_dialog.h"
+ #include "roadmap_main.h"
  #include "roadmap_messagebox.h"
  
***************
*** 43,46 ****
--- 46,120 ----
  
  
+ static int SyncProgressItems;
+ static int SyncProgressCurrentItem;
+ static int SyncProgressTarget;
+ static int SyncProgressLoaded;
+ 
+ static int roadmap_download_request (int size) {
+ 
+    SyncProgressTarget = size;
+    SyncProgressLoaded = 0;
+    SyncProgressCurrentItem++;
+    return 1;
+ }
+ 
+ 
+ static void roadmap_download_error (const char *format, ...) {
+ 
+    va_list ap;
+    char message[2048];
+ 
+    va_start(ap, format);
+    vsnprintf (message, sizeof(message), format, ap);
+    va_end(ap);
+ 
+    roadmap_messagebox ("Download Error", message);
+ }
+ 
+ 
+ static void roadmap_download_progress (int loaded) {
+ 
+    if (roadmap_dialog_activate ("Sync process", NULL)) {
+ 
+       const char *icon = roadmap_path_join (roadmap_path_user(), "icons/sync.bmp");
+       roadmap_dialog_new_image  ("Sync", icon);
+       roadmap_dialog_new_label  ("Sync", "Progress status");
+       roadmap_dialog_new_progress  ("Sync", "Progress");
+       roadmap_path_free (icon);
+ 
+       roadmap_dialog_complete (0);
+    }
+ 
+    if ((SyncProgressLoaded > loaded) || !loaded || !SyncProgressItems) {
+       roadmap_dialog_set_progress ("Sync", "Progress", 0);
+       SyncProgressLoaded = loaded;
+    } else {
+ 
+       if (SyncProgressLoaded == loaded) {
+          return;
+ 
+       } else if ((loaded < SyncProgressTarget) &&
+             (100 * (loaded - SyncProgressLoaded) / SyncProgressTarget) < 5) {
+          return;
+       }
+ 
+       SyncProgressLoaded = loaded;
+ 
+       roadmap_dialog_set_progress ("Sync", "Progress",
+          100 / SyncProgressItems * (SyncProgressCurrentItem - 1) +
+          (100 / SyncProgressItems) * SyncProgressLoaded / SyncProgressTarget);
+    }
+ 
+    roadmap_main_flush ();
+ }
+ 
+ 
+ static RoadMapDownloadCallbacks SyncDownloadCallbackFunctions = {
+    roadmap_download_request,
+    roadmap_download_progress,
+    roadmap_download_error
+ };
+ 
+ 
  static int sync_do_export (void) {
  
***************
*** 63,67 ****
     full_name = roadmap_path_join (path, name);
  
!    res = editor_export_data (full_name, 0);
     free (full_name);
  
--- 137,143 ----
     full_name = roadmap_path_join (path, name);
  
!    SyncProgressItems = 1;
!    SyncProgressCurrentItem = 0;
!    res = editor_export_data (full_name, &SyncDownloadCallbackFunctions);
     free (full_name);
  
***************
*** 75,86 ****
     char **cursor;
     char directory[255];
     snprintf (directory, sizeof(directory), "%s/queue", roadmap_path_user());
  
     files = roadmap_path_list (directory, ".gpx.gz");
  
     for (cursor = files; *cursor != NULL; ++cursor) {
        
        char *full_name = roadmap_path_join (directory, *cursor);
!       int res = editor_upload_auto (full_name);
  
        if (res == 0) {
--- 151,171 ----
     char **cursor;
     char directory[255];
+    int count;
     snprintf (directory, sizeof(directory), "%s/queue", roadmap_path_user());
  
     files = roadmap_path_list (directory, ".gpx.gz");
  
+    count = 0;
+    for (cursor = files; *cursor != NULL; ++cursor) {
+       count++;
+    }
+ 
+    SyncProgressItems = count;
+    SyncProgressCurrentItem = 0;
+ 
     for (cursor = files; *cursor != NULL; ++cursor) {
        
        char *full_name = roadmap_path_join (directory, *cursor);
!       int res = editor_upload_auto (full_name, &SyncDownloadCallbackFunctions);
  
        if (res == 0) {
***************
*** 106,110 ****
--- 191,203 ----
     time_t map_time_t;
  
+    roadmap_download_progress (0);
+    roadmap_dialog_set_data ("Sync", "Progress status",
+                             roadmap_lang_get ("Preparing export data..."));
+    roadmap_main_flush ();
     res = sync_do_export ();
+    roadmap_download_progress (0);
+    roadmap_dialog_set_data ("Sync", "Progress status",
+                             roadmap_lang_get ("Uploading data..."));
+    roadmap_main_flush ();
     res = sync_do_upload ();
  
***************
*** 116,121 ****
  
     if (roadmap_locator_activate (fips) == -1) {
!       roadmap_messagebox ("Error.", "Can't load map data.");
!       return -1;
     }
  
--- 209,214 ----
  
     if (roadmap_locator_activate (fips) == -1) {
!       roadmap_messagebox ("Error", "Can't load map data.");
!       goto end_sync;
     }
  
***************
*** 133,145 ****
        if (now_tm.tm_mday == map_time_tm.tm_mday) {
  
!          return 0;
        } else {
           /* new day - only download if new maps were already generated. */
!          if (now_tm.tm_hour < 2) return 0;
        }
     }
  
!    res = editor_download_update_map (EDITOR_DOWNLOAD_AUTO);
  
     return 0;
  }
--- 226,246 ----
        if (now_tm.tm_mday == map_time_tm.tm_mday) {
  
!          goto end_sync;
        } else {
           /* new day - only download if new maps were already generated. */
!          if (now_tm.tm_hour < 2) goto end_sync;
        }
     }
  
!    SyncProgressItems = 2;
!    SyncProgressCurrentItem = 0;
!    roadmap_download_progress (0);
!    roadmap_dialog_set_data ("Sync", "Progress status",
!                             roadmap_lang_get ("Downloading new maps..."));
!    roadmap_main_flush ();
!    res = editor_download_update_map (&SyncDownloadCallbackFunctions);
  
+ end_sync:
+    roadmap_dialog_hide ("Sync process");
     return 0;
  }

Index: editor_download.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_download.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editor_download.h	13 Jul 2006 06:38:53 -0000	1.1
--- editor_download.h	9 Aug 2006 07:27:13 -0000	1.2
***************
*** 25,32 ****
  #define INCLUDE__EDITOR_DOWNLOAD_H
  
! #define EDITOR_DOWNLOAD_NORMAL 1
! #define EDITOR_DOWNLOAD_AUTO   2
  
! int editor_download_update_map (int mode);
  
  #endif // INCLUDE__EDITOR_DOWNLOAD_H
--- 25,31 ----
  #define INCLUDE__EDITOR_DOWNLOAD_H
  
! #include "roadmap_download.h"
  
! int editor_download_update_map (RoadMapDownloadCallbacks *callbacks);
  
  #endif // INCLUDE__EDITOR_DOWNLOAD_H

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

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

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

Modified Files:
	editor_screen.c 
Log Message:
I18n

Index: editor_screen.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_screen.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** editor_screen.c	11 Jun 2006 12:43:15 -0000	1.14
--- editor_screen.c	9 Aug 2006 07:26:39 -0000	1.15
***************
*** 46,49 ****
--- 46,50 ----
  #include "roadmap_locator.h"
  #include "roadmap_hash.h"
+ #include "roadmap_lang.h"
  #include "roadmap_main.h"
  
***************
*** 202,209 ****
     if (menu == NULL) {
        menu = roadmap_main_new_menu ();
!       roadmap_main_add_menu_item (menu, "Properties",
!             "Update road properties", editor_screen_update_segments);
        roadmap_main_add_separator (menu);
!       roadmap_main_add_menu_item (menu, "Delete", "Delete selected roads", editor_screen_delete_segments);
     }
  
--- 203,218 ----
     if (menu == NULL) {
        menu = roadmap_main_new_menu ();
!       roadmap_main_add_menu_item
!                               (menu,
!                                roadmap_lang_get ("Properties"),
!                                roadmap_lang_get ("Update road properties"),
!                                editor_screen_update_segments);
!       
        roadmap_main_add_separator (menu);
!       roadmap_main_add_menu_item
!                      (menu,
!                       roadmap_lang_get ("Delete"),
!                       roadmap_lang_get ("Delete selected roads"),
!                       editor_screen_delete_segments);
     }
  

[Roadmap-commit] roadmap_editor/src/editor editor_main.c, 1.13, 1.14 editor_main.h, 1.4, 1.5

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

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

Modified Files:
	editor_main.c editor_main.h 
Log Message:
Check map version on startup.

Index: editor_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** editor_main.c	27 Jul 2006 14:21:14 -0000	1.13
--- editor_main.c	9 Aug 2006 07:25:58 -0000	1.14
***************
*** 26,33 ****
--- 26,37 ----
   */
  
+ #include <stdlib.h>
  #include "../roadmap.h"
  #include "../roadmap_pointer.h"
  #include "../roadmap_plugin.h"
  #include "../roadmap_layer.h"
+ #include "../roadmap_locator.h"
+ #include "../roadmap_metadata.h"
+ #include "../roadmap_messagebox.h"
  
  #include "editor_screen.h"
***************
*** 41,45 ****
  int EditorPluginID = -1;
  
! const char *EDITOR_VERSION = "0.8.0 pre3";
  
  int editor_is_enabled (void) {
--- 45,75 ----
  int EditorPluginID = -1;
  
! const char *EDITOR_VERSION = "0.8.0 pre4";
! 
! void editor_main_check_map (void) {
! 
!    int fips;
!    time_t now_t;
!    time_t map_time_t;
! 
!    fips = roadmap_locator_active ();
! 
!    if (fips < 0) {
!       fips = 77001;
!    }
! 
!    if (roadmap_locator_activate (fips) == -1) {
!       roadmap_messagebox ("Error.", "Can't load map data.");
!    }
! 
!    now_t = time (NULL);
!    map_time_t = atoi(roadmap_metadata_get_attribute ("Version", "UnixTime"));
! 
!    if ((map_time_t + 3600*24) < now_t) {
!       roadmap_messagebox
!          ("Warning", "Your map is not updated. Please synchronize.");
!    }
! }
! 
  
  int editor_is_enabled (void) {

Index: editor_main.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_main.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** editor_main.h	12 May 2006 14:19:36 -0000	1.4
--- editor_main.h	9 Aug 2006 07:25:58 -0000	1.5
***************
*** 30,33 ****
--- 30,34 ----
  int editor_is_enabled (void);
  void editor_main_initialize (void);
+ void editor_main_check_map (void);
  void editor_main_set (int status);
  const char *editor_main_get_version (void);

[Roadmap-commit] roadmap_editor/src/agg roadmap_canvas.cpp, 1.5, 1.6

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

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

Modified Files:
	roadmap_canvas.cpp 
Log Message:
Use faster text drawing methods when text is drawn without an angle.
Add an interface to release an image.

Index: roadmap_canvas.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/roadmap_canvas.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** roadmap_canvas.cpp	17 Jul 2006 06:31:10 -0000	1.5
--- roadmap_canvas.cpp	9 Aug 2006 07:24:47 -0000	1.6
***************
*** 597,606 ****
     dbg_time_end(DBG_TIME_TEXT_CNV);
     
-    dbg_time_start(DBG_TIME_TEXT_LOAD);
-    
     double x  = 0;
     double y  = 0;
     
!    dbg_time_end(DBG_TIME_TEXT_LOAD);
     while(*p) {
        dbg_time_start(DBG_TIME_TEXT_ONE_LETTER);
--- 597,634 ----
     dbg_time_end(DBG_TIME_TEXT_CNV);
     
     double x  = 0;
     double y  = 0;
     
!    if ((angle >= 85) && (angle <= 95)) {
! 
!       int size = 15;
! 
!       /* Use faster drawing for text with no angle */
!       x  = position->x;
!       y  = position->y;
! 
!       ren_solid.color(agg::rgba8(0, 0, 0));
! 
!       m_image_feng.height(size);
!       m_image_feng.width(size);
! 
!       while(*p) {
!          const agg::glyph_cache* glyph = m_image_fman.glyph(*p);
! 
!          if(glyph) {
!             m_image_fman.init_embedded_adaptors(glyph, x, y);
! 
!             agg::render_scanlines(m_image_fman.gray8_adaptor(), 
!                   m_image_fman.gray8_scanline(), 
!                   ren_solid);      
! 
!             // increment pen position
!             x += glyph->advance_x;
!             y += glyph->advance_y;
!          }
!          ++p;
!       }
!    }
! 
     while(*p) {
        dbg_time_start(DBG_TIME_TEXT_ONE_LETTER);
***************
*** 720,723 ****
--- 748,758 ----
  }
  
+ 
+ void roadmap_canvas_free_image (RoadMapImage image) {
+ 
+    roadmap_canvas_agg_free_image (image);
+ }
+ 
+ 
  void roadmap_canvas_draw_image (RoadMapImage image, RoadMapGuiPoint *pos,
                                  int opacity, int mode) {
***************
*** 805,810 ****
  #endif
     
-    ren_solid.color(CurrentPen->color);
-    
     double x  = position->x;
     double y  = position->y + size - 7;
--- 840,843 ----

[Roadmap-commit] roadmap_editor/src Makefile,1.18,1.19

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

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

Modified Files:
	Makefile 
Log Message:
Add street range update dialog.

Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Makefile	27 Jul 2006 14:18:46 -0000	1.18
--- Makefile	9 Aug 2006 07:22:41 -0000	1.19
***************
*** 176,179 ****
--- 176,180 ----
               editor/editor_screen.c \
               editor/static/editor_dialog.c \
+              editor/static/update_range.c \
               editor/db/editor_street.c \
               editor/db/editor_point.c \

[Roadmap-commit] roadmap_editor/src roadmap_preferences.c,1.4,1.5

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

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

Modified Files:
	roadmap_preferences.c 
Log Message:
Add a missing const.

Index: roadmap_preferences.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_preferences.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_preferences.c	22 Jun 2006 18:44:23 -0000	1.4
--- roadmap_preferences.c	9 Aug 2006 07:13:09 -0000	1.5
***************
*** 156,160 ****
  
     int   count;
!    char *values[256];
  
  
--- 156,160 ----
  
     int   count;
!    const char *values[256];
  
  

[Roadmap-commit] roadmap_editor/src roadmap_sound.h,1.1,1.2

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

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

Modified Files:
	roadmap_sound.h 
Log Message:
Add an interface to record voice.

Index: roadmap_sound.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_sound.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_sound.h	27 Jul 2006 14:15:41 -0000	1.1
--- roadmap_sound.h	9 Aug 2006 07:12:49 -0000	1.2
***************
*** 47,49 ****
--- 47,51 ----
  void roadmap_sound_shutdown   (void);
  
+ int roadmap_sound_record (const char *file_name, int seconds);
+ 
  #endif // __ROADMAP_SOUND__H

[Roadmap-commit] roadmap_editor/src roadmap_pointer.c, 1.4, 1.5 roadmap_pointer.h, 1.1.1.1, 1.2

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

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

Modified Files:
	roadmap_pointer.c roadmap_pointer.h 
Log Message:
Add an interface to get the last pointer position.

Index: roadmap_pointer.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_pointer.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_pointer.h	15 Oct 2005 22:19:05 -0000	1.1.1.1
--- roadmap_pointer.h	9 Aug 2006 07:11:50 -0000	1.2
***************
*** 34,37 ****
--- 34,38 ----
  
  void roadmap_pointer_initialize (void);
+ const RoadMapGuiPoint *roadmap_pointer_position (void);
  
  RoadMapPointerHandler roadmap_pointer_register_short_click

Index: roadmap_pointer.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_pointer.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_pointer.c	2 May 2006 12:45:33 -0000	1.4
--- roadmap_pointer.c	9 Aug 2006 07:11:50 -0000	1.5
***************
*** 179,182 ****
--- 179,188 ----
  
  
+ const RoadMapGuiPoint *roadmap_pointer_position (void) {
+ 
+    return &last_pointer_point;
+ }
+ 
+ 
  RoadMapPointerHandler roadmap_pointer_register_short_click
                      (RoadMapPointerHandler handler) {

[Roadmap-commit] roadmap_editor/src roadmap_plugin.c, 1.6, 1.7 roadmap_plugin.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-serv29219

Modified Files:
	roadmap_plugin.c roadmap_plugin.h 
Log Message:
Add a function to calculate the real distance of a point on a line.

Index: roadmap_plugin.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_plugin.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** roadmap_plugin.h	21 May 2006 12:40:37 -0000	1.6
--- roadmap_plugin.h	9 Aug 2006 07:10:57 -0000	1.7
***************
*** 213,216 ****
--- 213,220 ----
  int roadmap_plugin_get_direction (PluginLine *line, int who);
  
+ int roadmap_plugin_calc_length (const RoadMapPosition *position,
+                                 const PluginLine *line,
+                                 int *total_length);
+ 
  void roadmap_plugin_shutdown (void);
  

Index: roadmap_plugin.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_plugin.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** roadmap_plugin.c	21 May 2006 12:40:37 -0000	1.6
--- roadmap_plugin.c	9 Aug 2006 07:10:57 -0000	1.7
***************
*** 34,37 ****
--- 34,38 ----
  #include "roadmap_street.h"
  #include "roadmap_screen.h"
+ #include "roadmap_math.h"
  #include "roadmap_shape.h"
  
***************
*** 549,552 ****
--- 550,622 ----
  
  
+ int roadmap_plugin_calc_length (const RoadMapPosition *position,
+                                 const PluginLine *line,
+                                 int *total_length) {
+ 
+    RoadMapPosition line_from_pos;
+    RoadMapPosition line_to_pos;
+    int first_shape;
+    int last_shape;
+    RoadMapShapeItr shape_itr;
+    RoadMapPosition from;
+    RoadMapPosition to;
+    RoadMapPosition intersection;
+    int current_length = 0;
+    int length_result = 0;
+    int smallest_distance = 0x7fffffff;
+    int distance;
+    int i;
+ 
+    roadmap_plugin_get_line_points (line, &line_from_pos, &line_to_pos,
+                                   &first_shape, &last_shape, &shape_itr);
+                                     
+    if (first_shape <= -1) {
+       
+       from = line_from_pos;
+       to = line_to_pos;
+    } else {
+ 
+       from = line_from_pos;
+       to   = line_from_pos;
+ 
+       for (i = first_shape; i <= last_shape; i++) {
+ 
+          shape_itr (i, &to);
+ 
+          distance =
+             roadmap_math_get_distance_from_segment
+             (position, &from, &to, &intersection, NULL);
+ 
+          if (distance < smallest_distance) {
+             smallest_distance = distance;
+             length_result = current_length +
+                roadmap_math_distance (&from, &intersection);
+          }
+ 
+          current_length += roadmap_math_distance (&from, &to);
+          from = to;
+       }
+ 
+       to = line_to_pos;
+    }
+ 
+    distance =
+       roadmap_math_get_distance_from_segment
+       (position, &from, &to, &intersection, NULL);
+ 
+    if (distance < smallest_distance) {
+ 
+       length_result = current_length +
+                         roadmap_math_distance (&from, &intersection);
+    }
+ 
+    current_length += roadmap_math_distance (&from, &to);
+ 
+    if (total_length) *total_length = current_length;
+ 
+    return length_result;
+ }
+ 
+ 
  void roadmap_plugin_shutdown (void) {
  
***************
*** 565,567 ****
  }
  
- 
--- 635,636 ----

[Roadmap-commit] roadmap_editor/src roadmap_navigate.c, 1.13, 1.14 roadmap_navigate.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-serv28754

Modified Files:
	roadmap_navigate.c roadmap_navigate.h 
Log Message:
Fix fuzzify bug.

Index: roadmap_navigate.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_navigate.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** roadmap_navigate.c	11 Jun 2006 10:58:58 -0000	1.13
--- roadmap_navigate.c	9 Aug 2006 07:09:51 -0000	1.14
***************
*** 249,252 ****
--- 249,253 ----
                   RoadMapNeighbour *previous_line,
                   RoadMapNeighbour *line,
+                  int against_direction,
                   int direction) {
  
***************
*** 277,280 ****
--- 278,287 ----
            (line_direction == ROUTE_DIRECTION_ANY)) {
         symetric = 1;
+     } else if (against_direction) {
+        if (line_direction == ROUTE_DIRECTION_WITH_LINE) {
+           line_direction = ROUTE_DIRECTION_AGAINST_LINE;
+        } else {
+           line_direction = ROUTE_DIRECTION_WITH_LINE;
+        }
      }
  
***************
*** 595,602 ****
          (RoadMapLatestGpsPosition.longitude == gps_position->longitude)) return;
  
-     RoadMapLatestGpsPosition = *gps_position;
- 
      if (gps_position->speed < roadmap_gps_speed_accuracy()) return;
  
  
      roadmap_fuzzy_start_cycle ();
--- 602,608 ----
          (RoadMapLatestGpsPosition.longitude == gps_position->longitude)) return;
  
      if (gps_position->speed < roadmap_gps_speed_accuracy()) return;
  
+     RoadMapLatestGpsPosition = *gps_position;
  
      roadmap_fuzzy_start_cycle ();
***************
*** 630,633 ****
--- 636,640 ----
                                 &RoadMapConfirmedLine,
                                 &RoadMapConfirmedLine,
+                                0,
                                 gps_position->steering);
          }
***************
*** 667,670 ****
--- 674,678 ----
                        &RoadMapConfirmedLine,
                        RoadMapNeighbourhood+i,
+                       0,
                        gps_position->steering);
  
***************
*** 811,819 ****
  
  
! int roadmap_navigate_get_current (RoadMapPosition *position,
!                                    PluginLine *line,
!                                    int *direction) {
  
!    *position = RoadMapLatestPosition;
     
     if (RoadMapConfirmedStreet.valid) {
--- 819,827 ----
  
  
! int roadmap_navigate_get_current (RoadMapGpsPosition *position,
!                                   PluginLine *line,
!                                   int *direction) {
  
!    *position = RoadMapLatestGpsPosition;
     
     if (RoadMapConfirmedStreet.valid) {

Index: roadmap_navigate.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_navigate.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** roadmap_navigate.h	22 May 2006 20:54:01 -0000	1.6
--- roadmap_navigate.h	9 Aug 2006 07:09:51 -0000	1.7
***************
*** 78,86 ****
                   RoadMapTracking *previous_street,
                   RoadMapNeighbour *previous_line,
!                  RoadMapNeighbour *line, int direction);
  
! int roadmap_navigate_get_current (RoadMapPosition *position,
!                                    PluginLine *line,
!                                    int *direction);
  
  void roadmap_navigate_route (RoadMapNavigateRouteCB callbacks);
--- 78,88 ----
                   RoadMapTracking *previous_street,
                   RoadMapNeighbour *previous_line,
!                  RoadMapNeighbour *line,
!                  int against_direction,
!                  int direction);
  
! int roadmap_navigate_get_current (RoadMapGpsPosition *position,
!                                   PluginLine *line,
!                                   int *direction);
  
  void roadmap_navigate_route (RoadMapNavigateRouteCB callbacks);

[Roadmap-commit] roadmap_editor/src roadmap_factory.c, 1.2, 1.3 roadmap_factory.h, 1.1.1.1, 1.2 roadmap_main.h, 1.1.1.1, 1.2 roadmap_start.c, 1.24, 1.25

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

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

Modified Files:
	roadmap_factory.c roadmap_factory.h roadmap_main.h 
	roadmap_start.c 
Log Message:
Quick menu.
Keyboard handling and configuration for wince.

Index: roadmap_factory.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_factory.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_factory.h	15 Oct 2005 22:18:50 -0000	1.1.1.1
--- roadmap_factory.h	9 Aug 2006 07:07:49 -0000	1.2
***************
*** 40,43 ****
--- 40,48 ----
  } RoadMapAction;
  
+ struct RoadMapFactoryKeyMap {
+ 
+    const char          *key;
+    const RoadMapAction *action;
+ };
  
  #define ROADMAP_MENU      "/"
***************
*** 59,62 ****
--- 64,71 ----
  void roadmap_factory_usage (const char *section, const RoadMapAction *action);
  
+ RoadMapMenu roadmap_factory_menu (const char           *name,
+                                   const char           *items[],
+                                   const RoadMapAction  *actions);
+ 
  #endif /* INCLUDE__ROADMAP_FACTORY__H */
  

Index: roadmap_factory.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_factory.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_factory.c	28 Nov 2005 19:36:34 -0000	1.2
--- roadmap_factory.c	9 Aug 2006 07:07:49 -0000	1.3
***************
*** 37,40 ****
--- 37,41 ----
  #include "roadmap_help.h"
  #include "roadmap_path.h"
+ #include "roadmap_lang.h"
  
  #include "roadmap_factory.h"
***************
*** 52,61 ****
  
  
- struct RoadMapFactoryKeyMap {
- 
-    const char          *key;
-    const RoadMapAction *action;
- };
- 
  static struct RoadMapFactoryKeyMap *RoadMapFactoryBindings = NULL;
  
--- 53,56 ----
***************
*** 93,97 ****
          ok = roadmap_help_next_topic(&label, &callback)) {
  
!       roadmap_main_add_menu_item (menu, label, label, callback);
     }
  }
--- 88,95 ----
          ok = roadmap_help_next_topic(&label, &callback)) {
  
!       roadmap_main_add_menu_item (menu,
!                                   roadmap_lang_get (label),
!                                   roadmap_lang_get (label),
!                                   callback);
     }
  }
***************
*** 235,239 ****
  
           gui_menu = roadmap_main_new_menu ();
!          roadmap_main_add_menu (gui_menu, item + prefix);
  
        } else {
--- 233,237 ----
  
           gui_menu = roadmap_main_new_menu ();
!          roadmap_main_add_menu (gui_menu, roadmap_lang_get (item + prefix));
  
        } else {
***************
*** 242,249 ****
           this_action = roadmap_factory_find_action (actions, item);
           if (this_action != NULL) {
!             roadmap_main_add_menu_item (gui_menu,
!                                         this_action->label_long,
!                                         this_action->tip,
!                                         this_action->callback);
           }
        }
--- 240,248 ----
           this_action = roadmap_factory_find_action (actions, item);
           if (this_action != NULL) {
!             roadmap_main_add_menu_item
!                               (gui_menu,
!                                roadmap_lang_get (this_action->label_long),
!                                roadmap_lang_get (this_action->tip),
!                                this_action->callback);
           }
        }
***************
*** 281,287 ****
     }
  
     if (RoadMapFactoryBindings != NULL) {
!       roadmap_main_set_keyboard (roadmap_factory_keyboard);
     }
  }
  
--- 280,289 ----
     }
  
+    /*
     if (RoadMapFactoryBindings != NULL) {
!       roadmap_main_set_keyboard
!          (RoadMapFactoryBindings, roadmap_factory_keyboard);
     }
+    */
  }
  
***************
*** 347,351 ****
        RoadMapFactoryBindings[j].key = NULL;
  
!       roadmap_main_set_keyboard (roadmap_factory_keyboard);
     }
  }
--- 349,354 ----
        RoadMapFactoryBindings[j].key = NULL;
  
!       roadmap_main_set_keyboard
!          (RoadMapFactoryBindings, roadmap_factory_keyboard);
     }
  }
***************
*** 390,391 ****
--- 393,434 ----
  }
  
+ RoadMapMenu roadmap_factory_menu (const char           *name,
+                                   const char           *items[],
+                                   const RoadMapAction  *actions) {
+ 
+    int i;
+    RoadMapMenu menu = NULL;
+    const char **menu_items =
+       roadmap_factory_user_config (name, "menu", actions);
+ 
+    menu = roadmap_main_new_menu ();
+    if (menu_items == NULL) menu_items = items;
+ 
+    for (i = 0; menu_items[i] != NULL; ++i) {
+ 
+       const char *item = menu_items[i];
+ 
+       if (item == RoadMapFactorySeparator) {
+ 
+          roadmap_main_add_separator (menu);
+ 
+       } else {
+ 
+          const RoadMapAction *this_action;
+ 
+          this_action = roadmap_factory_find_action (actions, item);
+ 
+          if (this_action != NULL) {
+             roadmap_main_add_menu_item
+                               (menu,
+                                roadmap_lang_get (this_action->label_long),
+                                roadmap_lang_get (this_action->tip),
+                                this_action->callback);
+          }
+       }
+    }
+ 
+    return menu;
+ }
+ 
+ 

Index: roadmap_main.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_main.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_main.h	15 Oct 2005 22:18:50 -0000	1.1.1.1
--- roadmap_main.h	9 Aug 2006 07:07:49 -0000	1.2
***************
*** 31,34 ****
--- 31,36 ----
  #include "roadmap_spawn.h"
  
+ struct RoadMapFactoryKeyMap;
+ 
  typedef void (* RoadMapKeyInput) (char *key);
  typedef void (* RoadMapInput)    (RoadMapIO *io);
***************
*** 38,42 ****
  void roadmap_main_new (const char *title, int width, int height);
  
! void roadmap_main_set_keyboard   (RoadMapKeyInput callback);
  
  RoadMapMenu roadmap_main_new_menu (void);
--- 40,45 ----
  void roadmap_main_new (const char *title, int width, int height);
  
! void roadmap_main_set_keyboard (struct RoadMapFactoryKeyMap *bindings,
!                                 RoadMapKeyInput callback);
  
  RoadMapMenu roadmap_main_new_menu (void);

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_start.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** roadmap_start.c	27 Jul 2006 14:18:46 -0000	1.24
--- roadmap_start.c	9 Aug 2006 07:07:49 -0000	1.25
***************
*** 74,81 ****
--- 74,83 ----
  #include "roadmap_sound.h"
  #include "roadmap_lang.h"
+ #include "roadmap_start.h"
  
  #include "navigate/navigate_main.h"
  #include "editor/editor_main.h"
  #include "editor/db/editor_db.h"
+ #include "editor/static/update_range.h"
  #include "editor/export/editor_export.h"
  #include "editor/export/editor_upload.h"
***************
*** 102,105 ****
--- 104,108 ----
  
  static RoadMapMenu LongClickMenu;
+ static RoadMapMenu QuickMenu;
  
  static RoadMapScreenSubscriber roadmap_start_prev_after_refresh = NULL;
***************
*** 184,188 ****
  static void roadmap_start_download_map (void) {
  
!    editor_download_update_map (EDITOR_DOWNLOAD_NORMAL);
  }
  
--- 187,191 ----
  static void roadmap_start_download_map (void) {
  
!    editor_download_update_map (NULL);
  }
  
***************
*** 312,315 ****
--- 315,327 ----
  
  
+ static void roadmap_start_quick_menu (void) {
+     
+    if (QuickMenu != NULL) {
+       const RoadMapGuiPoint *point = roadmap_pointer_position ();
+       roadmap_main_popup_menu (QuickMenu, point->x, point->y);
+    }
+ }
+ 
+ 
  /* The RoadMap menu and toolbar items: ----------------------------------- */
  
***************
*** 502,505 ****
--- 514,523 ----
        "Sync map and data", roadmap_start_sync_data},
  
+    {"quickmenu", "Open quick menu", NULL, NULL,
+       "Open quick menu", roadmap_start_quick_menu},
+ 
+    {"updaterange", "Update street range", NULL, NULL,
+       "Update street range", update_range_dialog},
+ 
     {NULL, NULL, NULL, NULL, NULL, NULL}
  };
***************
*** 552,556 ****
     "toggleorientation",
     "toggleview",
!    "full",
  
     RoadMapFactorySeparator,
--- 570,574 ----
     "toggleorientation",
     "toggleview",
!    "full",
  
     RoadMapFactorySeparator,
***************
*** 654,657 ****
--- 672,700 ----
  
  
+ static char const *RoadMapStartLongClickMenu[] = {
+ 
+    "setasdeparture",
+    "setasdestination",
+    "navigate",
+ 
+    NULL,
+ };
+ 
+ 
+ static char const *RoadMapStartQuickMenu[] = {
+ 
+    "address",
+    "updaterange",
+    RoadMapFactorySeparator,
+    "sync",
+    RoadMapFactorySeparator,
+    "detectreceiver",
+    "preferences",
+ 
+    NULL,
+ };
+ 
+ 
+ #ifndef UNDER_CE
  static char const *RoadMapStartKeyBinding[] = {
  
***************
*** 699,702 ****
--- 742,833 ----
  };
  
+ #else
+ static char const *RoadMapStartKeyBinding[] = {
+ 
+    "Button-Left"     ROADMAP_MAPPED_TO "counterclockwise",
+    "Button-Right"    ROADMAP_MAPPED_TO "clockwise",
+    "Button-Up"       ROADMAP_MAPPED_TO "zoomin",
+    "Button-Down"     ROADMAP_MAPPED_TO "zoomout",
+ 
+    "Button-App1"     ROADMAP_MAPPED_TO "",
+    "Button-App2"     ROADMAP_MAPPED_TO "",
+    "Button-App3"     ROADMAP_MAPPED_TO "",
+    "Button-App4"     ROADMAP_MAPPED_TO "",
+ 
+    NULL
+ };
+ #endif
+ 
+ 
+ static void roadmap_start_init_key_cfg (void) {
+ 
+    const char **keys = RoadMapStartKeyBinding;
+    RoadMapConfigDescriptor config = ROADMAP_CONFIG_ITEM("KeyBinding", "");
+ 
+    while (*keys) {
+       char *text;
+       char *separator;
+       const RoadMapAction *this_action;
+       const RoadMapAction *actions = RoadMapStartActions;
+       RoadMapConfigItem *item;
+ 
+       text = strdup (*keys);
+       roadmap_check_allocated(text);
+ 
+       separator = strstr (text, ROADMAP_MAPPED_TO);
+       if (separator != NULL) {
+ 
+          const char *new_config = NULL;
+          char *p;
+          for (p = separator; *p <= ' '; --p) *p = 0;
+ 
+          p = separator + strlen(ROADMAP_MAPPED_TO);
+          while (*p && (*p <= ' ')) ++p;
+ 
+          this_action = roadmap_start_find_action (p);
+ 
+          config.name = text;
+          config.reference = NULL;
+ 
+          if (this_action != NULL) {
+ 
+             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);
+             }
+ 
+             roadmap_config_add_enumeration_value (item, "");
+          } else {
+ 
+             item = roadmap_config_declare_enumeration
+                    ("preferences", &config, "", NULL);
+ 
+             if (strlen(roadmap_config_get (&config))) {
+                new_config = roadmap_config_get (&config);
+             }
+          }
+ 
+          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);
+          }
+       }
+ 
+       keys++;
+    }
+ }
+ 
  
  static void roadmap_start_set_unit (void) {
***************
*** 814,817 ****
--- 945,961 ----
  
  
+ static void roadmap_start_long_click (RoadMapGuiPoint *point) {
+    
+    RoadMapPosition position;
+ 
+    roadmap_math_to_position (point, &position, 1);
+    roadmap_trip_set_point ("Selection", &position);
+    
+    if (LongClickMenu != NULL) {
+       roadmap_main_popup_menu (LongClickMenu, point->x, point->y);
+    }
+ }
+  
+ 
  static void roadmap_start_window (void) {
  
***************
*** 825,828 ****
--- 969,982 ----
                      RoadMapStartToolbar);
  
+    QuickMenu = roadmap_factory_menu ("quick",
+                                      RoadMapStartQuickMenu,
+                                      RoadMapStartActions);
+ 
+    LongClickMenu = roadmap_factory_menu ("long_click",
+                                          RoadMapStartLongClickMenu,
+                                          RoadMapStartActions);
+ 
+    roadmap_pointer_register_long_click (roadmap_start_long_click);
+ 
     roadmap_main_add_canvas ();
  
***************
*** 899,932 ****
  
  
- static void roadmap_start_long_click (RoadMapGuiPoint *point) {
-    
-    RoadMapPosition position;
- 
-    roadmap_math_to_position (point, &position, 1);
-    roadmap_trip_set_point ("Selection", &position);
-    
-    if (LongClickMenu != NULL) {
-       roadmap_main_popup_menu (LongClickMenu, point->x, point->y);
-    }
- }
-  
- 
- void roadmap_start_add_long_click_item (const char *name,
-                                         const char *description,
-                                         RoadMapCallback callback) {
-    if (LongClickMenu == NULL) {
-       LongClickMenu = roadmap_main_new_menu ();
-    }
- 
-    if (name == NULL) {
-       roadmap_main_add_separator (LongClickMenu);
-       return;
-    }
- 
-    roadmap_main_add_menu_item (LongClickMenu, name, description, callback);
- 
- }
-    
- 
  void roadmap_start_freeze (void) {
  
--- 1053,1056 ----
***************
*** 966,983 ****
        ("preferences", &RoadMapConfigGeometryMain, "800x600");
  
-    roadmap_start_add_long_click_item ("Set as Departure",
-                   "Set current point as Departure point.",
-                   roadmap_start_set_departure);
- 
-    roadmap_start_add_long_click_item ("Set as Destination",
-                   "Set current point as Destination point.",
-                   roadmap_start_set_destination);
- 
-    roadmap_start_add_long_click_item ("Navigate",
-                   "Calculate a route",
-                   roadmap_start_navigate);
- 
-    roadmap_pointer_register_long_click (roadmap_start_long_click);
- 
     roadmap_option_initialize   ();
     roadmap_math_initialize     ();
--- 1090,1093 ----
***************
*** 1010,1014 ****
     roadmap_path_set("maps", roadmap_config_get(&RoadMapConfigMapPath));
  
!    roadmap_factory_keymap (RoadMapStartActions, RoadMapStartKeyBinding);
  
     roadmap_option (argc, argv, roadmap_start_usage);
--- 1120,1126 ----
     roadmap_path_set("maps", roadmap_config_get(&RoadMapConfigMapPath));
  
! #if UNDER_CE
!    roadmap_start_init_key_cfg ();
! #endif   
  
     roadmap_option (argc, argv, roadmap_start_usage);
***************
*** 1018,1021 ****
--- 1130,1134 ----
     roadmap_math_restore_zoom ();
     roadmap_start_window      ();
+    roadmap_factory_keymap (RoadMapStartActions, RoadMapStartKeyBinding);
     roadmap_label_activate    ();
     roadmap_sprite_initialize ();
***************
*** 1037,1040 ****
--- 1150,1154 ----
  
     editor_main_initialize ();
+    editor_main_check_map ();
     navigate_main_initialize ();
  

[Roadmap-commit] roadmap_editor/src roadmap_download.c, 1.9, 1.10 roadmap_download.h, 1.3, 1.4

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

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

Modified Files:
	roadmap_download.c roadmap_download.h 
Log Message:
Add callbacks for getting progress info.

Index: roadmap_download.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_download.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** roadmap_download.c	27 Jul 2006 14:19:30 -0000	1.9
--- roadmap_download.c	9 Aug 2006 07:06:02 -0000	1.10
***************
*** 89,92 ****
--- 89,95 ----
  static int  RoadMapDownloadDownloaded = -1;
  
+ static const char *RoadMapDownloadFrom;
+ static const char *RoadMapDownloadTo;
+ 
  
  struct roadmap_download_protocol {
***************
*** 101,105 ****
  
  
! static int roadmap_download_next_county (int ui);
  
  static void roadmap_download_no_handler (void) {}
--- 104,108 ----
  
  
! static int roadmap_download_next_county (RoadMapDownloadCallbacks *callbacks);
  
  static void roadmap_download_no_handler (void) {}
***************
*** 152,156 ****
  
  
! static int roadmap_download_end () {
  
  
--- 155,159 ----
  
  
! static int roadmap_download_end (RoadMapDownloadCallbacks *callbacks) {
  
  
***************
*** 161,165 ****
  
        /* The queue is not yet empty: start the next download. */
!       if (roadmap_download_next_county (0) != 0) {
           RoadMapDownloadWhenDone ();
           return -1;
--- 164,168 ----
  
        /* The queue is not yet empty: start the next download. */
!       if (roadmap_download_next_county (callbacks) != 0) {
           RoadMapDownloadWhenDone ();
           return -1;
***************
*** 429,433 ****
  
  
! static int roadmap_download_start (const char *name) {
  
     int  fips = RoadMapDownloadQueue[RoadMapDownloadQueueConsumer];
--- 432,437 ----
  
  
! static int roadmap_download_start (const char *name,
!                                    RoadMapDownloadCallbacks *callbacks) {
  
     int  fips = RoadMapDownloadQueue[RoadMapDownloadQueueConsumer];
***************
*** 442,454 ****
     const char *directory;
  
  
!    format = roadmap_dialog_get_data (".file", "From");
     roadmap_config_set (&RoadMapConfigSource, format);
     snprintf (source, sizeof(source), format, fips);
  
!    format = roadmap_dialog_get_data (".file", "To");
     snprintf (destination, sizeof(destination), format, fips);
  
!    roadmap_dialog_hide (name);
  
     directory = roadmap_path_parent (NULL, destination);
--- 446,461 ----
     const char *directory;
  
+    if (!callbacks) callbacks = &RoadMapDownloadCallbackFunctions;
  
!    format = RoadMapDownloadFrom;
     roadmap_config_set (&RoadMapConfigSource, format);
     snprintf (source, sizeof(source), format, fips);
  
!    format = RoadMapDownloadTo;
     snprintf (destination, sizeof(destination), format, fips);
  
!    if (!callbacks) {
!       roadmap_dialog_hide (name);
!    }
  
     directory = roadmap_path_parent (NULL, destination);
***************
*** 476,481 ****
           roadmap_locator_close (fips);
  
!          if (protocol->handler (&RoadMapDownloadCallbackFunctions,
!                                 source, tmp_file)) {
  
              char *tmp;
--- 483,487 ----
           roadmap_locator_close (fips);
  
!          if (protocol->handler (callbacks, source, tmp_file)) {
  
              char *tmp;
***************
*** 491,496 ****
                    memcpy (tmp, ".dgl", 4);
                 
!                      if (!protocol->handler (&RoadMapDownloadCallbackFunctions,
!                                                 source, tmp_file)) {
                          roadmap_messagebox ("Error",
                                "Error downloading navigation data.");
--- 497,501 ----
                    memcpy (tmp, ".dgl", 4);
                 
!                      if (!protocol->handler (callbacks, source, tmp_file)) {
                          roadmap_messagebox ("Error",
                                "Error downloading navigation data.");
***************
*** 506,510 ****
           roadmap_download_unblock (fips);
           roadmap_start_unfreeze ();
!          roadmap_download_end ();
           break;
        }
--- 511,515 ----
           roadmap_download_unblock (fips);
           roadmap_start_unfreeze ();
!          roadmap_download_end (callbacks);
           break;
        }
***************
*** 530,534 ****
  static void roadmap_download_ok (const char *name, void *context) {
  
!    roadmap_download_start (name);
  }
  
--- 535,544 ----
  static void roadmap_download_ok (const char *name, void *context) {
  
!    RoadMapDownloadFrom = roadmap_dialog_get_data (".file", "From");
!    roadmap_config_set (&RoadMapConfigSource, RoadMapDownloadFrom);
! 
!    RoadMapDownloadTo = roadmap_dialog_get_data (".file", "To");
! 
!    roadmap_download_start (name, NULL);
  }
  
***************
*** 543,551 ****
     RoadMapDownloadQueueConsumer = RoadMapDownloadQueueProducer - 1;
  
!    roadmap_download_end ();
  }
  
  
! static int roadmap_download_usdir (void) {
  
     struct roadmap_download_protocol *protocol;
--- 553,561 ----
     RoadMapDownloadQueueConsumer = RoadMapDownloadQueueProducer - 1;
  
!    roadmap_download_end (0);
  }
  
  
! static int roadmap_download_usdir (RoadMapDownloadCallbacks *callbacks) {
  
     struct roadmap_download_protocol *protocol;
***************
*** 559,562 ****
--- 569,573 ----
     const char *tmp_file;
  
+    if (!callbacks) callbacks = &RoadMapDownloadCallbackFunctions;
  
     strncpy (source, roadmap_config_get (&RoadMapConfigSource), sizeof(source));
***************
*** 567,571 ****
        roadmap_messagebox ("Download Error", "Can't download usdir.");
        roadmap_log (ROADMAP_WARNING, "invalid download source %s", source);
!       roadmap_download_end ();
        return -1;
     }
--- 578,582 ----
        roadmap_messagebox ("Download Error", "Can't download usdir.");
        roadmap_log (ROADMAP_WARNING, "invalid download source %s", source);
!       roadmap_download_end (callbacks);
        return -1;
     }
***************
*** 598,603 ****
           roadmap_locator_close_dir();
  
!          if (protocol->handler (&RoadMapDownloadCallbackFunctions,
!                                 source, tmp_file)) {
  
              roadmap_download_uncompress (tmp_file, destination);
--- 609,613 ----
           roadmap_locator_close_dir();
  
!          if (protocol->handler (callbacks, source, tmp_file)) {
  
              roadmap_download_uncompress (tmp_file, destination);
***************
*** 607,611 ****
           }
           roadmap_start_unfreeze ();
!          roadmap_download_end ();
           break;
        }
--- 617,621 ----
           }
           roadmap_start_unfreeze ();
!          roadmap_download_end (callbacks);
           break;
        }
***************
*** 618,622 ****
        roadmap_messagebox ("Download Error", "invalid download protocol");
        roadmap_log (ROADMAP_WARNING, "invalid download source %s", source);
!       roadmap_download_end ();
        return -1;
     }
--- 628,632 ----
        roadmap_messagebox ("Download Error", "invalid download protocol");
        roadmap_log (ROADMAP_WARNING, "invalid download source %s", source);
!       roadmap_download_end (callbacks);
        return -1;
     }
***************
*** 630,634 ****
  
  
! static int roadmap_download_next_county (int ui) {
  
     int fips = RoadMapDownloadQueue[RoadMapDownloadQueueConsumer];
--- 640,644 ----
  
  
! int roadmap_download_next_county (RoadMapDownloadCallbacks *callbacks) {
  
     int fips = RoadMapDownloadQueue[RoadMapDownloadQueueConsumer];
***************
*** 640,644 ****
  
     if (fips == -1) {
!       return roadmap_download_usdir ();
     }
  
--- 650,654 ----
  
     if (fips == -1) {
!       return roadmap_download_usdir (callbacks);
     }
  
***************
*** 647,668 ****
     if (basename == NULL) {
        roadmap_messagebox (source, "Bad source file name (no path)");
        return -1;
     }
  
!    if (roadmap_dialog_activate ("Download a Map", NULL)) {
  
!       roadmap_dialog_new_label  (".file", "County");
!       roadmap_dialog_new_label  (".file", "State");
!       roadmap_dialog_new_entry  (".file", "From", NULL);
!       roadmap_dialog_new_entry  (".file", "To", NULL);
  
!       roadmap_dialog_add_button ("OK", roadmap_download_ok);
!       roadmap_dialog_add_button ("Cancel", roadmap_download_cancel);
  
!       roadmap_dialog_complete (roadmap_preferences_use_keyboard());
     }
-    roadmap_dialog_set_data (".file", "County", roadmap_county_get_name (fips));
-    roadmap_dialog_set_data (".file", "State", roadmap_county_get_state (fips));
  
     roadmap_dialog_set_data (".file", "From", source);
  
--- 657,682 ----
     if (basename == NULL) {
        roadmap_messagebox (source, "Bad source file name (no path)");
+       roadmap_download_end (callbacks);
        return -1;
     }
  
!    if (!callbacks) {
!       if (roadmap_dialog_activate ("Download a Map", NULL)) {
  
!          roadmap_dialog_new_label  (".file", "County");
!          roadmap_dialog_new_label  (".file", "State");
!          roadmap_dialog_new_entry  (".file", "From", NULL);
!          roadmap_dialog_new_entry  (".file", "To", NULL);
  
!          roadmap_dialog_add_button ("OK", roadmap_download_ok);
!          roadmap_dialog_add_button ("Cancel", roadmap_download_cancel);
  
!          roadmap_dialog_complete (roadmap_preferences_use_keyboard());
!       }
!       roadmap_dialog_set_data (".file", "County", roadmap_county_get_name (fips));
!       roadmap_dialog_set_data (".file", "State", roadmap_county_get_state (fips));
     }
  
+    RoadMapDownloadFrom = source;
     roadmap_dialog_set_data (".file", "From", source);
  
***************
*** 675,682 ****
  #endif
  
!    roadmap_dialog_set_data (".file", "To", buffer);
  
!    if (!ui) {
!       return roadmap_download_start ("Download a Map");
     }
  
--- 689,698 ----
  #endif
  
!    RoadMapDownloadTo = buffer;
  
!    if (!callbacks) {
!       roadmap_dialog_set_data (".file", "To", buffer);
!    } else {
!       return roadmap_download_start ("Download a Map", callbacks);
     }
  
***************
*** 685,689 ****
  
  
! int roadmap_download_get_county (int fips, int download_usdir, int ui) {
  
     int next;
--- 701,706 ----
  
  
! int roadmap_download_get_county (int fips, int download_usdir,
!                                  RoadMapDownloadCallbacks *callbacks) {
  
     int next;
***************
*** 726,730 ****
  
        RoadMapDownloadQueueProducer = next;
!       return roadmap_download_next_county(ui);
     }
  
--- 743,747 ----
  
        RoadMapDownloadQueueProducer = next;
!       return roadmap_download_next_county(callbacks);
     }
  

Index: roadmap_download.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_download.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_download.h	13 Jul 2006 06:32:00 -0000	1.3
--- roadmap_download.h	9 Aug 2006 07:06:02 -0000	1.4
***************
*** 64,68 ****
  
  
! int roadmap_download_get_county (int fips, int download_usdir, int ui);
  
  void roadmap_download_show_space (void);
--- 64,69 ----
  
  
! int roadmap_download_get_county (int fips, int download_usdir,
!                                  RoadMapDownloadCallbacks *callbacks);
  
  void roadmap_download_show_space (void);

[Roadmap-commit] roadmap_editor/src roadmap_canvas.h, 1.8, 1.9 roadmap_canvas_agg.h, 1.3, 1.4

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

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

Modified Files:
	roadmap_canvas.h roadmap_canvas_agg.h 
Log Message:
Add an interface to release an image.

Index: roadmap_canvas.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_canvas.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** roadmap_canvas.h	17 Jul 2006 06:29:37 -0000	1.8
--- roadmap_canvas.h	9 Aug 2006 07:04:16 -0000	1.9
***************
*** 170,173 ****
--- 170,175 ----
                                       int size, const char *text);
  
+ void roadmap_canvas_free_image (RoadMapImage image);
+ 
  #endif // INCLUDE__ROADMAP_CANVAS__H
  

Index: roadmap_canvas_agg.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_canvas_agg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_canvas_agg.h	8 May 2006 16:23:17 -0000	1.3
--- roadmap_canvas_agg.h	9 Aug 2006 07:04:16 -0000	1.4
***************
*** 52,55 ****
--- 52,57 ----
                                              const char *file_name);
  
+ void roadmap_canvas_agg_free_image (RoadMapImage image);
+ 
  #endif // INCLUDE__ROADMAP_CANVAS_AGG__H
  

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

Modified Files:
	roadmap_dialog.h 
Log Message:
Dialogs can now contain a progress bar and an image.

Index: roadmap_dialog.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_dialog.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_dialog.h	27 Jul 2006 14:18:46 -0000	1.4
--- roadmap_dialog.h	9 Aug 2006 07:03:05 -0000	1.5
***************
*** 74,77 ****
--- 74,80 ----
  void roadmap_dialog_new_label (const char *frame, const char *name);
  
+ /* Add one image item to the current dialog. */
+ void roadmap_dialog_new_image (const char *frame, const char *name);
+ 
  /* Add one text entry item to the current dialog. */
  void roadmap_dialog_new_entry (const char *frame, const char *name,
***************
*** 81,84 ****
--- 84,90 ----
  void roadmap_dialog_new_password (const char *frame, const char *name);
  
+ /* Add a progress bar item */
+ void roadmap_dialog_new_progress (const char *frame, const char *name);
+ 
  /* Add one color selection item to to the current dialog. */
  void roadmap_dialog_new_color (const char *frame, const char *name);
***************
*** 126,129 ****
--- 132,137 ----
  void  roadmap_dialog_set_data (const char *frame, const char *name,
                                 const void *data);
+ void  roadmap_dialog_set_progress (const char *frame, const char *name,
+                                    int progress);
  void  roadmap_dialog_protect  (const char *frame, const char *name);
  
***************
*** 146,149 ****
--- 154,164 ----
  }
  
+ static __inline void roadmap_dialog_new_image_i
+                      (const char *frame, const char *name) {
+ 
+    roadmap_dialog_new_image
+       (roadmap_lang_get (frame), roadmap_lang_get (name));
+ }
+ 
  static __inline void roadmap_dialog_new_entry_i
         (const char *frame, const char *name, RoadMapDialogCallback callback) {
***************
*** 160,163 ****
--- 175,185 ----
  }
  
+ static __inline void roadmap_dialog_new_progress_i
+                      (const char *frame, const char *name) {
+ 
+    roadmap_dialog_new_progress
+       (roadmap_lang_get (frame), roadmap_lang_get (name));
+ }
+ 
  static __inline void roadmap_dialog_new_color_i
                       (const char *frame, const char *name) {
***************
*** 219,222 ****
--- 241,250 ----
  }
  
+ static __inline void roadmap_dialog_set_progress_i
+                       (const char *frame, const char *name, int progress) {
+    roadmap_dialog_set_progress
+       (roadmap_lang_get (frame), roadmap_lang_get (name), progress);
+ }
+ 
  static __inline void roadmap_dialog_protect_i
                       (const char *frame, const char *name) {
***************
*** 228,232 ****
--- 256,262 ----
  #define roadmap_dialog_hide         roadmap_dialog_hide_i
  #define roadmap_dialog_new_label    roadmap_dialog_new_label_i
+ #define roadmap_dialog_new_image    roadmap_dialog_new_image_i
  #define roadmap_dialog_new_entry    roadmap_dialog_new_entry_i
+ #define roadmap_dialog_new_progress roadmap_dialog_new_progress_i
  #define roadmap_dialog_new_password roadmap_dialog_new_password_i
  #define roadmap_dialog_new_color    roadmap_dialog_new_color_i
***************
*** 238,241 ****
--- 268,272 ----
  #define roadmap_dialog_get_data     roadmap_dialog_get_data_i
  #define roadmap_dialog_set_data     roadmap_dialog_set_data_i
+ #define roadmap_dialog_set_progress roadmap_dialog_set_progress_i
  #define roadmap_dialog_protect      roadmap_dialog_protect_i
  #endif

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

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

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

Modified Files:
	roadmap_address.c 
Log Message:
I18n

Index: roadmap_address.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_address.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** roadmap_address.c	27 Jul 2006 14:19:08 -0000	1.6
--- roadmap_address.c	9 Aug 2006 07:01:35 -0000	1.7
***************
*** 171,178 ****
     roadmap_history_get ('A', context->history, argv);
  
!    roadmap_dialog_set_data ("Address", "Number:", argv[0]);
!    roadmap_dialog_set_data ("Address", "Street:", argv[1]);
!    roadmap_dialog_set_data ("Address", "City:",   argv[2]);
!    roadmap_dialog_set_data ("Address", "State:",  argv[3]);
  }
  
--- 171,178 ----
     roadmap_history_get ('A', context->history, argv);
  
!    roadmap_dialog_set_data ("Address", "Number", argv[0]);
!    roadmap_dialog_set_data ("Address", "Street", argv[1]);
!    roadmap_dialog_set_data ("Address", "City",   argv[2]);
!    roadmap_dialog_set_data ("Address", "State",  argv[3]);
  }
  
***************
*** 215,222 ****
  
     street_number_image =
!       (char *) roadmap_dialog_get_data ("Address", "Number:");
  
!    street_name   = (char *) roadmap_dialog_get_data ("Address", "Street:");
!    state         = (char *) roadmap_dialog_get_data ("Address", "State:");
  
     if (context->use_zip) {
--- 215,222 ----
  
     street_number_image =
!       (char *) roadmap_dialog_get_data ("Address", "Number");
  
!    street_name   = (char *) roadmap_dialog_get_data ("Address", "Street");
!    state         = (char *) roadmap_dialog_get_data ("Address", "State");
  
     if (context->use_zip) {
***************
*** 224,228 ****
     }
  
!    city = (char *) roadmap_dialog_get_data ("Address", "City:");
  
     count = roadmap_geocode_address (&selections,
--- 224,228 ----
     }
  
!    city = (char *) roadmap_dialog_get_data ("Address", "City");
  
     count = roadmap_geocode_address (&selections,
***************
*** 294,298 ****
     RoadMapAddressSearch *context = (RoadMapAddressSearch *)data;
  
!    str = roadmap_dialog_get_data (".search", "Name:");
  
     RoadMapAddressSearchCount = 0;
--- 294,298 ----
     RoadMapAddressSearch *context = (RoadMapAddressSearch *)data;
  
!    str = roadmap_dialog_get_data (".search", "Name");
  
     RoadMapAddressSearchCount = 0;
***************
*** 311,315 ****
  
     snprintf (count_str, sizeof(count_str), "%d", RoadMapAddressSearchCount);
!    roadmap_dialog_set_data  (".search", "found:", count_str);
  
     roadmap_dialog_show_list
--- 311,315 ----
  
     snprintf (count_str, sizeof(count_str), "%d", RoadMapAddressSearchCount);
!    roadmap_dialog_set_data  (".search", "found", count_str);
  
     roadmap_dialog_show_list
***************
*** 355,359 ****
     if ((result == NULL) || !strlen (result)) return;
  
!    roadmap_dialog_set_data ("Address", "City:", result);
  }
  
--- 355,359 ----
     if ((result == NULL) || !strlen (result)) return;
  
!    roadmap_dialog_set_data ("Address", "City", result);
  }
  
***************
*** 380,385 ****
      * The whole combo boxes mass must be fixed ASAP.
      */
!    roadmap_dialog_set_data ("Address", "Street:", strdup(name));
!    roadmap_dialog_set_data ("Address", "City:", strdup(tmp));
  }
  
--- 380,385 ----
      * The whole combo boxes mass must be fixed ASAP.
      */
!    roadmap_dialog_set_data ("Address", "Street", strdup(name));
!    roadmap_dialog_set_data ("Address", "City", strdup(tmp));
  }
  
***************
*** 387,402 ****
  static void roadmap_address_other_cb (const char *name, void *context) {
  
!    if (!strcmp(roadmap_dialog_get_data ("Address", "City:"), def_values[1]) ){
        
!       roadmap_dialog_set_data ("Address", "City:", def_values[0]);
        roadmap_address_search_dialog
           (NULL, roadmap_address_city_result, context);
!    } else if (!strcmp(roadmap_dialog_get_data ("Address", "Street:"),
                        def_values[1])) {
        
!       roadmap_dialog_set_data ("Address", "Street:", def_values[0]);
  
        roadmap_address_search_dialog
!          (roadmap_dialog_get_data ("Address", "City:"),
            roadmap_address_street_result, context);
     }
--- 387,402 ----
  static void roadmap_address_other_cb (const char *name, void *context) {
  
!    if (!strcmp(roadmap_dialog_get_data ("Address", "City"), def_values[1]) ){
        
!       roadmap_dialog_set_data ("Address", "City", def_values[0]);
        roadmap_address_search_dialog
           (NULL, roadmap_address_city_result, context);
!    } else if (!strcmp(roadmap_dialog_get_data ("Address", "Street"),
                        def_values[1])) {
        
!       roadmap_dialog_set_data ("Address", "Street", def_values[0]);
  
        roadmap_address_search_dialog
!          (roadmap_dialog_get_data ("Address", "City"),
            roadmap_address_street_result, context);
     }
***************
*** 404,408 ****
  
  static void roadmap_address_dialog (RoadMapAddressDialog *context) {
! 
     if (!def_values[1][0]) {
        def_values[1] = roadmap_lang_get ("Search");
--- 404,408 ----
  
  static void roadmap_address_dialog (RoadMapAddressDialog *context) {
! 
     if (!def_values[1][0]) {
        def_values[1] = roadmap_lang_get ("Search");
***************
*** 411,426 ****
     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);
        } else {
!          roadmap_dialog_new_choice ("Address", "City:",
                 sizeof(def_values) / sizeof(char **),
                 def_values, (void **)def_values, roadmap_address_other_cb);
        }
!       roadmap_dialog_new_entry ("Address", "State:", NULL);
  
        roadmap_dialog_add_button ("Back", roadmap_address_before);
--- 411,426 ----
     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);
        } else {
!          roadmap_dialog_new_choice ("Address", "City",
                 sizeof(def_values) / sizeof(char **),
                 def_values, (void **)def_values, roadmap_address_other_cb);
        }
!       roadmap_dialog_new_entry ("Address", "State", NULL);
  
        roadmap_dialog_add_button ("Back", roadmap_address_before);
***************
*** 431,435 ****
        roadmap_dialog_complete (roadmap_preferences_use_keyboard());
        roadmap_dialog_set_data
!             ("Address", "State:",
               roadmap_county_get_name (roadmap_locator_active ()));
  
--- 431,435 ----
        roadmap_dialog_complete (roadmap_preferences_use_keyboard());
        roadmap_dialog_set_data
!             ("Address", "State",
               roadmap_county_get_name (roadmap_locator_active ()));
  
***************
*** 468,474 ****
     if (roadmap_dialog_activate ("Search Address", context)) {
  
!       roadmap_dialog_new_entry  (".search", "Name:",
                                   roadmap_address_search_populate);
!       roadmap_dialog_new_label  (".search", "found:");
  
        roadmap_dialog_new_list   (".search", ".results");
--- 468,474 ----
     if (roadmap_dialog_activate ("Search Address", context)) {
  
!       roadmap_dialog_new_entry  (".search", "Name",
                                   roadmap_address_search_populate);
!       roadmap_dialog_new_label  (".search", "found");
  
        roadmap_dialog_new_list   (".search", ".results");
***************
*** 480,485 ****
     }
  
!    roadmap_dialog_set_data  (".search", "Name:", "");
!    roadmap_dialog_set_data  (".search", "found:", "");
  
     roadmap_address_search_populate ("Search Address", context);
--- 480,485 ----
     }
  
!    roadmap_dialog_set_data  (".search", "Name", "");
!    roadmap_dialog_set_data  (".search", "found", "");
  
     roadmap_address_search_populate ("Search Address", context);

[Roadmap-commit] roadmap_editor/src objects,1.5,1.6

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

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

Modified Files:
	objects 
Log Message:
Add quick menu.

Index: objects
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/objects,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** objects	11 Jun 2006 11:01:38 -0000	1.5
--- objects	9 Aug 2006 07:00:14 -0000	1.6
***************
*** 67,68 ****
--- 67,75 ----
  R
  
+ N menu_button
+ I rm_menu.bmp
+ P 1 100
+ O 160
+ A quickmenu
+ B -4 -4 28 28
+ 

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

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

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

Modified Files:
	buildmap_postgres.c 
Log Message:
Process street ranges.

Index: buildmap_postgres.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/buildmap_postgres.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** buildmap_postgres.c	27 Jul 2006 14:16:13 -0000	1.10
--- buildmap_postgres.c	9 Aug 2006 06:58:58 -0000	1.11
***************
*** 328,338 ****
           } else {
  
!             buildmap_range_add_no_address (line, street);
!             /*            
!                           buildmap_range_add
!                           (line, street, 1, 11, zip, city);
                            buildmap_range_add
!                           (line, street, 2, 12, zip, city);
!                           */
          }
        }
--- 328,336 ----
           } else {
  
!             //buildmap_range_add_no_address (line, street);
!             buildmap_range_add
!                           (line, street, 0, 0, zip, city);
                            buildmap_range_add
!                           (line, street, 0, 0, zip, city);
          }
        }