roadmap-commit — track CVS commits

[Roadmap-commit] roadmap/src/gtk roadmap_canvas.c,1.16,1.17

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

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

Modified Files:
	roadmap_canvas.c 
Log Message:

from Alessandro Briosi:
 > 
 > finally had some time to clean up and "reimplement" the ADVANCED_STYLE 
 > patches.
 > 
 > part 2. roadmap_advanced_style.patch which adds all the additional 
 > definitions (based on patch 1) to be loaded.
 > The only implementation available right now is qt4, I have added all the 
 > "stubs" functions as in previous patch.
 > 


Index: roadmap_canvas.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk/roadmap_canvas.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** roadmap_canvas.c	21 Apr 2008 16:49:07 -0000	1.16
--- roadmap_canvas.c	7 Oct 2008 00:42:21 -0000	1.17
***************
*** 198,201 ****
--- 198,222 ----
  }
  
+ #if defined(ROADMAP_ADVANCED_STYLE)
+ /* this are stubs */
+ void roadmap_canvas_set_opacity (int opacity) {}
+ 
+ void roadmap_canvas_set_linejoin(const char *join) {}
+ void roadmap_canvas_set_linecap(const char *cap) {}
+ 
+ void roadmap_canvas_set_brush_color(const char *color) {}
+ void roadmap_canvas_set_brush_style(const char *style) {}
+ void roadmap_canvas_set_brush_isbackground(int isbackground) {}
+ 
+ void roadmap_canvas_set_label_font_name(const char *name) {}
+ void roadmap_canvas_set_label_font_color(const char *color) {}
+ void roadmap_canvas_set_label_font_size(int size) {}
+ void roadmap_canvas_set_label_font_spacing(int spacing) {}
+ void roadmap_canvas_set_label_font_weight(const char *weight) {}
+ void roadmap_canvas_set_label_font_style(int style) {}
+ 
+ void roadmap_canvas_set_label_buffer_color(const char *color) {}
+ void roadmap_canvas_set_label_buffer_size(int size) {}
+ #endif /* ROADMAP_ADVANCED_STYLE */
  
  void roadmap_canvas_erase (void) {

[Roadmap-commit] roadmap/src config.mk, 1.32, 1.33 options.mk, 1.28, 1.29 roadmap_canvas.h, 1.11, 1.12 roadmap_label.c, 1.31, 1.32 roadmap_label.h, 1.9, 1.10 roadmap_landmark.c, 1.16, 1.17 roadmap_layer.c, 1.17, 1.18 roadmap_screen.c, 1.131, 1.132

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

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

Modified Files:
	config.mk options.mk roadmap_canvas.h roadmap_label.c 
	roadmap_label.h roadmap_landmark.c roadmap_layer.c 
	roadmap_screen.c 
Log Message:

from Alessandro Briosi:
 > 
 > finally had some time to clean up and "reimplement" the ADVANCED_STYLE 
 > patches.
 > 
 > part 2. roadmap_advanced_style.patch which adds all the additional 
 > definitions (based on patch 1) to be loaded.
 > The only implementation available right now is qt4, I have added all the 
 > "stubs" functions as in previous patch.
 > 


Index: roadmap_landmark.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_landmark.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** roadmap_landmark.c	21 Mar 2008 23:09:00 -0000	1.16
--- roadmap_landmark.c	7 Oct 2008 00:42:20 -0000	1.17
***************
*** 100,105 ****
--- 100,110 ----
           * labels come out on "top" of other map features.
           */
+ #if defined(ROADMAP_ADVANCED_STYLE)
+         roadmap_label_draw_text(waypointp->shortname,
+            &guipoint, 0, 0, pen);
+ #else
          roadmap_label_draw_text(waypointp->shortname,
             &guipoint, 0, 0, RoadMapLandmarkFontSize);
+ #endif
      }
  }
***************
*** 135,140 ****
--- 140,150 ----
           * labels come out on "top" of other map features.
           */
+ #if defined(ROADMAP_ADVANCED_STYLE)
+         roadmap_label_draw_text(weepointp->name,
+            &guipoint, 0, 0, pen);
+ #else
          roadmap_label_draw_text(weepointp->name,
             &guipoint, 0, 0, RoadMapLandmarkFontSize);
+ #endif
      }
  }

Index: config.mk
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/config.mk,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** config.mk	13 May 2008 15:30:21 -0000	1.32
--- config.mk	7 Oct 2008 00:42:20 -0000	1.33
***************
*** 142,145 ****
--- 142,149 ----
  # LANGS = YES
  
+ # Advanced style (only qt4 supports this for now)
+ # # Adds support to more control on the map drawings
+ # ADVANCED_STYLE = YES
+ 
  # Basic building mode
  MODE =		# blank for "normal" build

Index: options.mk
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/options.mk,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** options.mk	28 Jun 2008 16:49:27 -0000	1.28
--- options.mk	7 Oct 2008 00:42:20 -0000	1.29
***************
*** 119,122 ****
--- 119,126 ----
  endif
  
+ ifneq ($(strip $(ADVANCED_STYLE)),)
+   CFLAGS += -DROADMAP_ADVANCED_STYLE
+ endif
+ 
  ifeq ($(strip $(MODE)),DEBUG)
  	CFLAGS += -g

Index: roadmap_layer.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_layer.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** roadmap_layer.c	7 Oct 2008 00:29:47 -0000	1.17
--- roadmap_layer.c	7 Oct 2008 00:42:20 -0000	1.18
***************
*** 164,167 ****
--- 164,183 ----
    {"Color", ROADMAP_STYLE_TYPE_STRING, "#000000", roadmap_canvas_set_foreground},
    {"Style", ROADMAP_STYLE_TYPE_STRING, "", roadmap_canvas_set_linestyle},
+ #if defined(ROADMAP_ADVANCED_STYLE)
+   {"LineCap", ROADMAP_STYLE_TYPE_STRING, "", roadmap_canvas_set_linecap },
+   {"LineJoin", ROADMAP_STYLE_TYPE_STRING, "", roadmap_canvas_set_linejoin },
+   {"Opacity", ROADMAP_STYLE_TYPE_INT, "", roadmap_canvas_set_opacity },
+   {"BrushColor", ROADMAP_STYLE_TYPE_STRING, "", roadmap_canvas_set_brush_color },
+   {"BrushStyle", ROADMAP_STYLE_TYPE_STRING, "", roadmap_canvas_set_brush_style },
+   {"isBackground", ROADMAP_STYLE_TYPE_INT, "", roadmap_canvas_set_brush_isbackground },
+   {"LabelFontName", ROADMAP_STYLE_TYPE_STRING, "", roadmap_canvas_set_label_font_name },
+   {"LabelFontSize", ROADMAP_STYLE_TYPE_INT, "", roadmap_canvas_set_label_font_size },
+   {"LabelFontStyle", ROADMAP_STYLE_TYPE_INT, "", roadmap_canvas_set_label_font_style },
+   {"LabelFontColor", ROADMAP_STYLE_TYPE_STRING, "", roadmap_canvas_set_label_font_color },
+   {"LabelFontWeight", ROADMAP_STYLE_TYPE_STRING, "", roadmap_canvas_set_label_font_weight },
+   {"LabelFontSpacing", ROADMAP_STYLE_TYPE_INT, "", roadmap_canvas_set_label_font_spacing },
+   {"LabelBufferColor", ROADMAP_STYLE_TYPE_STRING, "", roadmap_canvas_set_label_buffer_color },
+   {"LabelBufferSize", ROADMAP_STYLE_TYPE_INT, "", roadmap_canvas_set_label_buffer_size },
+ #endif /* ADVANCED STYLE */
  };
  
***************
*** 660,664 ****
      const char *class_name;
  
- 
      if (class_config == NULL) {
         roadmap_log (ROADMAP_FATAL, "cannot access class file %s", class_file);
--- 676,679 ----
***************
*** 741,745 ****
          static char *other_pen;
          int thickness;
!         
          other_pen = realloc(other_pen, other_pen_length);
  
--- 756,760 ----
          static char *other_pen;
          int thickness;
! 
          other_pen = realloc(other_pen, other_pen_length);
  
***************
*** 748,752 ****
          layer->navigation_modes = 0;
  
- 
          /* Retrieve the layer's thickness & declutter. */
  
--- 763,766 ----
***************
*** 754,758 ****
          layer->thickness.name     = "Thickness";
          roadmap_config_declare (class_config, &layer->thickness, "1");
! 
          /* this value is not used here */
          /* thickness = roadmap_config_get_integer (&layer->thickness); */
--- 768,772 ----
          layer->thickness.name     = "Thickness";
          roadmap_config_declare (class_config, &layer->thickness, "1");
!         
          /* this value is not used here */
          /* thickness = roadmap_config_get_integer (&layer->thickness); */
***************
*** 761,779 ****
          layer->declutter.name     = "Declutter";
          roadmap_config_declare (class_config, &layer->declutter, "20248000000");
! 
          for (pen_index = 0; pen_index < ROADMAP_MAX_LAYER_PENS; ++pen_index) {
            /* retrieve delta (thickness was taken above) */
            if (pen_index > 0) {
!            const char *image;
  
!            snprintf (other_pen, other_pen_length, "Delta%d", pen_index);
  
!            image =
!               roadmap_config_get_from (class_config, layers[i], other_pen);
!            if (image == NULL || image[0] == 0) break;
  
!            layer->delta_thickness[pen_index] = atoi(image);
            } 
! 
            /* now retrieve other pen attribute values */
            for (j = 0; j < n_of_callbacks; ++j) {
--- 775,793 ----
          layer->declutter.name     = "Declutter";
          roadmap_config_declare (class_config, &layer->declutter, "20248000000");
!          
          for (pen_index = 0; pen_index < ROADMAP_MAX_LAYER_PENS; ++pen_index) {
            /* retrieve delta (thickness was taken above) */
            if (pen_index > 0) {
!             const char *image;
  
!              snprintf (other_pen, other_pen_length, "Delta%d", pen_index);
  
!              image =
!                 roadmap_config_get_from (class_config, layers[i], other_pen);
!              if (image == NULL || image[0] == 0) break;
  
!              layer->delta_thickness[pen_index] = atoi(image);
            } 
!            
            /* now retrieve other pen attribute values */
            for (j = 0; j < n_of_callbacks; ++j) {
***************
*** 783,787 ****
                snprintf (other_pen, other_pen_length, "%s%d", RoadMapLayerPenSetupTable[j].name, pen_index);
              }
! 
              descriptor.category = layers[i];
              descriptor.name = other_pen;
--- 797,801 ----
                snprintf (other_pen, other_pen_length, "%s%d", RoadMapLayerPenSetupTable[j].name, pen_index);
              }
!          
              descriptor.category = layers[i];
              descriptor.name = other_pen;
***************
*** 812,818 ****
               sprintf (other_pen, "%s", layers[i]);
             } else {
!            snprintf (other_pen, other_pen_length, "%s%d", layers[i], pen_index);
             }
! 
             layer->pen[pen_index] = roadmap_canvas_create_pen (other_pen);
  
--- 826,832 ----
               sprintf (other_pen, "%s", layers[i]);
             } else {
!              snprintf (other_pen, other_pen_length, "%s%d", layers[i], pen_index);
             }
!            
             layer->pen[pen_index] = roadmap_canvas_create_pen (other_pen);
  
***************
*** 823,834 ****
               roadmap_canvas_set_thickness (thickness);
             } else {
!            if (layer->delta_thickness[pen_index] < 0) {
!               thickness += layer->delta_thickness[pen_index];
!            } else {
!               thickness = layer->delta_thickness[pen_index];
!            }
!            if (thickness > 0) {
!               roadmap_canvas_set_thickness (thickness);
!            }
             }
            
--- 837,848 ----
               roadmap_canvas_set_thickness (thickness);
             } else {
!              if (layer->delta_thickness[pen_index] < 0) {
!                 thickness += layer->delta_thickness[pen_index];
!              } else {
!                 thickness = layer->delta_thickness[pen_index];
!              }
!              if (thickness > 0) {
!                 roadmap_canvas_set_thickness (thickness);
!              }
             }
            
***************
*** 854,857 ****
--- 868,872 ----
          }
      }
+     
  
      /* Retrieve the navigation modes associated with each layer. */

Index: roadmap_canvas.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_canvas.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** roadmap_canvas.h	21 Mar 2008 23:09:00 -0000	1.11
--- roadmap_canvas.h	7 Oct 2008 00:42:20 -0000	1.12
***************
*** 95,98 ****
--- 95,122 ----
  void roadmap_canvas_set_linestyle (const char *style);
  
+ #if defined(ROADMAP_ADVANCED_STYLE)
+ 
+ /* This is a set of functions which enable advanced display of the map
+  * and improves the overall map experience
+  */
+ 
+ void roadmap_canvas_set_linejoin(const char *join);
+ void roadmap_canvas_set_linecap(const char *cap);
+ 
+ void roadmap_canvas_set_brush_color(const char *color);
+ void roadmap_canvas_set_brush_style(const char *style);
+ void roadmap_canvas_set_brush_isbackground(int isbackground);
+ 
+ void roadmap_canvas_set_label_font_name(const char *name);
+ void roadmap_canvas_set_label_font_color(const char *color);
+ void roadmap_canvas_set_label_font_size(int size);
+ void roadmap_canvas_set_label_font_style(int style);
+ void roadmap_canvas_set_label_font_spacing(int style);
+ void roadmap_canvas_set_label_font_weight(const char *weight);
+ 
+ void roadmap_canvas_set_label_buffer_color(const char *color);
+ void roadmap_canvas_set_label_buffer_size(int size);
+ 
+ #endif
  
  /* The functions below draw in the selected buffer using the selected pen: */

Index: roadmap_screen.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_screen.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** roadmap_screen.c	24 Jun 2008 20:40:42 -0000	1.131
--- roadmap_screen.c	7 Oct 2008 00:42:20 -0000	1.132
***************
*** 952,957 ****
--- 952,963 ----
                      (&seg_middle, &loweredge, MATH_DIST_SQUARED)) ) {
         PluginLine l = {ROADMAP_PLUGIN_ID, line, layer, fips};
+ #if defined(ROADMAP_ADVANCED_STYLE)
+        roadmap_label_add
+             (&seg_middle, angle_ptr ? *angle_ptr : 90, 
+              *total_length_ptr, &l, pen);
+ #else
         roadmap_label_add
              (&seg_middle, angle_ptr ? *angle_ptr : 90, *total_length_ptr, &l);
+ #endif
      }
  

Index: roadmap_label.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_label.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** roadmap_label.h	26 Apr 2008 17:19:05 -0000	1.9
--- roadmap_label.h	7 Oct 2008 00:42:20 -0000	1.10
***************
*** 32,37 ****
--- 32,43 ----
  
  
+ #if defined(ROADMAP_ADVANCED_STYLE)
+ int roadmap_label_add (const RoadMapGuiPoint *point, int angle,
+                        int featuresize, const PluginLine *line, 
+                        RoadMapPen pen);
+ #else
  int roadmap_label_add (const RoadMapGuiPoint *point, int angle,
                         int featuresize, const PluginLine *line);
+ #endif
  
  int roadmap_label_activate (void);
***************
*** 42,48 ****
--- 48,60 ----
  void roadmap_label_start (void);
  
+ #if defined(ROADMAP_ADVANCED_STYLE)
+ void roadmap_label_draw_text(const char *text,
+         RoadMapGuiPoint *pos,
+         int doing_angles, int angle, RoadMapPen pen);
+ #else
  void roadmap_label_draw_text(const char *text,
          RoadMapGuiPoint *pos,
          int doing_angles, int angle, int size);
+ #endif
  
  void roadmap_label_cache_invalidate(void);

Index: roadmap_label.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_label.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** roadmap_label.c	27 Apr 2008 15:06:40 -0000	1.31
--- roadmap_label.c	7 Oct 2008 00:42:20 -0000	1.32
***************
*** 94,97 ****
--- 94,101 ----
     RoadMapGuiPoint poly[4];
  
+ #if defined(ROADMAP_ADVANCED_STYLE)
+    RoadMapPen pen;
+ #endif
+ 
     unsigned short zoom;
     short angle;  /* degrees */
***************
*** 212,220 ****
  }
  
! 
  void roadmap_label_draw_text(const char *text,
          RoadMapGuiPoint *pos,
          int doing_angles, int angle, int size)
  {
                 
     if (doing_angles) {
--- 216,238 ----
  }
  
! #if defined(ROADMAP_ADVANCED_STYLE)
! void roadmap_label_draw_text(const char *text,
!         RoadMapGuiPoint *pos,
!         int doing_angles, int angle, RoadMapPen pen)
! {
!   int size;
! #else
  void roadmap_label_draw_text(const char *text,
          RoadMapGuiPoint *pos,
          int doing_angles, int angle, int size)
  {
+ #endif
+ 
+ #if defined(ROADMAP_ADVANCED_STYLE)
+   if (pen!=0)
+     roadmap_canvas_select_pen (pen);
+   else
+     roadmap_canvas_select_pen (RoadMapLabelPen);
+ #endif
                 
     if (doing_angles) {
***************
*** 257,263 ****
  }
  
! 
  int roadmap_label_add (const RoadMapGuiPoint *point, int angle,
                         int featuresize_sq, const PluginLine *line) {
  
     roadmap_label *cPtr = 0;
--- 275,286 ----
  }
  
! #if defined(ROADMAP_ADVANCED_STYLE)
! int roadmap_label_add (const RoadMapGuiPoint *point, int angle,
!                        int featuresize_sq, const PluginLine *line,
!                        RoadMapPen pen) {
! #else
  int roadmap_label_add (const RoadMapGuiPoint *point, int angle,
                         int featuresize_sq, const PluginLine *line) {
+ #endif
  
     roadmap_label *cPtr = 0;
***************
*** 297,300 ****
--- 320,326 ----
  
     cPtr->center_point = *point;
+ #if defined(ROADMAP_ADVANCED_STYLE)
+    cPtr->pen = pen;
+ #endif
  
     /* The stored point is not screen oriented, rotate is needed */
***************
*** 612,619 ****
--- 638,652 ----
              cPtr, cPtr->text, width, cPtr->featuresize_sq, cPtr->angle);
  
+ #if defined(ROADMAP_ADVANCED_STYLE)
+          roadmap_label_draw_text
+             (cPtr->text, &cPtr->center_point,
+                angles, angles ? cPtr->angle : 0,
+                cPtr->pen );
+ #else
           roadmap_label_draw_text
              (cPtr->text, &cPtr->center_point,
                 angles, angles ? cPtr->angle : 0,
                 RoadMapLabelFontSize );
+ #endif
  
           if (whichlist == NEWLIST) {

[Roadmap-commit] roadmap/src/win32 roadmap_canvas.c,1.15,1.16

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

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

Modified Files:
	roadmap_canvas.c 
Log Message:

from Alessandro Briosi:
 > 
 > finally had some time to clean up and "reimplement" the ADVANCED_STYLE 
 > patches.
 > 
 > part 2. roadmap_advanced_style.patch which adds all the additional 
 > definitions (based on patch 1) to be loaded.
 > The only implementation available right now is qt4, I have added all the 
 > "stubs" functions as in previous patch.
 > 


Index: roadmap_canvas.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_canvas.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** roadmap_canvas.c	24 May 2008 04:54:24 -0000	1.15
--- roadmap_canvas.c	7 Oct 2008 00:42:21 -0000	1.16
***************
*** 200,203 ****
--- 200,224 ----
  }
  
+ #if defined(ROADMAP_ADVANCED_STYLE)
+ /* this are stubs */
+ void roadmap_canvas_set_opacity (int opacity) {}
+ 
+ void roadmap_canvas_set_linejoin(const char *join) {}
+ void roadmap_canvas_set_linecap(const char *cap) {}
+ 
+ void roadmap_canvas_set_brush_color(const char *color) {}
+ void roadmap_canvas_set_brush_style(const char *style) {}
+ void roadmap_canvas_set_brush_is_background(int is_background) {}
+ 
+ void roadmap_canvas_set_label_font_name(const char *name) {}
+ void roadmap_canvas_set_label_font_color(const char *color) {}
+ void roadmap_canvas_set_label_font_size(int size) {}
+ void roadmap_canvas_set_label_font_spacing(int spacing) {}
+ void roadmap_canvas_set_label_font_weight(const char *weight) {}
+ void roadmap_canvas_set_label_font_style(int style) {}
+ 
+ void roadmap_canvas_set_label_buffer_color(const char *color) {}
+ void roadmap_canvas_set_label_buffer_size(int size) {}
+ #endif /* ROADMAP_ADVANCED_STYLE */
  
  void roadmap_canvas_erase (void)

[Roadmap-commit] roadmap/src/agg_support roadmap_canvas.cpp, 1.11, 1.12

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

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

Modified Files:
	roadmap_canvas.cpp 
Log Message:

from Alessandro Briosi:
 > 
 > finally had some time to clean up and "reimplement" the ADVANCED_STYLE 
 > patches.
 > 
 > part 2. roadmap_advanced_style.patch which adds all the additional 
 > definitions (based on patch 1) to be loaded.
 > The only implementation available right now is qt4, I have added all the 
 > "stubs" functions as in previous patch.
 > 


Index: roadmap_canvas.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/agg_support/roadmap_canvas.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** roadmap_canvas.cpp	21 Mar 2008 23:09:00 -0000	1.11
--- roadmap_canvas.cpp	7 Oct 2008 00:42:20 -0000	1.12
***************
*** 281,284 ****
--- 281,303 ----
  }
  
+ #if defined(ROADMAP_ADVANCED_STYLE)
+ /* this are stubs */
+ void roadmap_canvas_set_linejoin(const char *join) {}
+ void roadmap_canvas_set_linecap(const char *cap) {}
+ 
+ void roadmap_canvas_set_brush_color(const char *color) {}
+ void roadmap_canvas_set_brush_style(const char *style) {}
+ void roadmap_canvas_set_brush_isbackground(int isbackground) {}
+ 
+ void roadmap_canvas_set_label_font_name(const char *name) {}
+ void roadmap_canvas_set_label_font_color(const char *color) {}
+ void roadmap_canvas_set_label_font_size(int size) {}
+ void roadmap_canvas_set_label_font_spacing(int spacing) {}
+ void roadmap_canvas_set_label_font_weight(const char *weight) {}
+ void roadmap_canvas_set_label_font_style(int style) {}
+ 
+ void roadmap_canvas_set_label_buffer_color(const char *color) {}
+ void roadmap_canvas_set_label_buffer_size(int size) {}
+ #endif /* ROADMAP_ADVANCED_STYLE */
  
  void roadmap_canvas_erase (void) {

[Roadmap-commit] roadmap/src/iphone roadmap_canvas.m,1.2,1.3

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

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

Modified Files:
	roadmap_canvas.m 
Log Message:

from Alessandro Briosi:
 > 
 > finally had some time to clean up and "reimplement" the ADVANCED_STYLE 
 > patches.
 > 
 > part 2. roadmap_advanced_style.patch which adds all the additional 
 > definitions (based on patch 1) to be loaded.
 > The only implementation available right now is qt4, I have added all the 
 > "stubs" functions as in previous patch.
 > 


Index: roadmap_canvas.m
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/iphone/roadmap_canvas.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_canvas.m	20 Jun 2008 13:09:19 -0000	1.2
--- roadmap_canvas.m	7 Oct 2008 00:42:21 -0000	1.3
***************
*** 266,269 ****
--- 266,291 ----
  }
  
+ #if defined(ROADMAP_ADVANCED_STYLE)
+ /* this are stubs */
+ void roadmap_canvas_set_opacity (int opacity) {}
+ 
+ void roadmap_canvas_set_linejoin(const char *join) {}
+ void roadmap_canvas_set_linecap(const char *cap) {}
+ 
+ void roadmap_canvas_set_brush_color(const char *color) {}
+ void roadmap_canvas_set_brush_style(const char *style) {}
+ void roadmap_canvas_set_brush_isbackground(int isbackground) {}
+ 
+ void roadmap_canvas_set_label_font_name(const char *name) {}
+ void roadmap_canvas_set_label_font_color(const char *color) {}
+ void roadmap_canvas_set_label_font_size(int size) {}
+ void roadmap_canvas_set_label_font_spacing(int spacing) {}
+ void roadmap_canvas_set_label_font_weight(const char *weight) {}
+ void roadmap_canvas_set_label_font_style(int style) {}
+ 
+ void roadmap_canvas_set_label_buffer_color(const char *color) {}
+ void roadmap_canvas_set_label_buffer_size(int size) {}
+ #endif /* ROADMAP_ADVANCED_STYLE */
+ 
  void roadmap_canvas_erase (void) {
     /* 'erase' means fill the canvas with the foreground color */

[Roadmap-commit] roadmap/src roadmap_layer.c, 1.16, 1.17 roadmap_layer.h, 1.5, 1.6

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

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

Modified Files:
	roadmap_layer.c roadmap_layer.h 
Log Message:

from Alessandro Briosi:

 > finally had some time to clean up and "reimplement" the ADVANCED_STYLE 
 > patches.
 > 
 > part 1:  roadmap_pen_attribues.patch which only changes the
 > way that the class is loaded with a table driven configuration
 > 


Index: roadmap_layer.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_layer.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** roadmap_layer.c	7 May 2008 13:40:30 -0000	1.16
--- roadmap_layer.c	7 Oct 2008 00:29:47 -0000	1.17
***************
*** 155,158 ****
--- 155,169 ----
  static RoadMapSet *RoadMapLayerActiveSet = NULL;
  
+ /* PEN ATTRIBUTES */
+ static RoadMapLayerPenAttribute RoadMapLayerPenSetupTable[] = {
+   /*
+    *  Thickness and Delta are a bit special, for now leave them out
+    */
+   /* {"Thickness", ROADMAP_STYLE_TYPE_INT, "",  roadmap_canvas_set_thickness},*/
+   /* {"Delta", ROADMAP_STYLE_TYPE_INT, "",  roadmap_canvas_set_thickness},     */
+   {"Color", ROADMAP_STYLE_TYPE_STRING, "#000000", roadmap_canvas_set_foreground},
+   {"Style", ROADMAP_STYLE_TYPE_STRING, "", roadmap_canvas_set_linestyle},
+ };
+ 
  
  static RoadMapSet *roadmap_layer_find_set (const char *set) {
***************
*** 636,639 ****
--- 647,651 ----
  
      int i;
+     int j;
      unsigned int pen_index;
  
***************
*** 665,671 ****
  
      if (roadmap_layer_find_class(set->classes, class_name) != NULL) {
!        roadmap_log (ROADMAP_FATAL,
                      "class %s (set %s) redefined in %s",
                      class_name, set->name, class_file);
      }
  
--- 677,684 ----
  
      if (roadmap_layer_find_class(set->classes, class_name) != NULL) {
!        roadmap_log (ROADMAP_WARNING,
                      "class %s (set %s) redefined in %s",
                      class_name, set->name, class_file);
+        return;
      }
  
***************
*** 716,729 ****
      }
  
      for (i = lines_count + polygons_count - 1; i >= 0; --i) {
  
          RoadMapLayer *layer = new_class->layers + i;
! 
!         const char *color[ROADMAP_MAX_LAYER_PENS];
!         const char *style[ROADMAP_MAX_LAYER_PENS];
! 
!         int  thickness;
          int  other_pen_length = strlen(layers[i]) + 64;
          static char *other_pen;
          
          other_pen = realloc(other_pen, other_pen_length);
--- 729,744 ----
      }
  
+     int n_of_callbacks = (int) sizeof(RoadMapLayerPenSetupTable) / 
+                                         sizeof(RoadMapLayerPenAttribute);
+   
      for (i = lines_count + polygons_count - 1; i >= 0; --i) {
+         const char *svalues[ROADMAP_MAX_LAYER_PENS][n_of_callbacks];
+         int ivalues[ROADMAP_MAX_LAYER_PENS][n_of_callbacks];
  
          RoadMapLayer *layer = new_class->layers + i;
!         RoadMapConfigDescriptor descriptor = ROADMAP_CONFIG_ITEM_EMPTY;
          int  other_pen_length = strlen(layers[i]) + 64;
          static char *other_pen;
+         int thickness;
          
          other_pen = realloc(other_pen, other_pen_length);
***************
*** 740,744 ****
          roadmap_config_declare (class_config, &layer->thickness, "1");
  
!         thickness = roadmap_config_get_integer (&layer->thickness);
  
          layer->declutter.category = layers[i];
--- 755,760 ----
          roadmap_config_declare (class_config, &layer->thickness, "1");
  
!         /* this value is not used here */
!         /* thickness = roadmap_config_get_integer (&layer->thickness); */
  
          layer->declutter.category = layers[i];
***************
*** 746,762 ****
          roadmap_config_declare (class_config, &layer->declutter, "20248000000");
  
! 
!         /* Retrieve the first pen's color (mandatory). */
! 
!         color[0] = roadmap_config_get_from (class_config, layers[i], "Color");
! 
!         /* Retrieve the first pen's style (optional). */
!         style[0] = roadmap_config_get_from (class_config, layers[i], "Style");
! 
! 
!         /* Retrieve the layer's other colors and styles (optional). */
! 
!         for (pen_index = 1; pen_index < ROADMAP_MAX_LAYER_PENS; ++pen_index) {
! 
             const char *image;
  
--- 762,768 ----
          roadmap_config_declare (class_config, &layer->declutter, "20248000000");
  
!         for (pen_index = 0; pen_index < ROADMAP_MAX_LAYER_PENS; ++pen_index) {
!           /* retrieve delta (thickness was taken above) */
!           if (pen_index > 0) {
             const char *image;
  
***************
*** 768,785 ****
  
             layer->delta_thickness[pen_index] = atoi(image);
  
  
!            snprintf (other_pen, other_pen_length, "Color%d", pen_index);
! 
!            color[pen_index] =
!               roadmap_config_get_from (class_config, layers[i], other_pen);
! 
!            if (color[pen_index] == NULL || *color[pen_index] == 0) break;
! 
!            snprintf (other_pen, other_pen_length, "Style%d", pen_index);
! 
!            style[pen_index] =
!               roadmap_config_get_from (class_config, layers[i], other_pen);
! 
          }
          layer->pen_count = pen_index;
--- 774,800 ----
  
             layer->delta_thickness[pen_index] = atoi(image);
+           } 
  
+           /* now retrieve other pen attribute values */
+           for (j = 0; j < n_of_callbacks; ++j) {
+             if (pen_index == 0) {
+               snprintf (other_pen, other_pen_length, "%s", RoadMapLayerPenSetupTable[j].name);
+             } else {
+               snprintf (other_pen, other_pen_length, "%s%d", RoadMapLayerPenSetupTable[j].name, pen_index);
+             }
  
!             descriptor.category = layers[i];
!             descriptor.name = other_pen;
!             descriptor.reference = NULL;
!             roadmap_config_declare (class_config, &descriptor, RoadMapLayerPenSetupTable[j].default_value);
!             switch (RoadMapLayerPenSetupTable[j].type) {
!               case ROADMAP_STYLE_TYPE_INT:
!                  ivalues[pen_index][j] = roadmap_config_get_integer(&descriptor);
!                  break; 
!               case ROADMAP_STYLE_TYPE_STRING:
!                  svalues[pen_index][j] = roadmap_config_get(&descriptor);
!                  break;
!             }
!           }
          }
          layer->pen_count = pen_index;
***************
*** 789,819 ****
          /* Create all necessary pens. */
  
-         layer->pen[0] = roadmap_canvas_create_pen (layers[i]);
- 
-         if (style[0] != NULL && *(style[0]) > ' ') {
-            roadmap_canvas_set_linestyle (style[0]);
-         }
- 
-         thickness = roadmap_config_get_integer (&layer->thickness);
-         roadmap_canvas_set_thickness (thickness);
- 
-         if (color[0] != NULL && *(color[0]) > ' ') {
-            roadmap_canvas_set_foreground (color[0]);
-         }
- 
          if (i >= lines_count) { /* This is a polygon. */
             layer->in_use[0] = 1;
          }
  
!         for (pen_index = 1; pen_index < layer->pen_count; ++pen_index) {
! 
             snprintf (other_pen, other_pen_length, "%s%d", layers[i], pen_index);
  
             layer->pen[pen_index] = roadmap_canvas_create_pen (other_pen);
  
!            if (style[pen_index] != NULL && *(style[pen_index]) > ' ') {
!               roadmap_canvas_set_linestyle (style[pen_index]);
!            }
  
             if (layer->delta_thickness[pen_index] < 0) {
                thickness += layer->delta_thickness[pen_index];
--- 804,826 ----
          /* Create all necessary pens. */
  
          if (i >= lines_count) { /* This is a polygon. */
             layer->in_use[0] = 1;
          }
  
!         for (pen_index = 0; pen_index < layer->pen_count; ++pen_index) {
!            if (pen_index == 0) {
!              sprintf (other_pen, "%s", layers[i]);
!            } else {
             snprintf (other_pen, other_pen_length, "%s%d", layers[i], pen_index);
+            }
  
             layer->pen[pen_index] = roadmap_canvas_create_pen (other_pen);
  
!            /* set up thickness based on main thickness and delta ones */
  
+            if (pen_index == 0) {
+              thickness = roadmap_config_get_integer (&layer->thickness);
+              roadmap_canvas_set_thickness (thickness);
+            } else {
             if (layer->delta_thickness[pen_index] < 0) {
                thickness += layer->delta_thickness[pen_index];
***************
*** 824,828 ****
                roadmap_canvas_set_thickness (thickness);
             }
!            roadmap_canvas_set_foreground (color[pen_index]);
  
             if (i >= lines_count) { /* This is a polygon. */
--- 831,851 ----
                roadmap_canvas_set_thickness (thickness);
             }
!            }
!           
!            /* now setup the other pen attributes */ 
!            for (j = 0; j < n_of_callbacks; ++j) {
!              switch (RoadMapLayerPenSetupTable[j].type) {
!                case ROADMAP_STYLE_TYPE_INT:
!                  if (ivalues[pen_index][j] > 0) {
!                    RoadMapLayerPenSetupTable[j].callback(ivalues[pen_index][j]);
!                  }
!                  break;
!                case ROADMAP_STYLE_TYPE_STRING:
!                  if (svalues[pen_index][j] != NULL && *(svalues[pen_index][j]) > ' ') {
!                    RoadMapLayerPenSetupTable[j].callback((const char *)svalues[pen_index][j]);
!                  }
!                  break;
!              }
!            }
  
             if (i >= lines_count) { /* This is a polygon. */

Index: roadmap_layer.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_layer.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** roadmap_layer.h	6 Feb 2006 01:43:54 -0000	1.5
--- roadmap_layer.h	7 Oct 2008 00:29:47 -0000	1.6
***************
*** 59,62 ****
--- 59,76 ----
  #include "roadmap_canvas.h"
  
+ /* defines the types of parameter a pen attribute function gets */
+ enum {
+   ROADMAP_STYLE_TYPE_INT,
+   ROADMAP_STYLE_TYPE_STRING
+ };
+ 
+ /* structure to define a pen attribute setup function */
+ typedef struct {
+   char *name;
+   int   type;
+   const char *default_value;
+   void  (*callback) ();
+ } RoadMapLayerPenAttribute;
+ 
  unsigned int roadmap_layer_max_defined(void);
  unsigned int roadmap_layer_max_pen(void);

[Roadmap-commit] roadmap/src/win32 CEDevice.cpp,1.2,1.3

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

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

Modified Files:
	CEDevice.cpp 
Log Message:
Clean up and document.


Index: CEDevice.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/CEDevice.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CEDevice.cpp	7 May 2008 15:27:59 -0000	1.2
--- CEDevice.cpp	3 Oct 2008 22:26:57 -0000	1.3
***************
*** 6,15 ****
   * as published by the Free Software Foundation; either version 2
   * of the License, or (at your option) any later version.
! 
   * This program is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   * GNU General Public License for more details.
! 
   * You should have received a copy of the GNU General Public License
   * along with this program; if not, write to the Free Software
--- 6,15 ----
   * as published by the Free Software Foundation; either version 2
   * of the License, or (at your option) any later version.
!  *
   * This program is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   * GNU General Public License for more details.
!  *
   * You should have received a copy of the GNU General Public License
   * along with this program; if not, write to the Free Software
***************
*** 20,34 ****
   */
  
- //#define SIMU_SMARTPHONE 1
- //#define SIMU_SMARTPHONE_2005 1
- 
  #include "windows.h"
  #include "CEDevice.h"
  
! #define KEY_CALENDAR 0xc1
! #define KEY_CONTACTS 0xc2
! #define KEY_INBOX 0xc3
! #define KEY_TASK 0xc4
! 
  static void (WINAPI* _SHIdleTimerReset)(void) = NULL;
  static HANDLE (WINAPI* _SetPowerRequirement)(const void *,int,ULONG,PVOID,ULONG) = NULL;
--- 20,38 ----
   */
  
  #include "windows.h"
  #include "CEDevice.h"
  
! /**
!  * @file
!  * @brief Windows CE power management code
!  *
!  * This code uses three techniques :
!  * - Call SetPowerRequirement once on the backlight device BLK1: to keep the light on
!  * - Periodically call SystemIdleTimerReset to keep the system from powering down
!  * - Periodically call SHIdleTimerReset to keep the shell from locking the device or
!  *   reverting to the Today screen.
!  *
!  * Power management code borrowed from MoDaCo & Betaplayer. Thanks !
!  */
  static void (WINAPI* _SHIdleTimerReset)(void) = NULL;
  static HANDLE (WINAPI* _SetPowerRequirement)(const void *,int,ULONG,PVOID,ULONG) = NULL;
***************
*** 39,43 ****
  #define TIMER_TRIGGER 9000
  
- // Power management code borrowed from MoDaCo & Betaplayer. Thanks !
  void CEDevice::init() {
  	HINSTANCE dll = LoadLibrary(TEXT("aygshell.dll"));
--- 43,46 ----
***************
*** 74,80 ****
  
  bool CEDevice::isSmartphone() {
- #ifdef SIMU_SMARTPHONE
- 	return true;
- #else
  	TCHAR platformType[100];
  	BOOL result = SystemParametersInfo(SPI_GETPLATFORMTYPE, sizeof(platformType), platformType, 0);
--- 77,80 ----
***************
*** 82,86 ****
  		return true;
  	return (wcsnicmp(platformType, TEXT("SmartPhone"), 10) == 0);
- #endif
  }
  
--- 82,85 ----

[Roadmap-commit] roadmap/src roadmap_locator.c,1.27,1.28

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

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

Modified Files:
	roadmap_locator.c 
Log Message:
don't try a realloc of size 0  (alessandro briosi)


Index: roadmap_locator.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_locator.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** roadmap_locator.c	31 Jul 2008 20:56:18 -0000	1.27
--- roadmap_locator.c	16 Sep 2008 16:27:53 -0000	1.28
***************
*** 333,338 ****
      * roadmap_osm.c -- see usage of roadmap_osm_tilelist in that file.
      */
!    *fipslistp = realloc (*fipslistp, count * sizeof(int));
!    roadmap_check_allocated(*fipslistp);
  
     return count;
--- 333,340 ----
      * roadmap_osm.c -- see usage of roadmap_osm_tilelist in that file.
      */
!    if (count > 0) {
!        *fipslistp = realloc (*fipslistp, count * sizeof(int));
!        roadmap_check_allocated(*fipslistp); 
!    }
  
     return count;

[Roadmap-commit] roadmap/sugar mk_activity,1.7,1.8

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

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

Modified Files:
	mk_activity 
Log Message:
fix MANIFEST creation, and
don't include roadgps


Index: mk_activity
===================================================================
RCS file: /cvsroot/roadmap/roadmap/sugar/mk_activity,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mk_activity	14 Sep 2008 20:57:17 -0000	1.7
--- mk_activity	16 Sep 2008 15:57:11 -0000	1.8
***************
*** 73,77 ****
  rm -rf $ACT/bin/rdm* $ACT/pixmaps/roadmap* $ACT/config/font.ttf
  mv $ACT/bin/gtkroadmap $ACT/bin/roadmap
! rm -f $ACT/bin/gtkroadgps
  
  # provide some maps, which must already be installed on the build system
--- 73,77 ----
  rm -rf $ACT/bin/rdm* $ACT/pixmaps/roadmap* $ACT/config/font.ttf
  mv $ACT/bin/gtkroadmap $ACT/bin/roadmap
! rm -f $ACT/bin/*roadgps
  
  # provide some maps, which must already be installed on the build system
***************
*** 142,146 ****
  # finally, bundle the bundle
  cd tmp
! find $ACTNAME  > MANIFEST
  mv MANIFEST $ACTNAME
  rm -f ../RoadMap-$version.xo 
--- 142,146 ----
  # finally, bundle the bundle
  cd tmp
! ( cd $ACTNAME; find * -follow ! -type d) > MANIFEST
  mv MANIFEST $ACTNAME
  rm -f ../RoadMap-$version.xo 

[Roadmap-commit] roadmap/sugar/activity activity.info,1.4,1.5

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

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

Modified Files:
	activity.info 
Log Message:
include an update_url key


Index: activity.info
===================================================================
RCS file: /cvsroot/roadmap/roadmap/sugar/activity/activity.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** activity.info	14 Sep 2008 20:21:10 -0000	1.4
--- activity.info	15 Sep 2008 20:18:17 -0000	1.5
***************
*** 7,9 ****
  show_launcher = yes
  exec = sugarRoadMap
! #update_url=...
--- 7,9 ----
  show_launcher = yes
  exec = sugarRoadMap
! update_url = http://dev.laptop.org/~pgf/bundles/roadmap.html

[Roadmap-commit] roadmap/sugar mk_activity,1.6,1.7

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

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

Modified Files:
	mk_activity 
Log Message:
get rid of gtkroadgps in final bundle, don't complain if manual.html is missing


Index: mk_activity
===================================================================
RCS file: /cvsroot/roadmap/roadmap/sugar/mk_activity,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mk_activity	14 Sep 2008 20:21:10 -0000	1.6
--- mk_activity	14 Sep 2008 20:57:17 -0000	1.7
***************
*** 73,76 ****
--- 73,77 ----
  rm -rf $ACT/bin/rdm* $ACT/pixmaps/roadmap* $ACT/config/font.ttf
  mv $ACT/bin/gtkroadmap $ACT/bin/roadmap
+ rm -f $ACT/bin/gtkroadgps
  
  # provide some maps, which must already be installed on the build system
***************
*** 134,138 ****
  
  # and finally, copy in docs and licenses
! cp $TOP/COPYING $TOP/INSTALL $TOP/README README.xo_laptop $SRC/manual.html $ACT/docs
  
  version=$(sed -n 's/activity_version.*=[[:space:]]*//p' $STUFF/activity.info)
--- 135,140 ----
  
  # and finally, copy in docs and licenses
! cp $TOP/COPYING $TOP/INSTALL $TOP/README README.xo_laptop $ACT/docs
! test -f $SRC/manual.html && cp $SRC/manual.html $ACT/docs
  
  version=$(sed -n 's/activity_version.*=[[:space:]]*//p' $STUFF/activity.info)

[Roadmap-commit] roadmap/sugar/activity activity.info,1.3,1.4

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

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

Modified Files:
	activity.info 
Log Message:
cleanups, and switch to tty: for access to gps, and add permissions.info
file to make that possible under Rainbow


Index: activity.info
===================================================================
RCS file: /cvsroot/roadmap/roadmap/sugar/activity/activity.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** activity.info	11 Sep 2008 15:52:21 -0000	1.3
--- activity.info	14 Sep 2008 20:21:10 -0000	1.4
***************
*** 4,8 ****
  service_name = net.sourceforge.roadmap
  icon = RoadMap
! activity_version = 1
  show_launcher = yes
  exec = sugarRoadMap
--- 4,8 ----
  service_name = net.sourceforge.roadmap
  icon = RoadMap
! activity_version = 2
  show_launcher = yes
  exec = sugarRoadMap

[Roadmap-commit] roadmap/sugar mk_activity,1.5,1.6

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

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

Modified Files:
	mk_activity 
Log Message:
cleanups, and switch to tty: for access to gps, and add permissions.info
file to make that possible under Rainbow


Index: mk_activity
===================================================================
RCS file: /cvsroot/roadmap/roadmap/sugar/mk_activity,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mk_activity	4 Sep 2008 22:10:33 -0000	1.5
--- mk_activity	14 Sep 2008 20:21:10 -0000	1.6
***************
*** 22,28 ****
  
  mkdir -p $ACT/{bin,activity,lib,docs,maps}
- cp $STUFF/sugarRoadMap $ACT/bin
- cp $STUFF/activity.info $STUFF/RoadMap.svg $ACT/activity
- 
  # bring our development host's libexpat along, so we don't need to
  # "yum install" it.
--- 22,25 ----
***************
*** 51,57 ****
  
  mv $RMROOT/usr/share/activities/$ACT/bin/*		$ACT/bin
  mv $RMROOT/usr/share/activities/$ACT/share/pixmaps	$ACT/pixmaps
  mv $RMROOT/usr/share/activities/$ACT/share/roadmap	$ACT/config
! cp $STUFF/config/{roadmap.screenobjects,sprites}	$ACT/config
  
  # disable the toolbar by default, but provide an example
--- 48,66 ----
  
  mv $RMROOT/usr/share/activities/$ACT/bin/*		$ACT/bin
+ 
  mv $RMROOT/usr/share/activities/$ACT/share/pixmaps	$ACT/pixmaps
+ 
  mv $RMROOT/usr/share/activities/$ACT/share/roadmap	$ACT/config
! 
! cp $STUFF/sugarRoadMap $ACT/bin
! 
! cp $STUFF/activity.info \
!    $STUFF/permissions.info \
!    $STUFF/RoadMap.svg \
!       $ACT/activity
! 
! cp $STUFF/config/roadmap.screenobjects \
!    $STUFF/config/sprites \
!       $ACT/config
  
  # disable the toolbar by default, but provide an example
***************
*** 102,105 ****
--- 111,115 ----
  sed -i \
      -e "s/\(GPS.Font Size:\).*/\1 30/" \
+     -e "s/\(GPS.Source:\).*/\1 tty:\/\/dev\/ttyUSB0/" \
      -e "s/\(Display.Font Size:\).*/\1 30/" \
      -e "s/\(Labels.Font Size:\).*/\1 20/" \
***************
*** 132,136 ****
  find $ACTNAME  > MANIFEST
  mv MANIFEST $ACTNAME
! rm ../RoadMap-$version.xo 
  zip -r ../RoadMap-$version.xo $ACTNAME
  
--- 142,146 ----
  find $ACTNAME  > MANIFEST
  mv MANIFEST $ACTNAME
! rm -f ../RoadMap-$version.xo 
  zip -r ../RoadMap-$version.xo $ACTNAME
  

[Roadmap-commit] roadmap/sugar README.xo_laptop,1.2,1.3

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

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

Modified Files:
	README.xo_laptop 
Log Message:
fix text surrounding gps device access 


Index: README.xo_laptop
===================================================================
RCS file: /cvsroot/roadmap/roadmap/sugar/README.xo_laptop,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README.xo_laptop	11 Sep 2008 15:52:48 -0000	1.2
--- README.xo_laptop	14 Sep 2008 20:10:00 -0000	1.3
***************
*** 27,42 ****
  GPS --
  
!     If you have a GPS device and want RoadMap to use it, you'll want
!     to install gpsd to help: "yum install gpsd".
! 
!     If, instead, you'd prefer to access your GPS via the raw tty
!     device, RoadMap will need to be able to open /dev/ttyUSB0 to read
!     your gps device.  In that case, you'll need to make that device
!     world readable, by adding the following line to a udev config file:
  
!         # cat /etc/udev/rules.d/99-local-ttyUSB0.rules:
!         KERNEL=="ttyUSB0", NAME="%k", GROUP="root", MODE="0666"
  
-     (You'll need to do this, or the "yum install gpsd" above, after
-     every update of your XO's system software.)
  
--- 27,39 ----
  GPS --
  
!     As provided, RoadMap will access your USB-connected GPS device
!     directly.  For most such devices, this will work fine, as long
!     as the GPS device is the first serial USB device that your system
!     discovers (which is to say, as long as your GPS is on /dev/ttyUSB0).
  
!     If you'd prefer to use the free "gpsd" daemon to manage the
!     GPS, then you'll want to install gpsd with "yum install
!     gpsd", and change the method under File --> Preferences -->
!     GPS --> Source to "gpsd2://localhost".
  
  

[Roadmap-commit] roadmap/sugar/activity permissions.info,NONE,1.1

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

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

Added Files:
	permissions.info 
Log Message:
new file to get XO's Rainbow system to allow access to serial ports
(it puts us into group uucp if it sees "use-serial" in this file).


--- NEW FILE: permissions.info ---
use-serial

[Roadmap-commit] roadmap/src roadmap_gps.c,1.46,1.47

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

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

Modified Files:
	roadmap_gps.c 
Log Message:
force a close/reopen of a tty-connected gps if we lose contact with it.


Index: roadmap_gps.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_gps.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** roadmap_gps.c	10 Jun 2008 03:44:36 -0000	1.46
--- roadmap_gps.c	14 Sep 2008 19:03:09 -0000	1.47
***************
*** 300,303 ****
--- 300,312 ----
     if (now - RoadMapGpsLatestData > timeout) {
        roadmap_gps_update_status ('V');
+       switch (RoadMapGpsLink.subsystem) {
+       case ROADMAP_IO_SERIAL:
+ 	 // if we're using a serial connection, it may well be a USB adapter
+ 	 // and it may have been un/re-plugged, or otherwise powered down (e.g.
+ 	 // by a system suspend and resume.  close it here to force a re-open
+ 	 // at the end of roadmap_gps_input()
+ 	 roadmap_io_close (&RoadMapGpsLink);
+ 	 break;
+       }
     }
  

[Roadmap-commit] roadmap/src roadmap_osm.h,1.2,1.3

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

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

Modified Files:
	roadmap_osm.h 
Log Message:
use a smaller default for quadtile "bits"


Index: roadmap_osm.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_osm.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_osm.h	3 Dec 2007 04:38:00 -0000	1.2
--- roadmap_osm.h	13 Sep 2008 21:00:44 -0000	1.3
***************
*** 28,32 ****
   */
  
! #define ROADMAP_OSM_DEFAULT_BITS "19"  // yes, it's a string
  
  #define MaxLon 180000000
--- 28,32 ----
   */
  
! #define ROADMAP_OSM_DEFAULT_BITS "21"  // yes, it's a string
  
  #define MaxLon 180000000

[Roadmap-commit] roadmap/src roadmap_start.c,1.147,1.148

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

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

Modified Files:
	roadmap_start.c 
Log Message:
about box


Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -d -r1.147 -r1.148
*** roadmap_start.c	4 Sep 2008 02:23:55 -0000	1.147
--- roadmap_start.c	13 Sep 2008 20:59:57 -0000	1.148
***************
*** 199,203 ****
     roadmap_messagebox ( "About",
         "RoadMap " ROADMAP_VERSION "\n"
!        "(c) " ROADMAP_YEAR " Pascal Martin, Paul Fox, Danny Backx and many others\n"
         "\n"
         "RoadMap is free software; you can\n"
--- 199,204 ----
     roadmap_messagebox ( "About",
         "RoadMap " ROADMAP_VERSION "\n"
!        "Copyright " ROADMAP_YEAR " Pascal Martin,\n"
!        "Paul Fox, Ehud Shabtai, Danny Backx and many others\n"
         "\n"
         "RoadMap is free software; you can\n"
***************
*** 551,558 ****
        roadmap_start_show_location},
  
!    {"mapdownload", "Toggle Map Download", "Download", NULL,
!       "Enable/Disable map download mode", NULL,
        roadmap_start_toggle_download},
  
     {"mapdiskspace", "Map Disk Space", "Disk", NULL,
        "Show the amount of disk space occupied by the maps", NULL,
--- 552,565 ----
        roadmap_start_show_location},
  
!    {"mapdownload", "Toggle Tiger Map Download", "Download", NULL,
!       "Enable/Disable Tiger map download mode", NULL,
        roadmap_start_toggle_download},
  
+ #if SOON
+    {"osmdownload", "Start an OpenStreetMap Download", "OSM Download", NULL,
+       "Start OSM download", NULL,
+       roadmap_osm_start_download},
+ #endif
+ 
     {"mapdiskspace", "Map Disk Space", "Disk", NULL,
        "Show the amount of disk space occupied by the maps", NULL,

[Roadmap-commit] roadmap/src roadmap_copyright.h,1.29,1.30

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

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

Modified Files:
	roadmap_copyright.h 
Log Message:
add 2008


Index: roadmap_copyright.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_copyright.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** roadmap_copyright.h	23 Oct 2007 01:01:02 -0000	1.29
--- roadmap_copyright.h	13 Sep 2008 20:56:47 -0000	1.30
***************
*** 26,30 ****
  
  #define ROADMAP_VERSION "1.1.0-post"
! #define ROADMAP_YEAR    "2002, 2003, 2004, 2005, 2006, 2007"
  
  #endif // INCLUDE__ROADMAP_COPYRIGHT__H
--- 26,30 ----
  
  #define ROADMAP_VERSION "1.1.0-post"
! #define ROADMAP_YEAR    "2002, 2003, 2004, 2005, 2006, 2007, 2008"
  
  #endif // INCLUDE__ROADMAP_COPYRIGHT__H

[Roadmap-commit] roadmap/src buildmap_osm_main.c,1.9,1.10

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

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

Modified Files:
	buildmap_osm_main.c 
Log Message:
make buildmap_osm use the default map destination


Index: buildmap_osm_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_osm_main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** buildmap_osm_main.c	8 Aug 2008 12:38:29 -0000	1.9
--- buildmap_osm_main.c	13 Sep 2008 20:56:06 -0000	1.10
***************
*** 266,270 ****
  
  /**
!  * @brief
   * @param position
   * @param focus
--- 266,270 ----
  
  /**
!  * @brief populates a list of tileids necessary to give coverage for the given position
   * @param position
   * @param focus
***************
*** 324,332 ****
  
  /**
!  * @brief Called directly from main to convert lat/lon command line arguments into a tiles list
   * @param latlonarg
   * @param tilesp
   * @param bits
   * @return
   */
  static int
--- 324,336 ----
  
  /**
!  * @brief return tileids needed to for given positoin
   * @param latlonarg
   * @param tilesp
   * @param bits
   * @return
+  *
+  * Called directly from main to convert lat/lon command line
+  * arguments into a tiles list.  The area covered can be specified
+  * in several formats.
   */
  static int
***************
*** 524,528 ****
  
  /**
!  * @brief
   * @param decode
   * @return
--- 528,532 ----
  
  /**
!  * @brief prints as much information as possible about the given hex tileid
   * @param decode
   * @return
***************
*** 608,615 ****
  
  /**
!  * @brief
   * @param latlon
   * @param bits
   * @return
   */
  int buildmap_osm_encode(char *latlon, int bits) {
--- 612,622 ----
  
  /**
!  * @brief converts position to tileids
   * @param latlon
   * @param bits
   * @return
+  *
+  * Prints the RoadMap and OSM (true) tileids corresponding to the
+  * given position and bitlength.
   */
  int buildmap_osm_encode(char *latlon, int bits) {
***************
*** 693,696 ****
--- 700,705 ----
      char *class, *latlonarg, *source, *cmdfmt, *inputfile;
  
+     BuildMapResult = strdup(roadmap_path_preferred("maps")); /* default. */
+ 
      /* parse the options */
      error = opt_parse(options, &argc, argv, 0);

[Roadmap-commit] roadmap README,1.156,1.157

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

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

Modified Files:
	README 
Log Message:
fix section on map sources


Index: README
===================================================================
RCS file: /cvsroot/roadmap/roadmap/README,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -d -r1.156 -r1.157
*** README	28 Jun 2008 19:18:26 -0000	1.156
--- README	13 Sep 2008 20:55:01 -0000	1.157
***************
*** 15,35 ****
     as a static map viewer and address finder.
  
!    Most of the maps are provided by the US Census Bureau, which only cover
!    the US.  RoadMap now includes a preliminary support for two other
!    formats:  the Digital Charts of the Words (DCW), a set of world-wide
!    maps produced by the US Department of Defense, and the Canadian RNF
!    (Road Network File) maps.  The DCW contains only major highways and
!    freeways, for some parts or the world (mostly Europe and japan) and
!    their accuracy does not allow any reliable car navigation.  The RNF
!    files contain road data, but currently no water features or municipality
!    information.
  
!    RoadMap is released under the GPL (see the COPYING file). The US Census
!    Bureau's data is public domain. The DCW data is mostly public domain, but
!    some administrative boundary data is copyright of ESRI
!    ({{http://www.esri.com/}}). As no administrative data is incorporated in
!    the RoadMap map files, all the RoadMap map files are in the public domain.
  
!    RoadMap uses a binary file format for representing the maps that is
     compact enough to allow the storage of many maps on a Compact Flash or
     MultiMedia card. The map of Los Angeles county takes a little more than
--- 15,46 ----
     as a static map viewer and address finder.
  
!    RoadMap is released under the GPL (see the COPYING file).
  
!    RoadMap currently support map data from several sources:
  
!        * US Census Bureau (TIGER data)
!        
!        The census bureau TIGER data only covers the US and its territories.
!        
!        * OpenStreetMap
! 
!        An external tool (buildmap_osm) can be used to fetch maps from
!        the OpenStreetMap (OSM) project.  More information about this
!        user-supported project can be found at {{http://www.openstreetmap.org}}.
! 
!        * Canadian RNF (Road Network File) maps
! 
!        The RNF files contain road data, but currently no water
!        features or municipality information.
! 
!        * Digital Charts of the Words
! 
!        DCW is a set of world-wide maps produced by the US Department
!        of Defense, and The DCW contains only major highways and
!        freeways, for some parts or the world (mostly Europe and
!        japan) and their accuracy does not allow any reliable car
!        navigation.  These maps are also quite old.
!    
!    RoadMap uses a binary file format for representing maps that is
     compact enough to allow the storage of many maps on a Compact Flash or
     MultiMedia card. The map of Los Angeles county takes a little more than

[Roadmap-commit] roadmap/sugar README.xo_laptop,1.1,1.2

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

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

Modified Files:
	README.xo_laptop 
Log Message:
add note about Find limitations for OSM


Index: README.xo_laptop
===================================================================
RCS file: /cvsroot/roadmap/roadmap/sugar/README.xo_laptop,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README.xo_laptop	5 Sep 2008 20:39:35 -0000	1.1
--- README.xo_laptop	11 Sep 2008 15:52:48 -0000	1.2
***************
*** 21,24 ****
--- 21,28 ----
          ct/ ma/ me/ nh/ ri/ usdir.rdm vt/
  
+     If you're using the OSM quadtile maps, the "Find by Address"
+     and "Find by Intersection" menu entries will _not_ work. 
+     Only "Find by Position".
+ 
  GPS --
  

[Roadmap-commit] roadmap/sugar/activity activity.info,1.2,1.3

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

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

Modified Files:
	activity.info 
Log Message:
add license field


Index: activity.info
===================================================================
RCS file: /cvsroot/roadmap/roadmap/sugar/activity/activity.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** activity.info	4 Sep 2008 19:54:49 -0000	1.2
--- activity.info	11 Sep 2008 15:52:21 -0000	1.3
***************
*** 1,4 ****
--- 1,5 ----
  [Activity]
  name = RoadMap
+ license = GPLv2+
  service_name = net.sourceforge.roadmap
  icon = RoadMap

[Roadmap-commit] roadmap/src/gtk2 roadmap_canvas_agg.cpp,1.4,1.5

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

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

Modified Files:
	roadmap_canvas_agg.cpp 
Log Message:
check return from wide char conversion, warn if failed


Index: roadmap_canvas_agg.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk2/roadmap_canvas_agg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_canvas_agg.cpp	15 May 2008 00:02:22 -0000	1.4
--- roadmap_canvas_agg.cpp	9 Sep 2008 02:10:13 -0000	1.5
***************
*** 76,82 ****
  int roadmap_canvas_agg_to_wchar (const char *text, wchar_t *output, int size) {
  
!    int length = mbstowcs(output, text, size - 1);
!    output[length] = 0;
  
     return length;
  }
--- 76,97 ----
  int roadmap_canvas_agg_to_wchar (const char *text, wchar_t *output, int size) {
  
!    int length;
! 
!    length = mbstowcs(output, text, size - 1);
  
+    if (length < 0) {
+       static int warned;
+       if (!warned) {
+          roadmap_log(ROADMAP_WARNING,
+             "roadmap_canvas_agg_to_wchar: multi-byte conversion failed");
+          roadmap_log(ROADMAP_WARNING,
+             "roadmap_canvas_agg_to_wchar: locale setting LC_CTYPE correct?");
+          warned = 1;
+       }
+       output[0] = 0;
+       return 0;
+    }
+ 
+    output[length] = 0;
     return length;
  }

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

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

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

Modified Files:
	buildmap_osm_text.c 
Log Message:
Fix silly error.


Index: buildmap_osm_text.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_osm_text.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buildmap_osm_text.c	4 Aug 2008 17:44:07 -0000	1.1
--- buildmap_osm_text.c	7 Sep 2008 15:54:04 -0000	1.2
***************
*** 505,509 ****
  	int		fromlon, tolon, fromlat, tolat;
  	int		j;
! 	static int	lineid = 1;
  
  	if (WayInvalid)
--- 505,509 ----
  	int		fromlon, tolon, fromlat, tolat;
  	int		j;
! 	static int	lineid = 0;
  
  	if (WayInvalid)
***************
*** 530,534 ****
  		static int cenid = 0;
  		int line;
- 		static int lineid = 0;
  
  		/*
--- 530,533 ----
***************
*** 590,594 ****
  		to_point = buildmap_osm_text_point_get(WayNodes[nWayNodes-1]);
  
! 		line = buildmap_line_add(++lineid, WayLayer, from_point, to_point);
  
  		/* Street name */
--- 589,594 ----
  		to_point = buildmap_osm_text_point_get(WayNodes[nWayNodes-1]);
  
! 		lineid++;
! 		line = buildmap_line_add(lineid, WayLayer, from_point, to_point);
  
  		/* Street name */
***************
*** 663,674 ****
          line_index = buildmap_line_find_sorted(lineid);
  
- #if 0
- 	if (line_index != 25) {
- 		buildmap_info("Shapes skipped for line %d", line_index);
- 		continue;
- 	} else {
- 		buildmap_info("Shapes generated for line %d", line_index);
- 	}
- #endif
          if (line_index >= 0) {
  	    lons = shapes[i].lons;
--- 663,666 ----
***************
*** 678,686 ****
              for (j = 1; j < count - 1; j++) {
                  buildmap_shape_add (line_index, i, lineid, j - 1, lons[j], lats[j]);
- #if 0
- 		if (line_index == 25)
- 		buildmap_info("buildmap_shape_add(%d,%d,%d,%d,%d,%d)",
- 				line_index, i, lineid, j - 1, lons[j], lats[j]);
- #endif
              }
          }
--- 670,673 ----