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 95 by harbaum, Thu Sep 3 13:20:01 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 98  struct _OsmGpsMapPrivate Line 117  struct _OsmGpsMapPrivate
117      coord_t *gps;      coord_t *gps;
118      gboolean gps_valid;      gboolean gps_valid;
119    
120    #ifdef ENABLE_BALLOON
121        //a balloon with additional info
122        struct {
123            coord_t *coo;
124            gboolean valid;
125            OsmGpsMapRect_t rect;
126            OsmGpsMapBalloonCallback cb;
127            gpointer data;
128        } balloon;
129    #endif
130    
131    #ifdef ENABLE_OSD
132        //the osd controls (if present)
133        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
142    
143      //additional images or tracks added to the map      //additional images or tracks added to the map
144      GSList *tracks;      GSList *tracks;
145      GSList *images;      GSList *images;
# Line 149  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 310  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 631  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 674  osm_gps_map_draw_gps_point (OsmGpsMap *m
674                                      (mr*2)+lw+lw);                                      (mr*2)+lw+lw);
675  #endif  #endif
676      }      }
677    }
678    
679    #ifdef ENABLE_BALLOON
680    /* most visual effects are hardcoded by now, but may be made */
681    /* available via properties later */
682    #ifndef BALLOON_AREA_WIDTH
683    #define BALLOON_AREA_WIDTH           290
684    #endif
685    #ifndef BALLOON_AREA_HEIGHT
686    #define BALLOON_AREA_HEIGHT           75
687    #endif
688    #ifndef BALLOON_CORNER_RADIUS
689    #define BALLOON_CORNER_RADIUS         10
690    #endif
691    
692    #define BALLOON_BORDER               (BALLOON_CORNER_RADIUS/2)
693    #define BALLOON_WIDTH                (BALLOON_AREA_WIDTH + 2 * BALLOON_BORDER)
694    #define BALLOON_HEIGHT               (BALLOON_AREA_HEIGHT + 2 * BALLOON_BORDER)
695    #define BALLOON_TRANSPARENCY         0.8
696    #define POINTER_HEIGHT                20
697    #define POINTER_FOOT_WIDTH            20
698    #define POINTER_OFFSET               (BALLOON_CORNER_RADIUS*3/4)
699    #define BALLOON_SHADOW               (BALLOON_CORNER_RADIUS/2)
700    #define BALLOON_SHADOW_TRANSPARENCY  0.2
701    
702    #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
703    
704    
705    /* draw the bubble shape. this is used twice, once for the shape and once */
706    /* for the shadow */
707    static void
708    osm_gps_map_draw_balloon_shape (cairo_t *cr, int x0, int y0, int x1, int y1,
709           gboolean bottom, int px, int py, int px0, int px1) {
710    
711        cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);
712        cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
713                   BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);
714        if(!bottom) {
715            /* insert top pointer */
716            cairo_line_to (cr, px1, y0);
717            cairo_line_to (cr, px, py);
718            cairo_line_to (cr, px0, y0);
719        }
720    
721        cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0);
722        cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
723                   BALLOON_CORNER_RADIUS, -M_PI/2, 0);
724        cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS);
725        cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
726                   BALLOON_CORNER_RADIUS, 0, M_PI/2);
727        if(bottom) {
728            /* insert bottom pointer */
729            cairo_line_to (cr, px0, y1);
730            cairo_line_to (cr, px, py);
731            cairo_line_to (cr, px1, y1);
732        }
733    
734        cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1);
735        cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
736                   BALLOON_CORNER_RADIUS, M_PI/2, M_PI);
737    
738        cairo_close_path (cr);
739  }  }
740    
 /* http://cairographics.org/samples/ */  
741  static void  static void
742  osm_gps_map_draw_balloon (OsmGpsMap *map)  osm_gps_map_draw_balloon_int (OsmGpsMap *map)
743  {  {
744      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
745    
746      /* xyz */      if (priv->balloon.valid) {
 #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);  
747    
748      int x0 = X + EXTRA_BORDER, y0 = Y + EXTRA_BORDER;          /* ------- convert given coordinate into screen position --------- */
749      int x1 = x0 + WIDTH, y1 = y0 + HEIGHT;          int x0 = lon2pixel(priv->map_zoom, priv->balloon.coo->rlon) -
750                priv->map_x + EXTRA_BORDER;
751            int y0 = lat2pixel(priv->map_zoom, priv->balloon.coo->rlat) -
752                priv->map_y + EXTRA_BORDER;
753    
754      cairo_move_to (cr, x0, y0 + RADIUS);          /* check position of this relative to screen center to determine */
755      cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + RADIUS, y0);          /* pointer direction ... */
756      cairo_line_to (cr, x1 - RADIUS, y0);          int pointer_x = x0, pointer_x0, pointer_x1;
757      cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + RADIUS);          int pointer_y = y0;
     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);  
   
758    
759      cairo_line_to (cr, x0 + RADIUS, y1);          /* ... and calculate position */
760      cairo_curve_to (cr, x0, y1, x0, y1, x0, y1 - RADIUS);          if((x0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.width/2) {
761                x0 -= BALLOON_WIDTH - POINTER_OFFSET;
762                pointer_x0 = pointer_x - (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
763                pointer_x1 = pointer_x0 - POINTER_FOOT_WIDTH;
764            } else {
765                x0 -= POINTER_OFFSET;
766                pointer_x1 = pointer_x + (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
767                pointer_x0 = pointer_x1 + POINTER_FOOT_WIDTH;
768            }
769    
770            gboolean bottom = FALSE;
771            if((y0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.height/2) {
772                bottom = TRUE;
773                y0 -= BALLOON_HEIGHT + POINTER_HEIGHT;
774            } else
775                y0 += POINTER_HEIGHT;
776    
777            /* calculate bottom/right of box */
778            int x1 = x0 + BALLOON_WIDTH, y1 = y0 + BALLOON_HEIGHT;
779    
780            /* save balloon screen coordinates for later use */
781            priv->balloon.rect.x = x0 + BALLOON_BORDER;
782            priv->balloon.rect.y = y0 + BALLOON_BORDER;
783            priv->balloon.rect.w = x1 - x0 - 2*BALLOON_BORDER;
784            priv->balloon.rect.h = y1 - y0 - 2*BALLOON_BORDER;
785    
786      cairo_close_path (cr);  #ifdef USE_CAIRO
787      cairo_set_source_rgba (cr, 1, 1, 1, TRANSPARENCY);          cairo_t *cr = gdk_cairo_create(priv->pixmap);
788      cairo_fill_preserve (cr);  
789      cairo_set_source_rgba (cr, 0, 0, 0, TRANSPARENCY);          /* --------- draw shadow --------------- */
790      cairo_set_line_width (cr, 1);          osm_gps_map_draw_balloon_shape (cr,
791      cairo_stroke (cr);                      x0 + BALLOON_SHADOW, y0 + BALLOON_SHADOW,
792                        x1 + BALLOON_SHADOW, y1 + BALLOON_SHADOW,
793      gtk_widget_queue_draw_area (GTK_WIDGET(map),                      bottom, pointer_x, pointer_y,
794                                  x0,                      pointer_x0 + BALLOON_SHADOW, pointer_x1 + BALLOON_SHADOW);
795                                  y0,  
796                                  WIDTH,          cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_SHADOW_TRANSPARENCY);
797                                  HEIGHT + PIN_HEIGHT);          cairo_fill_preserve (cr);
798            cairo_set_source_rgba (cr, 1, 0, 0, 1.0);
799            cairo_set_line_width (cr, 0);
800            cairo_stroke (cr);
801    
802            /* --------- draw main shape ----------- */
803            osm_gps_map_draw_balloon_shape (cr, x0, y0, x1, y1,
804                        bottom, pointer_x, pointer_y, pointer_x0, pointer_x1);
805    
806            cairo_set_source_rgba (cr, 1, 1, 1, BALLOON_TRANSPARENCY);
807            cairo_fill_preserve (cr);
808            cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_TRANSPARENCY);
809            cairo_set_line_width (cr, 1);
810            cairo_stroke (cr);
811    
812    
813            /* ---------- draw close button --------- */
814    
815            int cx = x1 - BALLOON_BORDER - CLOSE_BUTTON_RADIUS;
816            int cy = y0 + BALLOON_BORDER + CLOSE_BUTTON_RADIUS;
817            int crad = CLOSE_BUTTON_RADIUS;
818    
819            cairo_arc (cr, cx, cy, crad, 0, 2 * M_PI);
820            cairo_set_source_rgba (cr, 0.8, 0, 0, 1.0);
821            cairo_fill_preserve (cr);
822            cairo_set_source_rgba (cr, 0.3, 0, 0, 1.0);
823            cairo_set_line_width (cr, 2);
824            cairo_stroke(cr);
825    
826            cairo_set_source_rgba (cr, 1, 1, 1, 1.0);
827            cairo_set_line_width (cr, BALLOON_CORNER_RADIUS/3.3);
828            cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
829            cairo_move_to (cr, cx - crad/2, cy - crad/2);
830            cairo_line_to (cr, cx + crad/2, cy + crad/2);
831            cairo_stroke (cr);
832            cairo_move_to (cr, cx + crad/2, cy - crad/2);
833            cairo_line_to (cr, cx - crad/2, cy + crad/2);
834            cairo_stroke (cr);
835    
836            if (priv->balloon.cb) {
837                /* clip in case application tries to draw in */
838                /* exceed of the balloon */
839                cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,
840                                 priv->balloon.rect.w, priv->balloon.rect.h);
841                cairo_clip (cr);
842                cairo_new_path (cr);  /* current path is not
843                                         consumed by cairo_clip() */
844    
845                priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);
846            }
847    
848            cairo_destroy(cr);
849    
850            gtk_widget_queue_draw_area (GTK_WIDGET(map),
851                                        x0, y0, BALLOON_WIDTH,
852                                        BALLOON_HEIGHT + POINTER_HEIGHT);
853    #else
854    #warning "Balloon display lacks a non-cairo implementation!"
855  #endif  #endif
856        }
857    }
858    
859    /* the user clicked into the balloons main area. handle this */
860    static void
861    osm_gps_map_handle_balloon_click(OsmGpsMap *map, gint x, gint y)
862    {
863        OsmGpsMapPrivate *priv = map->priv;
864    
865        if (!priv->balloon.valid)
866            return;
867    
868        /* check if the close button was clicked */
869        if ((x > priv->balloon.rect.w - 2*CLOSE_BUTTON_RADIUS) &&
870            (x < priv->balloon.rect.w) &&
871            (y > 0) && (y < 2*CLOSE_BUTTON_RADIUS)) {
872    
873            priv->balloon.valid = FALSE;
874            osm_gps_map_map_redraw_idle(map);
875        }
876    }
877    
878    /* return true if balloon is being displayed and if */
879    /* the given coordinate is within this balloon */
880    static gboolean
881    osm_gps_map_in_balloon(OsmGpsMapPrivate *priv, gint x, gint y)
882    {
883        return (priv->balloon.valid &&
884                (x > priv->balloon.rect.x) &&
885                (x < priv->balloon.rect.x + priv->balloon.rect.w) &&
886                (y > priv->balloon.rect.y) &&
887                (y < priv->balloon.rect.y + priv->balloon.rect.h));
888  }  }
889    #endif // ENABLE_BALLOON
890    
891  static void  static void
892  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 950  osm_gps_map_tile_download_complete (Soup
950              }              }
951              else              else
952              {              {
953                  g_warning("Error creating tile download directory: %s", dl->folder);                  g_warning("Error creating tile download directory: %s",
954                              dl->folder);
955                    perror("perror:");
956              }              }
957          }          }
958    
# Line 899  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 1251  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 1274  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1485  osm_gps_map_map_redraw (OsmGpsMap *map)
1485      osm_gps_map_print_tracks(map);      osm_gps_map_print_tracks(map);
1486      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1487      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1488    #ifdef ENABLE_BALLOON
1489      osm_gps_map_draw_balloon(map);      osm_gps_map_draw_balloon_int(map);
1490    #endif
1491    
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);
# Line 1293  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 1307  osm_gps_map_init (OsmGpsMap *object) Line 1599  osm_gps_map_init (OsmGpsMap *object)
1599      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1600      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1601    
1602    #ifdef ENABLE_BALLOON
1603        priv->balloon.coo = g_new0(coord_t, 1);
1604        priv->balloon.valid = FALSE;
1605        priv->balloon.cb = NULL;
1606    #endif
1607    
1608    #ifdef ENABLE_OSD
1609        priv->osd = NULL;
1610    #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 1323  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 1351  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 1406  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  
   
         if (priv->cache_dir) {  
             char *old = priv->cache_dir;  
             //the new cachedir is the given cache dir + the md5 of the repo_uri  
             priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, md5);  
             g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);  
             g_free(old);  
         } else {  
             //the new cachedir is the current dir + the md5 of the repo_uri  
             priv->cache_dir = g_strdup(md5);  
         }  
1697    
1698          g_free(md5);      if (priv->tile_dir) {
1699            //the new cachedir is the given cache dir + the friendly name of the repo_uri
1700            priv->cache_dir = g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);
1701            g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);
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      inspect_map_uri(map);      osm_gps_map_setup(OSM_GPS_MAP_PRIVATE(object));
1713    
1714        inspect_map_uri(OSM_GPS_MAP(object));
1715    
1716      return object;      return object;
1717  }  }
# Line 1464  osm_gps_map_dispose (GObject *object) Line 1748  osm_gps_map_dispose (GObject *object)
1748      if (priv->idle_map_redraw != 0)      if (priv->idle_map_redraw != 0)
1749          g_source_remove (priv->idle_map_redraw);          g_source_remove (priv->idle_map_redraw);
1750    
1751        g_free(priv->gps);
1752    
1753    #ifdef ENABLE_BALLOON
1754        g_free(priv->balloon.coo);
1755    #endif
1756    
1757    #ifdef ENABLE_OSD
1758        if(priv->osd)
1759            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
1766    
1767      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
1768  }  }
1769    
# Line 1473  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 1530  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 1561  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 1604  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 1679  osm_gps_map_button_press (GtkWidget *wid Line 2000  osm_gps_map_button_press (GtkWidget *wid
2000  {  {
2001      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2002    
2003    #ifdef ENABLE_BALLOON
2004        /* don't drag if the user clicked within the balloon */
2005        if (osm_gps_map_in_balloon(priv,
2006                       event->x + EXTRA_BORDER,
2007                       event->y + EXTRA_BORDER))
2008        {
2009            priv->drag_counter = -1;
2010            return FALSE;
2011        }
2012    #endif
2013    
2014    #ifdef ENABLE_OSD
2015        /* pressed inside OSD control? */
2016        if(priv->osd) {
2017            osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);
2018            if(but != OSD_NONE)
2019            {
2020                int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
2021                priv->drag_counter = -1;
2022    
2023                switch(but) {
2024                case OSD_UP:
2025                    priv->map_y -= step;
2026                    priv->center_coord_set = FALSE;
2027                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2028                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2029                    break;
2030    
2031                case OSD_DOWN:
2032                    priv->map_y += step;
2033                    priv->center_coord_set = FALSE;
2034                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2035                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2036                    break;
2037    
2038                case OSD_LEFT:
2039                    priv->map_x -= step;
2040                    priv->center_coord_set = FALSE;
2041                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2042                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2043                    break;
2044    
2045                case OSD_RIGHT:
2046                    priv->map_x += step;
2047                    priv->center_coord_set = FALSE;
2048                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2049                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2050                    break;
2051    
2052                case OSD_IN:
2053                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
2054                    break;
2055    
2056                case OSD_OUT:
2057                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
2058                    break;
2059    
2060                default:
2061                    /* all custom buttons are forwarded to the application */
2062                    if(priv->osd->cb)
2063                        priv->osd->cb(but, priv->osd->data);
2064                    break;
2065                }
2066    
2067                return FALSE;
2068            }
2069        }
2070    #endif
2071    
2072      priv->drag_counter = 0;      priv->drag_counter = 0;
2073      priv->drag_start_mouse_x = (int) event->x;      priv->drag_start_mouse_x = (int) event->x;
2074      priv->drag_start_mouse_y = (int) event->y;      priv->drag_start_mouse_y = (int) event->y;
# Line 1693  osm_gps_map_button_release (GtkWidget *w Line 2083  osm_gps_map_button_release (GtkWidget *w
2083  {  {
2084      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2085    
2086    #ifdef ENABLE_BALLOON
2087        /* released inside the balloon? */
2088        if (osm_gps_map_in_balloon(priv,
2089                       event->x + EXTRA_BORDER,
2090                       event->y + EXTRA_BORDER))
2091        {
2092            osm_gps_map_handle_balloon_click(OSM_GPS_MAP(widget),
2093                 event->x - priv->balloon.rect.x + EXTRA_BORDER,
2094                 event->y - priv->balloon.rect.y + EXTRA_BORDER);
2095        }
2096    #endif
2097    
2098      if (priv->dragging)      if (priv->dragging)
2099      {      {
2100          priv->dragging = FALSE;          priv->dragging = FALSE;
# Line 1710  osm_gps_map_button_release (GtkWidget *w Line 2112  osm_gps_map_button_release (GtkWidget *w
2112    
2113      priv->drag_mouse_dx = 0;      priv->drag_mouse_dx = 0;
2114      priv->drag_mouse_dy = 0;      priv->drag_mouse_dy = 0;
2115      priv->drag_counter = 0;      priv->drag_counter = -1;
2116    
2117      return FALSE;      return FALSE;
2118  }  }
2119    
2120  static gboolean  static gboolean
2121    osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);
2122    
2123    static gboolean
2124  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)
2125  {  {
2126      int x, y;      int x, y;
# Line 1735  osm_gps_map_motion_notify (GtkWidget *wi Line 2140  osm_gps_map_motion_notify (GtkWidget *wi
2140      if (!(state & GDK_BUTTON1_MASK))      if (!(state & GDK_BUTTON1_MASK))
2141          return FALSE;          return FALSE;
2142    
2143        if (priv->drag_counter < 0)
2144            return FALSE;
2145    
2146      priv->drag_counter++;      priv->drag_counter++;
2147    
2148      // we havent dragged more than 6 pixels      // we havent dragged more than 6 pixels
2149      if (priv->drag_counter < 6)      if (priv->drag_counter < 6)
2150          return FALSE;          return FALSE;
2151    
2152    #ifdef OSM_GPS_MAP_REFRESH
2153        /* reduce update frequency on maemo to keep screen update fluid */
2154        static guint32 last_time = 0;
2155    
2156        if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE;
2157        last_time = event->time;
2158    #endif
2159    
2160      priv->dragging = TRUE;      priv->dragging = TRUE;
2161    
2162      if (priv->map_auto_center)      if (priv->map_auto_center)
# Line 1749  osm_gps_map_motion_notify (GtkWidget *wi Line 2165  osm_gps_map_motion_notify (GtkWidget *wi
2165      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
2166      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
2167    
2168      gdk_draw_drawable (      osm_gps_map_expose (widget, NULL);
                        widget->window,  
                        widget->style->fg_gc[GTK_WIDGET_STATE (widget)],  
                        priv->pixmap,  
                        0,0,  
                        priv->drag_mouse_dx - EXTRA_BORDER, priv->drag_mouse_dy - EXTRA_BORDER,  
                        -1,-1);  
   
     //Paint white outside of the map if dragging. Its less  
     //ugly than painting the corrupted map  
     if(priv->drag_mouse_dx>EXTRA_BORDER) {  
         gdk_draw_rectangle (  
                             widget->window,  
                             widget->style->white_gc,  
                             TRUE,  
                             0, 0,  
                             priv->drag_mouse_dx - EXTRA_BORDER,  
                             widget->allocation.height);  
     }  
     else if (-priv->drag_mouse_dx > EXTRA_BORDER)  
     {  
         gdk_draw_rectangle (  
                             widget->window,  
                             widget->style->white_gc,  
                             TRUE,  
                             priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,  
                             -priv->drag_mouse_dx - EXTRA_BORDER,  
                             widget->allocation.height);  
     }  
   
     if (priv->drag_mouse_dy>EXTRA_BORDER) {  
         gdk_draw_rectangle (  
                             widget->window,  
                             widget->style->white_gc,  
                             TRUE,  
                             0, 0,  
                             widget->allocation.width,  
                             priv->drag_mouse_dy - EXTRA_BORDER);  
     }  
     else if (-priv->drag_mouse_dy > EXTRA_BORDER)  
     {  
         gdk_draw_rectangle (  
                             widget->window,  
                             widget->style->white_gc,  
                             TRUE,  
                             0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,  
                             widget->allocation.width,  
                             -priv->drag_mouse_dy - EXTRA_BORDER);  
     }  
2169    
2170      return FALSE;      return FALSE;
2171  }  }
# Line 1812  osm_gps_map_configure (GtkWidget *widget Line 2180  osm_gps_map_configure (GtkWidget *widget
2180          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
2181    
2182      priv->pixmap = gdk_pixmap_new (      priv->pixmap = gdk_pixmap_new (
2183                                     widget->window,                          widget->window,
2184                                     widget->allocation.width + EXTRA_BORDER * 2,                          widget->allocation.width + EXTRA_BORDER * 2,
2185                                     widget->allocation.height + EXTRA_BORDER * 2,                          widget->allocation.height + EXTRA_BORDER * 2,
2186                                     -1);                          -1);
2187    
2188    #ifdef ENABLE_OSD
2189    
2190    #ifdef OSD_DOUBLE_BUFFER
2191        if (priv->dbuf_pixmap)
2192            g_object_unref (priv->dbuf_pixmap);
2193    
2194        priv->dbuf_pixmap = gdk_pixmap_new (
2195                            widget->window,
2196                            widget->allocation.width,
2197                            widget->allocation.height,
2198                            -1);
2199    #endif
2200    
2201        /* the osd needs some references to map internal objects */
2202        if(priv->osd)
2203            priv->osd->widget = widget;
2204    #endif
2205    
2206      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
2207      if(priv->gc_map)      if(priv->gc_map)
# Line 1833  osm_gps_map_expose (GtkWidget *widget, G Line 2219  osm_gps_map_expose (GtkWidget *widget, G
2219  {  {
2220      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2221    
2222      gdk_draw_drawable (  #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2223                         widget->window,      GdkDrawable *drawable = priv->dbuf_pixmap;
2224    #else
2225        GdkDrawable *drawable = widget->window;
2226    #endif
2227    
2228        if (!priv->dragging && event)
2229        {
2230            gdk_draw_drawable (drawable,
2231                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2232                               priv->pixmap,
2233                               event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
2234                               event->area.x, event->area.y,
2235                               event->area.width, event->area.height);
2236        }
2237        else
2238        {
2239            gdk_draw_drawable (drawable,
2240                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2241                               priv->pixmap,
2242                               0,0,
2243                               priv->drag_mouse_dx - EXTRA_BORDER,
2244                               priv->drag_mouse_dy - EXTRA_BORDER,
2245                               -1,-1);
2246    
2247            //Paint white outside of the map if dragging. Its less
2248            //ugly than painting the corrupted map
2249            if(priv->drag_mouse_dx>EXTRA_BORDER) {
2250                gdk_draw_rectangle (drawable,
2251                                    widget->style->white_gc,
2252                                    TRUE,
2253                                    0, 0,
2254                                    priv->drag_mouse_dx - EXTRA_BORDER,
2255                                    widget->allocation.height);
2256            }
2257            else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2258            {
2259                gdk_draw_rectangle (drawable,
2260                                    widget->style->white_gc,
2261                                    TRUE,
2262                                    priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
2263                                    -priv->drag_mouse_dx - EXTRA_BORDER,
2264                                    widget->allocation.height);
2265            }
2266    
2267            if (priv->drag_mouse_dy>EXTRA_BORDER) {
2268                gdk_draw_rectangle (drawable,
2269                                    widget->style->white_gc,
2270                                    TRUE,
2271                                    0, 0,
2272                                    widget->allocation.width,
2273                                    priv->drag_mouse_dy - EXTRA_BORDER);
2274            }
2275            else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2276            {
2277                gdk_draw_rectangle (drawable,
2278                                    widget->style->white_gc,
2279                                    TRUE,
2280                                    0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
2281                                    widget->allocation.width,
2282                                    -priv->drag_mouse_dy - EXTRA_BORDER);
2283            }
2284        }
2285    
2286    #ifdef ENABLE_OSD
2287        /* draw new OSD */
2288        if(priv->osd)
2289            priv->osd->draw (priv->osd, drawable);
2290    
2291    #ifdef OSD_DOUBLE_BUFFER
2292        gdk_draw_drawable (widget->window,
2293                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2294                         priv->pixmap,                         priv->dbuf_pixmap,
2295                         event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,                         0,0,0,0,-1,-1);
2296                         event->area.x, event->area.y,  #endif
                        event->area.width, event->area.height);  
2297    
2298    #endif
2299    
2300      return FALSE;      return FALSE;
2301  }  }
2302    
# Line 1922  osm_gps_map_class_init (OsmGpsMapClass * Line 2378  osm_gps_map_class_init (OsmGpsMapClass *
2378                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2379    
2380      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,  
2381                                       PROP_ZOOM,                                       PROP_ZOOM,
2382                                       g_param_spec_int ("zoom",                                       g_param_spec_int ("zoom",
2383                                                         "zoom",                                                         "zoom",
# Line 2026  osm_gps_map_class_init (OsmGpsMapClass * Line 2474  osm_gps_map_class_init (OsmGpsMapClass *
2474                                                         "radius of the gps point inner circle",                                                         "radius of the gps point inner circle",
2475                                                         0,           /* minimum property value */                                                         0,           /* minimum property value */
2476                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2477                                                         5,                                                         10,
2478                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2479    
2480      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 2047  osm_gps_map_class_init (OsmGpsMapClass * Line 2495  osm_gps_map_class_init (OsmGpsMapClass *
2495                                                         -1,           /* minimum property value */                                                         -1,           /* minimum property value */
2496                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2497                                                         -1,                                                         -1,
2498                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2499    
2500      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2501                                       PROP_IMAGE_FORMAT,                                       PROP_IMAGE_FORMAT,
# Line 2066  osm_gps_map_source_get_friendly_name(Osm Line 2514  osm_gps_map_source_get_friendly_name(Osm
2514          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2515              return "None";              return "None";
2516          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2517              return "OpenStreetMap";              return "OpenStreetMap I";
2518          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2519              return "OpenStreetMap Renderer";              return "OpenStreetMap II";
2520          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2521              return "OpenAerialMap";              return "OpenCycleMap";
2522            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2523                return "OSMC Trails";
2524          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2525              return "Maps-For-Free";              return "Maps-For-Free";
2526          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 2562  osm_gps_map_source_get_repo_uri(OsmGpsMa
2562              return OSM_REPO_URI;              return OSM_REPO_URI;
2563          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2564              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2565          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2566              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";
2567            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2568                return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
2569          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2570              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";
2571          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 2603  osm_gps_map_source_get_image_format(OsmG
2603          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2604          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2605          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2606            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2607            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2608              return "png";              return "png";
2609          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2610          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2611            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2612          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2613          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2614          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 2616  osm_gps_map_source_get_image_format(OsmG
2616          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2617          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2618          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:  
2619              return "jpg";              return "jpg";
2620          default:          default:
2621              return "bin";              return "bin";
# Line 2186  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2639  osm_gps_map_source_get_max_zoom(OsmGpsMa
2639          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2640              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2641          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2642          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2643          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2644          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2645          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 2649  osm_gps_map_source_get_max_zoom(OsmGpsMa
2649          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2650          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2651              return 17;              return 17;
2652            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2653                return 15;
2654          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2655              return 11;              return 11;
2656          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
# Line 2420  osm_gps_map_clear_images (OsmGpsMap *map Line 2875  osm_gps_map_clear_images (OsmGpsMap *map
2875  }  }
2876    
2877  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  
2878  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)
2879  {  {
2880      int pixel_x, pixel_y;      int pixel_x, pixel_y;
# Line 2612  osm_gps_map_get_scale(OsmGpsMap *map) Line 3006  osm_gps_map_get_scale(OsmGpsMap *map)
3006      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);
3007  }  }
3008    
3009    #ifdef ENABLE_BALLOON
3010    void
3011    osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
3012                              OsmGpsMapBalloonCallback cb, gpointer data)
3013    {
3014        OsmGpsMapPrivate *priv;
3015    
3016        /* remove and previously installed balloon */
3017        osm_gps_map_clear_balloon (map);
3018    
3019        g_return_if_fail (OSM_IS_GPS_MAP (map));
3020        priv = map->priv;
3021    
3022        priv->balloon.coo->rlat = deg2rad(latitude);
3023        priv->balloon.coo->rlon = deg2rad(longitude);
3024        priv->balloon.valid = TRUE;
3025    
3026        priv->balloon.cb = cb;
3027        priv->balloon.data = data;
3028    
3029        // this redraws the map
3030        osm_gps_map_map_redraw_idle(map);
3031    }
3032    
3033    void
3034    osm_gps_map_clear_balloon (OsmGpsMap *map)
3035    {
3036        OsmGpsMapPrivate *priv;
3037    
3038        g_return_if_fail (OSM_IS_GPS_MAP (map));
3039        priv = map->priv;
3040    
3041        priv->balloon.valid = FALSE;
3042    
3043        osm_gps_map_map_redraw_idle(map);
3044    }
3045    #endif
3046    
3047    #ifdef ENABLE_OSD
3048    
3049    void
3050    osm_gps_map_redraw (OsmGpsMap *map)
3051    {
3052        osm_gps_map_map_redraw_idle(map);
3053    }
3054    
3055    osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {
3056        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
3057        return map->priv->osd;
3058    }
3059    
3060    void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {
3061        OsmGpsMapPrivate *priv;
3062    
3063        g_return_if_fail (OSM_IS_GPS_MAP (map));
3064    
3065        priv = map->priv;
3066        g_return_if_fail (!priv->osd);
3067    
3068        priv->osd = osd;
3069    }
3070    
3071    void
3072    osm_gps_map_repaint (OsmGpsMap *map) {
3073        osm_gps_map_expose (GTK_WIDGET(map), NULL);
3074    }
3075    
3076    #endif
Legend:
Removed from v.56  
changed lines
  Added in v.95