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 111 by harbaum, Mon Sep 14 12:16:08 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)
909  {  {
# 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    #ifdef DRAG_DEBUG
1482        printf("trying redraw\n");
1483    #endif
1484    
1485      /* the motion_notify handler uses priv->pixmap to redraw the area; if we      /* the motion_notify handler uses priv->pixmap to redraw the area; if we
1486       * change it while we are dragging, we will end up showing it in the wrong       * change it while we are dragging, we will end up showing it in the wrong
1487       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1201  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1489  osm_gps_map_map_redraw (OsmGpsMap *map)
1489      if (priv->dragging)      if (priv->dragging)
1490          return FALSE;          return FALSE;
1491    
1492        /* undo all offsets that may have happened when dragging */
1493        priv->drag_mouse_dx = 0;
1494        priv->drag_mouse_dy = 0;
1495    
1496      priv->redraw_cycle++;      priv->redraw_cycle++;
1497    
1498      /* draw white background to initialise pixmap */      /* draw white background to initialise pixmap */
# Line 1217  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1509  osm_gps_map_map_redraw (OsmGpsMap *map)
1509      osm_gps_map_print_tracks(map);      osm_gps_map_print_tracks(map);
1510      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1511      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1512    #ifdef ENABLE_BALLOON
1513        osm_gps_map_draw_balloon_int(map);
1514    #endif
1515    
1516    #ifdef ENABLE_OSD
1517        /* OSD may contain a coordinate/scale, so we may have to re-render it */
1518        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
1519            priv->osd->render (priv->osd);
1520    #endif
1521    
     //osm_gps_map_osd_speed(map, 1.5);  
1522      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1523      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
1524    
# Line 1234  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1534  osm_gps_map_map_redraw_idle (OsmGpsMap *
1534          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);
1535  }  }
1536    
1537    #ifdef OSM_GPS_MAP_KEYS
1538    static gboolean
1539    on_window_key_press(GtkWidget *widget,
1540                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1541      gboolean handled = FALSE;
1542      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1543    
1544      // the map handles some keys on its own ...
1545      switch(event->keyval) {
1546    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1547      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1548          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1549          if(!priv->fullscreen)
1550              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1551          else
1552              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1553    
1554          priv->fullscreen = !priv->fullscreen;
1555          handled = TRUE;
1556          } break;
1557    #endif
1558    
1559    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1560      case OSM_GPS_MAP_KEY_ZOOMIN:
1561          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1562          handled = TRUE;
1563          break;
1564    #endif
1565    
1566    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1567      case OSM_GPS_MAP_KEY_ZOOMOUT:
1568          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1569          handled = TRUE;
1570          break;
1571    #endif
1572    
1573    #ifdef OSM_GPS_MAP_KEY_UP
1574      case OSM_GPS_MAP_KEY_UP:
1575          priv->map_y -= step;
1576          priv->center_coord_set = FALSE;
1577          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1578          handled = TRUE;
1579          break;
1580    #endif
1581    
1582    #ifdef OSM_GPS_MAP_KEY_DOWN
1583      case OSM_GPS_MAP_KEY_DOWN:
1584          priv->map_y += step;
1585          priv->center_coord_set = FALSE;
1586          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1587          handled = TRUE;
1588          break;
1589    #endif
1590    
1591    #ifdef OSM_GPS_MAP_KEY_LEFT
1592      case OSM_GPS_MAP_KEY_LEFT:
1593          priv->map_x -= step;
1594          priv->center_coord_set = FALSE;
1595          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1596          handled = TRUE;
1597          break;
1598    #endif
1599    
1600    #ifdef OSM_GPS_MAP_KEY_RIGHT
1601      case OSM_GPS_MAP_KEY_RIGHT:
1602          priv->map_x += step;
1603          priv->center_coord_set = FALSE;
1604          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1605          handled = TRUE;
1606          break;
1607    #endif
1608    
1609      default:
1610          break;
1611      }
1612    
1613      return handled;
1614    }
1615    #endif
1616    
1617  static void  static void
1618  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1619  {  {
# Line 1247  osm_gps_map_init (OsmGpsMap *object) Line 1627  osm_gps_map_init (OsmGpsMap *object)
1627      priv->trip_history = NULL;      priv->trip_history = NULL;
1628      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1629      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1630        priv->gps_heading = OSM_GPS_MAP_INVALID;
1631    
1632    #ifdef ENABLE_BALLOON
1633        priv->balloon.coo = g_new0(coord_t, 1);
1634        priv->balloon.valid = FALSE;
1635        priv->balloon.cb = NULL;
1636    #endif
1637    
1638    #ifdef ENABLE_OSD
1639        priv->osd = NULL;
1640    #endif
1641    
1642    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1643        priv->fullscreen = FALSE;
1644    #endif
1645    
1646      priv->tracks = NULL;      priv->tracks = NULL;
1647      priv->images = NULL;      priv->images = NULL;
# Line 1264  osm_gps_map_init (OsmGpsMap *object) Line 1659  osm_gps_map_init (OsmGpsMap *object)
1659    
1660  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1661      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1662      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session =
1663                                                               SOUP_SESSION_USER_AGENT,          soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
1664                                                               "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11",                                              USER_AGENT, NULL);
                                                              NULL);  
1665  #else  #else
1666      /* libsoup-2.2 seems not to be able to set the user agent */      /* libsoup-2.2 has no special way to set the user agent, so we */
1667        /* set it seperately as an extra header field for each reuest */
1668      priv->soup_session = soup_session_async_new();      priv->soup_session = soup_session_async_new();
1669  #endif  #endif
1670    
# Line 1292  osm_gps_map_init (OsmGpsMap *object) Line 1687  osm_gps_map_init (OsmGpsMap *object)
1687      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1688    
1689      g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, my_log_handler, NULL);      g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, my_log_handler, NULL);
 }  
1690    
1691  #ifndef G_CHECKSUM_MD5  #ifdef OSM_GPS_MAP_KEYS
1692  /* simple hash algorithm hack if md5 is not present */      g_signal_connect(G_OBJECT(object), "key_press_event",
1693  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);  
 }  
1694  #endif  #endif
1695    }
1696    
1697  static GObject *  static void
1698  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_setup(OsmGpsMapPrivate *priv) {
 {  
     GObject *object;  
     OsmGpsMapPrivate *priv;  
     OsmGpsMap *map;  
1699      const char *uri;      const char *uri;
1700    
     //Always chain up to the parent constructor  
     object = G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);  
     map = OSM_GPS_MAP(object);  
     priv = OSM_GPS_MAP_PRIVATE(object);  
   
1701      //user can specify a map source ID, or a repo URI as the map source      //user can specify a map source ID, or a repo URI as the map source
1702      uri = osm_gps_map_source_get_repo_uri(OSM_GPS_MAP_SOURCE_NULL);      uri = osm_gps_map_source_get_repo_uri(OSM_GPS_MAP_SOURCE_NULL);
1703      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
# Line 1347  osm_gps_map_constructor (GType gtype, gu Line 1722  osm_gps_map_constructor (GType gtype, gu
1722          }          }
1723      }      }
1724    
1725      if (!priv->cache_dir_is_full_path) {      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1726  #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);  
         }  
1727    
1728          g_free(md5);      if (priv->tile_dir) {
1729            //the new cachedir is the given cache dir + the friendly name of the repo_uri
1730            priv->cache_dir = g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);
1731            g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);
1732      }      }
1733    }
1734    
1735      inspect_map_uri(map);  static GObject *
1736    osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
1737    {
1738        //Always chain up to the parent constructor
1739        GObject *object =
1740            G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1741    
1742        osm_gps_map_setup(OSM_GPS_MAP_PRIVATE(object));
1743    
1744        inspect_map_uri(OSM_GPS_MAP(object));
1745    
1746      return object;      return object;
1747  }  }
# Line 1405  osm_gps_map_dispose (GObject *object) Line 1778  osm_gps_map_dispose (GObject *object)
1778      if (priv->idle_map_redraw != 0)      if (priv->idle_map_redraw != 0)
1779          g_source_remove (priv->idle_map_redraw);          g_source_remove (priv->idle_map_redraw);
1780    
1781        g_free(priv->gps);
1782    
1783    #ifdef ENABLE_BALLOON
1784        g_free(priv->balloon.coo);
1785    #endif
1786    
1787    #ifdef ENABLE_OSD
1788        if(priv->osd)
1789            priv->osd->free(priv->osd);
1790    
1791    #ifdef OSD_DOUBLE_BUFFER
1792        if(priv->dbuf_pixmap)
1793            g_object_unref (priv->dbuf_pixmap);
1794    #endif
1795    #endif
1796    
1797      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
1798  }  }
1799    
# Line 1414  osm_gps_map_finalize (GObject *object) Line 1803  osm_gps_map_finalize (GObject *object)
1803      OsmGpsMap *map = OSM_GPS_MAP(object);      OsmGpsMap *map = OSM_GPS_MAP(object);
1804      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1805    
1806      g_free(priv->cache_dir);      if(priv->tile_dir)
1807            g_free(priv->tile_dir);
1808    
1809        if(priv->cache_dir)
1810            g_free(priv->cache_dir);
1811    
1812      g_free(priv->repo_uri);      g_free(priv->repo_uri);
1813      g_free(priv->image_format);      g_free(priv->image_format);
1814    
# Line 1471  osm_gps_map_set_property (GObject *objec Line 1865  osm_gps_map_set_property (GObject *objec
1865              break;              break;
1866          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1867              if ( g_value_get_string(value) )              if ( g_value_get_string(value) )
1868                  priv->cache_dir = g_value_dup_string (value);                  priv->tile_dir = g_value_dup_string (value);
             break;  
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             priv->cache_dir_is_full_path = g_value_get_boolean (value);  
1869              break;              break;
1870          case PROP_ZOOM:          case PROP_ZOOM:
1871              priv->map_zoom = g_value_get_int (value);              priv->map_zoom = g_value_get_int (value);
# Line 1502  osm_gps_map_set_property (GObject *objec Line 1893  osm_gps_map_set_property (GObject *objec
1893          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1894              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
1895              break;              break;
1896          case PROP_MAP_SOURCE:          case PROP_MAP_SOURCE: {
1897                gint old = priv->map_source;
1898              priv->map_source = g_value_get_int (value);              priv->map_source = g_value_get_int (value);
1899              break;              if(old >= OSM_GPS_MAP_SOURCE_NULL &&
1900                   priv->map_source != old &&
1901                   priv->map_source >= OSM_GPS_MAP_SOURCE_NULL &&
1902                   priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) {
1903    
1904                    /* we now have to switch the entire map */
1905    
1906                    /* flush the ram cache */
1907                    g_hash_table_remove_all(priv->tile_cache);
1908    
1909                    osm_gps_map_setup(priv);
1910    
1911                    inspect_map_uri(map);
1912    
1913                    /* adjust zoom if necessary */
1914                    if(priv->map_zoom > priv->max_zoom)
1915                        osm_gps_map_set_zoom(map, priv->max_zoom);
1916    
1917                    if(priv->map_zoom < priv->min_zoom)
1918                        osm_gps_map_set_zoom(map, priv->min_zoom);
1919    
1920                } } break;
1921          case PROP_IMAGE_FORMAT:          case PROP_IMAGE_FORMAT:
1922              priv->image_format = g_value_dup_string (value);              priv->image_format = g_value_dup_string (value);
1923              break;              break;
# Line 1545  osm_gps_map_get_property (GObject *objec Line 1958  osm_gps_map_get_property (GObject *objec
1958          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1959              g_value_set_string(value, priv->cache_dir);              g_value_set_string(value, priv->cache_dir);
1960              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             g_value_set_boolean(value, priv->cache_dir_is_full_path);  
             break;  
1961          case PROP_ZOOM:          case PROP_ZOOM:
1962              g_value_set_int(value, priv->map_zoom);              g_value_set_int(value, priv->map_zoom);
1963              break;              break;
# Line 1620  osm_gps_map_button_press (GtkWidget *wid Line 2030  osm_gps_map_button_press (GtkWidget *wid
2030  {  {
2031      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2032    
2033    #ifdef ENABLE_BALLOON
2034        /* don't drag if the user clicked within the balloon */
2035        if (osm_gps_map_in_balloon(priv,
2036                       event->x + EXTRA_BORDER,
2037                       event->y + EXTRA_BORDER))
2038        {
2039            priv->drag_counter = -1;
2040            return FALSE;
2041        }
2042    #endif
2043    
2044    #ifdef ENABLE_OSD
2045        /* pressed inside OSD control? */
2046        if(priv->osd) {
2047            osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);
2048            if(but != OSD_NONE)
2049            {
2050                int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
2051                priv->drag_counter = -1;
2052    
2053                switch(but) {
2054                case OSD_UP:
2055                    priv->map_y -= step;
2056                    priv->center_coord_set = FALSE;
2057                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2058                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2059                    break;
2060    
2061                case OSD_DOWN:
2062                    priv->map_y += step;
2063                    priv->center_coord_set = FALSE;
2064                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2065                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2066                    break;
2067    
2068                case OSD_LEFT:
2069                    priv->map_x -= step;
2070                    priv->center_coord_set = FALSE;
2071                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2072                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2073                    break;
2074    
2075                case OSD_RIGHT:
2076                    priv->map_x += step;
2077                    priv->center_coord_set = FALSE;
2078                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2079                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2080                    break;
2081    
2082                case OSD_IN:
2083                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
2084                    break;
2085    
2086                case OSD_OUT:
2087                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
2088                    break;
2089    
2090                default:
2091                    /* all custom buttons are forwarded to the application */
2092                    if(priv->osd->cb)
2093                        priv->osd->cb(but, priv->osd->data);
2094                    break;
2095                }
2096    
2097                return FALSE;
2098            }
2099        }
2100    #endif
2101    
2102      priv->drag_counter = 0;      priv->drag_counter = 0;
2103      priv->drag_start_mouse_x = (int) event->x;      priv->drag_start_mouse_x = (int) event->x;
2104      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 2113  osm_gps_map_button_release (GtkWidget *w
2113  {  {
2114      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2115    
2116    #ifdef ENABLE_BALLOON
2117        /* released inside the balloon? */
2118        if (osm_gps_map_in_balloon(priv,
2119                       event->x + EXTRA_BORDER,
2120                       event->y + EXTRA_BORDER))
2121        {
2122            osm_gps_map_handle_balloon_click(OSM_GPS_MAP(widget),
2123                 event->x - priv->balloon.rect.x + EXTRA_BORDER,
2124                 event->y - priv->balloon.rect.y + EXTRA_BORDER);
2125        }
2126    #endif
2127    
2128      if (priv->dragging)      if (priv->dragging)
2129      {      {
2130          priv->dragging = FALSE;          priv->dragging = FALSE;
# Line 1649  osm_gps_map_button_release (GtkWidget *w Line 2140  osm_gps_map_button_release (GtkWidget *w
2140          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2141      }      }
2142    
2143      priv->drag_mouse_dx = 0;  #ifdef DRAG_DEBUG
2144      priv->drag_mouse_dy = 0;      printf("dragging done\n");
2145      priv->drag_counter = 0;  #endif
2146    
2147        priv->drag_counter = -1;
2148    
2149      return FALSE;      return FALSE;
2150  }  }
2151    
2152  static gboolean  static gboolean
2153    osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);
2154    
2155    static gboolean
2156  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)
2157  {  {
2158      int x, y;      int x, y;
# Line 1676  osm_gps_map_motion_notify (GtkWidget *wi Line 2172  osm_gps_map_motion_notify (GtkWidget *wi
2172      if (!(state & GDK_BUTTON1_MASK))      if (!(state & GDK_BUTTON1_MASK))
2173          return FALSE;          return FALSE;
2174    
2175        if (priv->drag_counter < 0)
2176            return FALSE;
2177    
2178      priv->drag_counter++;      priv->drag_counter++;
2179    
2180      // we havent dragged more than 6 pixels      // we havent dragged more than 6 pixels
2181      if (priv->drag_counter < 6)      if (priv->drag_counter < 6)
2182          return FALSE;          return FALSE;
2183    
2184    #ifdef OSM_GPS_MAP_REFRESH
2185        /* reduce update frequency on maemo to keep screen update fluid */
2186        static guint32 last_time = 0;
2187    
2188        if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE;
2189        last_time = event->time;
2190    #endif
2191    
2192      priv->dragging = TRUE;      priv->dragging = TRUE;
2193    
2194      if (priv->map_auto_center)      if (priv->map_auto_center)
# Line 1690  osm_gps_map_motion_notify (GtkWidget *wi Line 2197  osm_gps_map_motion_notify (GtkWidget *wi
2197      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
2198      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
2199    
2200      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);  
     }  
2201    
2202      return FALSE;      return FALSE;
2203  }  }
# Line 1753  osm_gps_map_configure (GtkWidget *widget Line 2212  osm_gps_map_configure (GtkWidget *widget
2212          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
2213    
2214      priv->pixmap = gdk_pixmap_new (      priv->pixmap = gdk_pixmap_new (
2215                                     widget->window,                          widget->window,
2216                                     widget->allocation.width + EXTRA_BORDER * 2,                          widget->allocation.width + EXTRA_BORDER * 2,
2217                                     widget->allocation.height + EXTRA_BORDER * 2,                          widget->allocation.height + EXTRA_BORDER * 2,
2218                                     -1);                          -1);
2219    
2220    #ifdef ENABLE_OSD
2221    
2222    #ifdef OSD_DOUBLE_BUFFER
2223        if (priv->dbuf_pixmap)
2224            g_object_unref (priv->dbuf_pixmap);
2225    
2226        priv->dbuf_pixmap = gdk_pixmap_new (
2227                            widget->window,
2228                            widget->allocation.width,
2229                            widget->allocation.height,
2230                            -1);
2231    #endif
2232    
2233        /* the osd needs some references to map internal objects */
2234        if(priv->osd)
2235            priv->osd->widget = widget;
2236    #endif
2237    
2238      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
2239      if(priv->gc_map)      if(priv->gc_map)
# Line 1774  osm_gps_map_expose (GtkWidget *widget, G Line 2251  osm_gps_map_expose (GtkWidget *widget, G
2251  {  {
2252      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2253    
2254      gdk_draw_drawable (  #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2255                         widget->window,      GdkDrawable *drawable = priv->dbuf_pixmap;
2256    #else
2257        GdkDrawable *drawable = widget->window;
2258    #endif
2259    
2260    #ifdef DRAG_DEBUG
2261        printf("expose, map %d/%d\n", priv->map_x, priv->map_y);
2262    #endif
2263    
2264        if (!priv->drag_mouse_dx && !priv->drag_mouse_dy && event)
2265        {
2266    #ifdef DRAG_DEBUG
2267            printf("  dragging = %d, event = %p\n", priv->dragging, event);
2268    #endif
2269    
2270            gdk_draw_drawable (drawable,
2271                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2272                               priv->pixmap,
2273                               event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
2274                               event->area.x, event->area.y,
2275                               event->area.width, event->area.height);
2276        }
2277        else
2278        {
2279    #ifdef DRAG_DEBUG
2280            printf("  drag_mouse %d/%d\n",
2281                   priv->drag_mouse_dx - EXTRA_BORDER,
2282                   priv->drag_mouse_dy - EXTRA_BORDER);
2283    #endif
2284    
2285            gdk_draw_drawable (drawable,
2286                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2287                               priv->pixmap,
2288                               0,0,
2289                               priv->drag_mouse_dx - EXTRA_BORDER,
2290                               priv->drag_mouse_dy - EXTRA_BORDER,
2291                               -1,-1);
2292    
2293            //Paint white outside of the map if dragging. Its less
2294            //ugly than painting the corrupted map
2295            if(priv->drag_mouse_dx>EXTRA_BORDER) {
2296                gdk_draw_rectangle (drawable,
2297                                    widget->style->white_gc,
2298                                    TRUE,
2299                                    0, 0,
2300                                    priv->drag_mouse_dx - EXTRA_BORDER,
2301                                    widget->allocation.height);
2302            }
2303            else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2304            {
2305                gdk_draw_rectangle (drawable,
2306                                    widget->style->white_gc,
2307                                    TRUE,
2308                                    priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
2309                                    -priv->drag_mouse_dx - EXTRA_BORDER,
2310                                    widget->allocation.height);
2311            }
2312    
2313            if (priv->drag_mouse_dy>EXTRA_BORDER) {
2314                gdk_draw_rectangle (drawable,
2315                                    widget->style->white_gc,
2316                                    TRUE,
2317                                    0, 0,
2318                                    widget->allocation.width,
2319                                    priv->drag_mouse_dy - EXTRA_BORDER);
2320            }
2321            else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2322            {
2323                gdk_draw_rectangle (drawable,
2324                                    widget->style->white_gc,
2325                                    TRUE,
2326                                    0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
2327                                    widget->allocation.width,
2328                                    -priv->drag_mouse_dy - EXTRA_BORDER);
2329            }
2330        }
2331    
2332    #ifdef ENABLE_OSD
2333        /* draw new OSD */
2334        if(priv->osd)
2335            priv->osd->draw (priv->osd, drawable);
2336    
2337    #ifdef OSD_DOUBLE_BUFFER
2338        gdk_draw_drawable (widget->window,
2339                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2340                         priv->pixmap,                         priv->dbuf_pixmap,
2341                         event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,                         0,0,0,0,-1,-1);
2342                         event->area.x, event->area.y,  #endif
                        event->area.width, event->area.height);  
2343    
2344    #endif
2345    
2346      return FALSE;      return FALSE;
2347  }  }
2348    
# Line 1863  osm_gps_map_class_init (OsmGpsMapClass * Line 2424  osm_gps_map_class_init (OsmGpsMapClass *
2424                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2425    
2426      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,  
2427                                       PROP_ZOOM,                                       PROP_ZOOM,
2428                                       g_param_spec_int ("zoom",                                       g_param_spec_int ("zoom",
2429                                                         "zoom",                                                         "zoom",
# Line 1967  osm_gps_map_class_init (OsmGpsMapClass * Line 2520  osm_gps_map_class_init (OsmGpsMapClass *
2520                                                         "radius of the gps point inner circle",                                                         "radius of the gps point inner circle",
2521                                                         0,           /* minimum property value */                                                         0,           /* minimum property value */
2522                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2523                                                         5,                                                         10,
2524                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2525    
2526      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1988  osm_gps_map_class_init (OsmGpsMapClass * Line 2541  osm_gps_map_class_init (OsmGpsMapClass *
2541                                                         -1,           /* minimum property value */                                                         -1,           /* minimum property value */
2542                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2543                                                         -1,                                                         -1,
2544                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2545    
2546      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2547                                       PROP_IMAGE_FORMAT,                                       PROP_IMAGE_FORMAT,
# Line 2007  osm_gps_map_source_get_friendly_name(Osm Line 2560  osm_gps_map_source_get_friendly_name(Osm
2560          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2561              return "None";              return "None";
2562          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2563              return "OpenStreetMap";              return "OpenStreetMap I";
2564          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2565              return "OpenStreetMap Renderer";              return "OpenStreetMap II";
2566          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2567              return "OpenAerialMap";              return "OpenCycleMap";
2568            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2569                return "OSMC Trails";
2570          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2571              return "Maps-For-Free";              return "Maps-For-Free";
2572          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2053  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2608  osm_gps_map_source_get_repo_uri(OsmGpsMa
2608              return OSM_REPO_URI;              return OSM_REPO_URI;
2609          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2610              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2611          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2612              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";
2613            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2614                return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
2615          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2616              return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";              return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";
2617          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2092  osm_gps_map_source_get_image_format(OsmG Line 2649  osm_gps_map_source_get_image_format(OsmG
2649          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2650          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2651          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2652            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2653            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2654              return "png";              return "png";
2655          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2656          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2657            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2658          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2659          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2660          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
# Line 2102  osm_gps_map_source_get_image_format(OsmG Line 2662  osm_gps_map_source_get_image_format(OsmG
2662          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2663          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2664          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
         case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:  
         case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:  
2665              return "jpg";              return "jpg";
2666          default:          default:
2667              return "bin";              return "bin";
# Line 2125  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2683  osm_gps_map_source_get_max_zoom(OsmGpsMa
2683          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2684              return 18;              return 18;
2685          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2686            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2687              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2688          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
         case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:  
2689          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2690          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2691          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2137  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2695  osm_gps_map_source_get_max_zoom(OsmGpsMa
2695          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2696          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2697              return 17;              return 17;
2698            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2699                return 15;
2700          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2701              return 11;              return 11;
2702          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
# Line 2276  osm_gps_map_set_zoom (OsmGpsMap *map, in Line 2836  osm_gps_map_set_zoom (OsmGpsMap *map, in
2836          g_debug("Zoom changed from %d to %d factor:%f x:%d",          g_debug("Zoom changed from %d to %d factor:%f x:%d",
2837                  zoom_old, priv->map_zoom, factor, priv->map_x);                  zoom_old, priv->map_zoom, factor, priv->map_x);
2838    
2839    #ifdef ENABLE_OSD
2840            /* OSD may contain a scale, so we may have to re-render it */
2841            if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2842                priv->osd->render (priv->osd);
2843    #endif
2844    
2845          osm_gps_map_map_redraw_idle(map);          osm_gps_map_map_redraw_idle(map);
2846      }      }
2847      return priv->map_zoom;      return priv->map_zoom;
# Line 2361  osm_gps_map_clear_images (OsmGpsMap *map Line 2927  osm_gps_map_clear_images (OsmGpsMap *map
2927  }  }
2928    
2929  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  
2930  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)
2931  {  {
2932      int pixel_x, pixel_y;      int pixel_x, pixel_y;
# Line 2433  osm_gps_map_draw_gps (OsmGpsMap *map, fl Line 2938  osm_gps_map_draw_gps (OsmGpsMap *map, fl
2938      priv->gps->rlat = deg2rad(latitude);      priv->gps->rlat = deg2rad(latitude);
2939      priv->gps->rlon = deg2rad(longitude);      priv->gps->rlon = deg2rad(longitude);
2940      priv->gps_valid = TRUE;      priv->gps_valid = TRUE;
2941        priv->gps_heading = deg2rad(heading);
2942    
2943      // pixel_x,y, offsets      // pixel_x,y, offsets
2944      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);
# Line 2539  osm_gps_map_scroll (OsmGpsMap *map, gint Line 3045  osm_gps_map_scroll (OsmGpsMap *map, gint
3045      priv->map_x += dx;      priv->map_x += dx;
3046      priv->map_y += dy;      priv->map_y += dy;
3047    
3048    #ifdef ENABLE_OSD
3049        /* OSD may contain a coordinate, so we may have to re-render it */
3050        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
3051            priv->osd->render (priv->osd);
3052    #endif
3053    
3054      osm_gps_map_map_redraw_idle (map);      osm_gps_map_map_redraw_idle (map);
3055  }  }
3056    
# Line 2547  osm_gps_map_get_scale(OsmGpsMap *map) Line 3059  osm_gps_map_get_scale(OsmGpsMap *map)
3059  {  {
3060      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
3061    
3062      g_return_val_if_fail (OSM_IS_GPS_MAP (map), OSM_NAN);      g_return_val_if_fail (OSM_IS_GPS_MAP (map), OSM_GPS_MAP_INVALID);
3063      priv = map->priv;      priv = map->priv;
3064    
3065      return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);      return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);
3066  }  }
3067    
3068    #ifdef ENABLE_BALLOON
3069    void
3070    osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
3071                              OsmGpsMapBalloonCallback cb, gpointer data)
3072    {
3073        OsmGpsMapPrivate *priv;
3074    
3075        /* remove and previously installed balloon */
3076        osm_gps_map_clear_balloon (map);
3077    
3078        g_return_if_fail (OSM_IS_GPS_MAP (map));
3079        priv = map->priv;
3080    
3081        priv->balloon.coo->rlat = deg2rad(latitude);
3082        priv->balloon.coo->rlon = deg2rad(longitude);
3083        priv->balloon.valid = TRUE;
3084    
3085        priv->balloon.cb = cb;
3086        priv->balloon.data = data;
3087    
3088        // this redraws the map
3089        osm_gps_map_map_redraw_idle(map);
3090    }
3091    
3092    void
3093    osm_gps_map_clear_balloon (OsmGpsMap *map)
3094    {
3095        OsmGpsMapPrivate *priv;
3096    
3097        g_return_if_fail (OSM_IS_GPS_MAP (map));
3098        priv = map->priv;
3099    
3100        priv->balloon.valid = FALSE;
3101    
3102        osm_gps_map_map_redraw_idle(map);
3103    }
3104    #endif
3105    
3106    #ifdef ENABLE_OSD
3107    
3108    void
3109    osm_gps_map_redraw (OsmGpsMap *map)
3110    {
3111        osm_gps_map_map_redraw_idle(map);
3112    }
3113    
3114    osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {
3115        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
3116        return map->priv->osd;
3117    }
3118    
3119    void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {
3120        OsmGpsMapPrivate *priv;
3121    
3122        g_return_if_fail (OSM_IS_GPS_MAP (map));
3123    
3124        priv = map->priv;
3125        g_return_if_fail (!priv->osd);
3126    
3127        priv->osd = osd;
3128    }
3129    
3130    void
3131    osm_gps_map_repaint (OsmGpsMap *map) {
3132        osm_gps_map_expose (GTK_WIDGET(map), NULL);
3133    }
3134    
3135    #endif
Legend:
Removed from v.55  
changed lines
  Added in v.111