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

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

revision 85 by harbaum, Fri Aug 28 12:07:16 2009 UTC revision 111 by harbaum, Mon Sep 14 12:16:08 2009 UTC
# Line 66  Line 66 
66  #include <gdk/gdkkeysyms.h>  #include <gdk/gdkkeysyms.h>
67  #endif  #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 95  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;
102    
103      //contains flags indicating the various special characters      //contains flags indicating the various special characters
# Line 112  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_BALLOON  #ifdef ENABLE_BALLOON
# Line 348  static void Line 352  static void
352  inspect_map_uri(OsmGpsMap *map)  inspect_map_uri(OsmGpsMap *map)
353  {  {
354      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
355        priv->uri_format = 0;
356        priv->the_google = FALSE;
357    
358      if (g_strrstr(priv->repo_uri, URI_MARKER_X))      if (g_strrstr(priv->repo_uri, URI_MARKER_X))
359          priv->uri_format |= URI_HAS_X;          priv->uri_format |= URI_HAS_X;
# Line 584  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 590  osm_gps_map_draw_gps_point (OsmGpsMap *m
590          int x, y;          int x, y;
591          int r = priv->ui_gps_point_inner_radius;          int r = priv->ui_gps_point_inner_radius;
592          int r2 = priv->ui_gps_point_outer_radius;          int r2 = priv->ui_gps_point_outer_radius;
593          // int lw = priv->ui_gps_track_width;          int mr = MAX(3*r,r2);
         int mr = MAX(r,r2);  
594    
595          map_x0 = priv->map_x - EXTRA_BORDER;          map_x0 = priv->map_x - EXTRA_BORDER;
596          map_y0 = priv->map_y - EXTRA_BORDER;          map_y0 = priv->map_y - EXTRA_BORDER;
# Line 616  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 621  osm_gps_map_draw_gps_point (OsmGpsMap *m
621    
622          // draw ball gradient          // draw ball gradient
623          if (r > 0) {          if (r > 0) {
624                // draw direction arrow
625                if(!isnan(priv->gps_heading))
626                {
627                    cairo_move_to (cr, x-r*cos(priv->gps_heading), y-r*sin(priv->gps_heading));
628                    cairo_line_to (cr, x+3*r*sin(priv->gps_heading), y-3*r*cos(priv->gps_heading));
629                    cairo_line_to (cr, x+r*cos(priv->gps_heading), y+r*sin(priv->gps_heading));
630                    cairo_close_path (cr);
631    
632                    cairo_set_source_rgba (cr, 0.3, 0.3, 1.0, 0.5);
633                    cairo_fill_preserve (cr);
634    
635                    cairo_set_line_width (cr, 1.0);
636                    cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5);
637                    cairo_stroke(cr);
638                }
639    
640              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);
641              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);
642              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 629  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 650  osm_gps_map_draw_gps_point (OsmGpsMap *m
650              cairo_arc (cr, x, y, r, 0, 2 * M_PI);              cairo_arc (cr, x, y, r, 0, 2 * M_PI);
651              cairo_stroke(cr);              cairo_stroke(cr);
652          }          }
653    
654          cairo_destroy(cr);          cairo_destroy(cr);
655          gtk_widget_queue_draw_area (GTK_WIDGET(map),          gtk_widget_queue_draw_area (GTK_WIDGET(map),
656                                      x-mr,                                      x-mr,
# Line 1094  osm_gps_map_download_tile (OsmGpsMap *ma Line 1115  osm_gps_map_download_tile (OsmGpsMap *ma
1115                  }                  }
1116              }              }
1117    
1118    #ifdef LIBSOUP22
1119                soup_message_headers_append(msg->request_headers,
1120                                            "User-Agent", USER_AGENT);
1121    #endif
1122    
1123              g_hash_table_insert (priv->tile_queue, dl->uri, msg);              g_hash_table_insert (priv->tile_queue, dl->uri, msg);
1124              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);
1125          } else {          } else {
# Line 1446  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1472  osm_gps_map_map_redraw (OsmGpsMap *map)
1472    
1473      priv->idle_map_redraw = 0;      priv->idle_map_redraw = 0;
1474    
1475        /* don't redraw the entire map while the OSD is doing */
1476        /* some animation or the like. This is to keep the animation */
1477        /* fluid */
1478        if (priv->osd->busy(priv->osd))
1479            return FALSE;
1480    
1481    #ifdef DRAG_DEBUG
1482        printf("trying redraw\n");
1483    #endif
1484    
1485      /* 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
1486       * 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
1487       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1453  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1489  osm_gps_map_map_redraw (OsmGpsMap *map)
1489      if (priv->dragging)      if (priv->dragging)
1490          return FALSE;          return FALSE;
1491    
1492        /* undo all offsets that may have happened when dragging */
1493        priv->drag_mouse_dx = 0;
1494        priv->drag_mouse_dy = 0;
1495    
1496      priv->redraw_cycle++;      priv->redraw_cycle++;
1497    
1498      /* draw white background to initialise pixmap */      /* draw white background to initialise pixmap */
# Line 1473  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1513  osm_gps_map_map_redraw (OsmGpsMap *map)
1513      osm_gps_map_draw_balloon_int(map);      osm_gps_map_draw_balloon_int(map);
1514  #endif  #endif
1515    
1516      //osm_gps_map_osd_speed(map, 1.5);  #ifdef ENABLE_OSD
1517        /* OSD may contain a coordinate/scale, so we may have to re-render it */
1518        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
1519            priv->osd->render (priv->osd);
1520    #endif
1521    
1522      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1523      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
1524    
# Line 1496  on_window_key_press(GtkWidget *widget, Line 1541  on_window_key_press(GtkWidget *widget,
1541    gboolean handled = FALSE;    gboolean handled = FALSE;
1542    int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;    int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1543    
   //  printf("key event with keyval %x\n", event->keyval);  
   
1544    // the map handles some keys on its own ...    // the map handles some keys on its own ...
1545    switch(event->keyval) {    switch(event->keyval) {
1546  #ifdef OSM_GPS_MAP_KEY_FULLSCREEN  #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
# Line 1564  on_window_key_press(GtkWidget *widget, Line 1607  on_window_key_press(GtkWidget *widget,
1607  #endif  #endif
1608    
1609    default:    default:
       //      printf("unhandled key event with keyval %x\n", event->keyval);  
1610        break;        break;
1611    }    }
1612    
# Line 1585  osm_gps_map_init (OsmGpsMap *object) Line 1627  osm_gps_map_init (OsmGpsMap *object)
1627      priv->trip_history = NULL;      priv->trip_history = NULL;
1628      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1629      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1630        priv->gps_heading = OSM_GPS_MAP_INVALID;
1631    
1632  #ifdef ENABLE_BALLOON  #ifdef ENABLE_BALLOON
1633      priv->balloon.coo = g_new0(coord_t, 1);      priv->balloon.coo = g_new0(coord_t, 1);
# Line 1616  osm_gps_map_init (OsmGpsMap *object) Line 1659  osm_gps_map_init (OsmGpsMap *object)
1659    
1660  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1661      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1662      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session =
1663                                                               SOUP_SESSION_USER_AGENT,          soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
1664                                                               "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);  
1665  #else  #else
1666      /* 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 */
1667        /* set it seperately as an extra header field for each reuest */
1668      priv->soup_session = soup_session_async_new();      priv->soup_session = soup_session_async_new();
1669  #endif  #endif
1670    
# Line 1646  osm_gps_map_init (OsmGpsMap *object) Line 1689  osm_gps_map_init (OsmGpsMap *object)
1689      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);
1690    
1691  #ifdef OSM_GPS_MAP_KEYS  #ifdef OSM_GPS_MAP_KEYS
     //    GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(object));  
1692      g_signal_connect(G_OBJECT(object), "key_press_event",      g_signal_connect(G_OBJECT(object), "key_press_event",
1693                       G_CALLBACK(on_window_key_press), priv);                       G_CALLBACK(on_window_key_press), priv);
1694  #endif  #endif
1695  }  }
1696    
1697  static GObject *  static void
1698  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_setup(OsmGpsMapPrivate *priv) {
 {  
     GObject *object;  
     OsmGpsMapPrivate *priv;  
     OsmGpsMap *map;  
1699      const char *uri;      const char *uri;
1700    
     //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);  
   
1701      //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
1702      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);
1703      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
# Line 1692  osm_gps_map_constructor (GType gtype, gu Line 1725  osm_gps_map_constructor (GType gtype, gu
1725      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1726      if(!fname) fname = "_unknown_";      if(!fname) fname = "_unknown_";
1727    
1728      if (priv->cache_dir) {      if (priv->tile_dir) {
1729          char *old = priv->cache_dir;          //the new cachedir is the given cache dir + the friendly name of the repo_uri
1730          //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);
1731          priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, fname);          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);  
1732      }      }
1733    }
1734    
1735      inspect_map_uri(map);  static GObject *
1736    osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
1737    {
1738        //Always chain up to the parent constructor
1739        GObject *object =
1740            G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1741    
1742        osm_gps_map_setup(OSM_GPS_MAP_PRIVATE(object));
1743    
1744        inspect_map_uri(OSM_GPS_MAP(object));
1745    
1746      return object;      return object;
1747  }  }
# Line 1762  osm_gps_map_finalize (GObject *object) Line 1803  osm_gps_map_finalize (GObject *object)
1803      OsmGpsMap *map = OSM_GPS_MAP(object);      OsmGpsMap *map = OSM_GPS_MAP(object);
1804      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1805    
1806      g_free(priv->cache_dir);      if(priv->tile_dir)
1807            g_free(priv->tile_dir);
1808    
1809        if(priv->cache_dir)
1810            g_free(priv->cache_dir);
1811    
1812      g_free(priv->repo_uri);      g_free(priv->repo_uri);
1813      g_free(priv->image_format);      g_free(priv->image_format);
1814    
# Line 1819  osm_gps_map_set_property (GObject *objec Line 1865  osm_gps_map_set_property (GObject *objec
1865              break;              break;
1866          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1867              if ( g_value_get_string(value) )              if ( g_value_get_string(value) )
1868                  priv->cache_dir = g_value_dup_string (value);                  priv->tile_dir = g_value_dup_string (value);
1869              break;              break;
1870          case PROP_ZOOM:          case PROP_ZOOM:
1871              priv->map_zoom = g_value_get_int (value);              priv->map_zoom = g_value_get_int (value);
# Line 1847  osm_gps_map_set_property (GObject *objec Line 1893  osm_gps_map_set_property (GObject *objec
1893          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1894              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
1895              break;              break;
1896          case PROP_MAP_SOURCE:          case PROP_MAP_SOURCE: {
1897                gint old = priv->map_source;
1898              priv->map_source = g_value_get_int (value);              priv->map_source = g_value_get_int (value);
1899              break;              if(old >= OSM_GPS_MAP_SOURCE_NULL &&
1900                   priv->map_source != old &&
1901                   priv->map_source >= OSM_GPS_MAP_SOURCE_NULL &&
1902                   priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) {
1903    
1904                    /* we now have to switch the entire map */
1905    
1906                    /* flush the ram cache */
1907                    g_hash_table_remove_all(priv->tile_cache);
1908    
1909                    osm_gps_map_setup(priv);
1910    
1911                    inspect_map_uri(map);
1912    
1913                    /* adjust zoom if necessary */
1914                    if(priv->map_zoom > priv->max_zoom)
1915                        osm_gps_map_set_zoom(map, priv->max_zoom);
1916    
1917                    if(priv->map_zoom < priv->min_zoom)
1918                        osm_gps_map_set_zoom(map, priv->min_zoom);
1919    
1920                } } break;
1921          case PROP_IMAGE_FORMAT:          case PROP_IMAGE_FORMAT:
1922              priv->image_format = g_value_dup_string (value);              priv->image_format = g_value_dup_string (value);
1923              break;              break;
# Line 1986  osm_gps_map_button_press (GtkWidget *wid Line 2054  osm_gps_map_button_press (GtkWidget *wid
2054              case OSD_UP:              case OSD_UP:
2055                  priv->map_y -= step;                  priv->map_y -= step;
2056                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2057                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2058                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2059                  break;                  break;
2060    
2061              case OSD_DOWN:              case OSD_DOWN:
2062                  priv->map_y += step;                  priv->map_y += step;
2063                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2064                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2065                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2066                  break;                  break;
2067    
2068              case OSD_LEFT:              case OSD_LEFT:
2069                  priv->map_x -= step;                  priv->map_x -= step;
2070                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2071                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2072                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2073                  break;                  break;
2074    
2075              case OSD_RIGHT:              case OSD_RIGHT:
2076                  priv->map_x += step;                  priv->map_x += step;
2077                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2078                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2079                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2080                  break;                  break;
2081    
# Line 2068  osm_gps_map_button_release (GtkWidget *w Line 2140  osm_gps_map_button_release (GtkWidget *w
2140          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2141      }      }
2142    
2143      priv->drag_mouse_dx = 0;  #ifdef DRAG_DEBUG
2144      priv->drag_mouse_dy = 0;      printf("dragging done\n");
2145    #endif
2146    
2147      priv->drag_counter = -1;      priv->drag_counter = -1;
2148    
2149      return FALSE;      return FALSE;
# Line 2183  osm_gps_map_expose (GtkWidget *widget, G Line 2257  osm_gps_map_expose (GtkWidget *widget, G
2257      GdkDrawable *drawable = widget->window;      GdkDrawable *drawable = widget->window;
2258  #endif  #endif
2259    
2260      if (!priv->dragging)  #ifdef DRAG_DEBUG
2261        printf("expose, map %d/%d\n", priv->map_x, priv->map_y);
2262    #endif
2263    
2264        if (!priv->drag_mouse_dx && !priv->drag_mouse_dy && event)
2265      {      {
2266    #ifdef DRAG_DEBUG
2267            printf("  dragging = %d, event = %p\n", priv->dragging, event);
2268    #endif
2269    
2270          gdk_draw_drawable (drawable,          gdk_draw_drawable (drawable,
2271                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2272                             priv->pixmap,                             priv->pixmap,
# Line 2194  osm_gps_map_expose (GtkWidget *widget, G Line 2276  osm_gps_map_expose (GtkWidget *widget, G
2276      }      }
2277      else      else
2278      {      {
2279    #ifdef DRAG_DEBUG
2280            printf("  drag_mouse %d/%d\n",
2281                   priv->drag_mouse_dx - EXTRA_BORDER,
2282                   priv->drag_mouse_dy - EXTRA_BORDER);
2283    #endif
2284    
2285          gdk_draw_drawable (drawable,          gdk_draw_drawable (drawable,
2286                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2287                             priv->pixmap,                             priv->pixmap,
# Line 2453  osm_gps_map_class_init (OsmGpsMapClass * Line 2541  osm_gps_map_class_init (OsmGpsMapClass *
2541                                                         -1,           /* minimum property value */                                                         -1,           /* minimum property value */
2542                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2543                                                         -1,                                                         -1,
2544                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2545    
2546      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2547                                       PROP_IMAGE_FORMAT,                                       PROP_IMAGE_FORMAT,
# Line 2472  osm_gps_map_source_get_friendly_name(Osm Line 2560  osm_gps_map_source_get_friendly_name(Osm
2560          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2561              return "None";              return "None";
2562          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2563              return "OpenStreetMap";              return "OpenStreetMap I";
2564          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2565              return "OpenStreetMap Renderer";              return "OpenStreetMap II";
2566          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2567              return "OpenCycleMap";              return "OpenCycleMap";
2568            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2569                return "OSMC Trails";
2570          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2571              return "Maps-For-Free";              return "Maps-For-Free";
2572          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2520  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2610  osm_gps_map_source_get_repo_uri(OsmGpsMa
2610              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2611          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2612              return "http://c.andy.sandbox.cloudmade.com/tiles/cycle/#Z/#X/#Y.png";              return "http://c.andy.sandbox.cloudmade.com/tiles/cycle/#Z/#X/#Y.png";
2613            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2614                return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
2615          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2616              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";
2617          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2558  osm_gps_map_source_get_image_format(OsmG Line 2650  osm_gps_map_source_get_image_format(OsmG
2650          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2651          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2652          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2653            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2654              return "png";              return "png";
2655            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2656          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2657            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2658          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2659          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2660          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
# Line 2567  osm_gps_map_source_get_image_format(OsmG Line 2662  osm_gps_map_source_get_image_format(OsmG
2662          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2663          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2664          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:  
2665              return "jpg";              return "jpg";
2666          default:          default:
2667              return "bin";              return "bin";
# Line 2590  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2683  osm_gps_map_source_get_max_zoom(OsmGpsMa
2683          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2684              return 18;              return 18;
2685          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2686            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2687              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2688          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
         case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:  
2689          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2690          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2691          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2602  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2695  osm_gps_map_source_get_max_zoom(OsmGpsMa
2695          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2696          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2697              return 17;              return 17;
2698            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2699                return 15;
2700          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2701              return 11;              return 11;
2702          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
# Line 2741  osm_gps_map_set_zoom (OsmGpsMap *map, in Line 2836  osm_gps_map_set_zoom (OsmGpsMap *map, in
2836          g_debug("Zoom changed from %d to %d factor:%f x:%d",          g_debug("Zoom changed from %d to %d factor:%f x:%d",
2837                  zoom_old, priv->map_zoom, factor, priv->map_x);                  zoom_old, priv->map_zoom, factor, priv->map_x);
2838    
2839    #ifdef ENABLE_OSD
2840            /* OSD may contain a scale, so we may have to re-render it */
2841            if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2842                priv->osd->render (priv->osd);
2843    #endif
2844    
2845          osm_gps_map_map_redraw_idle(map);          osm_gps_map_map_redraw_idle(map);
2846      }      }
2847      return priv->map_zoom;      return priv->map_zoom;
# Line 2837  osm_gps_map_draw_gps (OsmGpsMap *map, fl Line 2938  osm_gps_map_draw_gps (OsmGpsMap *map, fl
2938      priv->gps->rlat = deg2rad(latitude);      priv->gps->rlat = deg2rad(latitude);
2939      priv->gps->rlon = deg2rad(longitude);      priv->gps->rlon = deg2rad(longitude);
2940      priv->gps_valid = TRUE;      priv->gps_valid = TRUE;
2941        priv->gps_heading = deg2rad(heading);
2942    
2943      // pixel_x,y, offsets      // pixel_x,y, offsets
2944      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);
# Line 2943  osm_gps_map_scroll (OsmGpsMap *map, gint Line 3045  osm_gps_map_scroll (OsmGpsMap *map, gint
3045      priv->map_x += dx;      priv->map_x += dx;
3046      priv->map_y += dy;      priv->map_y += dy;
3047    
3048    #ifdef ENABLE_OSD
3049        /* OSD may contain a coordinate, so we may have to re-render it */
3050        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
3051            priv->osd->render (priv->osd);
3052    #endif
3053    
3054      osm_gps_map_map_redraw_idle (map);      osm_gps_map_map_redraw_idle (map);
3055  }  }
3056    
# Line 2951  osm_gps_map_get_scale(OsmGpsMap *map) Line 3059  osm_gps_map_get_scale(OsmGpsMap *map)
3059  {  {
3060      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
3061    
3062      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);
3063      priv = map->priv;      priv = map->priv;
3064    
3065      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);
# Line 3019  void osm_gps_map_register_osd(OsmGpsMap Line 3127  void osm_gps_map_register_osd(OsmGpsMap
3127      priv->osd = osd;      priv->osd = osd;
3128  }  }
3129    
3130    void
3131    osm_gps_map_repaint (OsmGpsMap *map) {
3132        osm_gps_map_expose (GTK_WIDGET(map), NULL);
3133    }
3134    
3135  #endif  #endif
Legend:
Removed from v.85  
changed lines
  Added in v.111