roadmap-commit — track CVS commits

[Roadmap-commit] roadmap/src/android/gen/net - New directory

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/android/gen/net
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24631/gen/net

Log Message:
Directory /cvsroot/roadmap/roadmap/src/android/gen/net added to the repository

[Roadmap-commit] roadmap/src/android/distribution/default - New directory

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/android/distribution/default
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24567/distribution/default

Log Message:
Directory /cvsroot/roadmap/roadmap/src/android/distribution/default added to the repository

[Roadmap-commit] roadmap/src/android/src/net/sourceforge/projects/roadmap - New directory

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/android/src/net/sourceforge/projects/roadmap
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24516/roadmap

Log Message:
Directory /cvsroot/roadmap/roadmap/src/android/src/net/sourceforge/projects/roadmap added to the repository

[Roadmap-commit] roadmap/src/android/src/net/sourceforge - New directory

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/android/src/net/sourceforge
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24463/sourceforge

Log Message:
Directory /cvsroot/roadmap/roadmap/src/android/src/net/sourceforge added to the repository

[Roadmap-commit] roadmap/src/android/src/net - New directory

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/android/src/net
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24405/net

Log Message:
Directory /cvsroot/roadmap/roadmap/src/android/src/net added to the repository

[Roadmap-commit] roadmap/src/android/net - New directory

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/android/net
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24332/net

Log Message:
Directory /cvsroot/roadmap/roadmap/src/android/net added to the repository

[Roadmap-commit] roadmap/src/android/res - New directory

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/android/res
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24332/res

Log Message:
Directory /cvsroot/roadmap/roadmap/src/android/res added to the repository

[Roadmap-commit] roadmap/src/android/distribution - New directory

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/android/distribution
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24332/distribution

Log Message:
Directory /cvsroot/roadmap/roadmap/src/android/distribution added to the repository

[Roadmap-commit] roadmap/src/android/libs - New directory

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/android/libs
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24332/libs

Log Message:
Directory /cvsroot/roadmap/roadmap/src/android/libs added to the repository

[Roadmap-commit] roadmap/src/android/gen - New directory

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/android/gen
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24332/gen

Log Message:
Directory /cvsroot/roadmap/roadmap/src/android/gen added to the repository

[Roadmap-commit] roadmap/src/android/src - New directory

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/android/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24332/src

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

[Roadmap-commit] roadmap/src/android/bin - New directory

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/android/bin
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24332/bin

Log Message:
Directory /cvsroot/roadmap/roadmap/src/android/bin added to the repository

[Roadmap-commit] roadmap/src/android - New directory

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/android
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24207/android

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

[Roadmap-commit] roadmap/src roadmap_start.c, 1.159, 1.160 roadmap_display.c, 1.41, 1.42

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv463

Modified Files:
	roadmap_start.c roadmap_display.c 
Log Message:
Remove a line that doesn't make sense any more.
Add two cleanups that weren't covered previously.



Index: roadmap_display.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_display.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** roadmap_display.c	5 Dec 2009 05:20:07 -0000	1.41
--- roadmap_display.c	13 Jul 2010 05:52:39 -0000	1.42
***************
*** 3,7 ****
   *
   *   Copyright 2002 Pascal F. Martin
!  *   Copyright (c) 2009, Danny Backx
   *
   *   This file is part of RoadMap.
--- 3,7 ----
   *
   *   Copyright 2002 Pascal F. Martin
!  *   Copyright (c) 2009, 2010, Danny Backx
   *
   *   This file is part of RoadMap.
***************
*** 836,837 ****
--- 836,845 ----
      roadmap_main_set_periodic (3000, roadmap_display_periodic);
  }
+ 
+ /**
+  * @brief clean up periodic call
+  */
+ void roadmap_display_shutdown (void)
+ {
+     roadmap_main_remove_periodic (roadmap_display_periodic);
+ }

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -d -r1.159 -r1.160
*** roadmap_start.c	11 Jul 2010 16:46:16 -0000	1.159
--- roadmap_start.c	13 Jul 2010 05:52:39 -0000	1.160
***************
*** 2,6 ****
   * LICENSE:
   *
!  *   (c) Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
   *	 Pascal F. Martin, Paul Fox, Ehud Shabtai, Danny Backx,
   *	 and others.
--- 2,6 ----
   * LICENSE:
   *
!  *   (c) Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
   *	 Pascal F. Martin, Paul Fox, Ehud Shabtai, Danny Backx,
   *	 and others.
***************
*** 1244,1254 ****
           roadmap_object_move (RoadMapStartGpsID, gps_position);
  
- #ifdef HAVE_TRIP_PLUGIN
- 	 /* Here Danny FIX ME FIXME */
-          trip_set_gps (gps_time, gps_position);
           roadmap_trip_set_gps (gps_time, gps_position);
- #else
-          roadmap_trip_set_gps (gps_time, gps_position);
- #endif
           roadmap_gps_set_messages(gps_position);
  
--- 1244,1248 ----
***************
*** 1711,1714 ****
--- 1705,1709 ----
  void roadmap_start_exit (void)
  {
+     roadmap_main_remove_periodic (roadmap_start_periodic);
      roadmap_main_set_cursor (ROADMAP_CURSOR_WAIT);
      roadmap_driver_shutdown ();
***************
*** 1725,1728 ****
--- 1720,1724 ----
  #endif
      roadmap_config_save (0);
+     roadmap_display_shutdown ();
      roadmap_gps_shutdown ();
      roadmap_log (ROADMAP_WARNING, "RoadMap exiting, time %s", roadmap_start_now());

[Roadmap-commit] roadmap/src roadmap_layer.c, 1.23, 1.24 roadmap_navigate.c, 1.27, 1.28

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

Update of /cvsroot/roadmap/roadmap/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23717/src

Modified Files:
	roadmap_layer.c roadmap_navigate.c 
Log Message:
fix street selection when there are no Navigation classes configured


Index: roadmap_navigate.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_navigate.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** roadmap_navigate.c	15 Feb 2009 16:47:49 -0000	1.27
--- roadmap_navigate.c	11 Jul 2010 16:46:50 -0000	1.28
***************
*** 193,199 ****
  
      RoadMapNeighbour closest;
-     int navigation_mode = roadmap_navigate_get_mode();
  
!     if (roadmap_navigate_get_neighbours (focus, position, &closest, 1, navigation_mode) <= 0) {
  
         return -1;
--- 193,198 ----
  
      RoadMapNeighbour closest;
  
!     if (roadmap_navigate_get_neighbours (focus, position, &closest, 1, -1) <= 0) {
  
         return -1;

Index: roadmap_layer.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_layer.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** roadmap_layer.c	30 Mar 2009 14:00:44 -0000	1.23
--- roadmap_layer.c	11 Jul 2010 16:46:50 -0000	1.24
***************
*** 262,266 ****
  {
      int i;
!     int mask = 1 << mode;
      int count = 0;
  
--- 262,266 ----
  {
      int i;
!     int mask = (mode == -1) ? ~0 : (1 << mode);
      int count = 0;
  
***************
*** 274,278 ****
          layer = RoadMapLayerCurrentClass->layers + i - 1;
  
!         if (layer->navigation_modes & mask) {
  
             if (roadmap_layer_is_visible (layer)) {
--- 274,278 ----
          layer = RoadMapLayerCurrentClass->layers + i - 1;
  
!         if (mode == -1 || layer->navigation_modes & mask) {
  
             if (roadmap_layer_is_visible (layer)) {

[Roadmap-commit] roadmap/src Makefile, 1.141, 1.142 roadmap_start.c, 1.158, 1.159 roadmap_trip.c, 1.109, 1.110 roadmap_tripdb.c, 1.1, 1.2

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

Update of /cvsroot/roadmap/roadmap/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23547/src

Modified Files:
	Makefile roadmap_start.c roadmap_trip.c roadmap_tripdb.c 
Log Message:
refactor roadmap_trip.c/roadmap_tripdb.c, mainly as a result of
a debug session.  we can split roadmap_trip.c up, but it needs
to be done carefully.

the crash i was experiencing was the result of an incorrect "return 0"
in roadmap_trip_load_file().

these changes might have broken "navigated" trips.  see the
"ifdef BROKEN" in roadmap_trip.c



Index: roadmap_tripdb.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_tripdb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_tripdb.c	15 Feb 2009 15:20:24 -0000	1.1
--- roadmap_tripdb.c	11 Jul 2010 16:46:17 -0000	1.2
***************
*** 31,34 ****
--- 31,37 ----
   */
  
+ 
+ /// PLEASE!   don't add roadmap_trip_XXXX  functions in this file.
+ 
  #include <stdio.h>
  #include <string.h>
***************
*** 56,68 ****
  static RoadMapPosition	RoadMapTripLastPos;
  
! RoadMapList	RoadMapTripWaypointHead;
! RoadMapList	RoadMapTripRouteHead;
! RoadMapList	RoadMapTripTrackHead;
  
  /* route following flags */
! route_head *RoadMapCurrentRoute = NULL;
  
  /* These point at waypoints in the current route. */
! waypoint *RoadMapTripDest = NULL;
  
  /**
--- 59,71 ----
  static RoadMapPosition	RoadMapTripLastPos;
  
! // RoadMapList	RoadMapTripWaypointHead;
! // RoadMapList	RoadMapTripRouteHead;
! // RoadMapList	RoadMapTripTrackHead;
  
  /* route following flags */
! // route_head *RoadMapCurrentRoute = NULL;
  
  /* These point at waypoints in the current route. */
! // waypoint *RoadMapTripDest = NULL;
  
  /**
***************
*** 201,206 ****
  void roadmap_tripdb_initialize (void)
  {
-     ROADMAP_LIST_INIT(&RoadMapTripWaypointHead);
-     ROADMAP_LIST_INIT(&RoadMapTripRouteHead);
  }
  
--- 204,207 ----
***************
*** 249,266 ****
  }
  
- /**
-  *  * @brief clear the current trip
-  *   */
- void roadmap_tripdb_clear (void)
- {
- 	waypt_flush_queue (&RoadMapTripWaypointHead);
- 	route_flush_queue (&RoadMapTripRouteHead);
- 	route_flush_queue (&RoadMapTripTrackHead);
- 
- 	roadmap_trip_set_modified(1);
- 
- 	RoadMapCurrentRoute = NULL;
- 	roadmap_trip_unset_route_focii ();
- 
- 	roadmap_trip_refresh_needed();
- }
--- 250,251 ----

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -C2 -d -r1.158 -r1.159
*** roadmap_start.c	5 Dec 2009 05:20:07 -0000	1.158
--- roadmap_start.c	11 Jul 2010 16:46:16 -0000	1.159
***************
*** 1582,1586 ****
--- 1582,1588 ----
     roadmap_math_initialize     ();
     roadmap_trip_initialize     ();
+ #ifdef HAVE_NAVIGATE_PLUGIN
     roadmap_tripdb_initialize   ();
+ #endif
     roadmap_track_initialize    ();
     roadmap_landmark_initialize ();

Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/Makefile,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -d -r1.141 -r1.142
*** Makefile	30 Apr 2009 15:05:26 -0000	1.141
--- Makefile	11 Jul 2010 16:46:16 -0000	1.142
***************
*** 58,62 ****
  	roadmap_object.c \
  	roadmap_trip.c \
- 	roadmap_tripdb.c \
  	roadmap_track.c \
  	roadmap_landmark.c \
--- 58,61 ----
***************
*** 301,305 ****
  	roadmap_trigonometry.h \
  	roadmap_trip.h \
- 	roadmap_tripdb.h \
  	roadmap_turns.h \
  	roadmap_types.h \
--- 300,303 ----
***************
*** 407,410 ****
--- 405,409 ----
  ifeq ($(USE_NAVIGATE_PLUGIN),yes)
  NAVIGATE_PLUGINSRC = \
+ 	roadmap_tripdb.c \
  	navigate/navigate.c \
  	navigate/navigate_bar.c \
***************
*** 416,419 ****
--- 415,419 ----
  
  NAVIGATE_PLUGIN_HDR = \
+ 	roadmap_tripdb.h \
  	navigate/navigate_bar.h \
  	navigate/navigate_cost.h \

Index: roadmap_trip.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_trip.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** roadmap_trip.c	4 Apr 2009 08:16:16 -0000	1.109
--- roadmap_trip.c	11 Jul 2010 16:46:16 -0000	1.110
***************
*** 22,25 ****
--- 22,26 ----
   */
  
+ 
  /**
   * @file
***************
*** 60,71 ****
  #include "roadmap_track.h"
  #include "roadmap_landmark.h"
! #include "roadmap_street.h"
! #include "roadmap_layer.h"
! #include "roadmap_point.h"
! #include "roadmap_skin.h"
  
  #include "roadmap_trip.h"
- #include "roadmap_tripdb.h"
- #include "roadmap_plugin.h"
  
  static RoadMapConfigDescriptor RoadMapConfigTripName =
--- 61,69 ----
  #include "roadmap_track.h"
  #include "roadmap_landmark.h"
! #ifdef HAVE_NAVIGATE_PLUGIN
! #include "roadmap_tripdb.h"
! #endif
  
  #include "roadmap_trip.h"
  
  static RoadMapConfigDescriptor RoadMapConfigTripName =
***************
*** 114,118 ****
  
  /* route following flags */
! // static route_head *RoadMapCurrentRoute = NULL;
  static int RoadMapRouteInProgress = 0;
  static int RoadMapRouteIsReversed = 0;
--- 112,116 ----
  
  /* route following flags */
! route_head *RoadMapCurrentRoute = NULL;
  static int RoadMapRouteInProgress = 0;
  static int RoadMapRouteIsReversed = 0;
***************
*** 215,219 ****
  };
  
! /* WARNING:  These are pointers into the above "predefined" table -- order is important.  */
  static RoadMapTripFocal
  	*RoadMapTripGps = &RoadMapTripFocalPoints[0],
--- 213,218 ----
  };
  
! /* WARNING:  These are pointers into the above "predefined" table,
!  * i.e., order is important.  */
  static RoadMapTripFocal
  	*RoadMapTripGps = &RoadMapTripFocalPoints[0],
***************
*** 232,236 ****
  
  /* These point at waypoints in the current route. */
! // static waypoint *RoadMapTripDest = NULL;
  static waypoint *RoadMapTripStart = NULL;
  static waypoint *RoadMapTripNext = NULL;
--- 231,235 ----
  
  /* These point at waypoints in the current route. */
! waypoint *RoadMapTripDest = NULL;
  static waypoint *RoadMapTripStart = NULL;
  static waypoint *RoadMapTripNext = NULL;
***************
*** 243,249 ****
  static time_t RoadMapTripGPSTime = 0;
  
! // static RoadMapList RoadMapTripWaypointHead;
! // static RoadMapList RoadMapTripRouteHead;
! // static RoadMapList RoadMapTripTrackHead;
  
  static RoadMapList RoadMapTripLostRoutesHead;
--- 242,248 ----
  static time_t RoadMapTripGPSTime = 0;
  
! RoadMapList RoadMapTripWaypointHead;
! RoadMapList RoadMapTripRouteHead;
! RoadMapList RoadMapTripTrackHead;
  
  static RoadMapList RoadMapTripLostRoutesHead;
***************
*** 260,265 ****
  #define	ROUTE_PEN_WIDTH	4
  
- int RoadMapTripEnabled = 0;
- 
  static RoadMapPosition RoadMapTripDefaultPosition =
       {ROADMAP_INITIAL_LONGITUDE, ROADMAP_INITIAL_LATITUDE};
--- 259,262 ----
***************
*** 1180,1186 ****
      RoadMapCurrentRoute = NULL;
      roadmap_trip_unset_route_focii ();
-     RoadMapTripRefresh = 1;
      roadmap_dialog_hide (name);
!     roadmap_trip_refresh ();
  }
  
--- 1177,1183 ----
      RoadMapCurrentRoute = NULL;
      roadmap_trip_unset_route_focii ();
      roadmap_dialog_hide (name);
!     RoadMapTripRefresh = 1;
!     roadmap_screen_refresh ();
  }
  
***************
*** 1410,1416 ****
  	}
  	RoadMapRouteInProgress = 1;
! 	roadmap_trip_refresh ();
  }
  
  /**
   * @brief
--- 1407,1429 ----
  	}
  	RoadMapRouteInProgress = 1;
! 	roadmap_screen_refresh ();
! }
! 
! static void roadmap_trip_clear (void) {
!  
! 	waypt_flush_queue (&RoadMapTripWaypointHead);
! 	route_flush_queue (&RoadMapTripRouteHead);
! 	route_flush_queue (&RoadMapTripTrackHead);
! 
! 	roadmap_trip_set_modified(1);
! 
! 	RoadMapCurrentRoute = NULL;
! 	roadmap_trip_unset_route_focii ();
!        
! 	RoadMapTripRefresh = 1;
  }
  
+ 
+ 
  /**
   * @brief
***************
*** 1488,1492 ****
  
      roadmap_trip_set_point_focus (RoadMapTripBeginning);
!     roadmap_trip_refresh ();
  }
  
--- 1501,1505 ----
  
      roadmap_trip_set_point_focus (RoadMapTripBeginning);
!     roadmap_screen_refresh ();
  }
  
***************
*** 2095,2099 ****
      if (RoadMapRouteInProgress) roadmap_trip_route_resume ();
  
!     roadmap_trip_refresh ();
  }
  
--- 2108,2112 ----
      if (RoadMapRouteInProgress) roadmap_trip_route_resume ();
  
!     roadmap_screen_refresh ();
  }
  
***************
*** 2119,2123 ****
  
      RoadMapTripRefresh = 1;
!     roadmap_trip_refresh ();
  }
  
--- 2132,2136 ----
  
      RoadMapTripRefresh = 1;
!     roadmap_screen_refresh ();
  }
  
***************
*** 2591,2595 ****
  	}
  
! 	roadmap_tripdb_clear ();
  
  	roadmap_trip_set_modified(0);
--- 2604,2608 ----
  	}
  
! 	roadmap_trip_clear ();
  
  	roadmap_trip_set_modified(0);
***************
*** 2601,2610 ****
  	RoadMapTripUntitled = 1;
  
- 	roadmap_trip_refresh ();
  
  	roadmap_tripdb_empty_list ();
! 	roadmap_trip_set_point_focus (RoadMapTripBeginning);
! 	// TripRouteInProgress = 1;	/* Caused a crash */
! 	roadmap_trip_refresh ();
  }
  
--- 2614,2627 ----
  	RoadMapTripUntitled = 1;
  
  
+ #ifdef HAVE_NAVIGATE_PLUGIN
  	roadmap_tripdb_empty_list ();
! #endif
! 
! 	/* i think this is wrong:  how can an empty trip have anything
! 	 * to set focus to? */
! 	// roadmap_trip_set_point_focus (RoadMapTripBeginning);
! 
! 	roadmap_screen_refresh ();
  }
  
***************
*** 2704,2718 ****
  
  /**
-  * @brief refresh the visual after loading a new trip
-  */
- void trip_refresh(void)
- {
- 	extern int RoadMapTripRefresh;
- 
- 	RoadMapTripRefresh = 1;
- 	roadmap_screen_refresh ();
- }
- 
- /**
   * @brief
   * @param name
--- 2721,2724 ----
***************
*** 2778,2782 ****
              }
          }
!         roadmap_tripdb_clear();
  
          ROADMAP_LIST_MOVE(&RoadMapTripWaypointHead, &tmp_waypoint_list);
--- 2784,2788 ----
              }
          }
!         roadmap_trip_clear();
  
          ROADMAP_LIST_MOVE(&RoadMapTripWaypointHead, &tmp_waypoint_list);
***************
*** 2820,2837 ****
      }
  
!     /* Fill up our own structure based on this list */
      roadmap_tripdb_empty_list();
  
!     if (! RoadMapCurrentRoute) {
! 	    trip_refresh();
! 	    return 0;
      }
  
!     route_waypt_iterator (RoadMapCurrentRoute, roadmap_tripdb_waypoint_iter);
! 
!     roadmap_main_title(TRIP_TITLE_FMT,
! 		    roadmap_path_skip_directories(roadmap_trip_current()));
!     roadmap_trip_refresh ();
  
      return ret;
  }
--- 2826,2843 ----
      }
  
! #ifdef HAVE_NAVIGATE_PLUGIN
      roadmap_tripdb_empty_list();
  
!     if (RoadMapCurrentRoute != NULL) {
! 	route_waypt_iterator (RoadMapCurrentRoute,
! 		roadmap_tripdb_waypoint_iter);
      }
+ #endif
  
!     roadmap_main_title(TRIP_TITLE_FMT, 
! 	    roadmap_path_skip_directories(roadmap_trip_current()));
  
+     roadmap_screen_refresh ();
+  
      return ret;
  }
***************
*** 3589,3592 ****
--- 3595,3600 ----
      RoadMapTripFocal *focal;
  
+     ROADMAP_LIST_INIT(&RoadMapTripWaypointHead);
+     ROADMAP_LIST_INIT(&RoadMapTripRouteHead);
      ROADMAP_LIST_INIT(&RoadMapTripTrackHead);
  
***************
*** 3645,3671 ****
      roadmap_state_add ("get_direction_2nd", &roadmap_trip_2nd_point_state);
      roadmap_state_add ("get_direction_dest", &roadmap_trip_dest_state);
  
-     /* Some stuff inherited from temporary trip plugin */
-     roadmap_trip_enable(1);
- 
-     RoadMapPosition pos;
-     roadmap_trip_set_focus("GPS");
-     pos = RoadMapTripGps->map;
-     roadmap_trip_set_point ("Destination", &pos);
- }
- 
- /**
-  * @brief enable or disable navigation
-  * @param status whether to set TripEnabled
-  */
- void roadmap_trip_enable (int status)
- {
- 	if (status && RoadMapTripEnabled) {
- 		return;
- 	} else if (!status && !RoadMapTripEnabled) {
- 		return;
- 	}
- 
- 	RoadMapTripEnabled = status;
  }
  
--- 3653,3670 ----
      roadmap_state_add ("get_direction_2nd", &roadmap_trip_2nd_point_state);
      roadmap_state_add ("get_direction_dest", &roadmap_trip_dest_state);
+  
+ #ifdef BROKEN
+ // it's much too early to do most of this.  we haven't loaded any trip data.
+ // and forcing the current location to GPS is wrong, too.  initial location
+ // is set much later.
+      /* Some stuff inherited from temporary trip plugin */
+      roadmap_trip_enable(1);
+  
+      RoadMapPosition pos;
+      roadmap_trip_set_focus("GPS");
+      pos = RoadMapTripGps->map;
+      roadmap_trip_set_point ("Destination", &pos);
+ #endif
  
  }
  

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

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

Update of /cvsroot/roadmap/roadmap/src/unix
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12205/unix

Modified Files:
	roadmap_time.c 
Log Message:
when roadmap_time_get_hours_minutes() was changed to return the
date as well as the time, it made the result too long for the
caller in roadmap_display_periodic().  it also broke the
semantics of the routine -- not all callers want the date.


Index: roadmap_time.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/unix/roadmap_time.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** roadmap_time.c	10 Feb 2009 19:01:57 -0000	1.5
--- roadmap_time.c	5 Dec 2009 05:20:07 -0000	1.6
***************
*** 41,45 ****
   * @return the string that can be printed
   */
! char *roadmap_time_get_hours_minutes (time_t gmt) {
      
      static char image[32];
--- 41,45 ----
   * @return the string that can be printed
   */
! char *roadmap_time_get_date_hours_minutes (time_t gmt) {
      
      static char image[32];
***************
*** 56,59 ****
--- 56,71 ----
  }
  
+ char *roadmap_time_get_hours_minutes (time_t gmt) {
+     
+     static char image[32];
+     
+     struct tm *tm;
+     
+     tm = localtime (&gmt);
+     snprintf (image, sizeof(image), "%2d:%02d", tm->tm_hour, tm->tm_min);
+ 
+     return image;
+ }
+ 
  static unsigned long tv_to_msec(struct timeval *tv)
  {

[Roadmap-commit] roadmap/src roadmap_display.c, 1.40, 1.41 roadmap_time.h, 1.3, 1.4 roadmap_start.c, 1.157, 1.158

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

Update of /cvsroot/roadmap/roadmap/src
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12205

Modified Files:
	roadmap_display.c roadmap_time.h roadmap_start.c 
Log Message:
when roadmap_time_get_hours_minutes() was changed to return the
date as well as the time, it made the result too long for the
caller in roadmap_display_periodic().  it also broke the
semantics of the routine -- not all callers want the date.


Index: roadmap_time.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_time.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_time.h	7 Aug 2007 01:32:09 -0000	1.3
--- roadmap_time.h	5 Dec 2009 05:20:07 -0000	1.4
***************
*** 28,31 ****
--- 28,32 ----
  
  char *roadmap_time_get_hours_minutes (time_t gmt);
+ char *roadmap_time_get_date_hours_minutes (time_t gmt);
  
  unsigned long roadmap_time_get_millis(void);

Index: roadmap_display.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_display.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** roadmap_display.c	18 Apr 2009 05:47:09 -0000	1.40
--- roadmap_display.c	5 Dec 2009 05:20:07 -0000	1.41
***************
*** 761,765 ****
  void roadmap_display_periodic(void) {
  
!     static char thentime[16];
      int need_time_update = 0;
      time_t now = time(NULL);
--- 761,765 ----
  void roadmap_display_periodic(void) {
  
!     static char thentime[32];
      int need_time_update = 0;
      time_t now = time(NULL);

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -d -r1.157 -r1.158
*** roadmap_start.c	26 Mar 2009 20:57:37 -0000	1.157
--- roadmap_start.c	5 Dec 2009 05:20:07 -0000	1.158
***************
*** 1439,1443 ****
  char * roadmap_start_now() {
  
!    return roadmap_time_get_hours_minutes (time(NULL));
  
  }
--- 1439,1443 ----
  char * roadmap_start_now() {
  
!    return roadmap_time_get_date_hours_minutes (time(NULL));
  
  }

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

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

Update of /cvsroot/roadmap/roadmap/src/win32
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12205/win32

Modified Files:
	roadmap_time.c 
Log Message:
when roadmap_time_get_hours_minutes() was changed to return the
date as well as the time, it made the result too long for the
caller in roadmap_display_periodic().  it also broke the
semantics of the routine -- not all callers want the date.


Index: roadmap_time.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_time.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_time.c	10 Feb 2009 19:02:01 -0000	1.3
--- roadmap_time.c	5 Dec 2009 05:20:07 -0000	1.4
***************
*** 36,40 ****
   * @return the string that can be printed
   */
! char *roadmap_time_get_hours_minutes (time_t gmt) {
  
      static char image[32];
--- 36,40 ----
   * @return the string that can be printed
   */
! char *roadmap_time_get_date_hours_minutes (time_t gmt) {
  
      static char image[32];
***************
*** 49,52 ****
--- 49,63 ----
  }
  
+ char *roadmap_time_get_hours_minutes (time_t gmt) {
+ 
+     static char image[32];
+     struct tm *tm;
+ 
+     tm = localtime (&gmt);
+     snprintf (image, sizeof(image), "%2d:%02d", tm->tm_hour, tm->tm_min);
+ 
+     return image;
+ }
+ 
  /**
   * @brief Get some kind of time indication in milliseconds, on Windows it's the time since boot

[Roadmap-commit] roadmap/src buildmap_line.c,1.26,1.27

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

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7286

Modified Files:
	buildmap_line.c 
Log Message:
reinitialize lbp and its indices in the reset function


Index: buildmap_line.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_line.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** buildmap_line.c	12 May 2009 13:53:32 -0000	1.26
--- buildmap_line.c	7 Jul 2009 01:52:31 -0000	1.27
***************
*** 82,88 ****
  /*
   * @brief Line By Point stuff
!  * This structure holds info about a point : it gathers the line ids of lines that
!  * start or end in a point.
!  * The point id is not stored, this structure's index in the array is the point id.
   */
  struct lbp {
--- 82,89 ----
  /*
   * @brief Line By Point stuff
!  * This structure holds info about a point :  it gathers the line
!  * ids of lines that start or end in a point.  The point id is
!  * not stored, this structure's index in the array is the point
!  * id.
   */
  struct lbp {
***************
*** 997,1000 ****
--- 998,1006 ----
     roadmap_hash_delete (LineById);
     LineById = NULL;
+ 
+    free(lbp);
+    lbp = 0;
+    max_line_by_point = 0;
+    nalloc_line_by_point = 0;
  }
  
***************
*** 1035,1044 ****
  		lbp = (struct lbp *) realloc((void *)lbp,
  				nalloc_line_by_point * sizeof(struct lbp));
! 		for (i=old; i<nalloc_line_by_point; i++) {
! 			lbp[i].max = 0;
! 			lbp[i].num = 0;
! 			lbp[i].ptr = 0;
! 		}
  	}
  	/* lbp[point].point = point; */
  	if (lbp[point].num == lbp[point].max) {
--- 1041,1051 ----
  		lbp = (struct lbp *) realloc((void *)lbp,
  				nalloc_line_by_point * sizeof(struct lbp));
! 		memset(&lbp[old], 0,
! 			(nalloc_line_by_point  - old) * sizeof(struct lbp));
  	}
+ 	for (i=0; i<lbp[point].num; i++)
+ 		if (lbp[point].ptr[i] == line)
+ 			return;	/* already there, no need to add again */
+ 
  	/* lbp[point].point = point; */
  	if (lbp[point].num == lbp[point].max) {
***************
*** 1047,1053 ****
  				lbp[point].max * sizeof(int));
  	}
! 	for (i=0; i<lbp[point].num; i++)
! 		if (lbp[point].ptr[i] == line)
! 			return;	/* already there, no need to add again */
  	lbp[point].ptr[lbp[point].num++] = line;
  }
--- 1054,1058 ----
  				lbp[point].max * sizeof(int));
  	}
! 
  	lbp[point].ptr[lbp[point].num++] = line;
  }

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

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

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7190

Modified Files:
	buildmap_osm_main.c 
Log Message:
ignore ENOENT from pclose(), which seems to mean there was no data


Index: buildmap_osm_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_osm_main.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** buildmap_osm_main.c	30 Mar 2009 13:56:56 -0000	1.17
--- buildmap_osm_main.c	7 Jul 2009 01:51:43 -0000	1.18
***************
*** 222,227 ****
  
      if (pclose(fdata) != 0) {
!         buildmap_error(0, "problem fetching data (%s)", strerror(errno));
!         ret = -1;
      }
  
--- 222,227 ----
  
      if (pclose(fdata) != 0) {
!         buildmap_error(0, "problem fetching data (pclose: %s), continuing", strerror(errno));
!         // ret = -1;
      }
  
***************
*** 276,280 ****
      ret = buildmap_osm_text_read(f, country_num, division_num);
      if (fclose(f) != 0) {
!         buildmap_error(0, "problem fetching data");
          ret = -1;
      }
--- 276,280 ----
      ret = buildmap_osm_text_read(f, country_num, division_num);
      if (fclose(f) != 0) {
!         buildmap_error(0, "problem fetching data (fclose: %s)", strerror(errno));
          ret = -1;
      }

[Roadmap-commit] roadmap/src/php osmgetbmap, 1.1, 1.2 osmgetbmapcore.php, 1.2, 1.3

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

Update of /cvsroot/roadmap/roadmap/src/php
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7332/php

Modified Files:
	osmgetbmap osmgetbmapcore.php 
Log Message:
start using osm protocol 0.6 -- no code changes needed (as far as i can tell)


Index: osmgetbmapcore.php
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/php/osmgetbmapcore.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** osmgetbmapcore.php	12 Dec 2007 21:42:59 -0000	1.2
--- osmgetbmapcore.php	7 Jul 2009 01:53:08 -0000	1.3
***************
*** 10,14 ****
  
  This script takes requests for OSM map information for a bounding box,
! makes the request to the Open Street Map API v0.5 and reforms the reply
  from XML to a simplified binary format.
  
--- 10,14 ----
  
  This script takes requests for OSM map information for a bounding box,
! makes the request to the Open Street Map API v0.6 and reforms the reply
  from XML to a simplified binary format.
  

Index: osmgetbmap
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/php/osmgetbmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osmgetbmap	12 Dec 2007 17:40:09 -0000	1.1
--- osmgetbmap	7 Jul 2009 01:53:08 -0000	1.2
***************
*** 18,22 ****
  //$server = "osmxapi.informationfreeway.org";
  //$server = "openstreetmap.gryph.de";
! $path = "/api/0.5/map"; 
  
  function doLog($text) {
--- 18,22 ----
  //$server = "osmxapi.informationfreeway.org";
  //$server = "openstreetmap.gryph.de";
! $path = "/api/0.6/map"; 
  
  function doLog($text) {

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

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/win32
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16136/win32

Modified Files:
	roadmap_main.c 
Log Message:
Get CE RoadMap to understand command line parameters, so --debug works.


Index: roadmap_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_main.c	9 Feb 2009 19:39:17 -0000	1.1
--- roadmap_main.c	21 May 2009 16:30:36 -0000	1.2
***************
*** 271,277 ****
  	}
  	
! 	char *args[1] = {0};
  
! 	roadmap_start(0, args);
  
  #ifndef _ROADGPS
--- 271,305 ----
  	}
  	
! 	if (lpCmdLine) {
! 		char	*argv[10];
! 		char	*args, *p, *st;
! 		int	len;
! 		int	argc = 0;
  
! 		argv[argc++] = "wroadmap.exe";
! 
! 		len = wcslen(lpCmdLine);
! 		args = malloc(len+1);
! 		wcstombs(args, lpCmdLine, len);
! 		args[len] = '\0';
! 
! 		for (p=args, st=NULL; *p; p++) {
! 			if (st != NULL && (*p == ' ' || *p == '\t')) {
! 				*p = '\0';
! 				argv[argc++] = st;
! 				st = NULL;
! 			} else if ((st == NULL) && ! (*p == ' ' || *p == '\t'))
! 				st = p;
! 		}
! 		if (st)
! 			argv[argc++] = st;
! 		
! 		roadmap_log (ROADMAP_WARNING, "Yow %d args", argc);
! 		roadmap_option(argc, argv, 0, NULL);
! 		roadmap_start(argc, argv);
! 	} else {
! 		char *args[1] = {0};
! 		roadmap_start(0, args);
! 	}
  
  #ifndef _ROADGPS

[Roadmap-commit] roadmap/src buildmap.h, 1.7, 1.8 buildmap_city.c, 1.3, 1.4 buildmap_dbwrite.c, 1.7, 1.8 buildmap_line.c, 1.25, 1.26 buildmap_place.c, 1.6, 1.7 buildmap_point.c, 1.10, 1.11 buildmap_polygon.c, 1.14, 1.15 buildmap_shape.c, 1.13, 1.14 buildmap_street.c, 1.9, 1.10 buildmap_turn_restrictions.c, 1.1, 1.2

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31982

Modified Files:
	buildmap.h buildmap_city.c buildmap_dbwrite.c buildmap_line.c 
	buildmap_place.c buildmap_point.c buildmap_polygon.c 
	buildmap_shape.c buildmap_street.c 
	buildmap_turn_restrictions.c 
Log Message:
This might fix the memory issue that appeared when building big maps.
Also add documentation.


Index: buildmap_city.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_city.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildmap_city.c	11 Mar 2007 02:11:18 -0000	1.3
--- buildmap_city.c	12 May 2009 13:53:32 -0000	1.4
***************
*** 1,7 ****
! /* buildmap_city.c - Build a city table & index for BuildMap.
!  *
   * LICENSE:
   *
   *   Copyright 2002 Pascal F. Martin
   *
   *   This file is part of RoadMap.
--- 1,7 ----
! /*
   * LICENSE:
   *
   *   Copyright 2002 Pascal F. Martin
+  *   Copyright (c) 2009 Danny Backx.
   *
   *   This file is part of RoadMap.
***************
*** 20,35 ****
   *   along with RoadMap; if not, write to the Free Software
   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   *
!  * SYNOPSYS:
!  *
!  *   void  buildmap_city_add        (int fips, int year, RoadMapString name);
!  *
!  *   RoadMapString buildmap_city_get_name   (int fips);
!  *
!  * These functions are used to build a table of cities from
!  * the Tiger maps. The objective is double: (1) reduce the size of
!  * the Tiger data by sharing all duplicated information and
!  * (2) produce the index data to serve as the basis for a fast
!  * search mechanism for streets in roadmap.
   *
   * There is no city table for RoadMap, because the only attribute
--- 20,30 ----
   *   along with RoadMap; if not, write to the Free Software
   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
+ /**
+  * @file
+  * @brief Build a city table & index for BuildMap.
   *
!  * These functions are used to build a table of cities.
   *
   * There is no city table for RoadMap, because the only attribute
***************
*** 66,70 ****
  static void buildmap_city_register (void);
  
! 
  static void buildmap_city_initialize (void) {
  
--- 61,67 ----
  static void buildmap_city_register (void);
  
! /**
!  * @brief initialize the city module
!  */
  static void buildmap_city_initialize (void) {
  
***************
*** 76,80 ****
  }
  
! 
  void buildmap_city_add (int fips, int year, RoadMapString name) {
  
--- 73,82 ----
  }
  
! /**
!  * @brief add a city
!  * @param fips a region code (county or other country subdivision)
!  * @param year (not sure why this is relevant)
!  * @param name the city name
!  */
  void buildmap_city_add (int fips, int year, RoadMapString name) {
  
***************
*** 116,119 ****
--- 118,127 ----
     offset = CityCount % BUILDMAP_BLOCK;
  
+    if (block >= BUILDMAP_BLOCK) {
+       buildmap_fatal (0,
+          "Underdimensioned city table (block %d, BUILDMAP_BLOCK %d)",
+ 	 block, BUILDMAP_BLOCK);
+    }
+ 
     if (City[block] == NULL) {
  
***************
*** 138,142 ****
  }
  
! 
  RoadMapString buildmap_city_get_name (int fips) {
  
--- 146,154 ----
  }
  
! /**
!  * @brief query the name of a city by fips
!  * @param fips identifies the city
!  * @return internal represenation of city name
!  */
  RoadMapString buildmap_city_get_name (int fips) {
  
***************
*** 160,164 ****
  }
  
! 
  static void buildmap_city_summary (void) {
  
--- 172,178 ----
  }
  
! /**
!  * @brief print buildmap summary for this module
!  */
  static void buildmap_city_summary (void) {
  
***************
*** 167,171 ****
  }
  
! 
  static void buildmap_city_reset (void) {
  
--- 181,187 ----
  }
  
! /**
!  * @brief clear city module database
!  */
  static void buildmap_city_reset (void) {
  
***************
*** 185,189 ****
  }
  
! 
  static buildmap_db_module BuildMapCityModule = {
     "city",
--- 201,207 ----
  }
  
! /**
!  * @brief identify the city module
!  */
  static buildmap_db_module BuildMapCityModule = {
     "city",
***************
*** 194,200 ****
  };
  
! 
  static void buildmap_city_register (void) {
     buildmap_db_register (&BuildMapCityModule);
  }
- 
--- 212,219 ----
  };
  
! /**
!  * @brief register the city module with the buildmap application
!  */
  static void buildmap_city_register (void) {
     buildmap_db_register (&BuildMapCityModule);
  }

Index: buildmap.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** buildmap.h	3 Dec 2007 18:29:04 -0000	1.7
--- buildmap.h	12 May 2009 13:53:32 -0000	1.8
***************
*** 1,7 ****
! /* buildmap.h - General definition for the map builder tool.
!  *
   * LICENSE:
   *
   *   Copyright 2002 Pascal F. Martin
   *
   *   This file is part of RoadMap.
--- 1,7 ----
! /*
   * LICENSE:
   *
   *   Copyright 2002 Pascal F. Martin
+  *   Copyright (c) 2009 Danny Backx.
   *
   *   This file is part of RoadMap.
***************
*** 22,25 ****
--- 22,29 ----
   */
  
+ /*
+  * buildmap.h - General definition for the map builder tool.
+  */
+ 
  #ifndef INCLUDED__ROADMAP_BUILDMAP__H
  #define INCLUDED__ROADMAP_BUILDMAP__H
***************
*** 28,32 ****
  #include "roadmap_db.h"
  
! #define BUILDMAP_BLOCK  2048 /* memory allocation block. */
  
  
--- 32,36 ----
  #include "roadmap_db.h"
  
! #define BUILDMAP_BLOCK  4096 /* memory allocation block. */
  
  

Index: buildmap_turn_restrictions.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_turn_restrictions.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buildmap_turn_restrictions.c	15 Mar 2009 08:11:47 -0000	1.1
--- buildmap_turn_restrictions.c	12 May 2009 13:53:32 -0000	1.2
***************
*** 122,125 ****
--- 122,131 ----
  
     if (block >= BUILDMAP_BLOCK) {
+       buildmap_fatal (0,
+          "Underdimensioned turns table (block %d, BUILDMAP_BLOCK %d)",
+ 	 block, BUILDMAP_BLOCK);
+    }
+ 
+    if (block >= BUILDMAP_BLOCK) {
        buildmap_fatal (0, "too many shape records");
     }
***************
*** 183,187 ****
  }
  
! 
  static int buildmap_turns_compare (const void *r1, const void *r2) {
  
--- 189,198 ----
  }
  
! /**
!  * @brief support function for sorting the turns
!  * @param r1
!  * @param r2
!  * @return
!  */
  static int buildmap_turns_compare (const void *r1, const void *r2) {
  
***************
*** 207,210 ****
--- 218,224 ----
  
  
+ /**
+  * @brief Sort turns by node id, then by line ids.
+  */
  void buildmap_turn_restrictions_sort (void) {
  
***************
*** 227,231 ****
  }
  
! 
  void buildmap_turn_restrictions_save (void) {
  
--- 241,247 ----
  }
  
! /**
!  * @brief Save the turn restrictions database
!  */
  void buildmap_turn_restrictions_save (void) {
  

Index: buildmap_shape.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_shape.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** buildmap_shape.c	29 Mar 2009 11:53:56 -0000	1.13
--- buildmap_shape.c	12 May 2009 13:53:32 -0000	1.14
***************
*** 3,6 ****
--- 3,7 ----
   *
   *   Copyright 2002 Pascal F. Martin
+  *   Copyright (c) 2009 Danny Backx.
   *
   *   This file is part of RoadMap.
***************
*** 149,152 ****
--- 150,159 ----
  
     if (block >= BUILDMAP_BLOCK) {
+       buildmap_fatal (0,
+          "Underdimensioned shape table (block %d, BUILDMAP_BLOCK %d)",
+ 	 block, BUILDMAP_BLOCK);
+    }
+ 
+    if (block >= BUILDMAP_BLOCK) {
        buildmap_fatal (0, "too many shape records");
     }

Index: buildmap_line.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_line.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** buildmap_line.c	30 Mar 2009 18:40:24 -0000	1.25
--- buildmap_line.c	12 May 2009 13:53:32 -0000	1.26
***************
*** 101,105 ****
  
  
! /* FIXME.  this is called for every line, but it misses all of the
   * shape points for the line, so the bounding box is a poor
   * approximation, at best.  polygons have the same problem.
--- 101,111 ----
  
  
! /**
!  * @brief
!  * @param line
!  * @param longitude
!  * @param latitude
!  *
!  * FIXME.  this is called for every line, but it misses all of the
   * shape points for the line, so the bounding box is a poor
   * approximation, at best.  polygons have the same problem.
***************
*** 208,211 ****
--- 214,223 ----
     offset = LineCount % BUILDMAP_BLOCK;
  
+    if (block >= BUILDMAP_BLOCK) {
+       buildmap_fatal (0,
+          "Underdimensioned line table (block %d, BUILDMAP_BLOCK %d)",
+ 	 block, BUILDMAP_BLOCK);
+    }
+ 
     if (Line[block] == NULL) {
  
***************
*** 226,229 ****
--- 238,242 ----
     }
     if (layer <= 0) {
+ 	   abort();
        buildmap_fatal (0, "invalid layer %d in line #%d", layer, tlid);
     }

Index: buildmap_point.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_point.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** buildmap_point.c	4 Aug 2008 17:44:07 -0000	1.10
--- buildmap_point.c	12 May 2009 13:53:32 -0000	1.11
***************
*** 3,6 ****
--- 3,7 ----
   *
   *   Copyright 2002 Pascal F. Martin
+  *   Copyright (c) 2009 Danny Backx.
   *
   *   This file is part of RoadMap.
***************
*** 24,45 ****
   * @file
   * @brief Build a table of all points referenced in lines.
-  *
-  * SYNOPSYS:
-  *
-  *   int  buildmap_point_add        (int longitude, int latitude);
-  *
-  *   int  buildmap_point_get_square (int pointid);
-  *   int  buildmap_point_get_longitude (int pointid);
-  *   int  buildmap_point_get_latitude  (int pointid);
-  *   int  buildmap_point_get_sorted (int pointid);
-  *   int  buildmap_point_get_longitude_sorted (int point);
-  *   int  buildmap_point_get_latitude_sorted  (int point);
-  *   int  buildmap_point_get_square_sorted (int pointid);
-  *
-  * These functions are used to build a table of lines from
-  * the Tiger maps. The objective is double: (1) reduce the size of
-  * the Tiger data by sharing all duplicated information and
-  * (2) produce the index data to serve as the basis for a fast
-  * search mechanism for streets in roadmap.
   */
  
--- 25,28 ----
***************
*** 56,60 ****
  #include "buildmap_square.h"
  
! 
  typedef struct {
     int longitude;
--- 39,45 ----
  #include "buildmap_square.h"
  
! /**
!  * @brief internal structure of the point database while building a map
!  */
  typedef struct {
     int longitude;
***************
*** 75,78 ****
--- 60,66 ----
  static void buildmap_point_register (void);
  
+ /**
+  * @brief initialize the point module
+  */
  static void buildmap_point_initialize (void) {
  
***************
*** 128,131 ****
--- 116,125 ----
     offset = PointCount % BUILDMAP_BLOCK;
  
+    if (block >= BUILDMAP_BLOCK) {
+       buildmap_fatal (0,
+          "Underdimensioned point table (block %d, BUILDMAP_BLOCK %d)",
+ 	 block, BUILDMAP_BLOCK);
+    }
+ 
     if (Point[block] == NULL) {
  
***************
*** 159,163 ****
  }
  
! 
  static BuildMapPoint *buildmap_point_get (int pointid) {
  
--- 153,161 ----
  }
  
! /**
!  * @brief get the id of a point
!  * @param point the point to query
!  * @return id
!  */
  static BuildMapPoint *buildmap_point_get (int pointid) {
  
***************
*** 173,177 ****
  }
  
! 
  int buildmap_point_get_square (int pointid) {
  
--- 171,179 ----
  }
  
! /**
!  * @brief get the square of a point
!  * @param point the point to query
!  * @return square
!  */
  int buildmap_point_get_square (int pointid) {
  
***************
*** 179,183 ****
  }
  
! 
  int buildmap_point_get_longitude (int pointid) {
  
--- 181,189 ----
  }
  
! /**
!  * @brief get the longitude of a point
!  * @param point the point to query
!  * @return longitude
!  */
  int buildmap_point_get_longitude (int pointid) {
  
***************
*** 185,189 ****
  }
  
! 
  int buildmap_point_get_latitude  (int pointid) {
  
--- 191,199 ----
  }
  
! /**
!  * @brief get the latitude of a point
!  * @param point the point to query
!  * @return latitude
!  */
  int buildmap_point_get_latitude  (int pointid) {
  
***************
*** 191,195 ****
  }
  
! 
  int buildmap_point_get_sorted (int pointid) {
  
--- 201,209 ----
  }
  
! /**
!  * @brief get the id of a point
!  * @param point the point to query
!  * @return id
!  */
  int buildmap_point_get_sorted (int pointid) {
  
***************
*** 201,205 ****
  }
  
! 
  int buildmap_point_get_square_sorted (int point) {
  
--- 215,223 ----
  }
  
! /**
!  * @brief get the square of a sorted point
!  * @param point the point to query
!  * @return square
!  */
  int buildmap_point_get_square_sorted (int point) {
  
***************
*** 214,218 ****
  }
  
! 
  int  buildmap_point_get_longitude_sorted (int point) {
  
--- 232,240 ----
  }
  
! /**
!  * @brief get the longitude of a sorted point
!  * @param point the point to query
!  * @return longitude
!  */
  int  buildmap_point_get_longitude_sorted (int point) {
  
***************
*** 227,231 ****
  }
  
! 
  int  buildmap_point_get_latitude_sorted  (int point) {
  
--- 249,257 ----
  }
  
! /**
!  * @brief get the latitude of a sorted point
!  * @param point the point to query
!  * @return latitude
!  */
  int  buildmap_point_get_latitude_sorted  (int point) {
  
***************
*** 240,244 ****
  }
  
! 
  static int buildmap_point_compare (const void *r1, const void *r2) {
  
--- 266,275 ----
  }
  
! /**
!  * @brief compare two points
!  * @param r1 the first point
!  * @param r2 the second point
!  * @return 0 if equal
!  */
  static int buildmap_point_compare (const void *r1, const void *r2) {
  
***************
*** 271,274 ****
--- 302,308 ----
  }
  
+ /**
+  * @brief sort the points
+  */
  void buildmap_point_sort (void) {
  
***************
*** 319,323 ****
  }
  
! 
  static void buildmap_point_save (void) {
  
--- 353,359 ----
  }
  
! /**
!  * @brief save points into the database file
!  */
  static void buildmap_point_save (void) {
  
***************
*** 387,391 ****
  }
  
! 
  static void buildmap_point_summary (void) {
  
--- 423,429 ----
  }
  
! /**
!  * @brief print a summary for this module
!  */
  static void buildmap_point_summary (void) {
  
***************
*** 394,398 ****
  }
  
! 
  static void buildmap_point_reset (void) {
  
--- 432,438 ----
  }
  
! /**
!  * @brief remove all points
!  */
  static void buildmap_point_reset (void) {
  
***************
*** 418,422 ****
  }
  
! 
  static buildmap_db_module BuildMapPointModule = {
     "point",
--- 458,464 ----
  }
  
! /**
!  * @brief structure to register the point module
!  */
  static buildmap_db_module BuildMapPointModule = {
     "point",
***************
*** 427,433 ****
  };
  
! 
  static void buildmap_point_register (void) {
     buildmap_db_register (&BuildMapPointModule);
  }
- 
--- 469,476 ----
  };
  
! /**
!  * @brief register the point module with the buildmap application
!  */
  static void buildmap_point_register (void) {
     buildmap_db_register (&BuildMapPointModule);
  }

Index: buildmap_place.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_place.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** buildmap_place.c	27 Nov 2007 13:44:06 -0000	1.6
--- buildmap_place.c	12 May 2009 13:53:32 -0000	1.7
***************
*** 1,7 ****
! /* buildmap_place.c - Build a place table & index for RoadMap.
!  *
   * LICENSE:
   *
   *   Copyright 2004 Stephen Woodbridge <wo...@sw...>
   *
   *   This file is part of RoadMap.
--- 1,7 ----
! /*
   * LICENSE:
   *
   *   Copyright 2004 Stephen Woodbridge <wo...@sw...>
+  *   Copyright (c) 2009 Danny Backx.
   *
   *   This file is part of RoadMap.
***************
*** 20,46 ****
   *   along with RoadMap; if not, write to the Free Software
   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  *
!  * SYNOPSYS:
!  *
!  *   int  buildmap_place_add (int name, int layer, int point);
!  *
!  *   int  buildmap_place_get_sorted  (int place);
!  *   int buildmap_place_get_name_sorted (int place);
!  *   BuildMapPlace *buildmap_place_get_record (int place);
!  *   BuildMapPlace *buildmap_place_get_record_sorted (int place);
!  *   void buildmap_place_find_sorted (int name);
!  *   void buildmap_place_get_position 
!  *           (int place, int *longitude, int *latitude);
!  *   int buildmap_place_get_point_sorted (int place);
!  *   void buildmap_place_get_position_sorted
!  *           (int place, int *longitude, int *latitude);
!  *   void buildmap_place_get_square_sorted (int place);
!  *   int buildmap_place_compare (const void *r1, const void *r2);
   *
   * These functions are used to build a table of places from
!  * the various data sources. The objective is double: (1) reduce 
!  * the size of the data by sharing all duplicated information and
!  * (2) produce the index data to serve as the basis for a fast
!  * search mechanism for places in roadmap.
   */
  
--- 20,31 ----
   *   along with RoadMap; if not, write to the Free Software
   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  */
! 
! /**
!  * @file
!  * @brief Build a place table & index for RoadMap.
   *
   * These functions are used to build a table of places from
!  * the various data sources.
   */
  
***************
*** 79,83 ****
  static void buildmap_place_register (void);
  
! 
  static void buildmap_place_initialize (void) {
  
--- 64,70 ----
  static void buildmap_place_register (void);
  
! /**
!  * @brief
!  */
  static void buildmap_place_initialize (void) {
  
***************
*** 94,98 ****
  }
  
! 
  int buildmap_place_add (int name, int layer, int point) {
  
--- 81,91 ----
  }
  
! /**
!  * @brief
!  * @param name
!  * @param layer
!  * @param point
!  * @return
!  */
  int buildmap_place_add (int name, int layer, int point) {
  
***************
*** 108,111 ****
--- 101,110 ----
     offset = PlaceCount % BUILDMAP_BLOCK;
  
+    if (block >= BUILDMAP_BLOCK) {
+       buildmap_fatal (0,
+          "Underdimensioned place table (block %d, BUILDMAP_BLOCK %d)",
+ 	 block, BUILDMAP_BLOCK);
+    }
+ 
     if (Place[block] == NULL) {
  
***************
*** 134,138 ****
  }
  
! 
  int  buildmap_place_find_sorted (int name) {
  
--- 133,141 ----
  }
  
! /**
!  * @brief
!  * @param name
!  * @return
!  */
  int  buildmap_place_find_sorted (int name) {
  
***************
*** 158,162 ****
  }
  
! 
  static BuildMapPlace *buildmap_place_get_record (int place) {
  
--- 161,169 ----
  }
  
! /**
!  * @brief
!  * @param place
!  * @return
!  */
  static BuildMapPlace *buildmap_place_get_record (int place) {
  
***************
*** 168,172 ****
  }
  
! 
  static BuildMapPlace *buildmap_place_get_record_sorted (int place) {
  
--- 175,183 ----
  }
  
! /**
!  * @brief
!  * @param place
!  * @return
!  */
  static BuildMapPlace *buildmap_place_get_record_sorted (int place) {
  
***************
*** 184,188 ****
  }
  
! 
  int buildmap_place_get_point_sorted (int place) {
  
--- 195,203 ----
  }
  
! /**
!  * @brief
!  * @param place
!  * @return
!  */
  int buildmap_place_get_point_sorted (int place) {
  
***************
*** 192,195 ****
--- 207,216 ----
  }
  
+ /**
+  * @brief
+  * @param place
+  * @param longitude
+  * @param latitude
+  */
  void buildmap_place_get_position (int place, int *longitude, int *latitude) {
  
***************
*** 200,204 ****
  }
  
! 
  void buildmap_place_get_position_sorted
            (int place, int *longitude, int *latitude) {
--- 221,230 ----
  }
  
! /**
!  * @brief
!  * @param place
!  * @param longitude
!  * @param latitude
!  */
  void buildmap_place_get_position_sorted
            (int place, int *longitude, int *latitude) {
***************
*** 210,214 ****
  }
  
! 
  int  buildmap_place_get_sorted (int place) {
  
--- 236,244 ----
  }
  
! /**
!  * @brief
!  * @param place
!  * @return
!  */
  int  buildmap_place_get_sorted (int place) {
  
***************
*** 222,226 ****
  }
  
! 
  int buildmap_place_get_name_sorted (int place) {
  
--- 252,260 ----
  }
  
! /**
!  * @brief
!  * @param place
!  * @return
!  */
  int buildmap_place_get_name_sorted (int place) {
  
***************
*** 228,232 ****
  }
  
! 
  int buildmap_place_get_square_sorted (int place) {
  
--- 262,270 ----
  }
  
! /**
!  * @brief
!  * @param place
!  * @return
!  */
  int buildmap_place_get_square_sorted (int place) {
  
***************
*** 235,238 ****
--- 273,282 ----
  }
  
+ /**
+  * @brief
+  * @param r1
+  * @param r2
+  * @return
+  */
  
  static int buildmap_place_compare (const void *r1, const void *r2) {
***************
*** 270,273 ****
--- 314,320 ----
  }
  
+ /**
+  * @brief
+  */
  static void buildmap_place_sort (void) {
  
***************
*** 319,323 ****
  }
  
! 
  static void buildmap_place_save (void) {
  
--- 366,372 ----
  }
  
! /**
!  * @brief
!  */
  static void buildmap_place_save (void) {
  
***************
*** 468,472 ****
  }
  
! 
  static void buildmap_place_summary (void) {
  
--- 517,523 ----
  }
  
! /**
!  * @brief
!  */
  static void buildmap_place_summary (void) {
  
***************
*** 476,480 ****
  }
  
! 
  static void buildmap_place_reset (void) {
  
--- 527,533 ----
  }
  
! /**
!  * @brief
!  */
  static void buildmap_place_reset (void) {
  
***************
*** 497,501 ****
  }
  
! 
  static buildmap_db_module BuildMapPlaceModule = {
     "place",
--- 550,556 ----
  }
  
! /**
!  * @brief
!  */
  static buildmap_db_module BuildMapPlaceModule = {
     "place",
***************
*** 505,512 ****
     buildmap_place_reset
  }; 
!       
!          
  static void buildmap_place_register (void) {
     buildmap_db_register (&BuildMapPlaceModule);
  }
- 
--- 560,568 ----
     buildmap_place_reset
  }; 
!    
! /**
!  * @brief
!  */
  static void buildmap_place_register (void) {
     buildmap_db_register (&BuildMapPlaceModule);
  }

Index: buildmap_street.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_street.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** buildmap_street.c	29 Mar 2009 11:54:47 -0000	1.9
--- buildmap_street.c	12 May 2009 13:53:32 -0000	1.10
***************
*** 3,6 ****
--- 3,7 ----
   *
   *   Copyright 2002 Pascal F. Martin
+  *   Copyright (c) 2009 Danny Backx.
   *
   *   This file is part of RoadMap.
***************
*** 175,178 ****
--- 176,185 ----
     offset = StreetCount % BUILDMAP_BLOCK;
  
+    if (block >= BUILDMAP_BLOCK) {
+       buildmap_fatal (0,
+          "Underdimensioned street table (block %d, BUILDMAP_BLOCK %d)",
+ 	 block, BUILDMAP_BLOCK);
+    }
+ 
     if (Street[block] == NULL) {
  

Index: buildmap_polygon.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_polygon.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** buildmap_polygon.c	24 Dec 2007 19:26:36 -0000	1.14
--- buildmap_polygon.c	12 May 2009 13:53:32 -0000	1.15
***************
*** 1,7 ****
! /* buildmap_polygon.c - Build a line table & index for RoadMap.
!  *
   * LICENSE:
   *
   *   Copyright 2002 Pascal F. Martin
   *
   *   This file is part of RoadMap.
--- 1,7 ----
! /*
   * LICENSE:
   *
   *   Copyright 2002 Pascal F. Martin
+  *   Copyright (c) 2009 Danny Backx.
   *
   *   This file is part of RoadMap.
***************
*** 20,39 ****
   *   along with RoadMap; if not, write to the Free Software
   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  *
!  * SYNOPSYS:
!  *
!  *   int  buildmap_polygon_add_landmark
!  *           (int landid, char cfcc, RoadMapString name);
!  *   int  buildmap_polygon_add (int landid, RoadMapString cenid, int polyid);
!  *   int  buildmap_polygon_add_line
!  *           (RoadMapString cenid, int polyid, int tlid, int side);
!  *
!  *   int  buildmap_polygon_use_line (int tlid);
!  *
!  * These functions are used to build a table of lines from
!  * the Tiger maps. The objective is double: (1) reduce the size of
!  * the Tiger data by sharing all duplicated information and
!  * (2) produce the index data to serve as the basis for a fast
!  * search mechanism for streets in roadmap.
   *
   * This module considers a single area to be described by a unique landmark
--- 20,28 ----
   *   along with RoadMap; if not, write to the Free Software
   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  */
! 
! /**
!  * @file
!  * @brief Build a line table & index for RoadMap.
   *
   * This module considers a single area to be described by a unique landmark
***************
*** 488,491 ****
--- 477,486 ----
     offset = LandmarkCount % BUILDMAP_BLOCK;
  
+    if (block >= BUILDMAP_BLOCK) {
+       buildmap_fatal (0,
+          "Underdimensioned landmark table (block %d, BUILDMAP_BLOCK %d)",
+ 	 block, BUILDMAP_BLOCK);
+    }
+ 
     if (Landmark[block] == NULL) {
  

Index: buildmap_dbwrite.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_dbwrite.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** buildmap_dbwrite.c	31 Jul 2007 15:31:16 -0000	1.7
--- buildmap_dbwrite.c	12 May 2009 13:53:32 -0000	1.8
***************
*** 1,7 ****
! /* buildmap_dbwrite.c - a module to write a roadmap database.
!  *
   * LICENSE:
   *
   *   Copyright 2002 Pascal F. Martin
   *
   *   This file is part of RoadMap.
--- 1,7 ----
! /*
   * LICENSE:
   *
   *   Copyright 2002 Pascal F. Martin
+  *   Copyright (c) 2009 Danny Backx.
   *
   *   This file is part of RoadMap.
***************
*** 20,35 ****
   *   along with RoadMap; if not, write to the Free Software
   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  *
!  * SYNOPSYS:
!  *
!  *   #include "buildmap.h"
!  *
!  *   int buildmap_db_open (char *path, char *name);
!  *
!  *   buildmap_db *buildmap_db_add_section (buildmap_db *parent, char *name);
!  *   int    buildmap_db_add_data (buildmap_db *section, int count, int size);
!  *   void  *buildmap_db_get_data (buildmap_db *section);
!  *
!  *   void buildmap_db_close (void);
   */
  
--- 20,28 ----
   *   along with RoadMap; if not, write to the Free Software
   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  */
! 
! /**
!  * @file
!  * @brief buildmap_dbwrite.c - a module to write a roadmap database.
   */
  
***************
*** 63,67 ****
  static int BuildmapModuleCount = 0;
  
! 
  static void buildmap_db_repair_tree (buildmap_db *section) {
  
--- 56,63 ----
  static int BuildmapModuleCount = 0;
  
! /**
!  * @brief
!  * @param section
!  */
  static void buildmap_db_repair_tree (buildmap_db *section) {
  
***************
*** 77,81 ****
  }
  
! 
  static int buildmap_db_extend (int size) {
  
--- 73,80 ----
  }
  
! /**
!  * @brief
!  * @param size
!  */
  static int buildmap_db_extend (int size) {
  
***************
*** 120,124 ****
  }
  
! 
  static void buildmap_db_propagate (buildmap_db *parent, int size) {
  
--- 119,127 ----
  }
  
! /**
!  * @brief
!  * @param parent
!  * @param size
!  */
  static void buildmap_db_propagate (buildmap_db *parent, int size) {
  
***************
*** 130,134 ****
  }
  
! 
  static void buildmap_db_update_tree
                 (buildmap_db *parent, buildmap_db *section) {
--- 133,141 ----
  }
  
! /**
!  * @brief
!  * @param parent
!  * @param section
!  */
  static void buildmap_db_update_tree
                 (buildmap_db *parent, buildmap_db *section) {
***************
*** 153,157 ****
  }
  
! 
  int buildmap_db_open (const char *path, const char *name) {
  
--- 160,169 ----
  }
  
! /**
!  * @brief
!  * @param path
!  * @param name
!  * @return
!  */
  int buildmap_db_open (const char *path, const char *name) {
  
***************
*** 188,192 ****
  }
  
! 
  buildmap_db *buildmap_db_add_section (buildmap_db *parent, const char *name) {
  
--- 200,209 ----
  }
  
! /**
!  * @brief
!  * @param parent
!  * @param name
!  * @return
!  */
  buildmap_db *buildmap_db_add_section (buildmap_db *parent, const char *name) {
  
***************
*** 244,248 ****
  }
  
! 
  int buildmap_db_add_data (buildmap_db *section, int count, int size) {
  
--- 261,271 ----
  }
  
! /**
!  * @brief
!  * @param section
!  * @param count
!  * @param size
!  * @return
!  */
  int buildmap_db_add_data (buildmap_db *section, int count, int size) {
  
***************
*** 277,281 ****
  }
  
! 
  void *buildmap_db_get_data (buildmap_db *section) {
  
--- 300,308 ----
  }
  
! /**
!  * @brief
!  * @param section
!  * @return
!  */
  void *buildmap_db_get_data (buildmap_db *section) {
  
***************
*** 283,287 ****
  }
  
! 
  static void buildmap_db_free (buildmap_db *node) {
  
--- 310,318 ----
  }
  
! /**
!  * @brief
!  * @param node
!  * @return
!  */
  static void buildmap_db_free (buildmap_db *node) {
  
***************
*** 299,303 ****
  }
  
! 
  void buildmap_db_close (void) {
  
--- 330,337 ----
  }
  
! /**
!  * @brief
!  * @return
!  */
  void buildmap_db_close (void) {
  
***************
*** 333,337 ****
  }
  
! 
  buildmap_db *buildmap_db_add_child (buildmap_db *parent,
                                      char *name,
--- 367,378 ----
  }
  
! /**
!  * @brief
!  * @param parent
!  * @param name
!  * @param count
!  * @param size
!  * @return
!  */
  buildmap_db *buildmap_db_add_child (buildmap_db *parent,
                                      char *name,
***************
*** 359,362 ****
--- 400,407 ----
   */
  
+ /**
+  * @brief register a module that can write a map
+  * @param module pointer to the required structure
+  */
  void buildmap_db_register (const buildmap_db_module *module) {
  
***************
*** 376,380 ****
  }
  
! 
  void buildmap_db_sort (void) {
  
--- 421,428 ----
  }
  
! /**
!  * @brief
!  * @return
!  */
  void buildmap_db_sort (void) {
  
***************
*** 389,392 ****
--- 437,443 ----
  
  
+ /**
+  * @brief save the map
+  */
  void buildmap_db_save (void) {
  
***************
*** 400,404 ****
  }
  
! 
  void buildmap_db_summary (void) {
  
--- 451,458 ----
  }
  
! /**
!  * @brief
!  * @return
!  */
  void buildmap_db_summary (void) {
  
***************
*** 412,416 ****
  }
  
! 
  void buildmap_db_reset (void) {
  
--- 466,473 ----
  }
  
! /**
!  * @brief
!  * @return
!  */
  void buildmap_db_reset (void) {
  
***************
*** 423,425 ****
     }
  }
- 
--- 480,481 ----

[Roadmap-commit] roadmap/web Makefile,1.18,1.19

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/web
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27820

Modified Files:
	Makefile 
Log Message:
Recognize my environment so both Paul and I can use this without editing
the Makefile.


Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/web/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Makefile	8 Feb 2009 21:16:28 -0000	1.18
--- Makefile	12 May 2009 13:06:23 -0000	1.19
***************
*** 88,91 ****
--- 88,97 ----
  SITESOURCE_COPIED = $(addprefix .copied$(SF)-, $(SITESOURCE))
  
+ # Support both Paul and Danny
+ ifeq ($(USER),danny)
+ SF_UID=dannybackx
+ else
+ SF_UID=pgf
+ endif
  # use 'make SF=1 install' to send to SF
  ifeq ($(strip $(SF)),)
***************
*** 94,98 ****
  else
  OUR_SITE_REFERENCE = roadmap.sourceforge.net
! OUR_SITE_ACCESS = pgf,ro...@we...:/home/groups/r/ro/roadmap/htdocs
  endif
  
--- 100,104 ----
  else
  OUR_SITE_REFERENCE = roadmap.sourceforge.net
! OUR_SITE_ACCESS = $(SF_UID),ro...@we...:htdocs
  endif
  
***************
*** 191,195 ****
  webdoc: $(T2T_WEBDOCS)
  
! install: webdoc $(SITESOURCE_COPIED)
  
  clean-webdoc:
--- 197,201 ----
  webdoc: $(T2T_WEBDOCS)
  
! install:	webdoc $(SITESOURCE_COPIED)
  
  clean-webdoc: