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

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

revision 55 by harbaum, Thu Aug 13 12:01:52 2009 UTC revision 97 by harbaum, Mon Sep 7 06:16:06 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_BALLOON
122        //a balloon with additional info
123        struct {
124            coord_t *coo;
125            gboolean valid;
126            OsmGpsMapRect_t rect;
127            OsmGpsMapBalloonCallback cb;
128            gpointer data;
129        } balloon;
130    #endif
131    
132    #ifdef ENABLE_OSD
133        //the osd controls (if present)
134        osm_gps_map_osd_t *osd;
135    #ifdef OSD_DOUBLE_BUFFER
136        GdkPixmap *dbuf_pixmap;
137    #endif
138    #endif
139    
140    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
141        gboolean fullscreen;
142    #endif
143    
144      //additional images or tracks added to the map      //additional images or tracks added to the map
145      GSList *tracks;      GSList *tracks;
146      GSList *images;      GSList *images;
# Line 149  enum Line 192  enum
192      PROP_REPO_URI,      PROP_REPO_URI,
193      PROP_PROXY_URI,      PROP_PROXY_URI,
194      PROP_TILE_CACHE_DIR,      PROP_TILE_CACHE_DIR,
     PROP_TILE_CACHE_DIR_IS_FULL_PATH,  
195      PROP_ZOOM,      PROP_ZOOM,
196      PROP_MAX_ZOOM,      PROP_MAX_ZOOM,
197      PROP_MIN_ZOOM,      PROP_MIN_ZOOM,
# Line 310  static void Line 352  static void
352  inspect_map_uri(OsmGpsMap *map)  inspect_map_uri(OsmGpsMap *map)
353  {  {
354      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
355        priv->uri_format = 0;
356        priv->the_google = FALSE;
357    
358      if (g_strrstr(priv->repo_uri, URI_MARKER_X))      if (g_strrstr(priv->repo_uri, URI_MARKER_X))
359          priv->uri_format |= URI_HAS_X;          priv->uri_format |= URI_HAS_X;
# Line 546  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 590  osm_gps_map_draw_gps_point (OsmGpsMap *m
590          int x, y;          int x, y;
591          int r = priv->ui_gps_point_inner_radius;          int r = priv->ui_gps_point_inner_radius;
592          int r2 = priv->ui_gps_point_outer_radius;          int r2 = priv->ui_gps_point_outer_radius;
593          // int lw = priv->ui_gps_track_width;          int mr = MAX(3*r,r2);
         int mr = MAX(r,r2);  
594    
595          map_x0 = priv->map_x - EXTRA_BORDER;          map_x0 = priv->map_x - EXTRA_BORDER;
596          map_y0 = priv->map_y - EXTRA_BORDER;          map_y0 = priv->map_y - EXTRA_BORDER;
# Line 578  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 621  osm_gps_map_draw_gps_point (OsmGpsMap *m
621    
622          // draw ball gradient          // draw ball gradient
623          if (r > 0) {          if (r > 0) {
624                // draw direction arrow
625                if(!isnan(priv->gps_heading))
626                {
627                    cairo_move_to (cr, x-r*cos(priv->gps_heading), y-r*sin(priv->gps_heading));
628                    cairo_line_to (cr, x+3*r*sin(priv->gps_heading), y-3*r*cos(priv->gps_heading));
629                    cairo_line_to (cr, x+r*cos(priv->gps_heading), y+r*sin(priv->gps_heading));
630                    cairo_close_path (cr);
631    
632                    cairo_set_source_rgba (cr, 0.3, 0.3, 1.0, 0.5);
633                    cairo_fill_preserve (cr);
634    
635                    cairo_set_line_width (cr, 1.0);
636                    cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5);
637                    cairo_stroke(cr);
638                }
639    
640              pat = cairo_pattern_create_radial (x-(r/5), y-(r/5), (r/5), x,  y, r);              pat = cairo_pattern_create_radial (x-(r/5), y-(r/5), (r/5), x,  y, r);
641              cairo_pattern_add_color_stop_rgba (pat, 0, 1, 1, 1, 1.0);              cairo_pattern_add_color_stop_rgba (pat, 0, 1, 1, 1, 1.0);
642              cairo_pattern_add_color_stop_rgba (pat, 1, 0, 0, 1, 1.0);              cairo_pattern_add_color_stop_rgba (pat, 1, 0, 0, 1, 1.0);
# Line 591  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 650  osm_gps_map_draw_gps_point (OsmGpsMap *m
650              cairo_arc (cr, x, y, r, 0, 2 * M_PI);              cairo_arc (cr, x, y, r, 0, 2 * M_PI);
651              cairo_stroke(cr);              cairo_stroke(cr);
652          }          }
653    
654          cairo_destroy(cr);          cairo_destroy(cr);
655          gtk_widget_queue_draw_area (GTK_WIDGET(map),          gtk_widget_queue_draw_area (GTK_WIDGET(map),
656                                      x-mr,                                      x-mr,
# Line 631  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 690  osm_gps_map_draw_gps_point (OsmGpsMap *m
690                                      (mr*2)+lw+lw);                                      (mr*2)+lw+lw);
691  #endif  #endif
692      }      }
693    }
694    
695    #ifdef ENABLE_BALLOON
696    /* most visual effects are hardcoded by now, but may be made */
697    /* available via properties later */
698    #ifndef BALLOON_AREA_WIDTH
699    #define BALLOON_AREA_WIDTH           290
700    #endif
701    #ifndef BALLOON_AREA_HEIGHT
702    #define BALLOON_AREA_HEIGHT           75
703    #endif
704    #ifndef BALLOON_CORNER_RADIUS
705    #define BALLOON_CORNER_RADIUS         10
706    #endif
707    
708    #define BALLOON_BORDER               (BALLOON_CORNER_RADIUS/2)
709    #define BALLOON_WIDTH                (BALLOON_AREA_WIDTH + 2 * BALLOON_BORDER)
710    #define BALLOON_HEIGHT               (BALLOON_AREA_HEIGHT + 2 * BALLOON_BORDER)
711    #define BALLOON_TRANSPARENCY         0.8
712    #define POINTER_HEIGHT                20
713    #define POINTER_FOOT_WIDTH            20
714    #define POINTER_OFFSET               (BALLOON_CORNER_RADIUS*3/4)
715    #define BALLOON_SHADOW               (BALLOON_CORNER_RADIUS/2)
716    #define BALLOON_SHADOW_TRANSPARENCY  0.2
717    
718    #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
719    
720    
721    /* draw the bubble shape. this is used twice, once for the shape and once */
722    /* for the shadow */
723    static void
724    osm_gps_map_draw_balloon_shape (cairo_t *cr, int x0, int y0, int x1, int y1,
725           gboolean bottom, int px, int py, int px0, int px1) {
726    
727        cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);
728        cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
729                   BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);
730        if(!bottom) {
731            /* insert top pointer */
732            cairo_line_to (cr, px1, y0);
733            cairo_line_to (cr, px, py);
734            cairo_line_to (cr, px0, y0);
735        }
736    
737        cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0);
738        cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
739                   BALLOON_CORNER_RADIUS, -M_PI/2, 0);
740        cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS);
741        cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
742                   BALLOON_CORNER_RADIUS, 0, M_PI/2);
743        if(bottom) {
744            /* insert bottom pointer */
745            cairo_line_to (cr, px0, y1);
746            cairo_line_to (cr, px, py);
747            cairo_line_to (cr, px1, y1);
748        }
749    
750        cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1);
751        cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
752                   BALLOON_CORNER_RADIUS, M_PI/2, M_PI);
753    
754        cairo_close_path (cr);
755    }
756    
757    static void
758    osm_gps_map_draw_balloon_int (OsmGpsMap *map)
759    {
760        OsmGpsMapPrivate *priv = map->priv;
761    
762        if (priv->balloon.valid) {
763    
764            /* ------- convert given coordinate into screen position --------- */
765            int x0 = lon2pixel(priv->map_zoom, priv->balloon.coo->rlon) -
766                priv->map_x + EXTRA_BORDER;
767            int y0 = lat2pixel(priv->map_zoom, priv->balloon.coo->rlat) -
768                priv->map_y + EXTRA_BORDER;
769    
770            /* check position of this relative to screen center to determine */
771            /* pointer direction ... */
772            int pointer_x = x0, pointer_x0, pointer_x1;
773            int pointer_y = y0;
774    
775            /* ... and calculate position */
776            if((x0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.width/2) {
777                x0 -= BALLOON_WIDTH - POINTER_OFFSET;
778                pointer_x0 = pointer_x - (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
779                pointer_x1 = pointer_x0 - POINTER_FOOT_WIDTH;
780            } else {
781                x0 -= POINTER_OFFSET;
782                pointer_x1 = pointer_x + (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
783                pointer_x0 = pointer_x1 + POINTER_FOOT_WIDTH;
784            }
785    
786            gboolean bottom = FALSE;
787            if((y0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.height/2) {
788                bottom = TRUE;
789                y0 -= BALLOON_HEIGHT + POINTER_HEIGHT;
790            } else
791                y0 += POINTER_HEIGHT;
792    
793            /* calculate bottom/right of box */
794            int x1 = x0 + BALLOON_WIDTH, y1 = y0 + BALLOON_HEIGHT;
795    
796            /* save balloon screen coordinates for later use */
797            priv->balloon.rect.x = x0 + BALLOON_BORDER;
798            priv->balloon.rect.y = y0 + BALLOON_BORDER;
799            priv->balloon.rect.w = x1 - x0 - 2*BALLOON_BORDER;
800            priv->balloon.rect.h = y1 - y0 - 2*BALLOON_BORDER;
801    
802    #ifdef USE_CAIRO
803            cairo_t *cr = gdk_cairo_create(priv->pixmap);
804    
805            /* --------- draw shadow --------------- */
806            osm_gps_map_draw_balloon_shape (cr,
807                        x0 + BALLOON_SHADOW, y0 + BALLOON_SHADOW,
808                        x1 + BALLOON_SHADOW, y1 + BALLOON_SHADOW,
809                        bottom, pointer_x, pointer_y,
810                        pointer_x0 + BALLOON_SHADOW, pointer_x1 + BALLOON_SHADOW);
811    
812            cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_SHADOW_TRANSPARENCY);
813            cairo_fill_preserve (cr);
814            cairo_set_source_rgba (cr, 1, 0, 0, 1.0);
815            cairo_set_line_width (cr, 0);
816            cairo_stroke (cr);
817    
818            /* --------- draw main shape ----------- */
819            osm_gps_map_draw_balloon_shape (cr, x0, y0, x1, y1,
820                        bottom, pointer_x, pointer_y, pointer_x0, pointer_x1);
821    
822            cairo_set_source_rgba (cr, 1, 1, 1, BALLOON_TRANSPARENCY);
823            cairo_fill_preserve (cr);
824            cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_TRANSPARENCY);
825            cairo_set_line_width (cr, 1);
826            cairo_stroke (cr);
827    
828    
829            /* ---------- draw close button --------- */
830    
831            int cx = x1 - BALLOON_BORDER - CLOSE_BUTTON_RADIUS;
832            int cy = y0 + BALLOON_BORDER + CLOSE_BUTTON_RADIUS;
833            int crad = CLOSE_BUTTON_RADIUS;
834    
835            cairo_arc (cr, cx, cy, crad, 0, 2 * M_PI);
836            cairo_set_source_rgba (cr, 0.8, 0, 0, 1.0);
837            cairo_fill_preserve (cr);
838            cairo_set_source_rgba (cr, 0.3, 0, 0, 1.0);
839            cairo_set_line_width (cr, 2);
840            cairo_stroke(cr);
841    
842            cairo_set_source_rgba (cr, 1, 1, 1, 1.0);
843            cairo_set_line_width (cr, BALLOON_CORNER_RADIUS/3.3);
844            cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
845            cairo_move_to (cr, cx - crad/2, cy - crad/2);
846            cairo_line_to (cr, cx + crad/2, cy + crad/2);
847            cairo_stroke (cr);
848            cairo_move_to (cr, cx + crad/2, cy - crad/2);
849            cairo_line_to (cr, cx - crad/2, cy + crad/2);
850            cairo_stroke (cr);
851    
852            if (priv->balloon.cb) {
853                /* clip in case application tries to draw in */
854                /* exceed of the balloon */
855                cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,
856                                 priv->balloon.rect.w, priv->balloon.rect.h);
857                cairo_clip (cr);
858                cairo_new_path (cr);  /* current path is not
859                                         consumed by cairo_clip() */
860    
861                priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);
862            }
863    
864            cairo_destroy(cr);
865    
866            gtk_widget_queue_draw_area (GTK_WIDGET(map),
867                                        x0, y0, BALLOON_WIDTH,
868                                        BALLOON_HEIGHT + POINTER_HEIGHT);
869    #else
870    #warning "Balloon display lacks a non-cairo implementation!"
871    #endif
872        }
873    }
874    
875    /* the user clicked into the balloons main area. handle this */
876    static void
877    osm_gps_map_handle_balloon_click(OsmGpsMap *map, gint x, gint y)
878    {
879        OsmGpsMapPrivate *priv = map->priv;
880    
881        if (!priv->balloon.valid)
882            return;
883    
884        /* check if the close button was clicked */
885        if ((x > priv->balloon.rect.w - 2*CLOSE_BUTTON_RADIUS) &&
886            (x < priv->balloon.rect.w) &&
887            (y > 0) && (y < 2*CLOSE_BUTTON_RADIUS)) {
888    
889            priv->balloon.valid = FALSE;
890            osm_gps_map_map_redraw_idle(map);
891        }
892    }
893    
894    /* return true if balloon is being displayed and if */
895    /* the given coordinate is within this balloon */
896    static gboolean
897    osm_gps_map_in_balloon(OsmGpsMapPrivate *priv, gint x, gint y)
898    {
899        return (priv->balloon.valid &&
900                (x > priv->balloon.rect.x) &&
901                (x < priv->balloon.rect.x + priv->balloon.rect.w) &&
902                (y > priv->balloon.rect.y) &&
903                (y < priv->balloon.rect.y + priv->balloon.rect.h));
904  }  }
905    #endif // ENABLE_BALLOON
906    
907  static void  static void
908  osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)  osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)
# Line 695  osm_gps_map_tile_download_complete (Soup Line 966  osm_gps_map_tile_download_complete (Soup
966              }              }
967              else              else
968              {              {
969                  g_warning("Error creating tile download directory: %s", dl->folder);                  g_warning("Error creating tile download directory: %s",
970                              dl->folder);
971                    perror("perror:");
972              }              }
973          }          }
974    
# Line 842  osm_gps_map_download_tile (OsmGpsMap *ma Line 1115  osm_gps_map_download_tile (OsmGpsMap *ma
1115                  }                  }
1116              }              }
1117    
1118    #ifdef LIBSOUP22
1119                soup_message_headers_append(msg->request_headers,
1120                                            "User-Agent", USER_AGENT);
1121    #endif
1122    
1123              g_hash_table_insert (priv->tile_queue, dl->uri, msg);              g_hash_table_insert (priv->tile_queue, dl->uri, msg);
1124              soup_session_queue_message (priv->soup_session, msg, osm_gps_map_tile_download_complete, dl);              soup_session_queue_message (priv->soup_session, msg, osm_gps_map_tile_download_complete, dl);
1125          } else {          } else {
# Line 1194  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1472  osm_gps_map_map_redraw (OsmGpsMap *map)
1472    
1473      priv->idle_map_redraw = 0;      priv->idle_map_redraw = 0;
1474    
1475        /* don't redraw the entire map while the OSD is doing */
1476        /* some animation or the like. This is to keep the animation */
1477        /* fluid */
1478        if (priv->osd->busy(priv->osd))
1479            return FALSE;
1480    
1481      /* 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
1482       * 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
1483       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1217  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1501  osm_gps_map_map_redraw (OsmGpsMap *map)
1501      osm_gps_map_print_tracks(map);      osm_gps_map_print_tracks(map);
1502      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1503      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1504    #ifdef ENABLE_BALLOON
1505        osm_gps_map_draw_balloon_int(map);
1506    #endif
1507    
1508      //osm_gps_map_osd_speed(map, 1.5);      //osm_gps_map_osd_speed(map, 1.5);
1509      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
# Line 1234  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1521  osm_gps_map_map_redraw_idle (OsmGpsMap *
1521          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);
1522  }  }
1523    
1524    #ifdef OSM_GPS_MAP_KEYS
1525    static gboolean
1526    on_window_key_press(GtkWidget *widget,
1527                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1528      gboolean handled = FALSE;
1529      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1530    
1531      // the map handles some keys on its own ...
1532      switch(event->keyval) {
1533    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1534      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1535          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1536          if(!priv->fullscreen)
1537              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1538          else
1539              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1540    
1541          priv->fullscreen = !priv->fullscreen;
1542          handled = TRUE;
1543          } break;
1544    #endif
1545    
1546    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1547      case OSM_GPS_MAP_KEY_ZOOMIN:
1548          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1549          handled = TRUE;
1550          break;
1551    #endif
1552    
1553    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1554      case OSM_GPS_MAP_KEY_ZOOMOUT:
1555          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1556          handled = TRUE;
1557          break;
1558    #endif
1559    
1560    #ifdef OSM_GPS_MAP_KEY_UP
1561      case OSM_GPS_MAP_KEY_UP:
1562          priv->map_y -= step;
1563          priv->center_coord_set = FALSE;
1564          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1565          handled = TRUE;
1566          break;
1567    #endif
1568    
1569    #ifdef OSM_GPS_MAP_KEY_DOWN
1570      case OSM_GPS_MAP_KEY_DOWN:
1571          priv->map_y += step;
1572          priv->center_coord_set = FALSE;
1573          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1574          handled = TRUE;
1575          break;
1576    #endif
1577    
1578    #ifdef OSM_GPS_MAP_KEY_LEFT
1579      case OSM_GPS_MAP_KEY_LEFT:
1580          priv->map_x -= step;
1581          priv->center_coord_set = FALSE;
1582          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1583          handled = TRUE;
1584          break;
1585    #endif
1586    
1587    #ifdef OSM_GPS_MAP_KEY_RIGHT
1588      case OSM_GPS_MAP_KEY_RIGHT:
1589          priv->map_x += step;
1590          priv->center_coord_set = FALSE;
1591          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1592          handled = TRUE;
1593          break;
1594    #endif
1595    
1596      default:
1597          break;
1598      }
1599    
1600      return handled;
1601    }
1602    #endif
1603    
1604  static void  static void
1605  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1606  {  {
# Line 1247  osm_gps_map_init (OsmGpsMap *object) Line 1614  osm_gps_map_init (OsmGpsMap *object)
1614      priv->trip_history = NULL;      priv->trip_history = NULL;
1615      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1616      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1617        priv->gps_heading = OSM_GPS_MAP_INVALID;
1618    
1619    #ifdef ENABLE_BALLOON
1620        priv->balloon.coo = g_new0(coord_t, 1);
1621        priv->balloon.valid = FALSE;
1622        priv->balloon.cb = NULL;
1623    #endif
1624    
1625    #ifdef ENABLE_OSD
1626        priv->osd = NULL;
1627    #endif
1628    
1629    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1630        priv->fullscreen = FALSE;
1631    #endif
1632    
1633      priv->tracks = NULL;      priv->tracks = NULL;
1634      priv->images = NULL;      priv->images = NULL;
# Line 1264  osm_gps_map_init (OsmGpsMap *object) Line 1646  osm_gps_map_init (OsmGpsMap *object)
1646    
1647  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1648      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1649      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session =
1650                                                               SOUP_SESSION_USER_AGENT,          soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
1651                                                               "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);  
1652  #else  #else
1653      /* 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 */
1654        /* set it seperately as an extra header field for each reuest */
1655      priv->soup_session = soup_session_async_new();      priv->soup_session = soup_session_async_new();
1656  #endif  #endif
1657    
# Line 1292  osm_gps_map_init (OsmGpsMap *object) Line 1674  osm_gps_map_init (OsmGpsMap *object)
1674      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1675    
1676      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);
 }  
1677    
1678  #ifndef G_CHECKSUM_MD5  #ifdef OSM_GPS_MAP_KEYS
1679  /* simple hash algorithm hack if md5 is not present */      g_signal_connect(G_OBJECT(object), "key_press_event",
1680  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);  
 }  
1681  #endif  #endif
1682    }
1683    
1684  static GObject *  static void
1685  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_setup(OsmGpsMapPrivate *priv) {
 {  
     GObject *object;  
     OsmGpsMapPrivate *priv;  
     OsmGpsMap *map;  
1686      const char *uri;      const char *uri;
1687    
     //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);  
   
1688      //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
1689      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);
1690      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
# Line 1347  osm_gps_map_constructor (GType gtype, gu Line 1709  osm_gps_map_constructor (GType gtype, gu
1709          }          }
1710      }      }
1711    
1712      if (!priv->cache_dir_is_full_path) {      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1713  #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  
1714    
1715          if (priv->cache_dir) {      if (priv->tile_dir) {
1716              char *old = priv->cache_dir;          //the new cachedir is the given cache dir + the friendly name of the repo_uri
1717              //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);
1718              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);  
1719      }      }
1720    }
1721    
1722      inspect_map_uri(map);  static GObject *
1723    osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
1724    {
1725        //Always chain up to the parent constructor
1726        GObject *object =
1727            G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1728    
1729        osm_gps_map_setup(OSM_GPS_MAP_PRIVATE(object));
1730    
1731        inspect_map_uri(OSM_GPS_MAP(object));
1732    
1733      return object;      return object;
1734  }  }
# Line 1405  osm_gps_map_dispose (GObject *object) Line 1765  osm_gps_map_dispose (GObject *object)
1765      if (priv->idle_map_redraw != 0)      if (priv->idle_map_redraw != 0)
1766          g_source_remove (priv->idle_map_redraw);          g_source_remove (priv->idle_map_redraw);
1767    
1768        g_free(priv->gps);
1769    
1770    #ifdef ENABLE_BALLOON
1771        g_free(priv->balloon.coo);
1772    #endif
1773    
1774    #ifdef ENABLE_OSD
1775        if(priv->osd)
1776            priv->osd->free(priv->osd);
1777    
1778    #ifdef OSD_DOUBLE_BUFFER
1779        if(priv->dbuf_pixmap)
1780            g_object_unref (priv->dbuf_pixmap);
1781    #endif
1782    #endif
1783    
1784      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
1785  }  }
1786    
# Line 1414  osm_gps_map_finalize (GObject *object) Line 1790  osm_gps_map_finalize (GObject *object)
1790      OsmGpsMap *map = OSM_GPS_MAP(object);      OsmGpsMap *map = OSM_GPS_MAP(object);
1791      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1792    
1793      g_free(priv->cache_dir);      if(priv->tile_dir)
1794            g_free(priv->tile_dir);
1795    
1796        if(priv->cache_dir)
1797            g_free(priv->cache_dir);
1798    
1799      g_free(priv->repo_uri);      g_free(priv->repo_uri);
1800      g_free(priv->image_format);      g_free(priv->image_format);
1801    
# Line 1471  osm_gps_map_set_property (GObject *objec Line 1852  osm_gps_map_set_property (GObject *objec
1852              break;              break;
1853          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1854              if ( g_value_get_string(value) )              if ( g_value_get_string(value) )
1855                  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);  
1856              break;              break;
1857          case PROP_ZOOM:          case PROP_ZOOM:
1858              priv->map_zoom = g_value_get_int (value);              priv->map_zoom = g_value_get_int (value);
# Line 1502  osm_gps_map_set_property (GObject *objec Line 1880  osm_gps_map_set_property (GObject *objec
1880          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1881              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
1882              break;              break;
1883          case PROP_MAP_SOURCE:          case PROP_MAP_SOURCE: {
1884                gint old = priv->map_source;
1885              priv->map_source = g_value_get_int (value);              priv->map_source = g_value_get_int (value);
1886              break;              if(old >= OSM_GPS_MAP_SOURCE_NULL &&
1887                   priv->map_source != old &&
1888                   priv->map_source >= OSM_GPS_MAP_SOURCE_NULL &&
1889                   priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) {
1890    
1891                    /* we now have to switch the entire map */
1892    
1893                    /* flush the ram cache */
1894                    g_hash_table_remove_all(priv->tile_cache);
1895    
1896                    osm_gps_map_setup(priv);
1897    
1898                    inspect_map_uri(map);
1899    
1900                    /* adjust zoom if necessary */
1901                    if(priv->map_zoom > priv->max_zoom)
1902                        osm_gps_map_set_zoom(map, priv->max_zoom);
1903    
1904                    if(priv->map_zoom < priv->min_zoom)
1905                        osm_gps_map_set_zoom(map, priv->min_zoom);
1906    
1907                } } break;
1908          case PROP_IMAGE_FORMAT:          case PROP_IMAGE_FORMAT:
1909              priv->image_format = g_value_dup_string (value);              priv->image_format = g_value_dup_string (value);
1910              break;              break;
# Line 1545  osm_gps_map_get_property (GObject *objec Line 1945  osm_gps_map_get_property (GObject *objec
1945          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1946              g_value_set_string(value, priv->cache_dir);              g_value_set_string(value, priv->cache_dir);
1947              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             g_value_set_boolean(value, priv->cache_dir_is_full_path);  
             break;  
1948          case PROP_ZOOM:          case PROP_ZOOM:
1949              g_value_set_int(value, priv->map_zoom);              g_value_set_int(value, priv->map_zoom);
1950              break;              break;
# Line 1620  osm_gps_map_button_press (GtkWidget *wid Line 2017  osm_gps_map_button_press (GtkWidget *wid
2017  {  {
2018      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2019    
2020    #ifdef ENABLE_BALLOON
2021        /* don't drag if the user clicked within the balloon */
2022        if (osm_gps_map_in_balloon(priv,
2023                       event->x + EXTRA_BORDER,
2024                       event->y + EXTRA_BORDER))
2025        {
2026            priv->drag_counter = -1;
2027            return FALSE;
2028        }
2029    #endif
2030    
2031    #ifdef ENABLE_OSD
2032        /* pressed inside OSD control? */
2033        if(priv->osd) {
2034            osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);
2035            if(but != OSD_NONE)
2036            {
2037                int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
2038                priv->drag_counter = -1;
2039    
2040                switch(but) {
2041                case OSD_UP:
2042                    priv->map_y -= step;
2043                    priv->center_coord_set = FALSE;
2044                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2045                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2046                    break;
2047    
2048                case OSD_DOWN:
2049                    priv->map_y += step;
2050                    priv->center_coord_set = FALSE;
2051                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2052                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2053                    break;
2054    
2055                case OSD_LEFT:
2056                    priv->map_x -= step;
2057                    priv->center_coord_set = FALSE;
2058                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2059                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2060                    break;
2061    
2062                case OSD_RIGHT:
2063                    priv->map_x += step;
2064                    priv->center_coord_set = FALSE;
2065                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2066                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2067                    break;
2068    
2069                case OSD_IN:
2070                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
2071                    break;
2072    
2073                case OSD_OUT:
2074                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
2075                    break;
2076    
2077                default:
2078                    /* all custom buttons are forwarded to the application */
2079                    if(priv->osd->cb)
2080                        priv->osd->cb(but, priv->osd->data);
2081                    break;
2082                }
2083    
2084                return FALSE;
2085            }
2086        }
2087    #endif
2088    
2089      priv->drag_counter = 0;      priv->drag_counter = 0;
2090      priv->drag_start_mouse_x = (int) event->x;      priv->drag_start_mouse_x = (int) event->x;
2091      priv->drag_start_mouse_y = (int) event->y;      priv->drag_start_mouse_y = (int) event->y;
# Line 1634  osm_gps_map_button_release (GtkWidget *w Line 2100  osm_gps_map_button_release (GtkWidget *w
2100  {  {
2101      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2102    
2103    #ifdef ENABLE_BALLOON
2104        /* released inside the balloon? */
2105        if (osm_gps_map_in_balloon(priv,
2106                       event->x + EXTRA_BORDER,
2107                       event->y + EXTRA_BORDER))
2108        {
2109            osm_gps_map_handle_balloon_click(OSM_GPS_MAP(widget),
2110                 event->x - priv->balloon.rect.x + EXTRA_BORDER,
2111                 event->y - priv->balloon.rect.y + EXTRA_BORDER);
2112        }
2113    #endif
2114    
2115      if (priv->dragging)      if (priv->dragging)
2116      {      {
2117          priv->dragging = FALSE;          priv->dragging = FALSE;
# Line 1651  osm_gps_map_button_release (GtkWidget *w Line 2129  osm_gps_map_button_release (GtkWidget *w
2129    
2130      priv->drag_mouse_dx = 0;      priv->drag_mouse_dx = 0;
2131      priv->drag_mouse_dy = 0;      priv->drag_mouse_dy = 0;
2132      priv->drag_counter = 0;      priv->drag_counter = -1;
2133    
2134      return FALSE;      return FALSE;
2135  }  }
2136    
2137  static gboolean  static gboolean
2138    osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);
2139    
2140    static gboolean
2141  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)
2142  {  {
2143      int x, y;      int x, y;
# Line 1676  osm_gps_map_motion_notify (GtkWidget *wi Line 2157  osm_gps_map_motion_notify (GtkWidget *wi
2157      if (!(state & GDK_BUTTON1_MASK))      if (!(state & GDK_BUTTON1_MASK))
2158          return FALSE;          return FALSE;
2159    
2160        if (priv->drag_counter < 0)
2161            return FALSE;
2162    
2163      priv->drag_counter++;      priv->drag_counter++;
2164    
2165      // we havent dragged more than 6 pixels      // we havent dragged more than 6 pixels
2166      if (priv->drag_counter < 6)      if (priv->drag_counter < 6)
2167          return FALSE;          return FALSE;
2168    
2169    #ifdef OSM_GPS_MAP_REFRESH
2170        /* reduce update frequency on maemo to keep screen update fluid */
2171        static guint32 last_time = 0;
2172    
2173        if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE;
2174        last_time = event->time;
2175    #endif
2176    
2177      priv->dragging = TRUE;      priv->dragging = TRUE;
2178    
2179      if (priv->map_auto_center)      if (priv->map_auto_center)
# Line 1690  osm_gps_map_motion_notify (GtkWidget *wi Line 2182  osm_gps_map_motion_notify (GtkWidget *wi
2182      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
2183      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
2184    
2185      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);  
     }  
2186    
2187      return FALSE;      return FALSE;
2188  }  }
# Line 1753  osm_gps_map_configure (GtkWidget *widget Line 2197  osm_gps_map_configure (GtkWidget *widget
2197          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
2198    
2199      priv->pixmap = gdk_pixmap_new (      priv->pixmap = gdk_pixmap_new (
2200                                     widget->window,                          widget->window,
2201                                     widget->allocation.width + EXTRA_BORDER * 2,                          widget->allocation.width + EXTRA_BORDER * 2,
2202                                     widget->allocation.height + EXTRA_BORDER * 2,                          widget->allocation.height + EXTRA_BORDER * 2,
2203                                     -1);                          -1);
2204    
2205    #ifdef ENABLE_OSD
2206    
2207    #ifdef OSD_DOUBLE_BUFFER
2208        if (priv->dbuf_pixmap)
2209            g_object_unref (priv->dbuf_pixmap);
2210    
2211        priv->dbuf_pixmap = gdk_pixmap_new (
2212                            widget->window,
2213                            widget->allocation.width,
2214                            widget->allocation.height,
2215                            -1);
2216    #endif
2217    
2218        /* the osd needs some references to map internal objects */
2219        if(priv->osd)
2220            priv->osd->widget = widget;
2221    #endif
2222    
2223      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
2224      if(priv->gc_map)      if(priv->gc_map)
# Line 1774  osm_gps_map_expose (GtkWidget *widget, G Line 2236  osm_gps_map_expose (GtkWidget *widget, G
2236  {  {
2237      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2238    
2239      gdk_draw_drawable (  #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2240                         widget->window,      GdkDrawable *drawable = priv->dbuf_pixmap;
2241    #else
2242        GdkDrawable *drawable = widget->window;
2243    #endif
2244    
2245        if (!priv->dragging && event)
2246        {
2247            gdk_draw_drawable (drawable,
2248                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2249                               priv->pixmap,
2250                               event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
2251                               event->area.x, event->area.y,
2252                               event->area.width, event->area.height);
2253        }
2254        else
2255        {
2256            gdk_draw_drawable (drawable,
2257                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2258                               priv->pixmap,
2259                               0,0,
2260                               priv->drag_mouse_dx - EXTRA_BORDER,
2261                               priv->drag_mouse_dy - EXTRA_BORDER,
2262                               -1,-1);
2263    
2264            //Paint white outside of the map if dragging. Its less
2265            //ugly than painting the corrupted map
2266            if(priv->drag_mouse_dx>EXTRA_BORDER) {
2267                gdk_draw_rectangle (drawable,
2268                                    widget->style->white_gc,
2269                                    TRUE,
2270                                    0, 0,
2271                                    priv->drag_mouse_dx - EXTRA_BORDER,
2272                                    widget->allocation.height);
2273            }
2274            else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2275            {
2276                gdk_draw_rectangle (drawable,
2277                                    widget->style->white_gc,
2278                                    TRUE,
2279                                    priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
2280                                    -priv->drag_mouse_dx - EXTRA_BORDER,
2281                                    widget->allocation.height);
2282            }
2283    
2284            if (priv->drag_mouse_dy>EXTRA_BORDER) {
2285                gdk_draw_rectangle (drawable,
2286                                    widget->style->white_gc,
2287                                    TRUE,
2288                                    0, 0,
2289                                    widget->allocation.width,
2290                                    priv->drag_mouse_dy - EXTRA_BORDER);
2291            }
2292            else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2293            {
2294                gdk_draw_rectangle (drawable,
2295                                    widget->style->white_gc,
2296                                    TRUE,
2297                                    0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
2298                                    widget->allocation.width,
2299                                    -priv->drag_mouse_dy - EXTRA_BORDER);
2300            }
2301        }
2302    
2303    #ifdef ENABLE_OSD
2304        /* draw new OSD */
2305        if(priv->osd)
2306            priv->osd->draw (priv->osd, drawable);
2307    
2308    #ifdef OSD_DOUBLE_BUFFER
2309        gdk_draw_drawable (widget->window,
2310                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2311                         priv->pixmap,                         priv->dbuf_pixmap,
2312                         event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,                         0,0,0,0,-1,-1);
2313                         event->area.x, event->area.y,  #endif
                        event->area.width, event->area.height);  
2314    
2315    #endif
2316    
2317      return FALSE;      return FALSE;
2318  }  }
2319    
# Line 1863  osm_gps_map_class_init (OsmGpsMapClass * Line 2395  osm_gps_map_class_init (OsmGpsMapClass *
2395                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2396    
2397      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,  
2398                                       PROP_ZOOM,                                       PROP_ZOOM,
2399                                       g_param_spec_int ("zoom",                                       g_param_spec_int ("zoom",
2400                                                         "zoom",                                                         "zoom",
# Line 1967  osm_gps_map_class_init (OsmGpsMapClass * Line 2491  osm_gps_map_class_init (OsmGpsMapClass *
2491                                                         "radius of the gps point inner circle",                                                         "radius of the gps point inner circle",
2492                                                         0,           /* minimum property value */                                                         0,           /* minimum property value */
2493                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2494                                                         5,                                                         10,
2495                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2496    
2497      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1988  osm_gps_map_class_init (OsmGpsMapClass * Line 2512  osm_gps_map_class_init (OsmGpsMapClass *
2512                                                         -1,           /* minimum property value */                                                         -1,           /* minimum property value */
2513                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2514                                                         -1,                                                         -1,
2515                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2516    
2517      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2518                                       PROP_IMAGE_FORMAT,                                       PROP_IMAGE_FORMAT,
# Line 2007  osm_gps_map_source_get_friendly_name(Osm Line 2531  osm_gps_map_source_get_friendly_name(Osm
2531          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2532              return "None";              return "None";
2533          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2534              return "OpenStreetMap";              return "OpenStreetMap I";
2535          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2536              return "OpenStreetMap Renderer";              return "OpenStreetMap II";
2537          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2538              return "OpenAerialMap";              return "OpenCycleMap";
2539            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2540                return "OSMC Trails";
2541          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2542              return "Maps-For-Free";              return "Maps-For-Free";
2543          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2053  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2579  osm_gps_map_source_get_repo_uri(OsmGpsMa
2579              return OSM_REPO_URI;              return OSM_REPO_URI;
2580          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2581              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2582          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2583              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";
2584            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2585                return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
2586          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2587              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";
2588          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2092  osm_gps_map_source_get_image_format(OsmG Line 2620  osm_gps_map_source_get_image_format(OsmG
2620          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2621          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2622          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2623            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2624            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2625              return "png";              return "png";
2626          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2627          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2628            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2629          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2630          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2631          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
# Line 2102  osm_gps_map_source_get_image_format(OsmG Line 2633  osm_gps_map_source_get_image_format(OsmG
2633          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2634          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2635          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:  
2636              return "jpg";              return "jpg";
2637          default:          default:
2638              return "bin";              return "bin";
# Line 2127  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2656  osm_gps_map_source_get_max_zoom(OsmGpsMa
2656          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2657              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2658          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2659          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2660          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2661          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2662          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2137  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2666  osm_gps_map_source_get_max_zoom(OsmGpsMa
2666          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2667          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2668              return 17;              return 17;
2669            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2670                return 15;
2671          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2672              return 11;              return 11;
2673          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
# Line 2361  osm_gps_map_clear_images (OsmGpsMap *map Line 2892  osm_gps_map_clear_images (OsmGpsMap *map
2892  }  }
2893    
2894  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  
2895  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)
2896  {  {
2897      int pixel_x, pixel_y;      int pixel_x, pixel_y;
# Line 2433  osm_gps_map_draw_gps (OsmGpsMap *map, fl Line 2903  osm_gps_map_draw_gps (OsmGpsMap *map, fl
2903      priv->gps->rlat = deg2rad(latitude);      priv->gps->rlat = deg2rad(latitude);
2904      priv->gps->rlon = deg2rad(longitude);      priv->gps->rlon = deg2rad(longitude);
2905      priv->gps_valid = TRUE;      priv->gps_valid = TRUE;
2906        priv->gps_heading = deg2rad(heading);
2907    
2908      // pixel_x,y, offsets      // pixel_x,y, offsets
2909      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);
# Line 2547  osm_gps_map_get_scale(OsmGpsMap *map) Line 3018  osm_gps_map_get_scale(OsmGpsMap *map)
3018  {  {
3019      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
3020    
3021      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);
3022      priv = map->priv;      priv = map->priv;
3023    
3024      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);
3025  }  }
3026    
3027    #ifdef ENABLE_BALLOON
3028    void
3029    osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
3030                              OsmGpsMapBalloonCallback cb, gpointer data)
3031    {
3032        OsmGpsMapPrivate *priv;
3033    
3034        /* remove and previously installed balloon */
3035        osm_gps_map_clear_balloon (map);
3036    
3037        g_return_if_fail (OSM_IS_GPS_MAP (map));
3038        priv = map->priv;
3039    
3040        priv->balloon.coo->rlat = deg2rad(latitude);
3041        priv->balloon.coo->rlon = deg2rad(longitude);
3042        priv->balloon.valid = TRUE;
3043    
3044        priv->balloon.cb = cb;
3045        priv->balloon.data = data;
3046    
3047        // this redraws the map
3048        osm_gps_map_map_redraw_idle(map);
3049    }
3050    
3051    void
3052    osm_gps_map_clear_balloon (OsmGpsMap *map)
3053    {
3054        OsmGpsMapPrivate *priv;
3055    
3056        g_return_if_fail (OSM_IS_GPS_MAP (map));
3057        priv = map->priv;
3058    
3059        priv->balloon.valid = FALSE;
3060    
3061        osm_gps_map_map_redraw_idle(map);
3062    }
3063    #endif
3064    
3065    #ifdef ENABLE_OSD
3066    
3067    void
3068    osm_gps_map_redraw (OsmGpsMap *map)
3069    {
3070        osm_gps_map_map_redraw_idle(map);
3071    }
3072    
3073    osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {
3074        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
3075        return map->priv->osd;
3076    }
3077    
3078    void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {
3079        OsmGpsMapPrivate *priv;
3080    
3081        g_return_if_fail (OSM_IS_GPS_MAP (map));
3082    
3083        priv = map->priv;
3084        g_return_if_fail (!priv->osd);
3085    
3086        priv->osd = osd;
3087    }
3088    
3089    void
3090    osm_gps_map_repaint (OsmGpsMap *map) {
3091        osm_gps_map_expose (GTK_WIDGET(map), NULL);
3092    }
3093    
3094    #endif
Legend:
Removed from v.55  
changed lines
  Added in v.97