roadmap-commit — track CVS commits

[Roadmap-commit] roadmap_editor/src/editor/export editor_export.c,1.7,1.8

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

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

Modified Files:
	editor_export.c 
Log Message:
Add a default .gpx extension.
Avoid exporting empty files.

Index: editor_export.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_export.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** editor_export.c	31 Dec 2005 09:58:37 -0000	1.7
--- editor_export.c	17 Mar 2006 09:53:38 -0000	1.8
***************
*** 39,43 ****
  #include "roadmap_locator.h"
  #include "roadmap_line_route.h"
! #include "roadmap_fileselection.h"
  
  #include "../editor_log.h"
--- 39,44 ----
  #include "roadmap_locator.h"
  #include "roadmap_line_route.h"
! #include "roadmap_fileselection.h"
! #include "roadmap_messagebox.h"
  
  #include "../editor_log.h"
***************
*** 377,381 ****
  
     if (file == NULL) {
!       editor_log (ROADMAP_ERROR, "Can't create file: %s", name);
        return -1;
     }
--- 378,383 ----
  
     if (file == NULL) {
!       editor_log (ROADMAP_ERROR, "Can't create file: %s", name);
!       roadmap_messagebox ("Export Error", "Can't create file.");
        return -1;
     }
***************
*** 384,393 ****
  
     if (fips < 0) {
!       editor_log (ROADMAP_ERROR, "Can't locate current fips");
        return -1;
     }
  
     if (editor_db_activate (fips) == -1) {
!       editor_log (ROADMAP_ERROR, "Can't load editor db");
        return -1;
     }
--- 386,401 ----
  
     if (fips < 0) {
!       editor_log (ROADMAP_ERROR, "Can't locate current fips");
!       close_export_file (file);
!       roadmap_file_remove (NULL, name);
!       roadmap_messagebox ("Export Error", "Can't locate fips.");
        return -1;
     }
  
     if (editor_db_activate (fips) == -1) {
!       editor_log (ROADMAP_ERROR, "Can't load editor db");
!       close_export_file (file);
!       roadmap_file_remove (NULL, name);
!       roadmap_messagebox ("Export Error", "No editor data to export.");
        return -1;
     }
***************
*** 400,404 ****
  
        if (!export_dirty_lines (file)) {
!          editor_log (ROADMAP_INFO, "No trksegs are available for export.");
        }
        close_export_file (file);
--- 408,416 ----
  
        if (!export_dirty_lines (file)) {
!          editor_log (ROADMAP_INFO, "No trksegs are available for export.");
!          roadmap_messagebox ("Export Error", "No new data to export.");
!          close_export_file (file);         
!          roadmap_file_remove (NULL, name);
!          return 0;
        }
        close_export_file (file);
***************
*** 540,544 ****
                                  
     roadmap_fileselection_new ("Export data",
!                               NULL, /* no filter. */
                                roadmap_path_user (),
                                "w",
--- 552,556 ----
                                  
     roadmap_fileselection_new ("Export data",
!                               "gpx", /* no filter. */
                                roadmap_path_user (),
                                "w",
***************
*** 578,580 ****
     return 1;
  }
- 
--- 590,591 ----

[Roadmap-commit] roadmap_editor/src/editor/db editor_db.c,1.3,1.4

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

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

Modified Files:
	editor_db.c 
Log Message:
Closing the editor DB should assign NULL value to the ActiveHeader variables.
Exception handling.

Index: editor_db.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/db/editor_db.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** editor_db.c	31 Dec 2005 09:58:24 -0000	1.3
--- editor_db.c	17 Mar 2006 09:52:08 -0000	1.4
***************
*** 106,109 ****
--- 106,113 ----
  }
  
+ static void editor_header_unmap (void *context) {
+    if (ActiveDBHeader == context) ActiveDBHeader = NULL;
+ }
+ 
  static void editor_blocks_activate (void *context) {
     ActiveBlocks = (char *) context;
***************
*** 114,118 ****
     editor_map,
     editor_header_activate,
!    editor_unmap
  };
  
--- 118,122 ----
     editor_map,
     editor_header_activate,
!    editor_header_unmap
  };
  
***************
*** 768,772 ****
     if (count) return fips[0];
  
!    return -1;
  }
  
--- 772,779 ----
     if (count) return fips[0];
  
!    /* FIXME this is a hack until I figure out why we get some -1 fips */
!    editor_log (ROADMAP_ERROR, "editor_db_locator - can't find fips.");
!    return 77001;
!    //return -1;
  }
  

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

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

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

Modified Files:
	roadmap_start.c 
Log Message:
Update map will download usdir along with the map.
Bump version.

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_start.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** roadmap_start.c	31 Dec 2005 09:57:09 -0000	1.11
--- roadmap_start.c	17 Mar 2006 09:49:54 -0000	1.12
***************
*** 151,155 ****
                         "A Street navigation system\n"
                         "for Linux & UNIX"
! 		                 "\n\nEditor Plugin 0.4.0\n"
  		                 "Ehud Shabtai\n"
  		                 "esh...@gm...");
--- 151,155 ----
                         "A Street navigation system\n"
                         "for Linux & UNIX"
! 		                 "\n\nEditor Plugin 0.4.3\n"
  		                 "Ehud Shabtai\n"
  		                 "esh...@gm...");
***************
*** 214,221 ****
        editor_db_close (fips[i]);
        editor_db_delete (fips[i]);
!       roadmap_download_get_county (fips[i]);
     }
  
- 
     roadmap_screen_redraw ();
  }
--- 214,220 ----
        editor_db_close (fips[i]);
        editor_db_delete (fips[i]);
!       roadmap_download_get_county (fips[i], i ? 0 : 1);
     }
  
     roadmap_screen_redraw ();
  }
***************
*** 312,316 ****
  
        roadmap_download_subscribe_when_done (roadmap_screen_redraw);
!       roadmap_locator_declare (roadmap_download_get_county);
        roadmap_download_unblock_all ();
     }
--- 311,315 ----
  
        roadmap_download_subscribe_when_done (roadmap_screen_redraw);
!       //roadmap_locator_declare (roadmap_download_get_county);
        roadmap_download_unblock_all ();
     }
***************
*** 774,778 ****
  static void roadmap_start_set_timeout (RoadMapCallback callback) {
  
!    roadmap_main_set_periodic (10000, callback);
  }
  
--- 773,777 ----
  static void roadmap_start_set_timeout (RoadMapCallback callback) {
  
!    roadmap_main_set_periodic (3000, callback);
  }
  

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

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

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

Modified Files:
	roadmap_log.c 
Log Message:
Add timestamp for each log entry.

Index: roadmap_log.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_log.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_log.c	16 Dec 2005 14:40:35 -0000	1.3
--- roadmap_log.c	17 Mar 2006 09:49:22 -0000	1.4
***************
*** 132,141 ****
           saved, category->prefix, source, line);
  #else
- 	DWORD tm = GetTickCount();
  
! 	//GetSystemTime(&st);
  
!    fprintf (file, "%d.%d %c%s %s, line %d ",
!          tm / 1000, tm % 1000,
           saved, category->prefix, source, line);
  
--- 132,141 ----
           saved, category->prefix, source, line);
  #else
  
!    SYSTEMTIME st;
! 	GetSystemTime(&st);
  
!    fprintf (file, "%d/%d %d:%d:%d %c%s %s, line %d ",
!          st.wDay, st.wMonth, st.wHour, st.wMinute, st.wSecond,
           saved, category->prefix, source, line);
  

[Roadmap-commit] roadmap_editor/src roadmap_locator.c,1.5,1.6 roadmap_locator.h,1.1.1.1,1.2

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

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

Modified Files:
	roadmap_locator.c roadmap_locator.h 
Log Message:
Add support for unloading the usdir database.

Index: roadmap_locator.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_locator.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_locator.h	15 Oct 2005 22:18:58 -0000	1.1.1.1
--- roadmap_locator.h	17 Mar 2006 09:48:59 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
  
  void roadmap_locator_close (int fips);
+ void roadmap_locator_close_dir (void);
  
  RoadMapString roadmap_locator_get_state (const char *state);

Index: roadmap_locator.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_locator.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** roadmap_locator.c	31 Dec 2005 09:57:09 -0000	1.5
--- roadmap_locator.c	17 Mar 2006 09:48:59 -0000	1.6
***************
*** 65,68 ****
--- 65,69 ----
  static int RoadMapActiveCounty;
  
+ static int RoadMapUsdirActive = 0;
  
  static roadmap_db_model *RoadMapUsModel;
***************
*** 123,134 ****
              (RoadMapUsModel, "string", &RoadMapDictionaryHandler);
  
-       if (! roadmap_db_open ("usdir", RoadMapUsModel, "r")) {
-          roadmap_log (ROADMAP_FATAL, "cannot open directory database (usdir)");
-       }
- 
-       RoadMapUsCityDictionary   = roadmap_dictionary_open ("city");
-       RoadMapUsStateDictionary  = roadmap_dictionary_open ("state");
- 
- 
        RoadMapCountyCacheSize = roadmap_option_cache ();
        if (RoadMapCountyCacheSize < ROADMAP_CACHE_SIZE) {
--- 124,127 ----
***************
*** 139,142 ****
--- 132,147 ----
        roadmap_check_allocated (RoadMapCountyCache);
     }
+ 
+    if (!RoadMapUsdirActive) {
+       if (! roadmap_db_open ("usdir", RoadMapUsModel, "r")) {
+          roadmap_log (ROADMAP_FATAL, "cannot open directory database (usdir)");
+       }
+ 
+       RoadMapUsCityDictionary   = roadmap_dictionary_open ("city");
+       RoadMapUsStateDictionary  = roadmap_dictionary_open ("state");
+ 
+       RoadMapUsdirActive = 1;
+    }
+ 
  }
  
***************
*** 256,259 ****
--- 261,273 ----
  
  
+ void roadmap_locator_close_dir (void) {
+ 
+    if (RoadMapUsdirActive) {
+       roadmap_db_close ("usdir");
+       RoadMapUsdirActive = 0;
+    }
+ }
+ 
+ 
  static int roadmap_locator_allocate (int **fips) {
  

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

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

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

Modified Files:
	roadmap_gps.c 
Log Message:
Fix timeout bug.

Index: roadmap_gps.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_gps.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_gps.c	16 Dec 2005 14:40:35 -0000	1.3
--- roadmap_gps.c	17 Mar 2006 09:48:22 -0000	1.4
***************
*** 85,89 ****
  
  static char   RoadMapLastKnownStatus = 'A';
! static time_t RoadMapGpsLatestPositionData = 0;
  static int    RoadMapGpsEstimatedError = 0;
  static int    RoadMapGpsRetryPending = 0;
--- 85,89 ----
  
  static char   RoadMapLastKnownStatus = 'A';
! static time_t RoadMapGpsLatestData = 0;
  static int    RoadMapGpsEstimatedError = 0;
  static int    RoadMapGpsRetryPending = 0;
***************
*** 139,144 ****
     int i;
  
-    RoadMapGpsLatestPositionData = time(NULL);
- 
     for (i = 0; i < ROADMAP_GPS_CLIENTS; ++i) {
  
--- 139,142 ----
***************
*** 535,539 ****
  #endif
        roadmap_config_declare
!          ("preferences", &RoadMapConfigGPSTimeout, "10");
  
        RoadMapGpsInitialized = 1;
--- 533,537 ----
  #endif
        roadmap_config_declare
!          ("preferences", &RoadMapConfigGPSTimeout, "3");
  
        RoadMapGpsInitialized = 1;
***************
*** 722,726 ****
  
     RoadMapGpsConnectedSince = time(NULL);
!    RoadMapGpsLatestPositionData = time(NULL);
  
     (*RoadMapGpsPeriodicAdd) (roadmap_gps_keep_alive);
--- 720,724 ----
  
     RoadMapGpsConnectedSince = time(NULL);
!    RoadMapGpsLatestData = time(NULL);
  
     (*RoadMapGpsPeriodicAdd) (roadmap_gps_keep_alive);
***************
*** 842,845 ****
--- 840,845 ----
        roadmap_gps_open();
     }
+ 
+    RoadMapGpsLatestData = time (NULL);
  }
  
***************
*** 855,859 ****
     timeout = (time_t) roadmap_config_get_integer (&RoadMapConfigGPSTimeout);
  
!    if (time(NULL) - RoadMapGpsLatestPositionData >= timeout) {
        return 0;
     }
--- 855,859 ----
     timeout = (time_t) roadmap_config_get_integer (&RoadMapConfigGPSTimeout);
  
!    if (time(NULL) - RoadMapGpsLatestData >= timeout) {
        return 0;
     }

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

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

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

Modified Files:
	roadmap_download.c roadmap_download.h 
Log Message:
Allow downloading the usdir file.

Index: roadmap_download.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_download.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_download.c	31 Dec 2005 09:57:09 -0000	1.2
--- roadmap_download.c	17 Mar 2006 09:48:04 -0000	1.3
***************
*** 199,204 ****
        roadmap_dialog_complete (0);
     }
!    roadmap_dialog_set_data (".file", "County", roadmap_county_get_name (fips));
!    roadmap_dialog_set_data (".file", "State", roadmap_county_get_state (fips));
  
     roadmap_download_format_size (image, RoadMapDownloadCurrentFileSize);
--- 199,212 ----
        roadmap_dialog_complete (0);
     }
! 
!    if (fips != -1) {
!       roadmap_dialog_set_data (".file", "County",
!             roadmap_county_get_name (fips));
!       roadmap_dialog_set_data (".file", "State",
!             roadmap_county_get_state (fips));
!    } else {
!       roadmap_dialog_set_data (".file", "County", "usdir");
!       roadmap_dialog_set_data (".file", "State", "");
!    }
  
     roadmap_download_format_size (image, RoadMapDownloadCurrentFileSize);
***************
*** 367,373 ****
--- 375,383 ----
  
     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");
+    roadmap_config_set (&RoadMapConfigDestination, format);
     snprintf (destination, sizeof(destination), format, fips);
  
***************
*** 427,434 ****
--- 437,539 ----
     roadmap_download_block (RoadMapDownloadQueue[RoadMapDownloadQueueConsumer]);
  
+    /* empty queue */
+    RoadMapDownloadQueueConsumer = RoadMapDownloadQueueProducer - 1;
+ 
     roadmap_download_end ();
  }
  
  
+ static void roadmap_download_usdir (void) {
+ 
+    struct roadmap_download_protocol *protocol;
+ 
+    char source[256];
+    char destination[256];
+ 
+    char *format;
+    const char *directory;
+ 
+ 
+    strncpy (source, roadmap_config_get (&RoadMapConfigSource), sizeof(source));
+    source[sizeof(source)-1] = 0;
+ 
+    format = strrchr (source, '/');
+    if (!format) {
+       roadmap_messagebox ("Download Error", "Can't download usdir.");
+       roadmap_log (ROADMAP_WARNING, "invalid download source %s", source);
+       roadmap_download_end ();
+       return;
+    }
+ 
+    strncpy (format+1, "usdir.rdm", sizeof(source) - (format - source + 1));
+ 
+    strncpy (destination, roadmap_config_get (&RoadMapConfigDestination), sizeof(destination));
+    destination[sizeof(destination)-1] = 0;
+ 
+ #ifndef _WIN32
+    format = strrchr (destination, '/');
+ #else
+    format = strrchr (destination, '\\');
+ #endif
+    if (!format) {
+       roadmap_messagebox ("Download Error", "Can't download usdir.");
+       roadmap_log (ROADMAP_WARNING, "invalid download destination %s", destination);
+       roadmap_download_end ();
+       return;
+    }
+ 
+    strncpy (format+1, "usdir.rdm", sizeof(destination) - (format - destination + 1));
+ 
+    directory = roadmap_path_parent (NULL, destination);
+    roadmap_path_create (directory);
+    roadmap_path_free (directory);
+ 
+ 
+    /* FIXME: at this point, we should set a temporary destination
+     * file name. When done with the transfer, we should rename the file
+     * to its final name. That would replace the "freeze" in a more
+     * elegant manner.
+     */
+ 
+    /* Search for the correct protocol handler to call this time. */
+ 
+    for (protocol = RoadMapDownloadProtocolMap;
+         protocol != NULL;
+         protocol = protocol->next) {
+ 
+       if (strncmp (source, protocol->prefix, strlen(protocol->prefix)) == 0) {
+ 
+          roadmap_start_freeze ();
+          roadmap_locator_close_dir();
+ 
+          if (protocol->handler (&RoadMapDownloadCallbackFunctions,
+                                 source, destination)) {
+ 
+             roadmap_download_uncompress (destination);
+             RoadMapDownloadRefresh = 1;
+          }
+          roadmap_start_unfreeze ();
+          roadmap_download_end ();
+          break;
+       }
+    }
+ 
+    if (protocol == NULL) {
+ 
+       roadmap_messagebox ("Download Error", "invalid download protocol");
+       roadmap_log (ROADMAP_WARNING, "invalid download source %s", source);
+       roadmap_download_end ();
+       return;
+    }
+ 
+    if (RoadMapDownloadCurrentFileSize > 0) {
+       roadmap_download_progress (RoadMapDownloadCurrentFileSize);
+    } else {
+       roadmap_download_end ();
+       return;
+    }
+ }
+ 
+ 
  static void roadmap_download_next_county (void) {
  
***************
*** 440,443 ****
--- 545,552 ----
     char buffer[2048];
  
+    if (fips == -1) {
+       roadmap_download_usdir ();
+       return;
+    }
  
     source = roadmap_config_get (&RoadMapConfigSource);
***************
*** 464,475 ****
  
     roadmap_dialog_set_data (".file", "From", source);
! 
  #ifndef _WIN32
     snprintf (buffer, sizeof(buffer), "%s%s", 
               roadmap_config_get (&RoadMapConfigDestination), basename);
! #else
!    snprintf (buffer, sizeof(buffer), "%s\\%s",
!              roadmap_config_get (&RoadMapConfigDestination), basename+1);
! #endif
  
     roadmap_dialog_set_data (".file", "To", buffer);
--- 573,584 ----
  
     roadmap_dialog_set_data (".file", "From", source);
! 
  #ifndef _WIN32
     snprintf (buffer, sizeof(buffer), "%s%s", 
               roadmap_config_get (&RoadMapConfigDestination), basename);
! #else
!    snprintf (buffer, sizeof(buffer), "%s\\%s",
!              roadmap_config_get (&RoadMapConfigDestination), basename+1);
! #endif
  
     roadmap_dialog_set_data (".file", "To", buffer);
***************
*** 477,481 ****
  
  
! int roadmap_download_get_county (int fips) {
  
     int next;
--- 586,590 ----
  
  
! int roadmap_download_get_county (int fips, int download_usdir) {
  
     int next;
***************
*** 504,507 ****
--- 613,625 ----
     RoadMapDownloadQueue[RoadMapDownloadQueueProducer] = fips;
  
+    if (download_usdir) {
+ 
+       next = roadmap_download_increment(next);
+ 
+       if (next != RoadMapDownloadQueueConsumer) {
+          RoadMapDownloadQueue[next-1] = -1;
+       }
+    }
+ 
     if (RoadMapDownloadQueueProducer == RoadMapDownloadQueueConsumer) {
  
***************
*** 657,669 ****
  
      for (i = 0; i < RoadMapDownloadDeleteCount; ++i) {
! 
  #ifndef _WIN32
         snprintf (name, sizeof(name), "%s/" ROADMAP_FILE_NAME_FORMAT,
                   roadmap_config_get (&RoadMapConfigDestination),
                   RoadMapDownloadDeleteFips[i]);
! #else
!        snprintf (name, sizeof(name), "%s\\" ROADMAP_FILE_NAME_FORMAT,
!                  roadmap_config_get (&RoadMapConfigDestination),
!                  RoadMapDownloadDeleteFips[i]);
  #endif
         if (! roadmap_file_exists (NULL, name)) {
--- 775,787 ----
  
      for (i = 0; i < RoadMapDownloadDeleteCount; ++i) {
! 
  #ifndef _WIN32
         snprintf (name, sizeof(name), "%s/" ROADMAP_FILE_NAME_FORMAT,
                   roadmap_config_get (&RoadMapConfigDestination),
                   RoadMapDownloadDeleteFips[i]);
! #else
!        snprintf (name, sizeof(name), "%s\\" ROADMAP_FILE_NAME_FORMAT,
!                  roadmap_config_get (&RoadMapConfigDestination),
!                  RoadMapDownloadDeleteFips[i]);
  #endif
         if (! roadmap_file_exists (NULL, name)) {
***************
*** 704,716 ****
  
        roadmap_download_block (RoadMapDownloadDeleteSelected);
! 
  #ifndef _WIN32
        snprintf (path, sizeof(path), "%s/" ROADMAP_FILE_NAME_FORMAT,
                  roadmap_config_get (&RoadMapConfigDestination),
                  RoadMapDownloadDeleteSelected);
! #else
!       snprintf (path, sizeof(path), "%s\\" ROADMAP_FILE_NAME_FORMAT,
!                 roadmap_config_get (&RoadMapConfigDestination),
!                 RoadMapDownloadDeleteSelected);
  #endif
        roadmap_locator_close (RoadMapDownloadDeleteSelected);
--- 822,834 ----
  
        roadmap_download_block (RoadMapDownloadDeleteSelected);
! 
  #ifndef _WIN32
        snprintf (path, sizeof(path), "%s/" ROADMAP_FILE_NAME_FORMAT,
                  roadmap_config_get (&RoadMapConfigDestination),
                  RoadMapDownloadDeleteSelected);
! #else
!       snprintf (path, sizeof(path), "%s\\" ROADMAP_FILE_NAME_FORMAT,
!                 roadmap_config_get (&RoadMapConfigDestination),
!                 RoadMapDownloadDeleteSelected);
  #endif
        roadmap_locator_close (RoadMapDownloadDeleteSelected);
***************
*** 785,789 ****
        ("preferences",
        &RoadMapConfigSource,
!       "http://www.eshabtai.net/roadmap/maps/" ROADMAP_FILE_NAME_FORMAT);
  
     snprintf (default_destination, sizeof(default_destination),
--- 903,907 ----
        ("preferences",
        &RoadMapConfigSource,
!       "http://www.freemap.co.il/roadmap/maps/" ROADMAP_FILE_NAME_FORMAT);
  
     snprintf (default_destination, sizeof(default_destination),

Index: roadmap_download.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_download.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_download.h	15 Oct 2005 22:19:00 -0000	1.1.1.1
--- roadmap_download.h	17 Mar 2006 09:48:04 -0000	1.2
***************
*** 64,68 ****
  
  
! int roadmap_download_get_county (int fips);
  
  void roadmap_download_show_space (void);
--- 64,68 ----
  
  
! int roadmap_download_get_county (int fips, int download_usdir);
  
  void roadmap_download_show_space (void);

[Roadmap-commit] roadmap_editor/src Makefile,1.8,1.9

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

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

Modified Files:
	Makefile 
Log Message:
Add NDEBUG to release mode.

Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	12 Dec 2005 20:35:41 -0000	1.8
--- Makefile	17 Mar 2006 09:47:30 -0000	1.9
***************
*** 35,39 ****
     MODELDFLAGS=-pg
  else
!    MODECFLAGS=-O2 -ffast-math -fomit-frame-pointer $(WARNFLAGS) $(OPTIONS)
     MODELDFLAGS=
  endif
--- 35,39 ----
     MODELDFLAGS=-pg
  else
!    MODECFLAGS=-O2 -ffast-math -fomit-frame-pointer -DNDEBUG=1 $(WARNFLAGS) $(OPTIONS)
     MODELDFLAGS=
  endif

[Roadmap-commit] roadmap README,1.87,1.88

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

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

Modified Files:
	README 
Log Message:
Update the description of the maps, add a description of the rdx format and class files

Index: README
===================================================================
RCS file: /cvsroot/roadmap/roadmap/README,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** README	16 Dec 2005 17:29:54 -0000	1.87
--- README	19 Feb 2006 06:30:17 -0000	1.88
***************
*** 196,205 ****
    for them.
  
!   The RoadMap commands must be installed in a bin directory. This is an
!   easy one: the only requirement is that this directory must appear in the
!   PATH variable (either you choose an existing directory or you add your own).
  
    RoadMap comes with some critical configuration files (files sprites,
!   schema, preferences, etc..). RoadMap supports these files to be in a few
    different places, which list cannot be changed in the user preferences
    since it is used to load the preferences themselves.
--- 196,210 ----
    for them.
  
! ** EXECUTABLE FILES
! 
!   The RoadMap programs should be installed in a standard executable directory.
!   This is an easy one: the only requirement is that this directory must appear
!   in the PATH variable (either you choose an existing directory or you add your
!   own).
! 
! ** CONFIGURATION FILES
  
    RoadMap comes with some critical configuration files (files sprites,
!   preferences, etc..). RoadMap supports these files to be in a few
    different places, which list cannot be changed in the user preferences
    since it is used to load the preferences themselves.
***************
*** 215,219 ****
           * ~/.roadmap.
           
!   As an exception, the list on the Zaurus is:
  
           * /opt/QtPalmtop/share/roadmap,
--- 220,271 ----
           * ~/.roadmap.
           
!   These directories are searched sequentially: any configuration item found
!   in one directory overrides all the same items found in the directories
!   listed before. In other words, the configuration is loaded in the following
!   order:
! 
!       1- /usr/share/roadmap (installation defaults)
! 
!       2- /usr/local/share/roadmap (local site defaults)
! 
!       3- /etc/roadmap (local machine defaults)
! 
!       4- ~/.roadmap (current user configuration)
! 
!   The directory <<~/.roadmap>> contains the user configuration: any user change
!   to the configuration is written there. The items in the user configuration
!   take precedence over the "default" configuration as defined in the "shared"
!   directories.
! 
!   The directory <<~/.roadmap>> has two subdirectories: <<trips>> and <<maps>>.
! 
!   The directory <<~/.roadmap/trips>> is used as the default location for the
!   trip files. Note that trip files can be stored anywhere, not only in
!   <<~/.roadmap/trips>>.
! 
!   The directory <<~/.roadmap/maps>> contains map files specific for this user.
!   As a general rule, it is not recommended for each user to have their
!   own copy of the maps, as these maps take a lot of space. This directory
!   can be used however when maps are downloaded on the fly, as shared maps
!   are usually not writable for users. The local rules can be established so
!   that either all users download maps into the shared repository, or else
!   each user manages his own maps. On a PDA or on a personal desktop systems
!   the first solution makes the more sense, but for public access computers
!   (such as computers at an University) the second solution might be the most
!   convenient.
! 
!   Theses user configuration directories are created when needed, if they do
!   not exist.
! 
!   Althrough the Sharp Zaurus is a Linux (i.e. UNIX) PDA, it's setup is
!   somewhat unusual, and the location of the configuration files is
!   different.
! 
!   The rational for the selected setup, which is typical of a PDA, is to
!   try to make RoadMap an auto-installed option when sliding in the proper
!   memory card. So the locations for files always include the Zaurus mount
!   points for the CompactFlash or SD cards.
! 
!   The configuration directories on the Sharp Zaurus PDA are:
  
           * /opt/QtPalmtop/share/roadmap,
***************
*** 225,229 ****
           * ~/.roadmap.
  
!   On Windows CE this list is:
  
           * \Program Files\roadmap
--- 277,285 ----
           * ~/.roadmap.
  
!   Like the Zaurus, Windows CE based computers are usually of the PDA type,
!   so the same approach as for the Zaurus is used here, i.e. we make it
!   possible to install all RoadMap files in a memory card.
! 
!   The configuration directories on Windows CE are:
  
           * \Program Files\roadmap
***************
*** 231,236 ****
           * \Storage Card\roadmap (preferred path)
  
    RoadMap (GTK version) needs some icons. These icons must be placed
!   in some standard location:
    
           * ~/pixmaps,
--- 287,297 ----
           * \Storage Card\roadmap (preferred path)
  
+   As Windows CE does not really have the concept of a user directory, RoadMap
+   will automatically add to the list the directory where its executable stands.
+ 
+ ** ICON FILES
+ 
    RoadMap (GTK version) needs some icons. These icons must be placed
!   in the operating system's standard locations. On UNIX, this usually is:
    
           * ~/pixmaps,
***************
*** 240,253 ****
           * /usr/share/pixmaps.
  
!   RoadMap needs some county maps to serve any useful purpose.
    The location for these map files can be redefined in the user preferences
    (item Map.Path). The maps are a problem of their own, since they may require
    a huge space (up to 1.8 G Bytes for the full set). It is recommended to share
!   these maps between users. Because these maps are not architecture-independent
    you should be careful, however, not to share them on a network (this could
!   also be very inefficient, both from a network and performances point of
!   view).
    
!   By default, RoadMap is built to search for these directories on most
    UNIX systems:
    
--- 301,317 ----
           * /usr/share/pixmaps.
  
! ** MAP FILES
! 
!   RoadMap needs some map files to serve any useful purpose.
! 
    The location for these map files can be redefined in the user preferences
    (item Map.Path). The maps are a problem of their own, since they may require
    a huge space (up to 1.8 G Bytes for the full set). It is recommended to share
!   these maps between users. Because these maps are architecture-dependent
    you should be careful, however, not to share them on a network (this could
!   also be very inefficient, as this could saturate the network and the RoadMap
!   performances would be severely impacted).
    
!   By default, RoadMap is built to search for the following directories on most
    UNIX systems:
    
***************
*** 281,288 ****
--- 345,358 ----
           * /usr/share/roadmap,
  
+          * /var/lib/roadmap,
+ 
           * /mnt/hda/share/roadmap and
  
           * /mnt/card/share/roadmap
  
+   Note that the architecture-dependent nature of the map files is not an
+   issue with a PDA, as these machines tend to be used standalone and not
+   to rely on network access.
+ 
    On Windows CE the default map search path is:
  
***************
*** 1029,1032 ****
--- 1099,1105 ----
  * ON-THE-FLY MAP DOWNLOAD
  
+    Map downloading is being rewritten: future versions will download
+    rdx files from the RoadMap web site (or from a user specified site).
+ 
     Today's PDA have a limited storage space, which must be shared with MP3
     and other files. As the RoadMap maps can take up to 1.6 GB, most PDA users
***************
*** 1323,1337 ****
     File suffix doesn't matter.
     
! ----
!        Note that although tracks and routes are conceptually
!        separate, either type can be selected at this point, and
!        any of the operations under the "Routes" menu can be
!        applied to either.
! ----
  
     One of the buttons in this "Manage Routes" dialog is "None", which is a
     quick way of not selecting any route at all.
  
!    Creating a route:
  
         If you're starting a "fresh" trip, you'll likely start by creating a
--- 1396,1408 ----
     File suffix doesn't matter.
     
!    Note that although tracks and routes are conceptually
!    separate, either type can be selected at this point, and
!    any of the operations under the "Routes" menu can be
!    applied to either.
  
     One of the buttons in this "Manage Routes" dialog is "None", which is a
     quick way of not selecting any route at all.
  
! ** Creating a route:
  
         If you're starting a "fresh" trip, you'll likely start by creating a
***************
*** 1354,1363 ****
         trip's list, or your personal list.  Continue adding waypoints to
         your route.  
! ----
! 	Note that waypoints are always copied.  So if you choose an
! 	existing waypoint or landmark to use as a route waypoint, you'll
! 	end up with a new waypoint, not just a second reference to an
! 	existing waypoint.
! ----
         You can give your new route points names as you go, or wait until
         later and use the "Route Waypoints..." menu item to go back to the
--- 1425,1434 ----
         trip's list, or your personal list.  Continue adding waypoints to
         your route.  
! 
!        Note that waypoints are always copied.  So if you choose an
!        existing waypoint or landmark to use as a route waypoint, you'll
!        end up with a new waypoint, not just a second reference to an
!        existing waypoint.
! 
         You can give your new route points names as you go, or wait until
         later and use the "Route Waypoints..." menu item to go back to the
***************
*** 1376,1380 ****
         This will not confuse RoadMap, though it may confuse the user.
  
!    Converting a track to a route:
  
         Another, perhaps less convenient, method of creating a route, is to
--- 1447,1451 ----
         This will not confuse RoadMap, though it may confuse the user.
  
! ** Converting a track to a route:
  
         Another, perhaps less convenient, method of creating a route, is to
***************
*** 1391,1395 ****
         as well.)
  
!    Importing a route:
  
         One advantage of using the popular GPX format is that routes
--- 1462,1466 ----
         as well.)
  
! ** Importing a route:
  
         One advantage of using the popular GPX format is that routes
***************
*** 1420,1423 ****
--- 1491,1495 ----
         gpsbabel can do this too, somewhat more indirectly -- the following
         script shows how:
+ 
  --------
          #!/bin/sh
***************
*** 1456,1460 ****
         another of your existing trips with "Merge Trip".
  
!    Quick Destination:
  
         Sometimes one doesn't really want to follow a route at all -- all
--- 1528,1532 ----
         another of your existing trips with "Merge Trip".
  
! ** Quick Destination:
  
         Sometimes one doesn't really want to follow a route at all -- all
***************
*** 1466,1470 ****
         distance and direction to that point.
  
!    Following a route:
  
         A route that has been created or loaded can then be activated. 
--- 1538,1542 ----
         distance and direction to that point.
  
! ** Following a route:
  
         A route that has been created or loaded can then be activated. 
***************
*** 1683,1735 ****
  CONFIGURATION
  
! * FILES
!    
!    The RoadMap configuration is stored in text files located in the following
!    directories:
! 
! ----
!             /usr/share/roadmap
!             /usr/local/share/roadmap
!             /etc/roadmap
!             ~/.roadmap (equivalent to "&" in RoadMap)
!             ~/.roadmap/trips (equivalent to "&/trips" in RoadMap)
!             ~/.roadmap/maps (equivalent to "&/maps" in RoadMap)
! ----
! 
!    The first four directories are searched sequentially: any configuration
!    item found in one directory overrides all the same items found in the
!    directories listed before. In other words, the configuration is loaded in
!    the following order:
! 
!       1- /usr/share/roadmap (installation defaults)
! 
!       2- /usr/local/share/roadmap (local site defaults)
! 
!       3- /etc/roadmap (local machine defaults)
! 
!       4- ~/.roadmap (current user configuration)
  
!    The directory <<~/.roadmap>> contains the user configuration: any user change
!    to the configuration is written there. The items in the user configuration
!    take precedence over the "default" configuration in the "shared" directories.
  
!    The directory <<~/.roadmap/trips>> is used as the default location for the
!    trip files. Note that trip files can be stored anywhere, not only in
!    <<~/.roadmap/trips>>.
  
!    The directory <<~/.roadmap/maps>> contains map files specific for this user.
!    As a general rule, it is not recommended for each user to have their
!    own copy of the maps, as these maps take a lot of space. This directory
!    can be used however when maps are downloaded on the fly, as shared maps
!    are usually not writable for users. The local rules can be established so
!    that either all users download maps into the shared repository, or else
!    each user manages his own maps. On a PDA or on a personal desktop systems
!    the first solution makes the more sense, but for public access computers
!    (such as computers at an University) the second solution might be the most
!    convenient.
  
!    The user configuration directories are created when needed, if they do
!    not exist.
  
     The syntax of most RoadMap configuration files is similar to the X
     ressources file format (the exceptions are the sprites file and the
--- 1755,1780 ----
  CONFIGURATION
  
!    This section describes the files used to configure RoadMap on the local
!    machine. In most cases these files contain user-defined data that defines
!    the look of the RoadMap user interface, or resources used by RoadMap.
  
!    We will first describe where to find these configuration files on the
!    different operating systems that RoadMap supports, then we will describe
!    the content of each configuration file.
  
!    The files themselves are the same on all operating systems.
  
!    Note that this section does not cover the files describing the maps:
!    there is a clear separation in RoadMap between the map data, which the
!    user normally does not modify or customize, and the configuration data,
!    which the user may want to custimize. The map files are described in
!    a separate section.
  
!    The configuration files are stored in a set of directories to allow
!    for a default, system-wide configuration and allow each user to customize
!    the configuration separately. See the INSTALLATION section for more details.
  
+ * FILES
+    
     The syntax of most RoadMap configuration files is similar to the X
     ressources file format (the exceptions are the sprites file and the
***************
*** 1743,1748 ****
     The following configuration files are used:
  
-      [schema]          The definition of the geographic entities.
- 
       [preferences]     User's preferences.
  
--- 1788,1791 ----
***************
*** 1766,1769 ****
--- 1809,1827 ----
     See the section CONFIGURING THE MENUS AND TOOLBAR for more information.
  
+ * CLASS FILES AND SKINS
+ 
+    The RoadMap configuration also contains the map class files. Each class
+    file describes the organization of one set of map files showing the same
+    list of layers (roads, topography, water feature, etc...).
+    
+    The class files are stored in a skin subdirectory. It is possible to
+    install multiple sets of class files by creating multiple skin
+    subdirectories and then select the active skin in the user preference.
+    The default skin is named, well, <<default>>.
+ 
+    The class files are described in more details in the MAP FORMAT section.
+ 
+    (Note that the class files replace the old <<schema>> file, which is no
+    longer used.)
  
  * CONFIGURING THE TEXT AND VOICE MESSAGES
***************
*** 1964,1970 ****
  
     Please note that, contrary to the example above, this renaming is not
!    intended to provide a mechanism for the internationalization of RoadMap.
!    This would be a very crude translation mechanism, as it is very incomplete.
!    For example, dialogs are not translated.
  
     In fact, this renaming mechanism is likely to conflict with a future
--- 2022,2028 ----
  
     Please note that, contrary to the example above, this renaming is not
!    intended to provide a general mechanism for the internationalization of
!    RoadMap.  This would be a very crude translation mechanism, as it is very
!    incomplete (for example, dialogs are not translated).
  
     In fact, this renaming mechanism is likely to conflict with a future
***************
*** 2752,2760 ****
          in the file are ignored.
  
!     [Note that since these files are in GPX format, they can also
      be manually opened as trips.  In this case, the landmarks associated
      with the "Personal Landmarks" file will appear as "Trip Landmarks"
      for that trip, and the track in "Current Track" will appear as
!     the only unnamed track in that trip.]
  
  
--- 2810,2818 ----
          in the file are ignored.
  
!     Note that since these files are in GPX format, they can also
      be manually opened as trips.  In this case, the landmarks associated
      with the "Personal Landmarks" file will appear as "Trip Landmarks"
      for that trip, and the track in "Current Track" will appear as
!     the only unnamed track in that trip.
  
  
***************
*** 2767,2771 ****
--- 2825,2831 ----
     RoadMap comes with a tool to display information extracted from a map file:
  
+ ----
     dumpmap [--usage] [-d TABLE] [--strings] [--volume=NAME] [--search=NAME]
+ ----
  
     dumpmap uses the popt library for parsing command line argument: the
***************
*** 3052,3060 ****
  MAP FORMAT
  
! * MAP FILES
  
     As indicated in several other places, the RoadMap map files (extension
!    .rdm) are organized by county (one file per county), plus a directory
!    of counties (usdir.rdm). The name of a county file follows the format:
  
  ----
--- 3112,3130 ----
  MAP FORMAT
  
!    The maps are made of three types of files: the map files themselves
!    contains the map data, the map indexes allow for fast retrieval of
!    the map files to display and the class files describe the features
!    stored in each map file.
! 
! * MAP FILES AND INDEXES
  
     As indicated in several other places, the RoadMap map files (extension
!    .rdm) are organized by administrative territories, such s a county per
!    file in the US. The map files are retrieved using index files, which files
!    themselves use a format similar to the map files. The index files contain
!    only the list of map files, plus some indexes to accelerate the display of
!    a specific area, or the search of an address.
! 
!    As for now, the names of the US county files follow the convention below:
  
  ----
***************
*** 3066,3076 ****
     three digits identify the county within the state.
  
     The rdm files are binary files and uses the local conventions for byte
!    order and C structure layout.
  
!    The two types of files, usdir.rdm or usc*.rdm, contain very different
     data but share the same general organization: these files contain
     multiple data tables organized in a tree fashion.
  
  * TABLES
  
--- 3136,3267 ----
     three digits identify the county within the state.
  
+    As for now, there is a single index file, named usdir.rdm. This file
+    must be in the same directory as the map files.
+ 
+    This naming convention is likely to change in the near future!
+ 
     The rdm files are binary files and uses the local conventions for byte
!    order and C structure layout. In order to make it possible to share map
!    files between different systems, an ASCII format is also defined, with
!    the suffix <<.rdx>>; the rdmxchange program translates from one format
!    to the other. Note that the data stored in the rdx files is strictly
!    equivalent to the one stored in the rdm files, and the organization of
!    this data is very specific to the RoadMap application. The rdx format
!    was not designed to exchange data with other applications.
  
!    These two types of files, the map and index files, contain very different
     data but share the same general organization: these files contain
     multiple data tables organized in a tree fashion.
  
+ * CLASS FILES
+ 
+    A class file is a text file that describes the features of a set of map
+    files, where the features are organized in layers. Each map file contains
+    features that belong to one (and only one) class.
+ 
+    An example of class would be roads. Roads would be organized is layers
+    like freeways, highways, streets and trails. All map files describing
+    roads will contain features organized using these same layers.
+ 
+    The class files are stored in the RoadMap configuration directories,
+    thus they can be customized by the user, independently from the map files.
+    It must be noted, however, that the way the layers are organized must not
+    be changed. Changing the list of layers would render the existing map files
+    more or less useless.
+ 
+    The preferred method for customizing a class is to create a new RoadMap
+    skin directory, copy all the class files from an existing skin directory
+    and then edit the class files in that new skin directory. The active
+    RoadMap skin can be selected in the user preferences.
+ 
+    The class files use the same format as the preference file. It defines
+    the properties of the various layers that make a set of maps.
+ 
+    The two differences with the preferences files are that there is no
+    predefined layers in RoadMap (layers are entirely defined by the class
+    files) and there is no default value.
+ 
+    A class file contains general attributes and layer attributes.
+ 
+    The general attributes are:
+ 
+      [Class.Name:] the name of the class (the name of the file does not count).
+ 
+          <<Format:>> string
+ 
+      [Class.Lines:] the line layers, ordered with the top layer first.
+ 
+          <<Format:>> a space separated list of layer names.
+ 
+      [Class.Polygons:] the polygon layers, ordered with the top layer first.
+ 
+          <<Format:>> a space separated list of layer names.
+ 
+      [Navigation.Car:] the list of layers to be used for car navigation.
+ 
+          <<Format:>> a space separated list of layer names.
+ 
+          <<Comment:>> The layers should all be line layers.
+ 
+    For each layer, RoadMap use the following items:
+ 
+      [<layer>.Class:] the class of object this layer belongs to.
+ 
+          <<Format:>> Road, Feature or Area.
+ 
+          <<Comment:>> Road and Feature categories are searched in the "line"
+                   table of the map files and drawn as lines. The Road
+                   layer is searched when a street name is looked for.
+                   The Area objects are drawn separatly, as polygons.
+ 
+      [<layer>.Color:] the first color used when drawing the objects.
+ 
+          <<Format:>> color
+ 
+      [<layer>.Color1:] the second color used when drawing the objects.
+ 
+          <<Format:>> color
+ 
+          <<Comment:>> This color is optional. See <layer>.Delta1.
+ 
+      [<layer>.Color2:] the third color used when drawing the objects.
+ 
+          <<Format:>> color
+ 
+          <<Comment:>> This color is optional. See <layer>.Delta2.
+ 
+      [<layer>.Color3:] the fourth color used when drawing the objects.
+ 
+          <<Format:>> color
+ 
+          <<Comment:>> This color is optional. See <layer>.Delta3.
+ 
+      [<layer>.Thickness:] the thickness used to draw the first color lines.
+ 
+          <<Format:>> number of pixels
+ 
+      [<layer>.Delta1:] the thickness used to draw the second color lines.
+ 
+          <<Format:>> number of pixels, relative to previous color if negative.
+ 
+      [<layer>.Delta2:] the thickness used to draw the third color lines.
+ 
+          <<Format:>> number of pixels, relative to previous color if negative.
+ 
+      [<layer>.Delta3:] the thickness used to draw the fourth color lines.
+ 
+          <<Format:>> number of pixels, relative to previous color if negative.
+ 
+      [<layer>.Declutter:] the zoom level from which the objects are hidden
+ 
+          <<Format:>> integer
+ 
+          <<Comment:>> The definition of this item is rather obscure. To be fixed.
+ 
+    The Color1 to Color3 and Delta1 to Delta3 attributes are optional, but
+    the 1 .. n-1 attributes must be defined if the nth attribute is defined.
+ 
+    These additional colors are typicall used to draw streets.
+ 
  * TABLES
  
***************
*** 3396,3397 ****
--- 3587,3633 ----
     [range.bysquare]  for each square, a street search accelerator.
  
+ * THE EXCHANGE FORMAT
+ 
+    The rdx files are straight conversion of the rdm file in an ASCII format
+    that is neither sensitive to the CPU byte order or the compiler's structure
+    layout. Apart from that ASCII representation, the list of tables and
+    the content of each table is exactly the same as for the rdm file. The
+    purpose of the rdx format is to allow the public distribution of map files
+    that can be used on all CPU architectures.
+ 
+    A rdx file is organized in two major sections: the first section contains
+    one header per table; the second section contains the data for each table.
+ 
+    A table header is one text line, with two comma-separated fields: the
+    table name and the table size (in number of records). The header section
+    ends with an empty line.
+ 
+    The data section is a sequence of table data, each table is separated
+    from the previous table with an empty line.
+ 
+    Each table data contains the following lines, in that order:
+ 
+    [Table name]
+    [Fields]
+    [Record]
+    [...]
+    [Record]
+ 
+    The table name is the full path of the table, such as "range/bysquare".
+ 
+    The fields line is a comma separated list of fields. A field may
+    be suffixed with an array size indication. For example:
+ 
+ ----
+       excluded[32],included[32],start,count
+ ----
+ 
+    Each record line is a comma separated list of values, in the same order
+    as specified in the fields line. The values of an array field are stored
+    sequentially, as if these were different fields. Value 0 may be represented
+    using an empty string. For example:
+ 
+ ----
+       5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,22
+ ----
+ 

[Roadmap-commit] roadmap/src schema,1.3,1.4

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

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

Modified Files:
	schema 
Log Message:
Eliminate the now obsolete schema file

Index: schema
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/schema,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** schema	5 Sep 2005 18:12:34 -0000	1.3
--- schema	19 Feb 2006 06:29:18 -0000	1.4
***************
*** 1,66 ****
! Freeways.Class: Road
! Freeways.Color: black
! Freeways.Color1: IndianRed
! Freeways.Delta1: -2
! Freeways.Color2: black
! Freeways.Delta2: 1
! Freeways.Declutter: 2147483647
! Freeways.Thickness: 4
! Ramps.Class: Road
! Ramps.Color: black
! Ramps.Color1: red
! Ramps.Delta1: -2
! Ramps.Declutter: 160
! Ramps.Thickness: 3
! Highways.Class: Road
! Highways.Color: black
! Highways.Color1: yellow
! Highways.Delta1: -2
! Highways.Declutter: 1300
! Highways.Thickness: 3
! Streets.Class: Road
! Streets.Color: black
! Streets.Color1: white
! Streets.Delta1: -2
! Streets.Declutter: 160
! Streets.Thickness: 2
! Trails.Class: Road
! Trails.Color: DarkGrey
! Trails.Declutter: 160
! Trails.Thickness: 1
! Rivers.Class: Feature
! Rivers.Color: LightBlue
! Rivers.Declutter: 300
! Rivers.Thickness: 3
! Shore.Class: Feature
! Shore.Color: LightSlateBlue
! Shore.Declutter: 2147483647
! Shore.Thickness: 2
! Hospitals.Class: Area
! Hospitals.Color: red
! Hospitals.Declutter: 4096
! Hospitals.Thickness: 1
! Malls.Class: Area
! Malls.Color: yellow
! Malls.Declutter: 4096
! Malls.Thickness: 1
! Airports.Class: Area
! Airports.Color: grey
! Airports.Declutter: 4096
! Airports.Thickness: 1
! Stations.Class: Area
! Stations.Color: grey
! Stations.Declutter: 4096
! Stations.Thickness: 1
! Lakes.Class: Area
! Lakes.Color: LightBlue
! Lakes.Declutter: 1300
! Lakes.Thickness: 1
! Parks.Class: Area
! Parks.Color: green
! Parks.Declutter: 4096
! Parks.Thickness: 1
! Sea.Class: Area
! Sea.Color: SlateBlue
! Sea.Declutter: 2147483647
! Sea.Thickness: 1
--- 1 ----
! THIS FILE IS NOW OBSOLETE: see the class files in "default".

[Roadmap-commit] roadmap/src roadmap_config.c,1.19,1.20

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

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

Modified Files:
	roadmap_config.c 
Log Message:
Eliminate the now obsolete schema file

Index: roadmap_config.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_config.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** roadmap_config.c	13 Nov 2005 07:23:38 -0000	1.19
--- roadmap_config.c	19 Feb 2006 06:29:01 -0000	1.20
***************
*** 98,102 ****
     {"session",     0},
     {"preferences", 0},
-    {"schema",      1},
     {NULL, 0}
  };
--- 98,101 ----

[Roadmap-commit] roadmap/src Makefile,1.76,1.77

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

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

Modified Files:
	Makefile 
Log Message:
Eliminate the now obsolete schema file

Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/Makefile,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** Makefile	6 Feb 2006 03:27:58 -0000	1.76
--- Makefile	19 Feb 2006 06:28:36 -0000	1.77
***************
*** 252,256 ****
  
  
! PKGDATAFILES=sprites preferences schema session drivers roadmap.popup
  BUILD=buildmap buildus dumpmap buildplace
  SCRIPTS=rdmdownload rdmgetall rdmgenmaps rdmgendcwmaps rdmcompare
--- 252,256 ----
  
  
! PKGDATAFILES=sprites preferences session drivers roadmap.popup
  BUILD=buildmap buildus dumpmap buildplace
  SCRIPTS=rdmdownload rdmgetall rdmgenmaps rdmgendcwmaps rdmcompare

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

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

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

Modified Files:
	util.c 
Log Message:
64 bit compatibility

Index: util.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gpx/util.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** util.c	9 Jan 2006 17:15:06 -0000	1.2
--- util.c	18 Feb 2006 16:04:43 -0000	1.3
***************
*** 35,39 ****
  
          if (!obj) {
!                 fatal("gpsbabel: Unable to allocate %d bytes of memory.\n", size);
          }
  
--- 35,39 ----
  
          if (!obj) {
!                 fatal("gpsbabel: Unable to allocate %d bytes of memory.\n", (int)size);
          }
  
***************
*** 47,51 ****
  
          if (!obj) {
!                 fatal("gpsbabel: Unable to allocate %d bytes of memory.\n", size);
          }
  
--- 47,51 ----
  
          if (!obj) {
!                 fatal("gpsbabel: Unable to allocate %d bytes of memory.\n", (int)size);
          }
  
***************
*** 65,69 ****
  
          if (!o) {
!                 fatal("gpsbabel: Unable to allocate %d bytes of memory.\n", strlen(s));
          }
  
--- 65,69 ----
  
          if (!o) {
!                 fatal("gpsbabel: Unable to allocate %d bytes of memory.\n", (int)strlen(s));
          }
  
***************
*** 121,125 ****
  
          if (!o) {
!                 fatal("gpsbabel: Unable to realloc %d bytes of memory.\n", s);
          }
  
--- 121,125 ----
  
          if (!o) {
!                 fatal("gpsbabel: Unable to realloc %d bytes of memory.\n", (int)s);
          }
  

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

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

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

Modified Files:
	gpx.c 
Log Message:
64 bit compatibility

Index: gpx.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gpx/gpx.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gpx.c	7 Dec 2005 14:21:09 -0000	1.1
--- gpx.c	18 Feb 2006 16:04:01 -0000	1.2
***************
*** 970,974 ****
          }
          if (!xsi_schema_loc) {
!                 fatal("gpx: Unable to allocate %d bytes of memory.\n", strlen(DEFAULT_XSI_SCHEMA_LOC) + 1);
          }
  
--- 970,974 ----
          }
          if (!xsi_schema_loc) {
!                 fatal("gpx: Unable to allocate %d bytes of memory.\n", (int) strlen(DEFAULT_XSI_SCHEMA_LOC) + 1);
          }
  

[Roadmap-commit] roadmap/src roadmap_dictionary.c,1.3,1.4

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

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

Modified Files:
	roadmap_dictionary.c 
Log Message:
64 bit compatibility

Index: roadmap_dictionary.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_dictionary.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_dictionary.c	9 Jan 2006 07:39:43 -0000	1.3
--- roadmap_dictionary.c	11 Feb 2006 03:47:35 -0000	1.4
***************
*** 97,101 ****
                      tree->position,
                      "",
!                     (tree - dictionary->tree),
                      tree->count);
  
--- 97,101 ----
                      tree->position,
                      "",
!                     (int)(tree - dictionary->tree),
                      tree->count);
  

[Roadmap-commit] roadmap/src rdmxchange_dictionary.c,1.3,1.4

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

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

Modified Files:
	rdmxchange_dictionary.c 
Log Message:
64 bit compatibility

Index: rdmxchange_dictionary.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/rdmxchange_dictionary.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rdmxchange_dictionary.c	4 Feb 2006 09:14:04 -0000	1.3
--- rdmxchange_dictionary.c	11 Feb 2006 03:47:09 -0000	1.4
***************
*** 313,317 ****
        buildmap_db_get_data (table_node);
     db_index = (unsigned int *) buildmap_db_get_data (table_index);
!    db_data  = buildmap_db_get_data (table_data);
  
  
--- 313,317 ----
        buildmap_db_get_data (table_node);
     db_index = (unsigned int *) buildmap_db_get_data (table_index);
!    db_data  = (char *)buildmap_db_get_data (table_data);
  
  

[Roadmap-commit] roadmap/src buildplace_main.c,1.5,1.6

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

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

Modified Files:
	buildplace_main.c 
Log Message:
64 bit compatibility

Index: buildplace_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildplace_main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** buildplace_main.c	16 Jan 2006 20:55:44 -0000	1.5
--- buildplace_main.c	11 Feb 2006 03:46:42 -0000	1.6
***************
*** 61,66 ****
  static int   BuildPlaceDSGCount = 0;
  
- static BuildMapDictionary DictionaryName;
- 
  static int   BuildPlaceFormatFamily = 0;
  
--- 61,64 ----
***************
*** 221,225 ****
  
  #if ROADMAP_USE_SHAPEFILES
!    
      char name[160];
      int irec;
--- 219,225 ----
  
  #if ROADMAP_USE_SHAPEFILES
! 
!     static BuildMapDictionary DictionaryName;
! 
      char name[160];
      int irec;

[Roadmap-commit] roadmap/src buildmap_street.c,1.4,1.5

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

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

Modified Files:
	buildmap_street.c 
Log Message:
64 bit compatibility

Index: buildmap_street.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_street.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** buildmap_street.c	16 Jan 2006 20:51:55 -0000	1.4
--- buildmap_street.c	11 Feb 2006 03:46:14 -0000	1.5
***************
*** 315,319 ****
     fprintf (stderr,
              "-- street table statistics: %d streets, %d add, %d bytes used\n",
!             StreetCount, StreetAddCount, StreetCount * sizeof(RoadMapStreet));
  }
  
--- 315,320 ----
     fprintf (stderr,
              "-- street table statistics: %d streets, %d add, %d bytes used\n",
!             StreetCount, StreetAddCount,
!             (int)(StreetCount * sizeof(RoadMapStreet)));
  }
  

[Roadmap-commit] roadmap/src buildmap_square.c,1.4,1.5

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

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

Modified Files:
	buildmap_square.c 
Log Message:
64 bit compatibility

Index: buildmap_square.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_square.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** buildmap_square.c	16 Jan 2006 20:51:00 -0000	1.4
--- buildmap_square.c	11 Feb 2006 03:45:45 -0000	1.5
***************
*** 361,365 ****
  
     fprintf (stderr, "-- square table statistics: %d squares, %d bytes used\n",
!                     SquareCount, SquareCount * sizeof(RoadMapSquare));
  }
  
--- 361,365 ----
  
     fprintf (stderr, "-- square table statistics: %d squares, %d bytes used\n",
!                     SquareCount, (int)(SquareCount * sizeof(RoadMapSquare)));
  }
  

[Roadmap-commit] roadmap/src buildmap_shape.c,1.5,1.6

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

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

Modified Files:
	buildmap_shape.c 
Log Message:
64 bit compatibility

Index: buildmap_shape.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_shape.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** buildmap_shape.c	16 Jan 2006 20:50:08 -0000	1.5
--- buildmap_shape.c	11 Feb 2006 03:45:20 -0000	1.6
***************
*** 493,498 ****
              "                %d lines (range %d), max %d points per line\n",
              ShapeCount, ShapeAddCount,
!             ShapeCount * sizeof(RoadMapShape)
!                + (ShapeMaxLine + 1) * sizeof(RoadMapShapeByLine),
              ShapeLineCount, ShapeMaxLine, ShapeMaxSequence);
  }
--- 493,498 ----
              "                %d lines (range %d), max %d points per line\n",
              ShapeCount, ShapeAddCount,
!             (int) (ShapeCount * sizeof(RoadMapShape)
!                + (ShapeMaxLine + 1) * sizeof(RoadMapShapeByLine)),
              ShapeLineCount, ShapeMaxLine, ShapeMaxSequence);
  }

[Roadmap-commit] roadmap/src buildmap_range.c,1.10,1.11

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

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

Modified Files:
	buildmap_range.c 
Log Message:
64 bit compatibility

Index: buildmap_range.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_range.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** buildmap_range.c	6 Feb 2006 06:33:24 -0000	1.10
--- buildmap_range.c	11 Feb 2006 03:44:07 -0000	1.11
***************
*** 994,998 ****
              RangeCount,
              RangeAddCount,
!             RangeCount * sizeof(RoadMapRange),
              RangeDuplicates);
  }
--- 994,998 ----
              RangeCount,
              RangeAddCount,
!             (int)(RangeCount * sizeof(RoadMapRange)),
              RangeDuplicates);
  }

[Roadmap-commit] roadmap/src buildmap_point.c,1.5,1.6

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

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

Modified Files:
	buildmap_point.c 
Log Message:
64 bit compatibility

Index: buildmap_point.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_point.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** buildmap_point.c	4 Feb 2006 09:22:36 -0000	1.5
--- buildmap_point.c	11 Feb 2006 03:43:38 -0000	1.6
***************
*** 403,407 ****
  
     fprintf (stderr, "-- point table statistics: %d points, %d bytes used\n",
!                     PointCount, PointCount * sizeof(RoadMapPoint));
  }
  
--- 403,407 ----
  
     fprintf (stderr, "-- point table statistics: %d points, %d bytes used\n",
!                     PointCount, (int)(PointCount * sizeof(RoadMapPoint)));
  }
  

[Roadmap-commit] roadmap/src buildmap_metadata.c,1.3,1.4

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

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

Modified Files:
	buildmap_metadata.c 
Log Message:
64 bit compatibility

Index: buildmap_metadata.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_metadata.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildmap_metadata.c	16 Jan 2006 20:46:22 -0000	1.3
--- buildmap_metadata.c	11 Feb 2006 03:43:13 -0000	1.4
***************
*** 269,273 ****
     fprintf (stderr,
              "-- metadata table statistics: %d attributes, %d bytes used\n",
!             AttributeCount, AttributeCount * sizeof(RoadMapAttribute));
  }
  
--- 269,273 ----
     fprintf (stderr,
              "-- metadata table statistics: %d attributes, %d bytes used\n",
!             AttributeCount, (int)(AttributeCount * sizeof(RoadMapAttribute)));
  }
  

[Roadmap-commit] roadmap/src buildmap_dictionary.c,1.5,1.6

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

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

Modified Files:
	buildmap_dictionary.c 
Log Message:
64 bit compatibility

Index: buildmap_dictionary.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_dictionary.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** buildmap_dictionary.c	16 Jan 2006 20:42:10 -0000	1.5
--- buildmap_dictionary.c	11 Feb 2006 03:42:47 -0000	1.6
***************
*** 118,122 ****
                      tree->position,
                      "",
!                     (tree - dictionary->tree),
                      tree->count);
  
--- 118,122 ----
                      tree->position,
                      "",
!                     (int)(tree - dictionary->tree),
                      tree->count);
  
***************
*** 496,500 ****
        buildmap_db_get_data (table_node);
     db_index = (unsigned int *) buildmap_db_get_data (table_index);
!    db_data  = buildmap_db_get_data (table_data);
  
     tree_count = 0;
--- 496,500 ----
        buildmap_db_get_data (table_node);
     db_index = (unsigned int *) buildmap_db_get_data (table_index);
!    db_data  = (char *)buildmap_db_get_data (table_data);
  
     tree_count = 0;

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

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

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

Modified Files:
	roadmap_trip.c 
Log Message:
64 bit compatibility: switch to 64bit alignment

Index: roadmap_trip.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_trip.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** roadmap_trip.c	3 Jan 2006 19:33:44 -0000	1.44
--- roadmap_trip.c	10 Feb 2006 09:00:55 -0000	1.45
***************
*** 508,518 ****
  };
  
! static int Placement_Vals [] = {
!     PLACE_NEW_ROUTE,
!     PLACE_PERSONAL_MARK,
!     PLACE_TRIP_MARK,
!     PLACE_ROUTE_MARK_DEST,
!     PLACE_ROUTE_MARK_INSERT,
!     PLACE_ROUTE_MARK_START
  };
  
--- 508,518 ----
  };
  
! static void *Placement_Vals [] = {
!     (void *)PLACE_NEW_ROUTE,
!     (void *)PLACE_PERSONAL_MARK,
!     (void *)PLACE_TRIP_MARK,
!     (void *)PLACE_ROUTE_MARK_DEST,
!     (void *)PLACE_ROUTE_MARK_INSERT,
!     (void *)PLACE_ROUTE_MARK_START
  };
  
***************
*** 540,544 ****
              ("Name", ".placements",
                  route_options ? NUM_ROUTE_PLACEMENTS : NUM_PLACEMENTS, 0,
!                 Placements, (void **) Placement_Vals, NULL);
  
          roadmap_dialog_add_button
--- 540,544 ----
              ("Name", ".placements",
                  route_options ? NUM_ROUTE_PLACEMENTS : NUM_PLACEMENTS, 0,
!                 Placements, Placement_Vals, NULL);
  
          roadmap_dialog_add_button