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

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

revision 74 by harbaum, Mon Aug 24 09:23:36 2009 UTC revision 91 by harbaum, Tue Sep 1 19:55:49 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 112  struct _OsmGpsMapPrivate Line 131  struct _OsmGpsMapPrivate
131  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
132      //the osd controls (if present)      //the osd controls (if present)
133      osm_gps_map_osd_t *osd;      osm_gps_map_osd_t *osd;
134    #ifdef OSD_DOUBLE_BUFFER
135        GdkPixmap *dbuf_pixmap;
136    #endif
137    #endif
138    
139    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
140        gboolean fullscreen;
141  #endif  #endif
142    
143      //additional images or tracks added to the map      //additional images or tracks added to the map
# Line 165  enum Line 191  enum
191      PROP_REPO_URI,      PROP_REPO_URI,
192      PROP_PROXY_URI,      PROP_PROXY_URI,
193      PROP_TILE_CACHE_DIR,      PROP_TILE_CACHE_DIR,
     PROP_TILE_CACHE_DIR_IS_FULL_PATH,  
194      PROP_ZOOM,      PROP_ZOOM,
195      PROP_MAX_ZOOM,      PROP_MAX_ZOOM,
196      PROP_MIN_ZOOM,      PROP_MIN_ZOOM,
# Line 326  static void Line 351  static void
351  inspect_map_uri(OsmGpsMap *map)  inspect_map_uri(OsmGpsMap *map)
352  {  {
353      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
354        priv->uri_format = 0;
355        priv->the_google = FALSE;
356    
357      if (g_strrstr(priv->repo_uri, URI_MARKER_X))      if (g_strrstr(priv->repo_uri, URI_MARKER_X))
358          priv->uri_format |= URI_HAS_X;          priv->uri_format |= URI_HAS_X;
# Line 1072  osm_gps_map_download_tile (OsmGpsMap *ma Line 1099  osm_gps_map_download_tile (OsmGpsMap *ma
1099                  }                  }
1100              }              }
1101    
1102    #ifdef LIBSOUP22
1103                soup_message_headers_append(msg->request_headers,
1104                                            "User-Agent", USER_AGENT);
1105    #endif
1106    
1107              g_hash_table_insert (priv->tile_queue, dl->uri, msg);              g_hash_table_insert (priv->tile_queue, dl->uri, msg);
1108              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);
1109          } else {          } else {
# Line 1424  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1456  osm_gps_map_map_redraw (OsmGpsMap *map)
1456    
1457      priv->idle_map_redraw = 0;      priv->idle_map_redraw = 0;
1458    
1459        /* don't redraw the entire map while the OSD is doing */
1460        /* some animation or the like. This is to keep the animation */
1461        /* fluid */
1462        if (priv->osd->busy(priv->osd))
1463            return FALSE;
1464    
1465      /* 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
1466       * 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
1467       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1451  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1489  osm_gps_map_map_redraw (OsmGpsMap *map)
1489      osm_gps_map_draw_balloon_int(map);      osm_gps_map_draw_balloon_int(map);
1490  #endif  #endif
1491    
 #ifdef ENABLE_OSD  
     if(priv->osd)  
         priv->osd->draw(priv->osd, EXTRA_BORDER, EXTRA_BORDER);  
 #endif  
   
1492      //osm_gps_map_osd_speed(map, 1.5);      //osm_gps_map_osd_speed(map, 1.5);
1493      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1494      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
# Line 1472  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1505  osm_gps_map_map_redraw_idle (OsmGpsMap *
1505          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);
1506  }  }
1507    
1508    #ifdef OSM_GPS_MAP_KEYS
1509    static gboolean
1510    on_window_key_press(GtkWidget *widget,
1511                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1512      gboolean handled = FALSE;
1513      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1514    
1515      // the map handles some keys on its own ...
1516      switch(event->keyval) {
1517    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1518      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1519          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1520          if(!priv->fullscreen)
1521              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1522          else
1523              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1524    
1525          priv->fullscreen = !priv->fullscreen;
1526          handled = TRUE;
1527          } break;
1528    #endif
1529    
1530    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1531      case OSM_GPS_MAP_KEY_ZOOMIN:
1532          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1533          handled = TRUE;
1534          break;
1535    #endif
1536    
1537    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1538      case OSM_GPS_MAP_KEY_ZOOMOUT:
1539          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1540          handled = TRUE;
1541          break;
1542    #endif
1543    
1544    #ifdef OSM_GPS_MAP_KEY_UP
1545      case OSM_GPS_MAP_KEY_UP:
1546          priv->map_y -= step;
1547          priv->center_coord_set = FALSE;
1548          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1549          handled = TRUE;
1550          break;
1551    #endif
1552    
1553    #ifdef OSM_GPS_MAP_KEY_DOWN
1554      case OSM_GPS_MAP_KEY_DOWN:
1555          priv->map_y += step;
1556          priv->center_coord_set = FALSE;
1557          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1558          handled = TRUE;
1559          break;
1560    #endif
1561    
1562    #ifdef OSM_GPS_MAP_KEY_LEFT
1563      case OSM_GPS_MAP_KEY_LEFT:
1564          priv->map_x -= step;
1565          priv->center_coord_set = FALSE;
1566          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1567          handled = TRUE;
1568          break;
1569    #endif
1570    
1571    #ifdef OSM_GPS_MAP_KEY_RIGHT
1572      case OSM_GPS_MAP_KEY_RIGHT:
1573          priv->map_x += step;
1574          priv->center_coord_set = FALSE;
1575          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1576          handled = TRUE;
1577          break;
1578    #endif
1579    
1580      default:
1581          break;
1582      }
1583    
1584      return handled;
1585    }
1586    #endif
1587    
1588  static void  static void
1589  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1590  {  {
# Line 1496  osm_gps_map_init (OsmGpsMap *object) Line 1609  osm_gps_map_init (OsmGpsMap *object)
1609      priv->osd = NULL;      priv->osd = NULL;
1610  #endif  #endif
1611    
1612    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1613        priv->fullscreen = FALSE;
1614    #endif
1615    
1616      priv->tracks = NULL;      priv->tracks = NULL;
1617      priv->images = NULL;      priv->images = NULL;
1618    
# Line 1512  osm_gps_map_init (OsmGpsMap *object) Line 1629  osm_gps_map_init (OsmGpsMap *object)
1629    
1630  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1631      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1632      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session =
1633                                                               SOUP_SESSION_USER_AGENT,          soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
1634                                                               "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);  
1635  #else  #else
1636      /* 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 */
1637        /* set it seperately as an extra header field for each reuest */
1638      priv->soup_session = soup_session_async_new();      priv->soup_session = soup_session_async_new();
1639  #endif  #endif
1640    
# Line 1540  osm_gps_map_init (OsmGpsMap *object) Line 1657  osm_gps_map_init (OsmGpsMap *object)
1657      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1658    
1659      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);
 }  
1660    
1661  #ifndef G_CHECKSUM_MD5  #ifdef OSM_GPS_MAP_KEYS
1662  /* simple hash algorithm hack if md5 is not present */      g_signal_connect(G_OBJECT(object), "key_press_event",
1663  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);  
 }  
1664  #endif  #endif
1665    }
1666    
1667  static GObject *  static void
1668  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_setup(OsmGpsMapPrivate *priv) {
 {  
     GObject *object;  
     OsmGpsMapPrivate *priv;  
     OsmGpsMap *map;  
1669      const char *uri;      const char *uri;
1670    
     //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);  
   
1671      //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
1672      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);
1673      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
# Line 1595  osm_gps_map_constructor (GType gtype, gu Line 1692  osm_gps_map_constructor (GType gtype, gu
1692          }          }
1693      }      }
1694    
1695      if (!priv->cache_dir_is_full_path) {      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1696  #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  
1697    
1698          if (priv->cache_dir) {      if (priv->tile_dir) {
1699              char *old = priv->cache_dir;          //the new cachedir is the given cache dir + the friendly name of the repo_uri
1700              //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);
1701              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);  
1702      }      }
1703    }
1704    
1705    static GObject *
1706    osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
1707    {
1708        //Always chain up to the parent constructor
1709        GObject *object =
1710            G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1711    
1712        osm_gps_map_setup(OSM_GPS_MAP_PRIVATE(object));
1713    
1714      inspect_map_uri(map);      inspect_map_uri(OSM_GPS_MAP(object));
1715    
1716      return object;      return object;
1717  }  }
# Line 1662  osm_gps_map_dispose (GObject *object) Line 1757  osm_gps_map_dispose (GObject *object)
1757  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1758      if(priv->osd)      if(priv->osd)
1759          priv->osd->free(priv->osd);          priv->osd->free(priv->osd);
1760    
1761    #ifdef OSD_DOUBLE_BUFFER
1762        if(priv->dbuf_pixmap)
1763            g_object_unref (priv->dbuf_pixmap);
1764    #endif
1765  #endif  #endif
1766    
1767      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
# Line 1673  osm_gps_map_finalize (GObject *object) Line 1773  osm_gps_map_finalize (GObject *object)
1773      OsmGpsMap *map = OSM_GPS_MAP(object);      OsmGpsMap *map = OSM_GPS_MAP(object);
1774      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1775    
1776      g_free(priv->cache_dir);      if(priv->tile_dir)
1777            g_free(priv->tile_dir);
1778    
1779        if(priv->cache_dir)
1780            g_free(priv->cache_dir);
1781    
1782      g_free(priv->repo_uri);      g_free(priv->repo_uri);
1783      g_free(priv->image_format);      g_free(priv->image_format);
1784    
# Line 1730  osm_gps_map_set_property (GObject *objec Line 1835  osm_gps_map_set_property (GObject *objec
1835              break;              break;
1836          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1837              if ( g_value_get_string(value) )              if ( g_value_get_string(value) )
1838                  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);  
1839              break;              break;
1840          case PROP_ZOOM:          case PROP_ZOOM:
1841              priv->map_zoom = g_value_get_int (value);              priv->map_zoom = g_value_get_int (value);
# Line 1761  osm_gps_map_set_property (GObject *objec Line 1863  osm_gps_map_set_property (GObject *objec
1863          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1864              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
1865              break;              break;
1866          case PROP_MAP_SOURCE:          case PROP_MAP_SOURCE: {
1867                gint old = priv->map_source;
1868              priv->map_source = g_value_get_int (value);              priv->map_source = g_value_get_int (value);
1869              break;              if(old >= OSM_GPS_MAP_SOURCE_NULL &&
1870                   priv->map_source != old &&
1871                   priv->map_source >= OSM_GPS_MAP_SOURCE_NULL &&
1872                   priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) {
1873    
1874                    /* we now have to switch the entire map */
1875    
1876                    /* flush the ram cache */
1877                    g_hash_table_remove_all(priv->tile_cache);
1878    
1879                    osm_gps_map_setup(priv);
1880    
1881                    inspect_map_uri(map);
1882    
1883                    /* adjust zoom if necessary */
1884                    if(priv->map_zoom > priv->max_zoom)
1885                        osm_gps_map_set_zoom(map, priv->max_zoom);
1886    
1887                    if(priv->map_zoom < priv->min_zoom)
1888                        osm_gps_map_set_zoom(map, priv->min_zoom);
1889    
1890                } } break;
1891          case PROP_IMAGE_FORMAT:          case PROP_IMAGE_FORMAT:
1892              priv->image_format = g_value_dup_string (value);              priv->image_format = g_value_dup_string (value);
1893              break;              break;
# Line 1804  osm_gps_map_get_property (GObject *objec Line 1928  osm_gps_map_get_property (GObject *objec
1928          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1929              g_value_set_string(value, priv->cache_dir);              g_value_set_string(value, priv->cache_dir);
1930              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             g_value_set_boolean(value, priv->cache_dir_is_full_path);  
             break;  
1931          case PROP_ZOOM:          case PROP_ZOOM:
1932              g_value_set_int(value, priv->map_zoom);              g_value_set_int(value, priv->map_zoom);
1933              break;              break;
# Line 1891  osm_gps_map_button_press (GtkWidget *wid Line 2012  osm_gps_map_button_press (GtkWidget *wid
2012  #endif  #endif
2013    
2014  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
     #define SCROLL_STEP 10  
   
2015      /* pressed inside OSD control? */      /* pressed inside OSD control? */
2016      if(priv->osd) {      if(priv->osd) {
2017          osd_button_t but = priv->osd->check(event->x, event->y);          osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);
2018          if(but != OSD_NONE)          if(but != OSD_NONE)
2019          {          {
2020                int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
2021              priv->drag_counter = -1;              priv->drag_counter = -1;
2022    
2023              switch(but) {              switch(but) {
2024              case OSD_UP:              case OSD_UP:
2025                  priv->map_y -= GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;                  priv->map_y -= step;
2026                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2027                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2028                  break;                  break;
2029    
2030              case OSD_DOWN:              case OSD_DOWN:
2031                  priv->map_y += GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;                  priv->map_y += step;
2032                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2033                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2034                  break;                  break;
2035    
2036              case OSD_LEFT:              case OSD_LEFT:
2037                  priv->map_x -= GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;                  priv->map_x -= step;
2038                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2039                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2040                  break;                  break;
2041    
2042              case OSD_RIGHT:              case OSD_RIGHT:
2043                  priv->map_x += GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;                  priv->map_x += step;
2044                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2045                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2046                  break;                  break;
2047    
2048              case OSD_IN:              case OSD_IN:
# Line 1936  osm_gps_map_button_press (GtkWidget *wid Line 2060  osm_gps_map_button_press (GtkWidget *wid
2060                  break;                  break;
2061              }              }
2062    
             osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));  
   
2063              return FALSE;              return FALSE;
2064          }          }
2065      }      }
# Line 2023  osm_gps_map_motion_notify (GtkWidget *wi Line 2145  osm_gps_map_motion_notify (GtkWidget *wi
2145      if (priv->drag_counter < 6)      if (priv->drag_counter < 6)
2146          return FALSE;          return FALSE;
2147    
2148  #ifdef USE_MAEMO  #ifdef OSM_GPS_MAP_REFRESH
2149      /* reduce update frequency on maemo to keep screen update fluid */      /* reduce update frequency on maemo to keep screen update fluid */
2150      static guint32 last_time = 0;      static guint32 last_time = 0;
2151    
2152      if(event->time - last_time < 100) return FALSE;      if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE;
2153      last_time = event->time;      last_time = event->time;
2154  #endif  #endif
2155    
# Line 2039  osm_gps_map_motion_notify (GtkWidget *wi Line 2161  osm_gps_map_motion_notify (GtkWidget *wi
2161      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
2162      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
2163    
 #ifdef ENABLE_OSD  
     if(priv->osd) {  
         /* undo OSD */  
         priv->osd->restore (priv->osd);  
   
         /* draw new OSD */  
         priv->osd->draw (priv->osd,  
                          EXTRA_BORDER - priv->drag_mouse_dx,  
                          EXTRA_BORDER - priv->drag_mouse_dy);  
     }  
 #endif  
   
2164      osm_gps_map_expose (widget, NULL);      osm_gps_map_expose (widget, NULL);
2165    
2166      return FALSE;      return FALSE;
# Line 2066  osm_gps_map_configure (GtkWidget *widget Line 2176  osm_gps_map_configure (GtkWidget *widget
2176          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
2177    
2178      priv->pixmap = gdk_pixmap_new (      priv->pixmap = gdk_pixmap_new (
2179                                     widget->window,                          widget->window,
2180                                     widget->allocation.width + EXTRA_BORDER * 2,                          widget->allocation.width + EXTRA_BORDER * 2,
2181                                     widget->allocation.height + EXTRA_BORDER * 2,                          widget->allocation.height + EXTRA_BORDER * 2,
2182                                     -1);                          -1);
2183    
2184  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
2185    
2186    #ifdef OSD_DOUBLE_BUFFER
2187        if (priv->dbuf_pixmap)
2188            g_object_unref (priv->dbuf_pixmap);
2189    
2190        priv->dbuf_pixmap = gdk_pixmap_new (
2191                            widget->window,
2192                            widget->allocation.width,
2193                            widget->allocation.height,
2194                            -1);
2195    #endif
2196    
2197      /* the osd needs some references to map internal objects */      /* the osd needs some references to map internal objects */
2198      if(priv->osd)      if(priv->osd)
     {  
         priv->osd->pixmap = priv->pixmap;  
2199          priv->osd->widget = widget;          priv->osd->widget = widget;
     }  
2200  #endif  #endif
2201    
2202      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
# Line 2096  osm_gps_map_expose (GtkWidget *widget, G Line 2215  osm_gps_map_expose (GtkWidget *widget, G
2215  {  {
2216      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2217    
2218      gdk_draw_drawable (  #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2219                         widget->window,      GdkDrawable *drawable = priv->dbuf_pixmap;
2220                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],  #else
2221                         priv->pixmap,      GdkDrawable *drawable = widget->window;
2222                         0,0,  #endif
2223                         priv->drag_mouse_dx - EXTRA_BORDER,  
2224                         priv->drag_mouse_dy - EXTRA_BORDER,      if (!priv->dragging && event)
2225                         -1,-1);      {
2226            gdk_draw_drawable (drawable,
2227      //Paint white outside of the map if dragging. Its less                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2228      //ugly than painting the corrupted map                             priv->pixmap,
2229      if(priv->drag_mouse_dx>EXTRA_BORDER) {                             event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
2230          gdk_draw_rectangle (                             event->area.x, event->area.y,
2231                              widget->window,                             event->area.width, event->area.height);
2232                              widget->style->white_gc,      }
2233                              TRUE,      else
2234                              0, 0,      {
2235                              priv->drag_mouse_dx - EXTRA_BORDER,          gdk_draw_drawable (drawable,
2236                              widget->allocation.height);                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2237      }                             priv->pixmap,
2238      else if (-priv->drag_mouse_dx > EXTRA_BORDER)                             0,0,
2239      {                             priv->drag_mouse_dx - EXTRA_BORDER,
2240          gdk_draw_rectangle (                             priv->drag_mouse_dy - EXTRA_BORDER,
2241                              widget->window,                             -1,-1);
2242                              widget->style->white_gc,  
2243                              TRUE,          //Paint white outside of the map if dragging. Its less
2244                              priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,          //ugly than painting the corrupted map
2245                              -priv->drag_mouse_dx - EXTRA_BORDER,          if(priv->drag_mouse_dx>EXTRA_BORDER) {
2246                              widget->allocation.height);              gdk_draw_rectangle (drawable,
2247      }                                  widget->style->white_gc,
2248                                    TRUE,
2249      if (priv->drag_mouse_dy>EXTRA_BORDER) {                                  0, 0,
2250          gdk_draw_rectangle (                                  priv->drag_mouse_dx - EXTRA_BORDER,
2251                              widget->window,                                  widget->allocation.height);
2252                              widget->style->white_gc,          }
2253                              TRUE,          else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2254                              0, 0,          {
2255                              widget->allocation.width,              gdk_draw_rectangle (drawable,
2256                              priv->drag_mouse_dy - EXTRA_BORDER);                                  widget->style->white_gc,
2257      }                                  TRUE,
2258      else if (-priv->drag_mouse_dy > EXTRA_BORDER)                                  priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
2259      {                                  -priv->drag_mouse_dx - EXTRA_BORDER,
2260          gdk_draw_rectangle (                                  widget->allocation.height);
2261                              widget->window,          }
2262                              widget->style->white_gc,  
2263                              TRUE,          if (priv->drag_mouse_dy>EXTRA_BORDER) {
2264                              0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,              gdk_draw_rectangle (drawable,
2265                              widget->allocation.width,                                  widget->style->white_gc,
2266                              -priv->drag_mouse_dy - EXTRA_BORDER);                                  TRUE,
2267      }                                  0, 0,
2268  #if 0                                  widget->allocation.width,
2269      if(!priv->dragging)                                  priv->drag_mouse_dy - EXTRA_BORDER);
2270          gdk_draw_drawable (          }
2271                         widget->window,          else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2272            {
2273                gdk_draw_rectangle (drawable,
2274                                    widget->style->white_gc,
2275                                    TRUE,
2276                                    0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
2277                                    widget->allocation.width,
2278                                    -priv->drag_mouse_dy - EXTRA_BORDER);
2279            }
2280        }
2281    
2282    #ifdef ENABLE_OSD
2283        /* draw new OSD */
2284        if(priv->osd)
2285            priv->osd->draw (priv->osd, drawable);
2286    
2287    #ifdef OSD_DOUBLE_BUFFER
2288        gdk_draw_drawable (widget->window,
2289                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2290                         priv->pixmap,                         priv->dbuf_pixmap,
2291                         event->area.x + EXTRA_BORDER,                         0,0,0,0,-1,-1);
2292                         event->area.y + EXTRA_BORDER,  #endif
2293                         event->area.x, event->area.y,  
                        event->area.width, event->area.height);  
2294  #endif  #endif
2295    
2296      return FALSE;      return FALSE;
2297  }  }
2298    
# Line 2238  osm_gps_map_class_init (OsmGpsMapClass * Line 2374  osm_gps_map_class_init (OsmGpsMapClass *
2374                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2375    
2376      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,  
2377                                       PROP_ZOOM,                                       PROP_ZOOM,
2378                                       g_param_spec_int ("zoom",                                       g_param_spec_int ("zoom",
2379                                                         "zoom",                                                         "zoom",
# Line 2363  osm_gps_map_class_init (OsmGpsMapClass * Line 2491  osm_gps_map_class_init (OsmGpsMapClass *
2491                                                         -1,           /* minimum property value */                                                         -1,           /* minimum property value */
2492                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2493                                                         -1,                                                         -1,
2494                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2495    
2496      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2497                                       PROP_IMAGE_FORMAT,                                       PROP_IMAGE_FORMAT,
# Line 2382  osm_gps_map_source_get_friendly_name(Osm Line 2510  osm_gps_map_source_get_friendly_name(Osm
2510          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2511              return "None";              return "None";
2512          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2513              return "OpenStreetMap";              return "OpenStreetMap I";
2514          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2515              return "OpenStreetMap Renderer";              return "OpenStreetMap II";
2516          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2517              return "OpenAerialMap";              return "OpenCycleMap";
2518          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2519              return "Maps-For-Free";              return "Maps-For-Free";
2520          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2428  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2556  osm_gps_map_source_get_repo_uri(OsmGpsMa
2556              return OSM_REPO_URI;              return OSM_REPO_URI;
2557          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2558              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2559          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2560              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";
2561          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2562              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";
2563          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2467  osm_gps_map_source_get_image_format(OsmG Line 2595  osm_gps_map_source_get_image_format(OsmG
2595          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2596          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2597          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2598            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2599              return "png";              return "png";
2600          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2601          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2602            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2603          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2604          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2605          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
# Line 2477  osm_gps_map_source_get_image_format(OsmG Line 2607  osm_gps_map_source_get_image_format(OsmG
2607          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2608          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2609          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:  
2610              return "jpg";              return "jpg";
2611          default:          default:
2612              return "bin";              return "bin";
# Line 2502  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2630  osm_gps_map_source_get_max_zoom(OsmGpsMa
2630          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2631              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2632          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2633          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2634          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2635          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2636          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2736  osm_gps_map_clear_images (OsmGpsMap *map Line 2864  osm_gps_map_clear_images (OsmGpsMap *map
2864  }  }
2865    
2866  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  
2867  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)
2868  {  {
2869      int pixel_x, pixel_y;      int pixel_x, pixel_y;
# Line 2990  void osm_gps_map_register_osd(OsmGpsMap Line 3057  void osm_gps_map_register_osd(OsmGpsMap
3057      priv->osd = osd;      priv->osd = osd;
3058  }  }
3059    
3060    void
3061    osm_gps_map_repaint (OsmGpsMap *map) {
3062        osm_gps_map_expose (GTK_WIDGET(map), NULL);
3063    }
3064    
3065  #endif  #endif
Legend:
Removed from v.74  
changed lines
  Added in v.91