Diff of /trunk/src/osm-gps-map.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 56 by harbaum, Fri Aug 14 12:19:45 2009 UTC revision 114 by harbaum, Wed Sep 16 20:04:38 2009 UTC
# Line 49  Line 49 
49    
50  #define EXTRA_BORDER (TILESIZE / 2)  #define EXTRA_BORDER (TILESIZE / 2)
51    
52    #define OSM_GPS_MAP_SCROLL_STEP 10
53    
54    /* any defined key enables key support */
55    #if (defined(OSM_GPS_MAP_KEY_FULLSCREEN) || \
56         defined(OSM_GPS_MAP_KEY_ZOOMIN) || \
57         defined(OSM_GPS_MAP_KEY_ZOOMOUT) || \
58         defined(OSM_GPS_MAP_KEY_UP) || \
59         defined(OSM_GPS_MAP_KEY_DOWN) || \
60         defined(OSM_GPS_MAP_KEY_LEFT) || \
61         defined(OSM_GPS_MAP_KEY_RIGHT))
62    #define OSM_GPS_MAP_KEYS
63    #endif
64    
65    #ifdef OSM_GPS_MAP_KEYS
66    #include <gdk/gdkkeysyms.h>
67    #endif
68    
69    #define USER_AGENT "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11"
70    
71  struct _OsmGpsMapPrivate  struct _OsmGpsMapPrivate
72  {  {
73      GHashTable *tile_queue;      GHashTable *tile_queue;
# Line 78  struct _OsmGpsMapPrivate Line 97  struct _OsmGpsMapPrivate
97      char *proxy_uri;      char *proxy_uri;
98    
99      //where downloaded tiles are cached      //where downloaded tiles are cached
100        char *tile_dir;
101      char *cache_dir;      char *cache_dir;
     gboolean cache_dir_is_full_path;  
102    
103      //contains flags indicating the various special characters      //contains flags indicating the various special characters
104      //the uri string contains, that will be replaced when calculating      //the uri string contains, that will be replaced when calculating
# Line 96  struct _OsmGpsMapPrivate Line 115  struct _OsmGpsMapPrivate
115      gboolean show_trip_history;      gboolean show_trip_history;
116      GSList *trip_history;      GSList *trip_history;
117      coord_t *gps;      coord_t *gps;
118        float gps_heading;
119      gboolean gps_valid;      gboolean gps_valid;
120    
121    #ifdef ENABLE_OSD
122        //the osd controls (if present)
123        osm_gps_map_osd_t *osd;
124    #ifdef OSD_DOUBLE_BUFFER
125        GdkPixmap *dbuf_pixmap;
126    #endif
127    #endif
128    
129    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
130        gboolean fullscreen;
131    #endif
132    
133      //additional images or tracks added to the map      //additional images or tracks added to the map
134      GSList *tracks;      GSList *tracks;
135      GSList *images;      GSList *images;
# Line 149  enum Line 181  enum
181      PROP_REPO_URI,      PROP_REPO_URI,
182      PROP_PROXY_URI,      PROP_PROXY_URI,
183      PROP_TILE_CACHE_DIR,      PROP_TILE_CACHE_DIR,
     PROP_TILE_CACHE_DIR_IS_FULL_PATH,  
184      PROP_ZOOM,      PROP_ZOOM,
185      PROP_MAX_ZOOM,      PROP_MAX_ZOOM,
186      PROP_MIN_ZOOM,      PROP_MIN_ZOOM,
# Line 310  static void Line 341  static void
341  inspect_map_uri(OsmGpsMap *map)  inspect_map_uri(OsmGpsMap *map)
342  {  {
343      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
344        priv->uri_format = 0;
345        priv->the_google = FALSE;
346    
347      if (g_strrstr(priv->repo_uri, URI_MARKER_X))      if (g_strrstr(priv->repo_uri, URI_MARKER_X))
348          priv->uri_format |= URI_HAS_X;          priv->uri_format |= URI_HAS_X;
# Line 546  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 579  osm_gps_map_draw_gps_point (OsmGpsMap *m
579          int x, y;          int x, y;
580          int r = priv->ui_gps_point_inner_radius;          int r = priv->ui_gps_point_inner_radius;
581          int r2 = priv->ui_gps_point_outer_radius;          int r2 = priv->ui_gps_point_outer_radius;
582          // int lw = priv->ui_gps_track_width;          int mr = MAX(3*r,r2);
         int mr = MAX(r,r2);  
583    
584          map_x0 = priv->map_x - EXTRA_BORDER;          map_x0 = priv->map_x - EXTRA_BORDER;
585          map_y0 = priv->map_y - EXTRA_BORDER;          map_y0 = priv->map_y - EXTRA_BORDER;
# Line 578  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 610  osm_gps_map_draw_gps_point (OsmGpsMap *m
610    
611          // draw ball gradient          // draw ball gradient
612          if (r > 0) {          if (r > 0) {
613                // draw direction arrow
614                if(!isnan(priv->gps_heading))
615                {
616                    cairo_move_to (cr, x-r*cos(priv->gps_heading), y-r*sin(priv->gps_heading));
617                    cairo_line_to (cr, x+3*r*sin(priv->gps_heading), y-3*r*cos(priv->gps_heading));
618                    cairo_line_to (cr, x+r*cos(priv->gps_heading), y+r*sin(priv->gps_heading));
619                    cairo_close_path (cr);
620    
621                    cairo_set_source_rgba (cr, 0.3, 0.3, 1.0, 0.5);
622                    cairo_fill_preserve (cr);
623    
624                    cairo_set_line_width (cr, 1.0);
625                    cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5);
626                    cairo_stroke(cr);
627                }
628    
629              pat = cairo_pattern_create_radial (x-(r/5), y-(r/5), (r/5), x,  y, r);              pat = cairo_pattern_create_radial (x-(r/5), y-(r/5), (r/5), x,  y, r);
630              cairo_pattern_add_color_stop_rgba (pat, 0, 1, 1, 1, 1.0);              cairo_pattern_add_color_stop_rgba (pat, 0, 1, 1, 1, 1.0);
631              cairo_pattern_add_color_stop_rgba (pat, 1, 0, 0, 1, 1.0);              cairo_pattern_add_color_stop_rgba (pat, 1, 0, 0, 1, 1.0);
# Line 591  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 639  osm_gps_map_draw_gps_point (OsmGpsMap *m
639              cairo_arc (cr, x, y, r, 0, 2 * M_PI);              cairo_arc (cr, x, y, r, 0, 2 * M_PI);
640              cairo_stroke(cr);              cairo_stroke(cr);
641          }          }
642    
643          cairo_destroy(cr);          cairo_destroy(cr);
644          gtk_widget_queue_draw_area (GTK_WIDGET(map),          gtk_widget_queue_draw_area (GTK_WIDGET(map),
645                                      x-mr,                                      x-mr,
# Line 631  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 679  osm_gps_map_draw_gps_point (OsmGpsMap *m
679                                      (mr*2)+lw+lw);                                      (mr*2)+lw+lw);
680  #endif  #endif
681      }      }
682  }  }
   
 /* http://cairographics.org/samples/ */  
 static void  
 osm_gps_map_draw_balloon (OsmGpsMap *map)  
 {  
     OsmGpsMapPrivate *priv = map->priv;  
   
     /* xyz */  
 #define X 100  
 #define Y 100  
 #define RADIUS 20  
 #define WIDTH  150  
 #define HEIGHT 75  
 #define TRANSPARENCY  0.7  
 #define PIN_HEIGHT 20  
 #define PIN_FOOT_WIDTH 20  
 #define PIN_X  (X + EXTRA_BORDER)  
 #define PIN_X0 (X + EXTRA_BORDER + RADIUS + PIN_FOOT_WIDTH)  
 #define PIN_X1 (X + EXTRA_BORDER + RADIUS)  
 #define PIN_Y  (Y + EXTRA_BORDER + HEIGHT + PIN_HEIGHT)  
   
 #ifdef USE_CAIRO  
     cairo_t *cr = gdk_cairo_create(priv->pixmap);  
   
     int x0 = X + EXTRA_BORDER, y0 = Y + EXTRA_BORDER;  
     int x1 = x0 + WIDTH, y1 = y0 + HEIGHT;  
   
     cairo_move_to (cr, x0, y0 + RADIUS);  
     cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + RADIUS, y0);  
     cairo_line_to (cr, x1 - RADIUS, y0);  
     cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + RADIUS);  
     cairo_line_to (cr, x1 , y1 - RADIUS);  
     cairo_curve_to (cr, x1, y1, x1, y1, x1 - RADIUS, y1);  
   
     /* insert pin */  
     cairo_line_to (cr, PIN_X0, y1);  
     cairo_line_to (cr, PIN_X, PIN_Y);  
     cairo_line_to (cr, PIN_X1, y1);  
   
   
     cairo_line_to (cr, x0 + RADIUS, y1);  
     cairo_curve_to (cr, x0, y1, x0, y1, x0, y1 - RADIUS);  
   
     cairo_close_path (cr);  
     cairo_set_source_rgba (cr, 1, 1, 1, TRANSPARENCY);  
     cairo_fill_preserve (cr);  
     cairo_set_source_rgba (cr, 0, 0, 0, TRANSPARENCY);  
     cairo_set_line_width (cr, 1);  
     cairo_stroke (cr);  
   
     gtk_widget_queue_draw_area (GTK_WIDGET(map),  
                                 x0,  
                                 y0,  
                                 WIDTH,  
                                 HEIGHT + PIN_HEIGHT);  
 #endif  
 }  
683    
684  static void  static void
685  osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)  osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)
# Line 752  osm_gps_map_tile_download_complete (Soup Line 743  osm_gps_map_tile_download_complete (Soup
743              }              }
744              else              else
745              {              {
746                  g_warning("Error creating tile download directory: %s", dl->folder);                  g_warning("Error creating tile download directory: %s",
747                              dl->folder);
748                    perror("perror:");
749              }              }
750          }          }
751    
# Line 899  osm_gps_map_download_tile (OsmGpsMap *ma Line 892  osm_gps_map_download_tile (OsmGpsMap *ma
892                  }                  }
893              }              }
894    
895    #ifdef LIBSOUP22
896                soup_message_headers_append(msg->request_headers,
897                                            "User-Agent", USER_AGENT);
898    #endif
899    
900              g_hash_table_insert (priv->tile_queue, dl->uri, msg);              g_hash_table_insert (priv->tile_queue, dl->uri, msg);
901              soup_session_queue_message (priv->soup_session, msg, osm_gps_map_tile_download_complete, dl);              soup_session_queue_message (priv->soup_session, msg, osm_gps_map_tile_download_complete, dl);
902          } else {          } else {
# Line 1251  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1249  osm_gps_map_map_redraw (OsmGpsMap *map)
1249    
1250      priv->idle_map_redraw = 0;      priv->idle_map_redraw = 0;
1251    
1252        /* don't redraw the entire map while the OSD is doing */
1253        /* some animation or the like. This is to keep the animation */
1254        /* fluid */
1255        if (priv->osd->busy(priv->osd))
1256            return FALSE;
1257    
1258    #ifdef DRAG_DEBUG
1259        printf("trying redraw\n");
1260    #endif
1261    
1262      /* the motion_notify handler uses priv->pixmap to redraw the area; if we      /* the motion_notify handler uses priv->pixmap to redraw the area; if we
1263       * change it while we are dragging, we will end up showing it in the wrong       * change it while we are dragging, we will end up showing it in the wrong
1264       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1258  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1266  osm_gps_map_map_redraw (OsmGpsMap *map)
1266      if (priv->dragging)      if (priv->dragging)
1267          return FALSE;          return FALSE;
1268    
1269        /* undo all offsets that may have happened when dragging */
1270        priv->drag_mouse_dx = 0;
1271        priv->drag_mouse_dy = 0;
1272    
1273      priv->redraw_cycle++;      priv->redraw_cycle++;
1274    
1275      /* draw white background to initialise pixmap */      /* draw white background to initialise pixmap */
# Line 1275  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1287  osm_gps_map_map_redraw (OsmGpsMap *map)
1287      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1288      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1289    
1290      osm_gps_map_draw_balloon(map);  #ifdef ENABLE_OSD
1291        /* OSD may contain a coordinate/scale, so we may have to re-render it */
1292        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
1293            priv->osd->render (priv->osd);
1294    #endif
1295    
     //osm_gps_map_osd_speed(map, 1.5);  
1296      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1297      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
1298    
# Line 1293  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1308  osm_gps_map_map_redraw_idle (OsmGpsMap *
1308          priv->idle_map_redraw = g_idle_add ((GSourceFunc)osm_gps_map_map_redraw, map);          priv->idle_map_redraw = g_idle_add ((GSourceFunc)osm_gps_map_map_redraw, map);
1309  }  }
1310    
1311    #ifdef OSM_GPS_MAP_KEYS
1312    static gboolean
1313    on_window_key_press(GtkWidget *widget,
1314                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1315      gboolean handled = FALSE;
1316      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1317    
1318      // the map handles some keys on its own ...
1319      switch(event->keyval) {
1320    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1321      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1322          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1323          if(!priv->fullscreen)
1324              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1325          else
1326              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1327    
1328          priv->fullscreen = !priv->fullscreen;
1329          handled = TRUE;
1330          } break;
1331    #endif
1332    
1333    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1334      case OSM_GPS_MAP_KEY_ZOOMIN:
1335          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1336          handled = TRUE;
1337          break;
1338    #endif
1339    
1340    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1341      case OSM_GPS_MAP_KEY_ZOOMOUT:
1342          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1343          handled = TRUE;
1344          break;
1345    #endif
1346    
1347    #ifdef OSM_GPS_MAP_KEY_UP
1348      case OSM_GPS_MAP_KEY_UP:
1349          priv->map_y -= step;
1350          priv->center_coord_set = FALSE;
1351          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1352          handled = TRUE;
1353          break;
1354    #endif
1355    
1356    #ifdef OSM_GPS_MAP_KEY_DOWN
1357      case OSM_GPS_MAP_KEY_DOWN:
1358          priv->map_y += step;
1359          priv->center_coord_set = FALSE;
1360          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1361          handled = TRUE;
1362          break;
1363    #endif
1364    
1365    #ifdef OSM_GPS_MAP_KEY_LEFT
1366      case OSM_GPS_MAP_KEY_LEFT:
1367          priv->map_x -= step;
1368          priv->center_coord_set = FALSE;
1369          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1370          handled = TRUE;
1371          break;
1372    #endif
1373    
1374    #ifdef OSM_GPS_MAP_KEY_RIGHT
1375      case OSM_GPS_MAP_KEY_RIGHT:
1376          priv->map_x += step;
1377          priv->center_coord_set = FALSE;
1378          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1379          handled = TRUE;
1380          break;
1381    #endif
1382    
1383      default:
1384          break;
1385      }
1386    
1387      return handled;
1388    }
1389    #endif
1390    
1391  static void  static void
1392  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1393  {  {
# Line 1306  osm_gps_map_init (OsmGpsMap *object) Line 1401  osm_gps_map_init (OsmGpsMap *object)
1401      priv->trip_history = NULL;      priv->trip_history = NULL;
1402      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1403      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1404        priv->gps_heading = OSM_GPS_MAP_INVALID;
1405    
1406    #ifdef ENABLE_OSD
1407        priv->osd = NULL;
1408    #endif
1409    
1410    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1411        priv->fullscreen = FALSE;
1412    #endif
1413    
1414      priv->tracks = NULL;      priv->tracks = NULL;
1415      priv->images = NULL;      priv->images = NULL;
# Line 1323  osm_gps_map_init (OsmGpsMap *object) Line 1427  osm_gps_map_init (OsmGpsMap *object)
1427    
1428  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1429      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1430      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session =
1431                                                               SOUP_SESSION_USER_AGENT,          soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
1432                                                               "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11",                                              USER_AGENT, NULL);
                                                              NULL);  
1433  #else  #else
1434      /* libsoup-2.2 seems not to be able to set the user agent */      /* libsoup-2.2 has no special way to set the user agent, so we */
1435        /* set it seperately as an extra header field for each reuest */
1436      priv->soup_session = soup_session_async_new();      priv->soup_session = soup_session_async_new();
1437  #endif  #endif
1438    
# Line 1351  osm_gps_map_init (OsmGpsMap *object) Line 1455  osm_gps_map_init (OsmGpsMap *object)
1455      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1456    
1457      g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, my_log_handler, NULL);      g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, my_log_handler, NULL);
 }  
1458    
1459  #ifndef G_CHECKSUM_MD5  #ifdef OSM_GPS_MAP_KEYS
1460  /* simple hash algorithm hack if md5 is not present */      g_signal_connect(G_OBJECT(object), "key_press_event",
1461  static char *simple_hash(char *str) {                       G_CALLBACK(on_window_key_press), priv);
     union {  
         char str[4];  
         gulong val;  
     } hash = { .val = 0x55555555 };  
   
     while(*str) {  
         hash.str[(int)str & 3] ^= *str;  
         str++;  
     }  
     return g_strdup_printf("%08lX", hash.val);  
 }  
1462  #endif  #endif
1463    }
1464    
1465  static GObject *  static void
1466  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_setup(OsmGpsMapPrivate *priv) {
 {  
     GObject *object;  
     OsmGpsMapPrivate *priv;  
     OsmGpsMap *map;  
1467      const char *uri;      const char *uri;
1468    
     //Always chain up to the parent constructor  
     object = G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);  
     map = OSM_GPS_MAP(object);  
     priv = OSM_GPS_MAP_PRIVATE(object);  
   
1469      //user can specify a map source ID, or a repo URI as the map source      //user can specify a map source ID, or a repo URI as the map source
1470      uri = osm_gps_map_source_get_repo_uri(OSM_GPS_MAP_SOURCE_NULL);      uri = osm_gps_map_source_get_repo_uri(OSM_GPS_MAP_SOURCE_NULL);
1471      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
# Line 1406  osm_gps_map_constructor (GType gtype, gu Line 1490  osm_gps_map_constructor (GType gtype, gu
1490          }          }
1491      }      }
1492    
1493      if (!priv->cache_dir_is_full_path) {      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1494  #ifdef G_CHECKSUM_MD5      if(!fname) fname = "_unknown_";
         char *md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, priv->repo_uri, -1);  
 #else  
         char *md5 = simple_hash(priv->repo_uri);  
 #endif  
   
         if (priv->cache_dir) {  
             char *old = priv->cache_dir;  
             //the new cachedir is the given cache dir + the md5 of the repo_uri  
             priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, md5);  
             g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);  
             g_free(old);  
         } else {  
             //the new cachedir is the current dir + the md5 of the repo_uri  
             priv->cache_dir = g_strdup(md5);  
         }  
1495    
1496          g_free(md5);      if (priv->tile_dir) {
1497            //the new cachedir is the given cache dir + the friendly name of the repo_uri
1498            priv->cache_dir = g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);
1499            g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);
1500      }      }
1501    }
1502    
1503      inspect_map_uri(map);  static GObject *
1504    osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
1505    {
1506        //Always chain up to the parent constructor
1507        GObject *object =
1508            G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1509    
1510        osm_gps_map_setup(OSM_GPS_MAP_PRIVATE(object));
1511    
1512        inspect_map_uri(OSM_GPS_MAP(object));
1513    
1514      return object;      return object;
1515  }  }
# Line 1464  osm_gps_map_dispose (GObject *object) Line 1546  osm_gps_map_dispose (GObject *object)
1546      if (priv->idle_map_redraw != 0)      if (priv->idle_map_redraw != 0)
1547          g_source_remove (priv->idle_map_redraw);          g_source_remove (priv->idle_map_redraw);
1548    
1549        g_free(priv->gps);
1550    
1551    #ifdef ENABLE_OSD
1552        if(priv->osd)
1553            priv->osd->free(priv->osd);
1554    
1555    #ifdef OSD_DOUBLE_BUFFER
1556        if(priv->dbuf_pixmap)
1557            g_object_unref (priv->dbuf_pixmap);
1558    #endif
1559    #endif
1560    
1561      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
1562  }  }
1563    
# Line 1473  osm_gps_map_finalize (GObject *object) Line 1567  osm_gps_map_finalize (GObject *object)
1567      OsmGpsMap *map = OSM_GPS_MAP(object);      OsmGpsMap *map = OSM_GPS_MAP(object);
1568      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1569    
1570      g_free(priv->cache_dir);      if(priv->tile_dir)
1571            g_free(priv->tile_dir);
1572    
1573        if(priv->cache_dir)
1574            g_free(priv->cache_dir);
1575    
1576      g_free(priv->repo_uri);      g_free(priv->repo_uri);
1577      g_free(priv->image_format);      g_free(priv->image_format);
1578    
# Line 1530  osm_gps_map_set_property (GObject *objec Line 1629  osm_gps_map_set_property (GObject *objec
1629              break;              break;
1630          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1631              if ( g_value_get_string(value) )              if ( g_value_get_string(value) )
1632                  priv->cache_dir = g_value_dup_string (value);                  priv->tile_dir = g_value_dup_string (value);
             break;  
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             priv->cache_dir_is_full_path = g_value_get_boolean (value);  
1633              break;              break;
1634          case PROP_ZOOM:          case PROP_ZOOM:
1635              priv->map_zoom = g_value_get_int (value);              priv->map_zoom = g_value_get_int (value);
# Line 1561  osm_gps_map_set_property (GObject *objec Line 1657  osm_gps_map_set_property (GObject *objec
1657          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1658              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
1659              break;              break;
1660          case PROP_MAP_SOURCE:          case PROP_MAP_SOURCE: {
1661                gint old = priv->map_source;
1662              priv->map_source = g_value_get_int (value);              priv->map_source = g_value_get_int (value);
1663              break;              if(old >= OSM_GPS_MAP_SOURCE_NULL &&
1664                   priv->map_source != old &&
1665                   priv->map_source >= OSM_GPS_MAP_SOURCE_NULL &&
1666                   priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) {
1667    
1668                    /* we now have to switch the entire map */
1669    
1670                    /* flush the ram cache */
1671                    g_hash_table_remove_all(priv->tile_cache);
1672    
1673                    osm_gps_map_setup(priv);
1674    
1675                    inspect_map_uri(map);
1676    
1677                    /* adjust zoom if necessary */
1678                    if(priv->map_zoom > priv->max_zoom)
1679                        osm_gps_map_set_zoom(map, priv->max_zoom);
1680    
1681                    if(priv->map_zoom < priv->min_zoom)
1682                        osm_gps_map_set_zoom(map, priv->min_zoom);
1683    
1684                } } break;
1685          case PROP_IMAGE_FORMAT:          case PROP_IMAGE_FORMAT:
1686              priv->image_format = g_value_dup_string (value);              priv->image_format = g_value_dup_string (value);
1687              break;              break;
# Line 1604  osm_gps_map_get_property (GObject *objec Line 1722  osm_gps_map_get_property (GObject *objec
1722          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1723              g_value_set_string(value, priv->cache_dir);              g_value_set_string(value, priv->cache_dir);
1724              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             g_value_set_boolean(value, priv->cache_dir_is_full_path);  
             break;  
1725          case PROP_ZOOM:          case PROP_ZOOM:
1726              g_value_set_int(value, priv->map_zoom);              g_value_set_int(value, priv->map_zoom);
1727              break;              break;
# Line 1679  osm_gps_map_button_press (GtkWidget *wid Line 1794  osm_gps_map_button_press (GtkWidget *wid
1794  {  {
1795      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1796    
1797    #ifdef ENABLE_OSD
1798        /* pressed inside OSD control? */
1799        if(priv->osd) {
1800            osd_button_t but =
1801                priv->osd->check(priv->osd, TRUE, event->x, event->y);
1802    
1803            if(but != OSD_NONE)
1804            {
1805                int step =
1806                    GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1807                priv->drag_counter = -1;
1808    
1809                switch(but) {
1810                case OSD_UP:
1811                    priv->map_y -= step;
1812                    priv->center_coord_set = FALSE;
1813                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1814                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1815                    break;
1816    
1817                case OSD_DOWN:
1818                    priv->map_y += step;
1819                    priv->center_coord_set = FALSE;
1820                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1821                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1822                    break;
1823    
1824                case OSD_LEFT:
1825                    priv->map_x -= step;
1826                    priv->center_coord_set = FALSE;
1827                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1828                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1829                    break;
1830    
1831                case OSD_RIGHT:
1832                    priv->map_x += step;
1833                    priv->center_coord_set = FALSE;
1834                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1835                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1836                    break;
1837    
1838                case OSD_IN:
1839                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1840                    break;
1841    
1842                case OSD_OUT:
1843                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1844                    break;
1845    
1846                default:
1847                    /* all custom buttons are forwarded to the application */
1848                    if(priv->osd->cb)
1849                        priv->osd->cb(but, priv->osd->data);
1850                    break;
1851                }
1852    
1853                return FALSE;
1854            }
1855        }
1856    #endif
1857    
1858      priv->drag_counter = 0;      priv->drag_counter = 0;
1859      priv->drag_start_mouse_x = (int) event->x;      priv->drag_start_mouse_x = (int) event->x;
1860      priv->drag_start_mouse_y = (int) event->y;      priv->drag_start_mouse_y = (int) event->y;
# Line 1707  osm_gps_map_button_release (GtkWidget *w Line 1883  osm_gps_map_button_release (GtkWidget *w
1883    
1884          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1885      }      }
1886    #ifdef ENABLE_OSD
1887        /* pressed inside OSD control? */
1888        else if(priv->osd)
1889            priv->osd->check(priv->osd, FALSE, event->x, event->y);
1890    #endif
1891    
1892      priv->drag_mouse_dx = 0;  
1893      priv->drag_mouse_dy = 0;  #ifdef DRAG_DEBUG
1894      priv->drag_counter = 0;      printf("dragging done\n");
1895    #endif
1896    
1897        priv->drag_counter = -1;
1898    
1899      return FALSE;      return FALSE;
1900  }  }
1901    
1902  static gboolean  static gboolean
1903    osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);
1904    
1905    static gboolean
1906  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)
1907  {  {
1908      int x, y;      int x, y;
# Line 1735  osm_gps_map_motion_notify (GtkWidget *wi Line 1922  osm_gps_map_motion_notify (GtkWidget *wi
1922      if (!(state & GDK_BUTTON1_MASK))      if (!(state & GDK_BUTTON1_MASK))
1923          return FALSE;          return FALSE;
1924    
1925        if (priv->drag_counter < 0)
1926            return FALSE;
1927    
1928      priv->drag_counter++;      priv->drag_counter++;
1929    
1930      // we havent dragged more than 6 pixels      // we havent dragged more than 6 pixels
1931      if (priv->drag_counter < 6)      if (priv->drag_counter < 6)
1932          return FALSE;          return FALSE;
1933    
1934    #ifdef OSM_GPS_MAP_REFRESH
1935        /* reduce update frequency on maemo to keep screen update fluid */
1936        static guint32 last_time = 0;
1937    
1938        if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE;
1939        last_time = event->time;
1940    #endif
1941    
1942      priv->dragging = TRUE;      priv->dragging = TRUE;
1943    
1944      if (priv->map_auto_center)      if (priv->map_auto_center)
# Line 1749  osm_gps_map_motion_notify (GtkWidget *wi Line 1947  osm_gps_map_motion_notify (GtkWidget *wi
1947      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
1948      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
1949    
1950      gdk_draw_drawable (      osm_gps_map_expose (widget, NULL);
                        widget->window,  
                        widget->style->fg_gc[GTK_WIDGET_STATE (widget)],  
                        priv->pixmap,  
                        0,0,  
                        priv->drag_mouse_dx - EXTRA_BORDER, priv->drag_mouse_dy - EXTRA_BORDER,  
                        -1,-1);  
   
     //Paint white outside of the map if dragging. Its less  
     //ugly than painting the corrupted map  
     if(priv->drag_mouse_dx>EXTRA_BORDER) {  
         gdk_draw_rectangle (  
                             widget->window,  
                             widget->style->white_gc,  
                             TRUE,  
                             0, 0,  
                             priv->drag_mouse_dx - EXTRA_BORDER,  
                             widget->allocation.height);  
     }  
     else if (-priv->drag_mouse_dx > EXTRA_BORDER)  
     {  
         gdk_draw_rectangle (  
                             widget->window,  
                             widget->style->white_gc,  
                             TRUE,  
                             priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,  
                             -priv->drag_mouse_dx - EXTRA_BORDER,  
                             widget->allocation.height);  
     }  
   
     if (priv->drag_mouse_dy>EXTRA_BORDER) {  
         gdk_draw_rectangle (  
                             widget->window,  
                             widget->style->white_gc,  
                             TRUE,  
                             0, 0,  
                             widget->allocation.width,  
                             priv->drag_mouse_dy - EXTRA_BORDER);  
     }  
     else if (-priv->drag_mouse_dy > EXTRA_BORDER)  
     {  
         gdk_draw_rectangle (  
                             widget->window,  
                             widget->style->white_gc,  
                             TRUE,  
                             0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,  
                             widget->allocation.width,  
                             -priv->drag_mouse_dy - EXTRA_BORDER);  
     }  
1951    
1952      return FALSE;      return FALSE;
1953  }  }
# Line 1812  osm_gps_map_configure (GtkWidget *widget Line 1962  osm_gps_map_configure (GtkWidget *widget
1962          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
1963    
1964      priv->pixmap = gdk_pixmap_new (      priv->pixmap = gdk_pixmap_new (
1965                                     widget->window,                          widget->window,
1966                                     widget->allocation.width + EXTRA_BORDER * 2,                          widget->allocation.width + EXTRA_BORDER * 2,
1967                                     widget->allocation.height + EXTRA_BORDER * 2,                          widget->allocation.height + EXTRA_BORDER * 2,
1968                                     -1);                          -1);
1969    
1970    #ifdef ENABLE_OSD
1971    
1972    #ifdef OSD_DOUBLE_BUFFER
1973        if (priv->dbuf_pixmap)
1974            g_object_unref (priv->dbuf_pixmap);
1975    
1976        priv->dbuf_pixmap = gdk_pixmap_new (
1977                            widget->window,
1978                            widget->allocation.width,
1979                            widget->allocation.height,
1980                            -1);
1981    #endif
1982    
1983        /* the osd needs some references to map internal objects */
1984        if(priv->osd)
1985            priv->osd->widget = widget;
1986    #endif
1987    
1988      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
1989      if(priv->gc_map)      if(priv->gc_map)
# Line 1833  osm_gps_map_expose (GtkWidget *widget, G Line 2001  osm_gps_map_expose (GtkWidget *widget, G
2001  {  {
2002      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2003    
2004      gdk_draw_drawable (  #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2005                         widget->window,      GdkDrawable *drawable = priv->dbuf_pixmap;
2006    #else
2007        GdkDrawable *drawable = widget->window;
2008    #endif
2009    
2010    #ifdef DRAG_DEBUG
2011        printf("expose, map %d/%d\n", priv->map_x, priv->map_y);
2012    #endif
2013    
2014        if (!priv->drag_mouse_dx && !priv->drag_mouse_dy && event)
2015        {
2016    #ifdef DRAG_DEBUG
2017            printf("  dragging = %d, event = %p\n", priv->dragging, event);
2018    #endif
2019    
2020            gdk_draw_drawable (drawable,
2021                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2022                               priv->pixmap,
2023                               event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
2024                               event->area.x, event->area.y,
2025                               event->area.width, event->area.height);
2026        }
2027        else
2028        {
2029    #ifdef DRAG_DEBUG
2030            printf("  drag_mouse %d/%d\n",
2031                   priv->drag_mouse_dx - EXTRA_BORDER,
2032                   priv->drag_mouse_dy - EXTRA_BORDER);
2033    #endif
2034    
2035            gdk_draw_drawable (drawable,
2036                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2037                               priv->pixmap,
2038                               0,0,
2039                               priv->drag_mouse_dx - EXTRA_BORDER,
2040                               priv->drag_mouse_dy - EXTRA_BORDER,
2041                               -1,-1);
2042    
2043            //Paint white outside of the map if dragging. Its less
2044            //ugly than painting the corrupted map
2045            if(priv->drag_mouse_dx>EXTRA_BORDER) {
2046                gdk_draw_rectangle (drawable,
2047                                    widget->style->white_gc,
2048                                    TRUE,
2049                                    0, 0,
2050                                    priv->drag_mouse_dx - EXTRA_BORDER,
2051                                    widget->allocation.height);
2052            }
2053            else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2054            {
2055                gdk_draw_rectangle (drawable,
2056                                    widget->style->white_gc,
2057                                    TRUE,
2058                                    priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
2059                                    -priv->drag_mouse_dx - EXTRA_BORDER,
2060                                    widget->allocation.height);
2061            }
2062    
2063            if (priv->drag_mouse_dy>EXTRA_BORDER) {
2064                gdk_draw_rectangle (drawable,
2065                                    widget->style->white_gc,
2066                                    TRUE,
2067                                    0, 0,
2068                                    widget->allocation.width,
2069                                    priv->drag_mouse_dy - EXTRA_BORDER);
2070            }
2071            else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2072            {
2073                gdk_draw_rectangle (drawable,
2074                                    widget->style->white_gc,
2075                                    TRUE,
2076                                    0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
2077                                    widget->allocation.width,
2078                                    -priv->drag_mouse_dy - EXTRA_BORDER);
2079            }
2080        }
2081    
2082    #ifdef ENABLE_OSD
2083        /* draw new OSD */
2084        if(priv->osd)
2085            priv->osd->draw (priv->osd, drawable);
2086    
2087    #ifdef OSD_DOUBLE_BUFFER
2088        gdk_draw_drawable (widget->window,
2089                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2090                         priv->pixmap,                         priv->dbuf_pixmap,
2091                         event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,                         0,0,0,0,-1,-1);
2092                         event->area.x, event->area.y,  #endif
                        event->area.width, event->area.height);  
2093    
2094    #endif
2095    
2096      return FALSE;      return FALSE;
2097  }  }
2098    
# Line 1922  osm_gps_map_class_init (OsmGpsMapClass * Line 2174  osm_gps_map_class_init (OsmGpsMapClass *
2174                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2175    
2176      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
                                      PROP_TILE_CACHE_DIR_IS_FULL_PATH,  
                                      g_param_spec_boolean ("tile-cache-is-full-path",  
                                                            "tile cache is full path",  
                                                            "if true, the path passed to tile-cache is interpreted as the full cache path",  
                                                            FALSE,  
                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));  
   
     g_object_class_install_property (object_class,  
2177                                       PROP_ZOOM,                                       PROP_ZOOM,
2178                                       g_param_spec_int ("zoom",                                       g_param_spec_int ("zoom",
2179                                                         "zoom",                                                         "zoom",
# Line 2026  osm_gps_map_class_init (OsmGpsMapClass * Line 2270  osm_gps_map_class_init (OsmGpsMapClass *
2270                                                         "radius of the gps point inner circle",                                                         "radius of the gps point inner circle",
2271                                                         0,           /* minimum property value */                                                         0,           /* minimum property value */
2272                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2273                                                         5,                                                         10,
2274                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2275    
2276      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 2047  osm_gps_map_class_init (OsmGpsMapClass * Line 2291  osm_gps_map_class_init (OsmGpsMapClass *
2291                                                         -1,           /* minimum property value */                                                         -1,           /* minimum property value */
2292                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2293                                                         -1,                                                         -1,
2294                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2295    
2296      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2297                                       PROP_IMAGE_FORMAT,                                       PROP_IMAGE_FORMAT,
# Line 2066  osm_gps_map_source_get_friendly_name(Osm Line 2310  osm_gps_map_source_get_friendly_name(Osm
2310          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2311              return "None";              return "None";
2312          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2313              return "OpenStreetMap";              return "OpenStreetMap I";
2314          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2315              return "OpenStreetMap Renderer";              return "OpenStreetMap II";
2316          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2317              return "OpenAerialMap";              return "OpenCycleMap";
2318            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2319                return "OSMC Trails";
2320          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2321              return "Maps-For-Free";              return "Maps-For-Free";
2322          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2112  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2358  osm_gps_map_source_get_repo_uri(OsmGpsMa
2358              return OSM_REPO_URI;              return OSM_REPO_URI;
2359          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2360              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2361          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2362              return "http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/#Z/#X/#Y.jpg";              return "http://c.andy.sandbox.cloudmade.com/tiles/cycle/#Z/#X/#Y.png";
2363            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2364                return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
2365          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2366              return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";              return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";
2367          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2151  osm_gps_map_source_get_image_format(OsmG Line 2399  osm_gps_map_source_get_image_format(OsmG
2399          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2400          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2401          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2402            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2403            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2404              return "png";              return "png";
2405          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2406          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2407            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2408          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2409          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2410          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
# Line 2161  osm_gps_map_source_get_image_format(OsmG Line 2412  osm_gps_map_source_get_image_format(OsmG
2412          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2413          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2414          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
         case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:  
         case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:  
2415              return "jpg";              return "jpg";
2416          default:          default:
2417              return "bin";              return "bin";
# Line 2184  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2433  osm_gps_map_source_get_max_zoom(OsmGpsMa
2433          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2434              return 18;              return 18;
2435          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2436            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2437              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2438          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
         case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:  
2439          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2440          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2441          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2196  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2445  osm_gps_map_source_get_max_zoom(OsmGpsMa
2445          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2446          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2447              return 17;              return 17;
2448            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2449                return 15;
2450          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2451              return 11;              return 11;
2452          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
# Line 2335  osm_gps_map_set_zoom (OsmGpsMap *map, in Line 2586  osm_gps_map_set_zoom (OsmGpsMap *map, in
2586          g_debug("Zoom changed from %d to %d factor:%f x:%d",          g_debug("Zoom changed from %d to %d factor:%f x:%d",
2587                  zoom_old, priv->map_zoom, factor, priv->map_x);                  zoom_old, priv->map_zoom, factor, priv->map_x);
2588    
2589    #ifdef ENABLE_OSD
2590            /* OSD may contain a scale, so we may have to re-render it */
2591            if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2592                priv->osd->render (priv->osd);
2593    #endif
2594    
2595          osm_gps_map_map_redraw_idle(map);          osm_gps_map_map_redraw_idle(map);
2596      }      }
2597      return priv->map_zoom;      return priv->map_zoom;
# Line 2420  osm_gps_map_clear_images (OsmGpsMap *map Line 2677  osm_gps_map_clear_images (OsmGpsMap *map
2677  }  }
2678    
2679  void  void
 osm_gps_map_osd_speed (OsmGpsMap *map, float speed)  
 {  
     OsmGpsMapPrivate *priv;  
   
     PangoContext        *context = NULL;  
     PangoLayout     *layout  = NULL;  
     PangoFontDescription    *desc    = NULL;  
   
     GdkColor color;  
     GdkGC *gc;  
   
     gchar *buffer;  
     //static int x = 10, y = 10;  
     static int width = 0, height = 0;  
   
     g_return_if_fail (OSM_IS_GPS_MAP (map));  
     priv = map->priv;  
   
     buffer = g_strdup_printf("%.0f", speed);  
   
     /* pango initialisation */  
     context = gtk_widget_get_pango_context (GTK_WIDGET(map));  
     layout  = pango_layout_new (context);  
     desc    = pango_font_description_new();  
   
     pango_font_description_set_size (desc, 40 * PANGO_SCALE);  
     pango_layout_set_font_description (layout, desc);  
     pango_layout_set_text (layout, buffer, strlen(buffer));  
   
     gc = gdk_gc_new (GTK_WIDGET(map)->window);  
   
     color.red = (0 > 50) ? 0xffff : 0;  
     color.green = 0;  
     color.blue = 0;  
   
     gdk_gc_set_rgb_fg_color (gc, &color);  
   
     /* faster / less flicker alternative:*/  
     gdk_draw_drawable (  
                        GTK_WIDGET(map)->window,  
                        GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(map)],  
                        priv->pixmap,  
                        0,0,  
                        0,0,  
                        width+10,width+10);  
   
     gdk_draw_layout(GTK_WIDGET(map)->window,  
                     gc,  
                     0, 0,  
                     layout);  
   
     /* set width and height */  
     pango_layout_get_pixel_size(layout, &width, &height);  
   
     g_free(buffer);  
     pango_font_description_free (desc);  
     g_object_unref (layout);  
     g_object_unref (gc);  
 }  
   
 void  
2680  osm_gps_map_draw_gps (OsmGpsMap *map, float latitude, float longitude, float heading)  osm_gps_map_draw_gps (OsmGpsMap *map, float latitude, float longitude, float heading)
2681  {  {
2682      int pixel_x, pixel_y;      int pixel_x, pixel_y;
# Line 2492  osm_gps_map_draw_gps (OsmGpsMap *map, fl Line 2688  osm_gps_map_draw_gps (OsmGpsMap *map, fl
2688      priv->gps->rlat = deg2rad(latitude);      priv->gps->rlat = deg2rad(latitude);
2689      priv->gps->rlon = deg2rad(longitude);      priv->gps->rlon = deg2rad(longitude);
2690      priv->gps_valid = TRUE;      priv->gps_valid = TRUE;
2691        priv->gps_heading = deg2rad(heading);
2692    
2693      // pixel_x,y, offsets      // pixel_x,y, offsets
2694      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);
# Line 2581  osm_gps_map_geographic_to_screen (OsmGps Line 2778  osm_gps_map_geographic_to_screen (OsmGps
2778      priv = map->priv;      priv = map->priv;
2779    
2780      if (pixel_x)      if (pixel_x)
2781          *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) - priv->map_x;          *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) -
2782                priv->map_x + priv->drag_mouse_dx;
2783      if (pixel_y)      if (pixel_y)
2784          *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) - priv->map_y;          *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) -
2785                priv->map_y + priv->drag_mouse_dy;
2786  }  }
2787    
2788  void  void
# Line 2598  osm_gps_map_scroll (OsmGpsMap *map, gint Line 2797  osm_gps_map_scroll (OsmGpsMap *map, gint
2797      priv->map_x += dx;      priv->map_x += dx;
2798      priv->map_y += dy;      priv->map_y += dy;
2799    
2800    #ifdef ENABLE_OSD
2801        /* OSD may contain a coordinate, so we may have to re-render it */
2802        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2803            priv->osd->render (priv->osd);
2804    #endif
2805    
2806      osm_gps_map_map_redraw_idle (map);      osm_gps_map_map_redraw_idle (map);
2807  }  }
2808    
# Line 2606  osm_gps_map_get_scale(OsmGpsMap *map) Line 2811  osm_gps_map_get_scale(OsmGpsMap *map)
2811  {  {
2812      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
2813    
2814      g_return_val_if_fail (OSM_IS_GPS_MAP (map), OSM_NAN);      g_return_val_if_fail (OSM_IS_GPS_MAP (map), OSM_GPS_MAP_INVALID);
2815      priv = map->priv;      priv = map->priv;
2816    
2817      return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);      return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);
2818  }  }
2819    
2820    #ifdef ENABLE_OSD
2821    
2822    void
2823    osm_gps_map_redraw (OsmGpsMap *map)
2824    {
2825        osm_gps_map_map_redraw_idle(map);
2826    }
2827    
2828    osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {
2829        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
2830        return map->priv->osd;
2831    }
2832    
2833    void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {
2834        OsmGpsMapPrivate *priv;
2835    
2836        g_return_if_fail (OSM_IS_GPS_MAP (map));
2837    
2838        priv = map->priv;
2839        g_return_if_fail (!priv->osd);
2840    
2841        priv->osd = osd;
2842    }
2843    
2844    void
2845    osm_gps_map_repaint (OsmGpsMap *map) {
2846        osm_gps_map_expose (GTK_WIDGET(map), NULL);
2847    }
2848    
2849    #endif
Legend:
Removed from v.56  
changed lines
  Added in v.114