roadmap-commit Mailing List for RoadMap (Page 98)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	roadmap_start.c roadmap_gpx.c 
Log Message:
consolidated EXPAT ifdefs.  added label init calls in roadmap_start.c


Index: roadmap_gpx.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_gpx.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_gpx.c	21 Apr 2006 18:37:59 -0000	1.3
--- roadmap_gpx.c	26 Jun 2006 19:51:14 -0000	1.4
***************
*** 24,30 ****
  
  
! #ifndef NO_EXPAT
  #include <expat.h>
  #endif
  #include "roadmap.h"
  #include "roadmap_trip.h"
--- 24,31 ----
  
  
! #ifdef ROADMAP_USES_EXPAT
  #include <expat.h>
  #endif
+ 
  #include "roadmap.h"
  #include "roadmap_trip.h"
***************
*** 33,50 ****
  #include "gpx/defs.h"
  
- 
- #ifdef NO_EXPAT
- static void roadmap_gpx_tell_no_expat (void) {
- 
-     static int roadmap_gpx_told_no_expat = 0;
- 
-     if (! roadmap_gpx_told_no_expat) {
-        roadmap_log (ROADMAP_ERROR, "No GPX file import (no expat library)");
-        roadmap_gpx_told_no_expat = 1;
-     }
- }
- #endif
- 
- 
  void fatal (const char *fmt, ...) {
      char buf[256];
--- 34,37 ----
***************
*** 67,72 ****
  }
  
! void gpx_rd_cleanup(void);
! void gpx_rd_prepare(void);
  
  int
--- 54,58 ----
  }
  
! #ifdef ROADMAP_USES_EXPAT
  
  int
***************
*** 74,81 ****
          const char *name, queue *w, queue *r, queue *t)
  {
- #ifdef NO_EXPAT
-     roadmap_gpx_tell_no_expat ();
-     return 0;
- #else
  
      queue *elem, *tmp;
--- 60,63 ----
***************
*** 98,102 ****
  
      return ret;
- #endif // NO_EXPAT
  }
  
--- 80,83 ----
***************
*** 169,184 ****
  
      return ret;
- 
  }
  
- 
  int
  roadmap_gpx_write_file(const char *path, const char *name,
          queue *w, queue *r, queue *t)
  {
- #ifdef NO_EXPAT
-     roadmap_gpx_tell_no_expat ();
-     return 0;
- #else
      FILE *fp;
      int ret;
--- 150,159 ----
***************
*** 193,197 ****
  
      return ret;
- #endif // NO_EXPAT
  }
  
--- 168,171 ----
***************
*** 199,206 ****
          queue *waypoints)
  {
- #ifdef NO_EXPAT
-     roadmap_gpx_tell_no_expat ();
-     return 0;
- #else
      FILE *fp;
      int ret;
--- 173,176 ----
***************
*** 215,219 ****
  
      return ret;
- #endif // NO_EXPAT
  }
  
--- 185,188 ----
***************
*** 221,228 ****
          route_head *route)
  {
- #ifdef NO_EXPAT
-     roadmap_gpx_tell_no_expat ();
-     return 0;
- #else
      FILE *fp;
      int ret;
--- 190,193 ----
***************
*** 241,245 ****
  
      return ret;
- #endif // NO_EXPAT
  }
  
--- 206,209 ----
***************
*** 247,254 ****
          route_head *track)
  {
- #ifdef NO_EXPAT
-     roadmap_gpx_tell_no_expat ();
-     return 0;
- #else
      FILE *fp;
      int ret;
--- 211,214 ----
***************
*** 267,270 ****
  
      return ret;
- #endif // NO_EXPAT
  }
--- 227,308 ----
  
      return ret;
  }
+ 
+ #else // ROADMAP_USES_EXPAT
+ 
+ 
+ static void roadmap_gpx_tell_no_expat (void) {
+ 
+     static int roadmap_gpx_told_no_expat = 0;
+ 
+     if (! roadmap_gpx_told_no_expat) {
+        roadmap_log (ROADMAP_ERROR, "No GPX file import (no expat library)");
+        roadmap_gpx_told_no_expat = 1;
+     }
+ }
+ 
+ int
+ roadmap_gpx_read_file(const char *path,
+         const char *name, queue *w, queue *r, queue *t)
+ {
+     roadmap_gpx_tell_no_expat ();
+     return 0;
+ }
+ 
+ int
+ roadmap_gpx_read_waypoints
+         (const char *path, const char *name, queue *waypoints)
+ {
+     roadmap_gpx_tell_no_expat ();
+     return 0;
+ 
+ }
+ 
+ int
+ roadmap_gpx_read_one_track(
+     const char *path, const char *name, route_head **track)
+ {
+     roadmap_gpx_tell_no_expat ();
+     return 0;
+ 
+ }
+ 
+ int
+ roadmap_gpx_read_one_route(
+     const char *path, const char *name, route_head **route)
+ {
+     roadmap_gpx_tell_no_expat ();
+     return 0;
+ }
+ 
+ int
+ roadmap_gpx_write_file(const char *path, const char *name,
+         queue *w, queue *r, queue *t)
+ {
+     roadmap_gpx_tell_no_expat ();
+     return 0;
+ }
+ 
+ int roadmap_gpx_write_waypoints(const char *path, const char *name,
+         queue *waypoints)
+ {
+     roadmap_gpx_tell_no_expat ();
+     return 0;
+ }
+ 
+ int roadmap_gpx_write_route(const char *path, const char *name,
+         route_head *route)
+ {
+     roadmap_gpx_tell_no_expat ();
+     return 0;
+ }
+ 
+ int roadmap_gpx_write_track(const char *path, const char *name,
+         route_head *track)
+ {
+     roadmap_gpx_tell_no_expat ();
+     return 0;
+ }
+ 
+ #endif // ROADMAP_USES_EXPAT
+ 

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** roadmap_start.c	26 Jun 2006 16:38:10 -0000	1.95
--- roadmap_start.c	26 Jun 2006 19:51:14 -0000	1.96
***************
*** 63,66 ****
--- 63,67 ----
  #include "roadmap_fuzzy.h"
  #include "roadmap_navigate.h"
+ #include "roadmap_label.h"
  #include "roadmap_display.h"
  #include "roadmap_locator.h"
***************
*** 177,238 ****
  }
  
  static void roadmap_start_open_trip (void) {
-     
- #ifdef NO_EXPAT
-     roadmap_log (ROADMAP_ERROR,
-                  "This feature is not available (no expat library)");
- #else
      roadmap_trip_load_ask (0);
- #endif
  }
  
  static void roadmap_start_merge_trip (void) {
-     
- #ifdef NO_EXPAT
-     roadmap_log (ROADMAP_ERROR,
-                  "This feature is not available (no expat library)");
- #else
      roadmap_trip_load_ask (1);
- #endif
  }
  
  static void roadmap_start_save_trip (void) {
- 
- #ifdef NO_EXPAT
-     roadmap_log (ROADMAP_ERROR,
-                  "This feature is not available (no expat library)");
- #else
      roadmap_trip_save (1);
- #endif
  }
  
  static void roadmap_start_save_trip_as (void) {
- 
- #ifdef NO_EXPAT
-     roadmap_log (ROADMAP_ERROR,
-                  "This feature is not available (no expat library)");
- #else
      roadmap_trip_save_as (1);
- #endif
  }
  
  static void roadmap_start_save_track (void) {
- #ifdef NO_EXPAT
-     roadmap_log (ROADMAP_ERROR,
-                  "This feature is not available (no expat library)");
- #else
      roadmap_track_save();
- #endif
  }
  
  static void roadmap_start_merge_landmark (void) {
! #ifdef NO_EXPAT
      roadmap_log (ROADMAP_ERROR,
                   "This feature is not available (no expat library)");
- #else
-     roadmap_landmark_merge ();
- #endif
  }
  
  static void roadmap_start_route (void) {
      
--- 178,227 ----
  }
  
+ #ifdef ROADMAP_USES_EXPAT
  static void roadmap_start_open_trip (void) {
      roadmap_trip_load_ask (0);
  }
  
  static void roadmap_start_merge_trip (void) {
      roadmap_trip_load_ask (1);
  }
  
  static void roadmap_start_save_trip (void) {
      roadmap_trip_save (1);
  }
  
  static void roadmap_start_save_trip_as (void) {
      roadmap_trip_save_as (1);
  }
  
  static void roadmap_start_save_track (void) {
      roadmap_track_save();
  }
  
  static void roadmap_start_merge_landmark (void) {
!     roadmap_landmark_merge ();
! }
! 
! #else // ROADMAP_USES_EXPAT
! 
! static void roadmap_start_no_expat (void) {
      roadmap_log (ROADMAP_ERROR,
                   "This feature is not available (no expat library)");
  }
  
+ static void roadmap_start_open_trip (void) { roadmap_start_no_expat(); }
+ 
+ static void roadmap_start_merge_trip (void) { roadmap_start_no_expat(); }
+ 
+ static void roadmap_start_save_trip (void) { roadmap_start_no_expat(); }
+ 
+ static void roadmap_start_save_trip_as (void) { roadmap_start_no_expat(); }
+ 
+ static void roadmap_start_save_track (void) { roadmap_start_no_expat(); }
+ 
+ static void roadmap_start_merge_landmark (void) { roadmap_start_no_expat(); }
+ 
+ #endif // ROADMAP_USES_EXPAT
+ 
  static void roadmap_start_route (void) {
      
***************
*** 449,452 ****
--- 438,457 ----
        "Stop following the current route", roadmap_trip_route_stop},
  
+    {"toggleview", "2D/3D View", "M", NULL,
+       "Toggle view mode 2D / 3D", roadmap_screen_toggle_view_mode},
+ 
+    {"togglelabels", "Show/Hide Street Labels", "Labels", NULL,
+       "Show or Hide the names of streets", roadmap_screen_toggle_labels},
+ 
+    {"toggleorientation", "Dynamic/Fixed Orientation", "", NULL,
+       "Toggle orientation mode dynamic / fixed",
+       roadmap_screen_toggle_orientation_mode},
+ 
+    {"IncHorizon", "Increase Horizon", "I", NULL,
+       "Increase the 3D horizon", roadmap_screen_increase_horizon},
+ 
+    {"DecHorizon", "Decrease Horizon", "DI", NULL,
+       "Decrease the 3D horizon", roadmap_screen_decrease_horizon},
+ 
     {"tracktoggle", "Show/Hide Track", "Track", NULL,
        "Show or Hide the GPS breadcrumb track", roadmap_track_toggle_display},
***************
*** 555,558 ****
--- 560,567 ----
     "right",
     "down",
+    "togglelabels",
+    "toggleorientation",
+    "toggleview",
+    "full",
  
     RoadMapFactorySeparator,
***************
*** 979,982 ****
--- 988,992 ----
     roadmap_fuzzy_initialize    ();
     roadmap_navigate_initialize ();
+    roadmap_label_initialize    ();
     roadmap_display_initialize  ();
     roadmap_voice_initialize    ();
***************
*** 1011,1014 ****
--- 1021,1025 ----
     roadmap_math_restore_zoom ();
     roadmap_start_window      ();
+    roadmap_label_activate    ();
     roadmap_sprite_load       ();
     roadmap_layer_load        ();
***************
*** 1018,1022 ****
     roadmap_history_load ();
  
! #ifndef NO_EXPAT
     roadmap_track_autoload ();
     roadmap_landmark_load ();
--- 1029,1033 ----
     roadmap_history_load ();
  
! #ifdef ROADMAP_USES_EXPAT
     roadmap_track_autoload ();
     roadmap_landmark_load ();
***************
*** 1034,1043 ****
     roadmap_trip_restore_focus ();
  
! #ifdef NO_EXPAT
!    roadmap_start_create_trip ();
! #else
     if ( ! roadmap_trip_load (1, 0)) {
        roadmap_start_create_trip ();
     }
  #endif
  
--- 1045,1054 ----
     roadmap_trip_restore_focus ();
  
! #ifdef ROADMAP_USES_EXPAT
     if ( ! roadmap_trip_load (1, 0)) {
        roadmap_start_create_trip ();
     }
+ #else
+    roadmap_start_create_trip ();
  #endif
  
***************
*** 1056,1060 ****
      roadmap_driver_shutdown ();
      roadmap_history_save();
! #ifndef NO_EXPAT
      roadmap_track_autosave ();
      roadmap_landmark_save ();
--- 1067,1071 ----
      roadmap_driver_shutdown ();
      roadmap_history_save();
! #ifdef ROADMAP_USES_EXPAT
      roadmap_track_autosave ();
      roadmap_landmark_save ();

2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (92)	Dec (141)
2006	Jan (126)	Feb (72)	Mar (31)	Apr (200)	May (81)	Jun (130)	Jul (112)	Aug (134)	Sep (76)	Oct (89)	Nov (153)	Dec (9)
2007	Jan (59)	Feb (82)	Mar (50)	Apr (20)	May (9)	Jun (81)	Jul (41)	Aug (109)	Sep (91)	Oct (87)	Nov (33)	Dec (60)
2008	Jan (21)	Feb (15)	Mar (38)	Apr (75)	May (59)	Jun (46)	Jul (30)	Aug (20)	Sep (35)	Oct (32)	Nov (34)	Dec (19)
2009	Jan (29)	Feb (71)	Mar (54)	Apr (17)	May (4)	Jun	Jul (3)	Aug	Sep	Oct	Nov	Dec (3)
2010	Jan	Feb	Mar	Apr	May	Jun	Jul (3)	Aug (58)	Sep (7)	Oct (7)	Nov (12)	Dec (18)
2011	Jan (17)	Feb (29)	Mar (11)	Apr (5)	May (1)	Jun	Jul	Aug (11)	Sep	Oct	Nov	Dec
2012	Jan (2)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr	May	Jun (87)	Jul	Aug	Sep	Oct	Nov	Dec
2015	Jan	Feb	Mar	Apr	May (44)	Jun (79)	Jul (16)	Aug (31)	Sep	Oct (51)	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (2)	Oct	Nov	Dec

roadmap-commit Mailing List for RoadMap (Page 98)

roadmap-commit — track CVS commits