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

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

revision 56 by harbaum, Fri Aug 14 12:19:45 2009 UTC revision 150 by harbaum, Thu Oct 29 20:25:11 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  }  }
   
 /* http://cairographics.org/samples/ */  
 static void  
 osm_gps_map_draw_balloon (OsmGpsMap *map)  
 {  
     OsmGpsMapPrivate *priv = map->priv;  
   
     /* xyz */  
 #define X 100  
 #define Y 100  
 #define RADIUS 20  
 #define WIDTH  150  
 #define HEIGHT 75  
 #define TRANSPARENCY  0.7  
 #define PIN_HEIGHT 20  
 #define PIN_FOOT_WIDTH 20  
 #define PIN_X  (X + EXTRA_BORDER)  
 #define PIN_X0 (X + EXTRA_BORDER + RADIUS + PIN_FOOT_WIDTH)  
 #define PIN_X1 (X + EXTRA_BORDER + RADIUS)  
 #define PIN_Y  (Y + EXTRA_BORDER + HEIGHT + PIN_HEIGHT)  
   
 #ifdef USE_CAIRO  
     cairo_t *cr = gdk_cairo_create(priv->pixmap);  
   
     int x0 = X + EXTRA_BORDER, y0 = Y + EXTRA_BORDER;  
     int x1 = x0 + WIDTH, y1 = y0 + HEIGHT;  
   
     cairo_move_to (cr, x0, y0 + RADIUS);  
     cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + RADIUS, y0);  
     cairo_line_to (cr, x1 - RADIUS, y0);  
     cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + RADIUS);  
     cairo_line_to (cr, x1 , y1 - RADIUS);  
     cairo_curve_to (cr, x1, y1, x1, y1, x1 - RADIUS, y1);  
   
     /* insert pin */  
     cairo_line_to (cr, PIN_X0, y1);  
     cairo_line_to (cr, PIN_X, PIN_Y);  
     cairo_line_to (cr, PIN_X1, y1);  
   
   
     cairo_line_to (cr, x0 + RADIUS, y1);  
     cairo_curve_to (cr, x0, y1, x0, y1, x0, y1 - RADIUS);  
   
     cairo_close_path (cr);  
     cairo_set_source_rgba (cr, 1, 1, 1, TRANSPARENCY);  
     cairo_fill_preserve (cr);  
     cairo_set_source_rgba (cr, 0, 0, 0, TRANSPARENCY);  
     cairo_set_line_width (cr, 1);  
     cairo_stroke (cr);  
   
     gtk_widget_queue_draw_area (GTK_WIDGET(map),  
                                 x0,  
                                 y0,  
                                 WIDTH,  
                                 HEIGHT + PIN_HEIGHT);  
 #endif  
 }  
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 752  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 899  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 1249  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. we'll just ignore this ... */
1253        if((GTK_WIDGET(map)->allocation.width < 2) ||
1254           (GTK_WIDGET(map)->allocation.height < 2)) {
1255            printf("not a useful sized map yet ...\n");
1256            return FALSE;
1257        }
1258    
1259      priv->idle_map_redraw = 0;      priv->idle_map_redraw = 0;
1260    
1261        /* don't redraw the entire map while the OSD is doing */
1262        /* some animation or the like. This is to keep the animation */
1263        /* fluid */
1264        if (priv->osd->busy(priv->osd))
1265            return FALSE;
1266    
1267    #ifdef DRAG_DEBUG
1268        printf("trying redraw\n");
1269    #endif
1270    
1271      /* 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
1272       * 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
1273       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1258  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1275  osm_gps_map_map_redraw (OsmGpsMap *map)
1275      if (priv->dragging)      if (priv->dragging)
1276          return FALSE;          return FALSE;
1277    
1278        /* undo all offsets that may have happened when dragging */
1279        priv->drag_mouse_dx = 0;
1280        priv->drag_mouse_dy = 0;
1281    
1282      priv->redraw_cycle++;      priv->redraw_cycle++;
1283    
1284      /* draw white background to initialise pixmap */      /* draw white background to initialise pixmap */
# Line 1275  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1296  osm_gps_map_map_redraw (OsmGpsMap *map)
1296      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1297      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1298    
1299      osm_gps_map_draw_balloon(map);  #ifdef ENABLE_OSD
1300        /* OSD may contain a coordinate/scale, so we may have to re-render it */
1301        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
1302            priv->osd->render (priv->osd);
1303    #endif
1304    
     //osm_gps_map_osd_speed(map, 1.5);  
1305      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1306      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
1307    
# Line 1293  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1317  osm_gps_map_map_redraw_idle (OsmGpsMap *
1317          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);
1318  }  }
1319    
1320    #ifdef OSM_GPS_MAP_KEYS
1321    static gboolean
1322    on_window_key_press(GtkWidget *widget,
1323                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1324      gboolean handled = FALSE;
1325      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1326    
1327      // the map handles some keys on its own ...
1328      switch(event->keyval) {
1329    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1330      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1331          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1332          if(!priv->fullscreen)
1333              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1334          else
1335              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1336    
1337          priv->fullscreen = !priv->fullscreen;
1338          handled = TRUE;
1339          } break;
1340    #endif
1341    
1342    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1343      case OSM_GPS_MAP_KEY_ZOOMIN:
1344          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1345          handled = TRUE;
1346          break;
1347    #endif
1348    
1349    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1350      case OSM_GPS_MAP_KEY_ZOOMOUT:
1351          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1352          handled = TRUE;
1353          break;
1354    #endif
1355    
1356    #ifdef OSM_GPS_MAP_KEY_UP
1357      case OSM_GPS_MAP_KEY_UP:
1358          priv->map_y -= step;
1359          priv->center_coord_set = FALSE;
1360          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1361          handled = TRUE;
1362          break;
1363    #endif
1364    
1365    #ifdef OSM_GPS_MAP_KEY_DOWN
1366      case OSM_GPS_MAP_KEY_DOWN:
1367          priv->map_y += step;
1368          priv->center_coord_set = FALSE;
1369          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1370          handled = TRUE;
1371          break;
1372    #endif
1373    
1374    #ifdef OSM_GPS_MAP_KEY_LEFT
1375      case OSM_GPS_MAP_KEY_LEFT:
1376          priv->map_x -= step;
1377          priv->center_coord_set = FALSE;
1378          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1379          handled = TRUE;
1380          break;
1381    #endif
1382    
1383    #ifdef OSM_GPS_MAP_KEY_RIGHT
1384      case OSM_GPS_MAP_KEY_RIGHT:
1385          priv->map_x += step;
1386          priv->center_coord_set = FALSE;
1387          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1388          handled = TRUE;
1389          break;
1390    #endif
1391    
1392      default:
1393          break;
1394      }
1395    
1396      return handled;
1397    }
1398    #endif
1399    
1400  static void  static void
1401  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1402  {  {
# Line 1306  osm_gps_map_init (OsmGpsMap *object) Line 1410  osm_gps_map_init (OsmGpsMap *object)
1410      priv->trip_history = NULL;      priv->trip_history = NULL;
1411      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1412      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1413        priv->gps_heading = OSM_GPS_MAP_INVALID;
1414    
1415    #ifdef ENABLE_OSD
1416        priv->osd = NULL;
1417    #endif
1418    
1419    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1420        priv->fullscreen = FALSE;
1421    #endif
1422    
1423      priv->tracks = NULL;      priv->tracks = NULL;
1424      priv->images = NULL;      priv->images = NULL;
# Line 1323  osm_gps_map_init (OsmGpsMap *object) Line 1436  osm_gps_map_init (OsmGpsMap *object)
1436    
1437  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1438      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1439      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session =
1440                                                               SOUP_SESSION_USER_AGENT,          soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
1441                                                               "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);  
1442  #else  #else
1443      /* 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 */
1444        /* set it seperately as an extra header field for each reuest */
1445      priv->soup_session = soup_session_async_new();      priv->soup_session = soup_session_async_new();
1446  #endif  #endif
1447    
# Line 1351  osm_gps_map_init (OsmGpsMap *object) Line 1464  osm_gps_map_init (OsmGpsMap *object)
1464      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1465    
1466      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);
 }  
1467    
1468  #ifndef G_CHECKSUM_MD5  #ifdef OSM_GPS_MAP_KEYS
1469  /* simple hash algorithm hack if md5 is not present */      g_signal_connect(G_OBJECT(object), "key_press_event",
1470  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);  
 }  
1471  #endif  #endif
1472    }
1473    
1474  static GObject *  static void
1475  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_setup(OsmGpsMapPrivate *priv) {
 {  
     GObject *object;  
     OsmGpsMapPrivate *priv;  
     OsmGpsMap *map;  
1476      const char *uri;      const char *uri;
1477    
     //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);  
   
1478      //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
1479      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);
1480      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
# Line 1406  osm_gps_map_constructor (GType gtype, gu Line 1499  osm_gps_map_constructor (GType gtype, gu
1499          }          }
1500      }      }
1501    
1502      if (!priv->cache_dir_is_full_path) {      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1503  #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  
1504    
1505          if (priv->cache_dir) {      if (priv->tile_dir) {
1506              char *old = priv->cache_dir;          //the new cachedir is the given cache dir + the friendly name of the repo_uri
1507              //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);
1508              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);  
1509      }      }
1510    }
1511    
1512    static GObject *
1513    osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
1514    {
1515        //Always chain up to the parent constructor
1516        GObject *object =
1517            G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1518    
1519      inspect_map_uri(map);      osm_gps_map_setup(OSM_GPS_MAP_PRIVATE(object));
1520    
1521        inspect_map_uri(OSM_GPS_MAP(object));
1522    
1523      return object;      return object;
1524  }  }
# Line 1464  osm_gps_map_dispose (GObject *object) Line 1555  osm_gps_map_dispose (GObject *object)
1555      if (priv->idle_map_redraw != 0)      if (priv->idle_map_redraw != 0)
1556          g_source_remove (priv->idle_map_redraw);          g_source_remove (priv->idle_map_redraw);
1557    
1558        if (priv->drag_expose != 0)
1559            g_source_remove (priv->drag_expose);
1560    
1561        g_free(priv->gps);
1562    
1563    #ifdef ENABLE_OSD
1564        if(priv->osd)
1565            priv->osd->free(priv->osd);
1566    
1567    #ifdef OSD_DOUBLE_BUFFER
1568        if(priv->dbuf_pixmap)
1569            g_object_unref (priv->dbuf_pixmap);
1570    #endif
1571    #endif
1572    
1573      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
1574  }  }
1575    
# Line 1473  osm_gps_map_finalize (GObject *object) Line 1579  osm_gps_map_finalize (GObject *object)
1579      OsmGpsMap *map = OSM_GPS_MAP(object);      OsmGpsMap *map = OSM_GPS_MAP(object);
1580      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1581    
1582      g_free(priv->cache_dir);      if(priv->tile_dir)
1583            g_free(priv->tile_dir);
1584    
1585        if(priv->cache_dir)
1586            g_free(priv->cache_dir);
1587    
1588      g_free(priv->repo_uri);      g_free(priv->repo_uri);
1589      g_free(priv->image_format);      g_free(priv->image_format);
1590    
# Line 1530  osm_gps_map_set_property (GObject *objec Line 1641  osm_gps_map_set_property (GObject *objec
1641              break;              break;
1642          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1643              if ( g_value_get_string(value) )              if ( g_value_get_string(value) )
1644                  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);  
1645              break;              break;
1646          case PROP_ZOOM:          case PROP_ZOOM:
1647              priv->map_zoom = g_value_get_int (value);              priv->map_zoom = g_value_get_int (value);
# Line 1561  osm_gps_map_set_property (GObject *objec Line 1669  osm_gps_map_set_property (GObject *objec
1669          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1670              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
1671              break;              break;
1672          case PROP_MAP_SOURCE:          case PROP_MAP_SOURCE: {
1673                gint old = priv->map_source;
1674              priv->map_source = g_value_get_int (value);              priv->map_source = g_value_get_int (value);
1675              break;              if(old >= OSM_GPS_MAP_SOURCE_NULL &&
1676                   priv->map_source != old &&
1677                   priv->map_source >= OSM_GPS_MAP_SOURCE_NULL &&
1678                   priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) {
1679    
1680                    /* we now have to switch the entire map */
1681    
1682                    /* flush the ram cache */
1683                    g_hash_table_remove_all(priv->tile_cache);
1684    
1685                    osm_gps_map_setup(priv);
1686    
1687                    inspect_map_uri(map);
1688    
1689                    /* adjust zoom if necessary */
1690                    if(priv->map_zoom > priv->max_zoom)
1691                        osm_gps_map_set_zoom(map, priv->max_zoom);
1692    
1693                    if(priv->map_zoom < priv->min_zoom)
1694                        osm_gps_map_set_zoom(map, priv->min_zoom);
1695    
1696                } } break;
1697          case PROP_IMAGE_FORMAT:          case PROP_IMAGE_FORMAT:
1698              priv->image_format = g_value_dup_string (value);              priv->image_format = g_value_dup_string (value);
1699              break;              break;
# Line 1604  osm_gps_map_get_property (GObject *objec Line 1734  osm_gps_map_get_property (GObject *objec
1734          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1735              g_value_set_string(value, priv->cache_dir);              g_value_set_string(value, priv->cache_dir);
1736              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             g_value_set_boolean(value, priv->cache_dir_is_full_path);  
             break;  
1737          case PROP_ZOOM:          case PROP_ZOOM:
1738              g_value_set_int(value, priv->map_zoom);              g_value_set_int(value, priv->map_zoom);
1739              break;              break;
# Line 1679  osm_gps_map_button_press (GtkWidget *wid Line 1806  osm_gps_map_button_press (GtkWidget *wid
1806  {  {
1807      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1808    
1809    #ifdef ENABLE_OSD
1810        /* pressed inside OSD control? */
1811        if(priv->osd) {
1812            osd_button_t but =
1813                priv->osd->check(priv->osd, TRUE, event->x, event->y);
1814    
1815            if(but != OSD_NONE)
1816            {
1817                int step =
1818                    GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1819                priv->drag_counter = -1;
1820    
1821                switch(but) {
1822                case OSD_UP:
1823                    priv->map_y -= step;
1824                    priv->center_coord_set = FALSE;
1825                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1826                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1827                    break;
1828    
1829                case OSD_DOWN:
1830                    priv->map_y += step;
1831                    priv->center_coord_set = FALSE;
1832                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1833                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1834                    break;
1835    
1836                case OSD_LEFT:
1837                    priv->map_x -= step;
1838                    priv->center_coord_set = FALSE;
1839                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1840                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1841                    break;
1842    
1843                case OSD_RIGHT:
1844                    priv->map_x += step;
1845                    priv->center_coord_set = FALSE;
1846                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1847                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1848                    break;
1849    
1850                case OSD_IN:
1851                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1852                    break;
1853    
1854                case OSD_OUT:
1855                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1856                    break;
1857    
1858                default:
1859                    /* all custom buttons are forwarded to the application */
1860                    if(priv->osd->cb)
1861                        priv->osd->cb(but, priv->osd->data);
1862                    break;
1863                }
1864    
1865                return FALSE;
1866            }
1867        }
1868    #endif
1869    
1870      priv->drag_counter = 0;      priv->drag_counter = 0;
1871      priv->drag_start_mouse_x = (int) event->x;      priv->drag_start_mouse_x = (int) event->x;
1872      priv->drag_start_mouse_y = (int) event->y;      priv->drag_start_mouse_y = (int) event->y;
# Line 1707  osm_gps_map_button_release (GtkWidget *w Line 1895  osm_gps_map_button_release (GtkWidget *w
1895    
1896          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1897      }      }
1898    #ifdef ENABLE_OSD
1899        /* pressed inside OSD control? */
1900        else if(priv->osd)
1901            priv->osd->check(priv->osd, FALSE, event->x, event->y);
1902    #endif
1903    
1904      priv->drag_mouse_dx = 0;  #ifdef DRAG_DEBUG
1905      priv->drag_mouse_dy = 0;      printf("dragging done\n");
1906      priv->drag_counter = 0;  #endif
1907    
1908        priv->drag_counter = -1;
1909    
1910      return FALSE;      return FALSE;
1911  }  }
1912    
1913  static gboolean  static gboolean
1914    osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);
1915    
1916    static gboolean
1917    osm_gps_map_map_expose (GtkWidget *widget)
1918    {
1919        OsmGpsMapPrivate *priv = OSM_GPS_MAP(widget)->priv;
1920    
1921        priv->drag_expose = 0;
1922        osm_gps_map_expose (widget, NULL);
1923        return FALSE;
1924    }
1925    
1926    static gboolean
1927  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)
1928  {  {
1929      int x, y;      int x, y;
# Line 1735  osm_gps_map_motion_notify (GtkWidget *wi Line 1943  osm_gps_map_motion_notify (GtkWidget *wi
1943      if (!(state & GDK_BUTTON1_MASK))      if (!(state & GDK_BUTTON1_MASK))
1944          return FALSE;          return FALSE;
1945    
1946      priv->drag_counter++;      if (priv->drag_counter < 0)
1947            return FALSE;
1948    
1949      // we havent dragged more than 6 pixels      /* not yet dragged far enough? */
1950      if (priv->drag_counter < 6)      if(!priv->drag_counter &&
1951           ( (x - priv->drag_start_mouse_x) * (x - priv->drag_start_mouse_x) +
1952             (y - priv->drag_start_mouse_y) * (y - priv->drag_start_mouse_y) <
1953             10*10))
1954          return FALSE;          return FALSE;
1955    
1956        priv->drag_counter++;
1957    
1958      priv->dragging = TRUE;      priv->dragging = TRUE;
1959    
1960      if (priv->map_auto_center)      if (priv->map_auto_center)
# Line 1749  osm_gps_map_motion_notify (GtkWidget *wi Line 1963  osm_gps_map_motion_notify (GtkWidget *wi
1963      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
1964      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
1965    
1966      gdk_draw_drawable (      /* instead of redrawing directly just add an idle function */
1967                         widget->window,      if (!priv->drag_expose)
1968                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],          priv->drag_expose =
1969                         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);  
     }  
1970    
1971      return FALSE;      return FALSE;
1972  }  }
# Line 1812  osm_gps_map_configure (GtkWidget *widget Line 1981  osm_gps_map_configure (GtkWidget *widget
1981          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
1982    
1983      priv->pixmap = gdk_pixmap_new (      priv->pixmap = gdk_pixmap_new (
1984                                     widget->window,                          widget->window,
1985                                     widget->allocation.width + EXTRA_BORDER * 2,                          widget->allocation.width + EXTRA_BORDER * 2,
1986                                     widget->allocation.height + EXTRA_BORDER * 2,                          widget->allocation.height + EXTRA_BORDER * 2,
1987                                     -1);                          -1);
1988    
1989    #ifdef ENABLE_OSD
1990    
1991    #ifdef OSD_DOUBLE_BUFFER
1992        if (priv->dbuf_pixmap)
1993            g_object_unref (priv->dbuf_pixmap);
1994    
1995        priv->dbuf_pixmap = gdk_pixmap_new (
1996                            widget->window,
1997                            widget->allocation.width,
1998                            widget->allocation.height,
1999                            -1);
2000    #endif
2001    
2002        /* the osd needs some references to map internal objects */
2003        if(priv->osd)
2004            priv->osd->widget = widget;
2005    #endif
2006    
2007      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
2008      if(priv->gc_map)      if(priv->gc_map)
# Line 1833  osm_gps_map_expose (GtkWidget *widget, G Line 2020  osm_gps_map_expose (GtkWidget *widget, G
2020  {  {
2021      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2022    
2023      gdk_draw_drawable (  #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2024                         widget->window,      GdkDrawable *drawable = priv->dbuf_pixmap;
2025    #else
2026        GdkDrawable *drawable = widget->window;
2027    #endif
2028    
2029    #ifdef DRAG_DEBUG
2030        printf("expose, map %d/%d\n", priv->map_x, priv->map_y);
2031    #endif
2032    
2033        if (!priv->drag_mouse_dx && !priv->drag_mouse_dy && event)
2034        {
2035    #ifdef DRAG_DEBUG
2036            printf("  dragging = %d, event = %p\n", priv->dragging, event);
2037    #endif
2038    
2039            gdk_draw_drawable (drawable,
2040                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2041                               priv->pixmap,
2042                               event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
2043                               event->area.x, event->area.y,
2044                               event->area.width, event->area.height);
2045        }
2046        else
2047        {
2048    #ifdef DRAG_DEBUG
2049            printf("  drag_mouse %d/%d\n",
2050                   priv->drag_mouse_dx - EXTRA_BORDER,
2051                   priv->drag_mouse_dy - EXTRA_BORDER);
2052    #endif
2053    
2054            gdk_draw_drawable (drawable,
2055                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2056                               priv->pixmap,
2057                               0,0,
2058                               priv->drag_mouse_dx - EXTRA_BORDER,
2059                               priv->drag_mouse_dy - EXTRA_BORDER,
2060                               -1,-1);
2061    
2062            //Paint white outside of the map if dragging. Its less
2063            //ugly than painting the corrupted map
2064            if(priv->drag_mouse_dx>EXTRA_BORDER) {
2065                gdk_draw_rectangle (drawable,
2066                                    widget->style->white_gc,
2067                                    TRUE,
2068                                    0, 0,
2069                                    priv->drag_mouse_dx - EXTRA_BORDER,
2070                                    widget->allocation.height);
2071            }
2072            else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2073            {
2074                gdk_draw_rectangle (drawable,
2075                                    widget->style->white_gc,
2076                                    TRUE,
2077                                    priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
2078                                    -priv->drag_mouse_dx - EXTRA_BORDER,
2079                                    widget->allocation.height);
2080            }
2081    
2082            if (priv->drag_mouse_dy>EXTRA_BORDER) {
2083                gdk_draw_rectangle (drawable,
2084                                    widget->style->white_gc,
2085                                    TRUE,
2086                                    0, 0,
2087                                    widget->allocation.width,
2088                                    priv->drag_mouse_dy - EXTRA_BORDER);
2089            }
2090            else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2091            {
2092                gdk_draw_rectangle (drawable,
2093                                    widget->style->white_gc,
2094                                    TRUE,
2095                                    0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
2096                                    widget->allocation.width,
2097                                    -priv->drag_mouse_dy - EXTRA_BORDER);
2098            }
2099        }
2100    
2101    #ifdef ENABLE_OSD
2102        /* draw new OSD */
2103        if(priv->osd)
2104            priv->osd->draw (priv->osd, drawable);
2105    
2106    #ifdef OSD_DOUBLE_BUFFER
2107        gdk_draw_drawable (widget->window,
2108                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2109                         priv->pixmap,                         priv->dbuf_pixmap,
2110                         event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,                         0,0,0,0,-1,-1);
2111                         event->area.x, event->area.y,  #endif
                        event->area.width, event->area.height);  
2112    
2113    #endif
2114    
2115      return FALSE;      return FALSE;
2116  }  }
2117    
# Line 1922  osm_gps_map_class_init (OsmGpsMapClass * Line 2193  osm_gps_map_class_init (OsmGpsMapClass *
2193                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2194    
2195      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,  
2196                                       PROP_ZOOM,                                       PROP_ZOOM,
2197                                       g_param_spec_int ("zoom",                                       g_param_spec_int ("zoom",
2198                                                         "zoom",                                                         "zoom",
# Line 2026  osm_gps_map_class_init (OsmGpsMapClass * Line 2289  osm_gps_map_class_init (OsmGpsMapClass *
2289                                                         "radius of the gps point inner circle",                                                         "radius of the gps point inner circle",
2290                                                         0,           /* minimum property value */                                                         0,           /* minimum property value */
2291                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2292                                                         5,                                                         10,
2293                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2294    
2295      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 2047  osm_gps_map_class_init (OsmGpsMapClass * Line 2310  osm_gps_map_class_init (OsmGpsMapClass *
2310                                                         -1,           /* minimum property value */                                                         -1,           /* minimum property value */
2311                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2312                                                         -1,                                                         -1,
2313                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2314    
2315      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2316                                       PROP_IMAGE_FORMAT,                                       PROP_IMAGE_FORMAT,
# Line 2066  osm_gps_map_source_get_friendly_name(Osm Line 2329  osm_gps_map_source_get_friendly_name(Osm
2329          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2330              return "None";              return "None";
2331          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2332              return "OpenStreetMap";              return "OpenStreetMap I";
2333          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2334              return "OpenStreetMap Renderer";              return "OpenStreetMap II";
2335          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2336              return "OpenAerialMap";              return "OpenCycleMap";
2337            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2338                return "OSMC Trails";
2339          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2340              return "Maps-For-Free";              return "Maps-For-Free";
2341          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2112  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2377  osm_gps_map_source_get_repo_uri(OsmGpsMa
2377              return OSM_REPO_URI;              return OSM_REPO_URI;
2378          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2379              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2380          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2381              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";
2382            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2383                return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
2384          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2385              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";
2386          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2151  osm_gps_map_source_get_image_format(OsmG Line 2418  osm_gps_map_source_get_image_format(OsmG
2418          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2419          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2420          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2421            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2422            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2423              return "png";              return "png";
2424          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2425          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2426            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2427          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2428          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2429          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
# Line 2161  osm_gps_map_source_get_image_format(OsmG Line 2431  osm_gps_map_source_get_image_format(OsmG
2431          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2432          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2433          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:  
2434              return "jpg";              return "jpg";
2435          default:          default:
2436              return "bin";              return "bin";
# Line 2184  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2452  osm_gps_map_source_get_max_zoom(OsmGpsMa
2452          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2453              return 18;              return 18;
2454          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2455            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2456              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2457          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
         case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:  
2458          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2459          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2460          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2196  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2464  osm_gps_map_source_get_max_zoom(OsmGpsMa
2464          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2465          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2466              return 17;              return 17;
2467            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2468                return 15;
2469          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2470              return 11;              return 11;
2471          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
# Line 2335  osm_gps_map_set_zoom (OsmGpsMap *map, in Line 2605  osm_gps_map_set_zoom (OsmGpsMap *map, in
2605          g_debug("Zoom changed from %d to %d factor:%f x:%d",          g_debug("Zoom changed from %d to %d factor:%f x:%d",
2606                  zoom_old, priv->map_zoom, factor, priv->map_x);                  zoom_old, priv->map_zoom, factor, priv->map_x);
2607    
2608    #ifdef ENABLE_OSD
2609            /* OSD may contain a scale, so we may have to re-render it */
2610            if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2611                priv->osd->render (priv->osd);
2612    #endif
2613    
2614          osm_gps_map_map_redraw_idle(map);          osm_gps_map_map_redraw_idle(map);
2615      }      }
2616      return priv->map_zoom;      return priv->map_zoom;
# Line 2420  osm_gps_map_clear_images (OsmGpsMap *map Line 2696  osm_gps_map_clear_images (OsmGpsMap *map
2696  }  }
2697    
2698  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  
2699  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)
2700  {  {
2701      int pixel_x, pixel_y;      int pixel_x, pixel_y;
# Line 2492  osm_gps_map_draw_gps (OsmGpsMap *map, fl Line 2707  osm_gps_map_draw_gps (OsmGpsMap *map, fl
2707      priv->gps->rlat = deg2rad(latitude);      priv->gps->rlat = deg2rad(latitude);
2708      priv->gps->rlon = deg2rad(longitude);      priv->gps->rlon = deg2rad(longitude);
2709      priv->gps_valid = TRUE;      priv->gps_valid = TRUE;
2710        priv->gps_heading = deg2rad(heading);
2711    
2712      // pixel_x,y, offsets      // pixel_x,y, offsets
2713      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);
# Line 2581  osm_gps_map_geographic_to_screen (OsmGps Line 2797  osm_gps_map_geographic_to_screen (OsmGps
2797      priv = map->priv;      priv = map->priv;
2798    
2799      if (pixel_x)      if (pixel_x)
2800          *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) - priv->map_x;          *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) -
2801                priv->map_x + priv->drag_mouse_dx;
2802      if (pixel_y)      if (pixel_y)
2803          *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) - priv->map_y;          *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) -
2804                priv->map_y + priv->drag_mouse_dy;
2805  }  }
2806    
2807  void  void
# Line 2598  osm_gps_map_scroll (OsmGpsMap *map, gint Line 2816  osm_gps_map_scroll (OsmGpsMap *map, gint
2816      priv->map_x += dx;      priv->map_x += dx;
2817      priv->map_y += dy;      priv->map_y += dy;
2818    
2819    #ifdef ENABLE_OSD
2820        /* OSD may contain a coordinate, so we may have to re-render it */
2821        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2822            priv->osd->render (priv->osd);
2823    #endif
2824    
2825      osm_gps_map_map_redraw_idle (map);      osm_gps_map_map_redraw_idle (map);
2826  }  }
2827    
# Line 2606  osm_gps_map_get_scale(OsmGpsMap *map) Line 2830  osm_gps_map_get_scale(OsmGpsMap *map)
2830  {  {
2831      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
2832    
2833      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);
2834      priv = map->priv;      priv = map->priv;
2835    
2836      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);
2837  }  }
2838    
2839    #ifdef ENABLE_OSD
2840    
2841    void
2842    osm_gps_map_redraw (OsmGpsMap *map)
2843    {
2844        osm_gps_map_map_redraw_idle(map);
2845    }
2846    
2847    osm_gps_map_osd_t *
2848    osm_gps_map_osd_get(OsmGpsMap *map)
2849    {
2850        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
2851        return map->priv->osd;
2852    }
2853    
2854    void
2855    osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd)
2856    {
2857        OsmGpsMapPrivate *priv;
2858    
2859        g_return_if_fail (OSM_IS_GPS_MAP (map));
2860    
2861        priv = map->priv;
2862        g_return_if_fail (!priv->osd);
2863    
2864        priv->osd = osd;
2865    }
2866    
2867    void
2868    osm_gps_map_repaint (OsmGpsMap *map)
2869    {
2870        osm_gps_map_expose (GTK_WIDGET(map), NULL);
2871    }
2872    
2873    coord_t *
2874    osm_gps_map_get_gps (OsmGpsMap *map)
2875    {
2876        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
2877    
2878        if(!map->priv->gps_valid)
2879            return NULL;
2880    
2881        return map->priv->gps;
2882    }
2883    
2884    #endif
Legend:
Removed from v.56  
changed lines
  Added in v.150