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

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

revision 55 by harbaum, Thu Aug 13 12:01:52 2009 UTC revision 147 by harbaum, Wed Oct 28 11:50:37 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 117  struct _OsmGpsMapPrivate Line 149  struct _OsmGpsMapPrivate
149      int drag_start_mouse_y;      int drag_start_mouse_y;
150      int drag_start_map_x;      int drag_start_map_x;
151      int drag_start_map_y;      int drag_start_map_y;
152        guint drag_expose;
153    
154      //for customizing the redering of the gps track      //for customizing the redering of the gps track
155      int ui_gps_track_width;      int ui_gps_track_width;
# Line 149  enum Line 182  enum
182      PROP_REPO_URI,      PROP_REPO_URI,
183      PROP_PROXY_URI,      PROP_PROXY_URI,
184      PROP_TILE_CACHE_DIR,      PROP_TILE_CACHE_DIR,
     PROP_TILE_CACHE_DIR_IS_FULL_PATH,  
185      PROP_ZOOM,      PROP_ZOOM,
186      PROP_MAX_ZOOM,      PROP_MAX_ZOOM,
187      PROP_MIN_ZOOM,      PROP_MIN_ZOOM,
# Line 310  static void Line 342  static void
342  inspect_map_uri(OsmGpsMap *map)  inspect_map_uri(OsmGpsMap *map)
343  {  {
344      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
345        priv->uri_format = 0;
346        priv->the_google = FALSE;
347    
348      if (g_strrstr(priv->repo_uri, URI_MARKER_X))      if (g_strrstr(priv->repo_uri, URI_MARKER_X))
349          priv->uri_format |= URI_HAS_X;          priv->uri_format |= URI_HAS_X;
# Line 546  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 580  osm_gps_map_draw_gps_point (OsmGpsMap *m
580          int x, y;          int x, y;
581          int r = priv->ui_gps_point_inner_radius;          int r = priv->ui_gps_point_inner_radius;
582          int r2 = priv->ui_gps_point_outer_radius;          int r2 = priv->ui_gps_point_outer_radius;
583          // int lw = priv->ui_gps_track_width;          int mr = MAX(3*r,r2);
         int mr = MAX(r,r2);  
584    
585          map_x0 = priv->map_x - EXTRA_BORDER;          map_x0 = priv->map_x - EXTRA_BORDER;
586          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 611  osm_gps_map_draw_gps_point (OsmGpsMap *m
611    
612          // draw ball gradient          // draw ball gradient
613          if (r > 0) {          if (r > 0) {
614                // draw direction arrow
615                if(!isnan(priv->gps_heading))
616                {
617                    cairo_move_to (cr, x-r*cos(priv->gps_heading), y-r*sin(priv->gps_heading));
618                    cairo_line_to (cr, x+3*r*sin(priv->gps_heading), y-3*r*cos(priv->gps_heading));
619                    cairo_line_to (cr, x+r*cos(priv->gps_heading), y+r*sin(priv->gps_heading));
620                    cairo_close_path (cr);
621    
622                    cairo_set_source_rgba (cr, 0.3, 0.3, 1.0, 0.5);
623                    cairo_fill_preserve (cr);
624    
625                    cairo_set_line_width (cr, 1.0);
626                    cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5);
627                    cairo_stroke(cr);
628                }
629    
630              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);
631              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);
632              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 640  osm_gps_map_draw_gps_point (OsmGpsMap *m
640              cairo_arc (cr, x, y, r, 0, 2 * M_PI);              cairo_arc (cr, x, y, r, 0, 2 * M_PI);
641              cairo_stroke(cr);              cairo_stroke(cr);
642          }          }
643    
644          cairo_destroy(cr);          cairo_destroy(cr);
645          gtk_widget_queue_draw_area (GTK_WIDGET(map),          gtk_widget_queue_draw_area (GTK_WIDGET(map),
646                                      x-mr,                                      x-mr,
# Line 631  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 680  osm_gps_map_draw_gps_point (OsmGpsMap *m
680                                      (mr*2)+lw+lw);                                      (mr*2)+lw+lw);
681  #endif  #endif
682      }      }
683  }  }
684    
685  static void  static void
686  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 695  osm_gps_map_tile_download_complete (Soup Line 744  osm_gps_map_tile_download_complete (Soup
744              }              }
745              else              else
746              {              {
747                  g_warning("Error creating tile download directory: %s", dl->folder);                  g_warning("Error creating tile download directory: %s",
748                              dl->folder);
749                    perror("perror:");
750              }              }
751          }          }
752    
# Line 842  osm_gps_map_download_tile (OsmGpsMap *ma Line 893  osm_gps_map_download_tile (OsmGpsMap *ma
893                  }                  }
894              }              }
895    
896    #ifdef LIBSOUP22
897                soup_message_headers_append(msg->request_headers,
898                                            "User-Agent", USER_AGENT);
899    #endif
900    
901              g_hash_table_insert (priv->tile_queue, dl->uri, msg);              g_hash_table_insert (priv->tile_queue, dl->uri, msg);
902              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);
903          } else {          } else {
# Line 1192  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1248  osm_gps_map_map_redraw (OsmGpsMap *map)
1248  {  {
1249      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1250    
1251        /* on diablo the map comes up at 1x1 pixel size and */
1252        /* isn't really usable. ignore this */
1253        if((GTK_WIDGET(map)->allocation.width < 10) ||
1254           (GTK_WIDGET(map)->allocation.height < 10))
1255            return FALSE;
1256    
1257      priv->idle_map_redraw = 0;      priv->idle_map_redraw = 0;
1258    
1259        /* don't redraw the entire map while the OSD is doing */
1260        /* some animation or the like. This is to keep the animation */
1261        /* fluid */
1262        if (priv->osd->busy(priv->osd))
1263            return FALSE;
1264    
1265    #ifdef DRAG_DEBUG
1266        printf("trying redraw\n");
1267    #endif
1268    
1269      /* 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
1270       * 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
1271       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1201  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1273  osm_gps_map_map_redraw (OsmGpsMap *map)
1273      if (priv->dragging)      if (priv->dragging)
1274          return FALSE;          return FALSE;
1275    
1276        /* undo all offsets that may have happened when dragging */
1277        priv->drag_mouse_dx = 0;
1278        priv->drag_mouse_dy = 0;
1279    
1280      priv->redraw_cycle++;      priv->redraw_cycle++;
1281    
1282      /* draw white background to initialise pixmap */      /* draw white background to initialise pixmap */
# Line 1218  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1294  osm_gps_map_map_redraw (OsmGpsMap *map)
1294      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1295      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1296    
1297      //osm_gps_map_osd_speed(map, 1.5);  #ifdef ENABLE_OSD
1298        /* OSD may contain a coordinate/scale, so we may have to re-render it */
1299        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
1300            priv->osd->render (priv->osd);
1301    #endif
1302    
1303      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1304      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
1305    
# Line 1234  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1315  osm_gps_map_map_redraw_idle (OsmGpsMap *
1315          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);
1316  }  }
1317    
1318    #ifdef OSM_GPS_MAP_KEYS
1319    static gboolean
1320    on_window_key_press(GtkWidget *widget,
1321                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1322      gboolean handled = FALSE;
1323      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1324    
1325      // the map handles some keys on its own ...
1326      switch(event->keyval) {
1327    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1328      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1329          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1330          if(!priv->fullscreen)
1331              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1332          else
1333              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1334    
1335          priv->fullscreen = !priv->fullscreen;
1336          handled = TRUE;
1337          } break;
1338    #endif
1339    
1340    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1341      case OSM_GPS_MAP_KEY_ZOOMIN:
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_ZOOMOUT
1348      case OSM_GPS_MAP_KEY_ZOOMOUT:
1349          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1350          handled = TRUE;
1351          break;
1352    #endif
1353    
1354    #ifdef OSM_GPS_MAP_KEY_UP
1355      case OSM_GPS_MAP_KEY_UP:
1356          priv->map_y -= step;
1357          priv->center_coord_set = FALSE;
1358          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1359          handled = TRUE;
1360          break;
1361    #endif
1362    
1363    #ifdef OSM_GPS_MAP_KEY_DOWN
1364      case OSM_GPS_MAP_KEY_DOWN:
1365          priv->map_y += step;
1366          priv->center_coord_set = FALSE;
1367          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1368          handled = TRUE;
1369          break;
1370    #endif
1371    
1372    #ifdef OSM_GPS_MAP_KEY_LEFT
1373      case OSM_GPS_MAP_KEY_LEFT:
1374          priv->map_x -= step;
1375          priv->center_coord_set = FALSE;
1376          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1377          handled = TRUE;
1378          break;
1379    #endif
1380    
1381    #ifdef OSM_GPS_MAP_KEY_RIGHT
1382      case OSM_GPS_MAP_KEY_RIGHT:
1383          priv->map_x += step;
1384          priv->center_coord_set = FALSE;
1385          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1386          handled = TRUE;
1387          break;
1388    #endif
1389    
1390      default:
1391          break;
1392      }
1393    
1394      return handled;
1395    }
1396    #endif
1397    
1398  static void  static void
1399  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1400  {  {
# Line 1247  osm_gps_map_init (OsmGpsMap *object) Line 1408  osm_gps_map_init (OsmGpsMap *object)
1408      priv->trip_history = NULL;      priv->trip_history = NULL;
1409      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1410      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1411        priv->gps_heading = OSM_GPS_MAP_INVALID;
1412    
1413    #ifdef ENABLE_OSD
1414        priv->osd = NULL;
1415    #endif
1416    
1417    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1418        priv->fullscreen = FALSE;
1419    #endif
1420    
1421      priv->tracks = NULL;      priv->tracks = NULL;
1422      priv->images = NULL;      priv->images = NULL;
# Line 1264  osm_gps_map_init (OsmGpsMap *object) Line 1434  osm_gps_map_init (OsmGpsMap *object)
1434    
1435  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1436      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1437      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session =
1438                                                               SOUP_SESSION_USER_AGENT,          soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
1439                                                               "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);  
1440  #else  #else
1441      /* 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 */
1442        /* set it seperately as an extra header field for each reuest */
1443      priv->soup_session = soup_session_async_new();      priv->soup_session = soup_session_async_new();
1444  #endif  #endif
1445    
# Line 1292  osm_gps_map_init (OsmGpsMap *object) Line 1462  osm_gps_map_init (OsmGpsMap *object)
1462      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1463    
1464      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);
 }  
1465    
1466  #ifndef G_CHECKSUM_MD5  #ifdef OSM_GPS_MAP_KEYS
1467  /* simple hash algorithm hack if md5 is not present */      g_signal_connect(G_OBJECT(object), "key_press_event",
1468  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);  
 }  
1469  #endif  #endif
1470    }
1471    
1472  static GObject *  static void
1473  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_setup(OsmGpsMapPrivate *priv) {
 {  
     GObject *object;  
     OsmGpsMapPrivate *priv;  
     OsmGpsMap *map;  
1474      const char *uri;      const char *uri;
1475    
     //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);  
   
1476      //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
1477      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);
1478      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
# Line 1347  osm_gps_map_constructor (GType gtype, gu Line 1497  osm_gps_map_constructor (GType gtype, gu
1497          }          }
1498      }      }
1499    
1500      if (!priv->cache_dir_is_full_path) {      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1501  #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  
1502    
1503          if (priv->cache_dir) {      if (priv->tile_dir) {
1504              char *old = priv->cache_dir;          //the new cachedir is the given cache dir + the friendly name of the repo_uri
1505              //the new cachedir is the given cache dir + the md5 of the repo_uri          priv->cache_dir = g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);
1506              priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, md5);          g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);
             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);  
         }  
   
         g_free(md5);  
1507      }      }
1508    }
1509    
1510      inspect_map_uri(map);  static GObject *
1511    osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
1512    {
1513        //Always chain up to the parent constructor
1514        GObject *object =
1515            G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1516    
1517        osm_gps_map_setup(OSM_GPS_MAP_PRIVATE(object));
1518    
1519        inspect_map_uri(OSM_GPS_MAP(object));
1520    
1521      return object;      return object;
1522  }  }
# Line 1405  osm_gps_map_dispose (GObject *object) Line 1553  osm_gps_map_dispose (GObject *object)
1553      if (priv->idle_map_redraw != 0)      if (priv->idle_map_redraw != 0)
1554          g_source_remove (priv->idle_map_redraw);          g_source_remove (priv->idle_map_redraw);
1555    
1556        if (priv->drag_expose != 0)
1557            g_source_remove (priv->drag_expose);
1558    
1559        g_free(priv->gps);
1560    
1561    #ifdef ENABLE_OSD
1562        if(priv->osd)
1563            priv->osd->free(priv->osd);
1564    
1565    #ifdef OSD_DOUBLE_BUFFER
1566        if(priv->dbuf_pixmap)
1567            g_object_unref (priv->dbuf_pixmap);
1568    #endif
1569    #endif
1570    
1571      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
1572  }  }
1573    
# Line 1414  osm_gps_map_finalize (GObject *object) Line 1577  osm_gps_map_finalize (GObject *object)
1577      OsmGpsMap *map = OSM_GPS_MAP(object);      OsmGpsMap *map = OSM_GPS_MAP(object);
1578      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1579    
1580      g_free(priv->cache_dir);      if(priv->tile_dir)
1581            g_free(priv->tile_dir);
1582    
1583        if(priv->cache_dir)
1584            g_free(priv->cache_dir);
1585    
1586      g_free(priv->repo_uri);      g_free(priv->repo_uri);
1587      g_free(priv->image_format);      g_free(priv->image_format);
1588    
# Line 1471  osm_gps_map_set_property (GObject *objec Line 1639  osm_gps_map_set_property (GObject *objec
1639              break;              break;
1640          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1641              if ( g_value_get_string(value) )              if ( g_value_get_string(value) )
1642                  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);  
1643              break;              break;
1644          case PROP_ZOOM:          case PROP_ZOOM:
1645              priv->map_zoom = g_value_get_int (value);              priv->map_zoom = g_value_get_int (value);
# Line 1502  osm_gps_map_set_property (GObject *objec Line 1667  osm_gps_map_set_property (GObject *objec
1667          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1668              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
1669              break;              break;
1670          case PROP_MAP_SOURCE:          case PROP_MAP_SOURCE: {
1671                gint old = priv->map_source;
1672              priv->map_source = g_value_get_int (value);              priv->map_source = g_value_get_int (value);
1673              break;              if(old >= OSM_GPS_MAP_SOURCE_NULL &&
1674                   priv->map_source != old &&
1675                   priv->map_source >= OSM_GPS_MAP_SOURCE_NULL &&
1676                   priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) {
1677    
1678                    /* we now have to switch the entire map */
1679    
1680                    /* flush the ram cache */
1681                    g_hash_table_remove_all(priv->tile_cache);
1682    
1683                    osm_gps_map_setup(priv);
1684    
1685                    inspect_map_uri(map);
1686    
1687                    /* adjust zoom if necessary */
1688                    if(priv->map_zoom > priv->max_zoom)
1689                        osm_gps_map_set_zoom(map, priv->max_zoom);
1690    
1691                    if(priv->map_zoom < priv->min_zoom)
1692                        osm_gps_map_set_zoom(map, priv->min_zoom);
1693    
1694                } } break;
1695          case PROP_IMAGE_FORMAT:          case PROP_IMAGE_FORMAT:
1696              priv->image_format = g_value_dup_string (value);              priv->image_format = g_value_dup_string (value);
1697              break;              break;
# Line 1545  osm_gps_map_get_property (GObject *objec Line 1732  osm_gps_map_get_property (GObject *objec
1732          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1733              g_value_set_string(value, priv->cache_dir);              g_value_set_string(value, priv->cache_dir);
1734              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             g_value_set_boolean(value, priv->cache_dir_is_full_path);  
             break;  
1735          case PROP_ZOOM:          case PROP_ZOOM:
1736              g_value_set_int(value, priv->map_zoom);              g_value_set_int(value, priv->map_zoom);
1737              break;              break;
# Line 1620  osm_gps_map_button_press (GtkWidget *wid Line 1804  osm_gps_map_button_press (GtkWidget *wid
1804  {  {
1805      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1806    
1807    #ifdef ENABLE_OSD
1808        /* pressed inside OSD control? */
1809        if(priv->osd) {
1810            osd_button_t but =
1811                priv->osd->check(priv->osd, TRUE, event->x, event->y);
1812    
1813            if(but != OSD_NONE)
1814            {
1815                int step =
1816                    GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1817                priv->drag_counter = -1;
1818    
1819                switch(but) {
1820                case OSD_UP:
1821                    priv->map_y -= step;
1822                    priv->center_coord_set = FALSE;
1823                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1824                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1825                    break;
1826    
1827                case OSD_DOWN:
1828                    priv->map_y += step;
1829                    priv->center_coord_set = FALSE;
1830                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1831                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1832                    break;
1833    
1834                case OSD_LEFT:
1835                    priv->map_x -= step;
1836                    priv->center_coord_set = FALSE;
1837                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1838                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1839                    break;
1840    
1841                case OSD_RIGHT:
1842                    priv->map_x += step;
1843                    priv->center_coord_set = FALSE;
1844                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1845                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1846                    break;
1847    
1848                case OSD_IN:
1849                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1850                    break;
1851    
1852                case OSD_OUT:
1853                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1854                    break;
1855    
1856                default:
1857                    /* all custom buttons are forwarded to the application */
1858                    if(priv->osd->cb)
1859                        priv->osd->cb(but, priv->osd->data);
1860                    break;
1861                }
1862    
1863                return FALSE;
1864            }
1865        }
1866    #endif
1867    
1868      priv->drag_counter = 0;      priv->drag_counter = 0;
1869      priv->drag_start_mouse_x = (int) event->x;      priv->drag_start_mouse_x = (int) event->x;
1870      priv->drag_start_mouse_y = (int) event->y;      priv->drag_start_mouse_y = (int) event->y;
# Line 1648  osm_gps_map_button_release (GtkWidget *w Line 1893  osm_gps_map_button_release (GtkWidget *w
1893    
1894          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1895      }      }
1896    #ifdef ENABLE_OSD
1897        /* pressed inside OSD control? */
1898        else if(priv->osd)
1899            priv->osd->check(priv->osd, FALSE, event->x, event->y);
1900    #endif
1901    
1902      priv->drag_mouse_dx = 0;  #ifdef DRAG_DEBUG
1903      priv->drag_mouse_dy = 0;      printf("dragging done\n");
1904      priv->drag_counter = 0;  #endif
1905    
1906        priv->drag_counter = -1;
1907    
1908        return FALSE;
1909    }
1910    
1911    static gboolean
1912    osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);
1913    
1914    static gboolean
1915    osm_gps_map_map_expose (GtkWidget *widget)
1916    {
1917        OsmGpsMapPrivate *priv = OSM_GPS_MAP(widget)->priv;
1918    
1919        priv->drag_expose = 0;
1920        osm_gps_map_expose (widget, NULL);
1921      return FALSE;      return FALSE;
1922  }  }
1923    
# Line 1676  osm_gps_map_motion_notify (GtkWidget *wi Line 1941  osm_gps_map_motion_notify (GtkWidget *wi
1941      if (!(state & GDK_BUTTON1_MASK))      if (!(state & GDK_BUTTON1_MASK))
1942          return FALSE;          return FALSE;
1943    
1944      priv->drag_counter++;      if (priv->drag_counter < 0)
1945            return FALSE;
1946    
1947      // we havent dragged more than 6 pixels      /* not yet dragged far enough? */
1948      if (priv->drag_counter < 6)      if(!priv->drag_counter &&
1949           ( (x - priv->drag_start_mouse_x) * (x - priv->drag_start_mouse_x) +
1950             (y - priv->drag_start_mouse_y) * (y - priv->drag_start_mouse_y) <
1951             10*10))
1952          return FALSE;          return FALSE;
1953    
1954        priv->drag_counter++;
1955    
1956      priv->dragging = TRUE;      priv->dragging = TRUE;
1957    
1958      if (priv->map_auto_center)      if (priv->map_auto_center)
# Line 1690  osm_gps_map_motion_notify (GtkWidget *wi Line 1961  osm_gps_map_motion_notify (GtkWidget *wi
1961      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
1962      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
1963    
1964      gdk_draw_drawable (      /* instead of redrawing directly just add an idle function */
1965                         widget->window,      if (!priv->drag_expose)
1966                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],          priv->drag_expose =
1967                         priv->pixmap,              g_idle_add ((GSourceFunc)osm_gps_map_map_expose, widget);
                        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);  
     }  
1968    
1969      return FALSE;      return FALSE;
1970  }  }
# Line 1753  osm_gps_map_configure (GtkWidget *widget Line 1979  osm_gps_map_configure (GtkWidget *widget
1979          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
1980    
1981      priv->pixmap = gdk_pixmap_new (      priv->pixmap = gdk_pixmap_new (
1982                                     widget->window,                          widget->window,
1983                                     widget->allocation.width + EXTRA_BORDER * 2,                          widget->allocation.width + EXTRA_BORDER * 2,
1984                                     widget->allocation.height + EXTRA_BORDER * 2,                          widget->allocation.height + EXTRA_BORDER * 2,
1985                                     -1);                          -1);
1986    
1987    #ifdef ENABLE_OSD
1988    
1989    #ifdef OSD_DOUBLE_BUFFER
1990        if (priv->dbuf_pixmap)
1991            g_object_unref (priv->dbuf_pixmap);
1992    
1993        priv->dbuf_pixmap = gdk_pixmap_new (
1994                            widget->window,
1995                            widget->allocation.width,
1996                            widget->allocation.height,
1997                            -1);
1998    #endif
1999    
2000        /* the osd needs some references to map internal objects */
2001        if(priv->osd)
2002            priv->osd->widget = widget;
2003    #endif
2004    
2005      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
2006      if(priv->gc_map)      if(priv->gc_map)
# Line 1774  osm_gps_map_expose (GtkWidget *widget, G Line 2018  osm_gps_map_expose (GtkWidget *widget, G
2018  {  {
2019      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2020    
2021      gdk_draw_drawable (  #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2022                         widget->window,      GdkDrawable *drawable = priv->dbuf_pixmap;
2023    #else
2024        GdkDrawable *drawable = widget->window;
2025    #endif
2026    
2027    #ifdef DRAG_DEBUG
2028        printf("expose, map %d/%d\n", priv->map_x, priv->map_y);
2029    #endif
2030    
2031        if (!priv->drag_mouse_dx && !priv->drag_mouse_dy && event)
2032        {
2033    #ifdef DRAG_DEBUG
2034            printf("  dragging = %d, event = %p\n", priv->dragging, event);
2035    #endif
2036    
2037            gdk_draw_drawable (drawable,
2038                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2039                               priv->pixmap,
2040                               event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
2041                               event->area.x, event->area.y,
2042                               event->area.width, event->area.height);
2043        }
2044        else
2045        {
2046    #ifdef DRAG_DEBUG
2047            printf("  drag_mouse %d/%d\n",
2048                   priv->drag_mouse_dx - EXTRA_BORDER,
2049                   priv->drag_mouse_dy - EXTRA_BORDER);
2050    #endif
2051    
2052            gdk_draw_drawable (drawable,
2053                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2054                               priv->pixmap,
2055                               0,0,
2056                               priv->drag_mouse_dx - EXTRA_BORDER,
2057                               priv->drag_mouse_dy - EXTRA_BORDER,
2058                               -1,-1);
2059    
2060            //Paint white outside of the map if dragging. Its less
2061            //ugly than painting the corrupted map
2062            if(priv->drag_mouse_dx>EXTRA_BORDER) {
2063                gdk_draw_rectangle (drawable,
2064                                    widget->style->white_gc,
2065                                    TRUE,
2066                                    0, 0,
2067                                    priv->drag_mouse_dx - EXTRA_BORDER,
2068                                    widget->allocation.height);
2069            }
2070            else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2071            {
2072                gdk_draw_rectangle (drawable,
2073                                    widget->style->white_gc,
2074                                    TRUE,
2075                                    priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
2076                                    -priv->drag_mouse_dx - EXTRA_BORDER,
2077                                    widget->allocation.height);
2078            }
2079    
2080            if (priv->drag_mouse_dy>EXTRA_BORDER) {
2081                gdk_draw_rectangle (drawable,
2082                                    widget->style->white_gc,
2083                                    TRUE,
2084                                    0, 0,
2085                                    widget->allocation.width,
2086                                    priv->drag_mouse_dy - EXTRA_BORDER);
2087            }
2088            else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2089            {
2090                gdk_draw_rectangle (drawable,
2091                                    widget->style->white_gc,
2092                                    TRUE,
2093                                    0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
2094                                    widget->allocation.width,
2095                                    -priv->drag_mouse_dy - EXTRA_BORDER);
2096            }
2097        }
2098    
2099    #ifdef ENABLE_OSD
2100        /* draw new OSD */
2101        if(priv->osd)
2102            priv->osd->draw (priv->osd, drawable);
2103    
2104    #ifdef OSD_DOUBLE_BUFFER
2105        gdk_draw_drawable (widget->window,
2106                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2107                         priv->pixmap,                         priv->dbuf_pixmap,
2108                         event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,                         0,0,0,0,-1,-1);
2109                         event->area.x, event->area.y,  #endif
                        event->area.width, event->area.height);  
2110    
2111    #endif
2112    
2113      return FALSE;      return FALSE;
2114  }  }
2115    
# Line 1863  osm_gps_map_class_init (OsmGpsMapClass * Line 2191  osm_gps_map_class_init (OsmGpsMapClass *
2191                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2192    
2193      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,  
2194                                       PROP_ZOOM,                                       PROP_ZOOM,
2195                                       g_param_spec_int ("zoom",                                       g_param_spec_int ("zoom",
2196                                                         "zoom",                                                         "zoom",
# Line 1967  osm_gps_map_class_init (OsmGpsMapClass * Line 2287  osm_gps_map_class_init (OsmGpsMapClass *
2287                                                         "radius of the gps point inner circle",                                                         "radius of the gps point inner circle",
2288                                                         0,           /* minimum property value */                                                         0,           /* minimum property value */
2289                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2290                                                         5,                                                         10,
2291                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2292    
2293      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1988  osm_gps_map_class_init (OsmGpsMapClass * Line 2308  osm_gps_map_class_init (OsmGpsMapClass *
2308                                                         -1,           /* minimum property value */                                                         -1,           /* minimum property value */
2309                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2310                                                         -1,                                                         -1,
2311                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2312    
2313      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2314                                       PROP_IMAGE_FORMAT,                                       PROP_IMAGE_FORMAT,
# Line 2007  osm_gps_map_source_get_friendly_name(Osm Line 2327  osm_gps_map_source_get_friendly_name(Osm
2327          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2328              return "None";              return "None";
2329          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2330              return "OpenStreetMap";              return "OpenStreetMap I";
2331          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2332              return "OpenStreetMap Renderer";              return "OpenStreetMap II";
2333          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2334              return "OpenAerialMap";              return "OpenCycleMap";
2335            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2336                return "OSMC Trails";
2337          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2338              return "Maps-For-Free";              return "Maps-For-Free";
2339          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2053  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2375  osm_gps_map_source_get_repo_uri(OsmGpsMa
2375              return OSM_REPO_URI;              return OSM_REPO_URI;
2376          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2377              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2378          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2379              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";
2380            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2381                return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
2382          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2383              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";
2384          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2092  osm_gps_map_source_get_image_format(OsmG Line 2416  osm_gps_map_source_get_image_format(OsmG
2416          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2417          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2418          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2419            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2420            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2421              return "png";              return "png";
2422          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2423          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2424            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2425          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2426          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2427          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
# Line 2102  osm_gps_map_source_get_image_format(OsmG Line 2429  osm_gps_map_source_get_image_format(OsmG
2429          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2430          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2431          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:  
2432              return "jpg";              return "jpg";
2433          default:          default:
2434              return "bin";              return "bin";
# Line 2125  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2450  osm_gps_map_source_get_max_zoom(OsmGpsMa
2450          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2451              return 18;              return 18;
2452          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2453            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2454              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2455          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
         case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:  
2456          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2457          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2458          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2137  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2462  osm_gps_map_source_get_max_zoom(OsmGpsMa
2462          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2463          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2464              return 17;              return 17;
2465            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2466                return 15;
2467          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2468              return 11;              return 11;
2469          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
# Line 2276  osm_gps_map_set_zoom (OsmGpsMap *map, in Line 2603  osm_gps_map_set_zoom (OsmGpsMap *map, in
2603          g_debug("Zoom changed from %d to %d factor:%f x:%d",          g_debug("Zoom changed from %d to %d factor:%f x:%d",
2604                  zoom_old, priv->map_zoom, factor, priv->map_x);                  zoom_old, priv->map_zoom, factor, priv->map_x);
2605    
2606    #ifdef ENABLE_OSD
2607            /* OSD may contain a scale, so we may have to re-render it */
2608            if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2609                priv->osd->render (priv->osd);
2610    #endif
2611    
2612          osm_gps_map_map_redraw_idle(map);          osm_gps_map_map_redraw_idle(map);
2613      }      }
2614      return priv->map_zoom;      return priv->map_zoom;
# Line 2361  osm_gps_map_clear_images (OsmGpsMap *map Line 2694  osm_gps_map_clear_images (OsmGpsMap *map
2694  }  }
2695    
2696  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  
2697  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)
2698  {  {
2699      int pixel_x, pixel_y;      int pixel_x, pixel_y;
# Line 2433  osm_gps_map_draw_gps (OsmGpsMap *map, fl Line 2705  osm_gps_map_draw_gps (OsmGpsMap *map, fl
2705      priv->gps->rlat = deg2rad(latitude);      priv->gps->rlat = deg2rad(latitude);
2706      priv->gps->rlon = deg2rad(longitude);      priv->gps->rlon = deg2rad(longitude);
2707      priv->gps_valid = TRUE;      priv->gps_valid = TRUE;
2708        priv->gps_heading = deg2rad(heading);
2709    
2710      // pixel_x,y, offsets      // pixel_x,y, offsets
2711      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);
# Line 2522  osm_gps_map_geographic_to_screen (OsmGps Line 2795  osm_gps_map_geographic_to_screen (OsmGps
2795      priv = map->priv;      priv = map->priv;
2796    
2797      if (pixel_x)      if (pixel_x)
2798          *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) - priv->map_x;          *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) -
2799                priv->map_x + priv->drag_mouse_dx;
2800      if (pixel_y)      if (pixel_y)
2801          *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) - priv->map_y;          *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) -
2802                priv->map_y + priv->drag_mouse_dy;
2803  }  }
2804    
2805  void  void
# Line 2539  osm_gps_map_scroll (OsmGpsMap *map, gint Line 2814  osm_gps_map_scroll (OsmGpsMap *map, gint
2814      priv->map_x += dx;      priv->map_x += dx;
2815      priv->map_y += dy;      priv->map_y += dy;
2816    
2817    #ifdef ENABLE_OSD
2818        /* OSD may contain a coordinate, so we may have to re-render it */
2819        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2820            priv->osd->render (priv->osd);
2821    #endif
2822    
2823      osm_gps_map_map_redraw_idle (map);      osm_gps_map_map_redraw_idle (map);
2824  }  }
2825    
# Line 2547  osm_gps_map_get_scale(OsmGpsMap *map) Line 2828  osm_gps_map_get_scale(OsmGpsMap *map)
2828  {  {
2829      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
2830    
2831      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);
2832      priv = map->priv;      priv = map->priv;
2833    
2834      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);
2835  }  }
2836    
2837    #ifdef ENABLE_OSD
2838    
2839    void
2840    osm_gps_map_redraw (OsmGpsMap *map)
2841    {
2842        osm_gps_map_map_redraw_idle(map);
2843    }
2844    
2845    osm_gps_map_osd_t *
2846    osm_gps_map_osd_get(OsmGpsMap *map)
2847    {
2848        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
2849        return map->priv->osd;
2850    }
2851    
2852    void
2853    osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd)
2854    {
2855        OsmGpsMapPrivate *priv;
2856    
2857        g_return_if_fail (OSM_IS_GPS_MAP (map));
2858    
2859        priv = map->priv;
2860        g_return_if_fail (!priv->osd);
2861    
2862        priv->osd = osd;
2863    }
2864    
2865    void
2866    osm_gps_map_repaint (OsmGpsMap *map)
2867    {
2868        osm_gps_map_expose (GTK_WIDGET(map), NULL);
2869    }
2870    
2871    coord_t *
2872    osm_gps_map_get_gps (OsmGpsMap *map)
2873    {
2874        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
2875    
2876        if(!map->priv->gps_valid)
2877            return NULL;
2878    
2879        return map->priv->gps;
2880    }
2881    
2882    #endif
Legend:
Removed from v.55  
changed lines
  Added in v.147