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

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

revision 32 by harbaum, Tue Jul 28 13:21:22 2009 UTC revision 89 by harbaum, Tue Sep 1 11:16:30 2009 UTC
# Line 33  Line 33 
33    
34  #include <gdk/gdk.h>  #include <gdk/gdk.h>
35  #include <glib.h>  #include <glib.h>
36    #include <glib/gstdio.h>
37  #include <glib/gprintf.h>  #include <glib/gprintf.h>
38  #include <libsoup/soup.h>  #include <libsoup/soup.h>
39    
# Line 48  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 77  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
105      //the uri to download.      //the uri to download.
106        OsmGpsMapSource_t map_source;
107      char *repo_uri;      char *repo_uri;
108        char *image_format;
109      int uri_format;      int uri_format;
110      //flag indicating if the map source is located on the google      //flag indicating if the map source is located on the google
111      gboolean the_google;      gboolean the_google;
# Line 95  struct _OsmGpsMapPrivate Line 117  struct _OsmGpsMapPrivate
117      coord_t *gps;      coord_t *gps;
118      gboolean gps_valid;      gboolean gps_valid;
119    
120    #ifdef ENABLE_BALLOON
121        //a balloon with additional info
122        struct {
123            coord_t *coo;
124            gboolean valid;
125            OsmGpsMapRect_t rect;
126            OsmGpsMapBalloonCallback cb;
127            gpointer data;
128        } balloon;
129    #endif
130    
131    #ifdef ENABLE_OSD
132        //the osd controls (if present)
133        osm_gps_map_osd_t *osd;
134    #ifdef OSD_DOUBLE_BUFFER
135        GdkPixmap *dbuf_pixmap;
136    #endif
137    #endif
138    
139    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
140        gboolean fullscreen;
141    #endif
142    
143      //additional images or tracks added to the map      //additional images or tracks added to the map
144      GSList *tracks;      GSList *tracks;
145      GSList *images;      GSList *images;
# Line 104  struct _OsmGpsMapPrivate Line 149  struct _OsmGpsMapPrivate
149      GdkGC *gc_map;      GdkGC *gc_map;
150    
151      //The tile painted when one cannot be found      //The tile painted when one cannot be found
152      //GdkPixbuf *missing_tile;      GdkPixbuf *null_tile;
153    
154      //For tracking click and drag      //For tracking click and drag
155      int drag_counter;      int drag_counter;
# Line 146  enum Line 191  enum
191      PROP_REPO_URI,      PROP_REPO_URI,
192      PROP_PROXY_URI,      PROP_PROXY_URI,
193      PROP_TILE_CACHE_DIR,      PROP_TILE_CACHE_DIR,
     PROP_TILE_CACHE_DIR_IS_FULL_PATH,  
194      PROP_ZOOM,      PROP_ZOOM,
195      PROP_MAX_ZOOM,      PROP_MAX_ZOOM,
196      PROP_MIN_ZOOM,      PROP_MIN_ZOOM,
# Line 157  enum Line 201  enum
201      PROP_TILES_QUEUED,      PROP_TILES_QUEUED,
202      PROP_GPS_TRACK_WIDTH,      PROP_GPS_TRACK_WIDTH,
203      PROP_GPS_POINT_R1,      PROP_GPS_POINT_R1,
204      PROP_GPS_POINT_R2      PROP_GPS_POINT_R2,
205        PROP_MAP_SOURCE,
206        PROP_IMAGE_FORMAT
207  };  };
208    
209  G_DEFINE_TYPE (OsmGpsMap, osm_gps_map, GTK_TYPE_DRAWING_AREA);  G_DEFINE_TYPE (OsmGpsMap, osm_gps_map, GTK_TYPE_DRAWING_AREA);
# Line 171  static gchar    *replace_map_uri(OsmGpsM Line 217  static gchar    *replace_map_uri(OsmGpsM
217  static void     osm_gps_map_print_images (OsmGpsMap *map);  static void     osm_gps_map_print_images (OsmGpsMap *map);
218  static void     osm_gps_map_draw_gps_point (OsmGpsMap *map);  static void     osm_gps_map_draw_gps_point (OsmGpsMap *map);
219  static void     osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y);  static void     osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y);
220    #ifdef LIBSOUP22
221    static void     osm_gps_map_tile_download_complete (SoupMessage *msg, gpointer user_data);
222    #else
223    static void     osm_gps_map_tile_download_complete (SoupSession *session, SoupMessage *msg, gpointer user_data);
224    #endif
225  static void     osm_gps_map_download_tile (OsmGpsMap *map, int zoom, int x, int y, gboolean redraw);  static void     osm_gps_map_download_tile (OsmGpsMap *map, int zoom, int x, int y, gboolean redraw);
226  static void     osm_gps_map_load_tile (OsmGpsMap *map, int zoom, int x, int y, int offset_x, int offset_y);  static void     osm_gps_map_load_tile (OsmGpsMap *map, int zoom, int x, int y, int offset_x, int offset_y);
227  static void     osm_gps_map_fill_tiles_pixel (OsmGpsMap *map);  static void     osm_gps_map_fill_tiles_pixel (OsmGpsMap *map);
# Line 300  static void Line 351  static void
351  inspect_map_uri(OsmGpsMap *map)  inspect_map_uri(OsmGpsMap *map)
352  {  {
353      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
354        priv->uri_format = 0;
355        priv->the_google = FALSE;
356    
357      if (g_strrstr(priv->repo_uri, URI_MARKER_X))      if (g_strrstr(priv->repo_uri, URI_MARKER_X))
358          priv->uri_format |= URI_HAS_X;          priv->uri_format |= URI_HAS_X;
# Line 420  my_log_handler (const gchar * log_domain Line 473  my_log_handler (const gchar * log_domain
473          g_log_default_handler (log_domain, log_level, message, user_data);          g_log_default_handler (log_domain, log_level, message, user_data);
474  }  }
475    
476    static float
477    osm_gps_map_get_scale_at_point(int zoom, float rlat, float rlon)
478    {
479        /* world at zoom 1 == 512 pixels */
480        return cos(rlat) * M_PI * OSM_EQ_RADIUS / (1<<(7+zoom));
481    }
482    
483  /* clears the trip list and all resources */  /* clears the trip list and all resources */
484  static void  static void
485  osm_gps_map_free_trip (OsmGpsMap *map)  osm_gps_map_free_trip (OsmGpsMap *map)
# Line 529  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 589  osm_gps_map_draw_gps_point (OsmGpsMap *m
589          int x, y;          int x, y;
590          int r = priv->ui_gps_point_inner_radius;          int r = priv->ui_gps_point_inner_radius;
591          int r2 = priv->ui_gps_point_outer_radius;          int r2 = priv->ui_gps_point_outer_radius;
592            // int lw = priv->ui_gps_track_width;
593          int mr = MAX(r,r2);          int mr = MAX(r,r2);
594    
595          map_x0 = priv->map_x - EXTRA_BORDER;          map_x0 = priv->map_x - EXTRA_BORDER;
# Line 539  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 600  osm_gps_map_draw_gps_point (OsmGpsMap *m
600          cairo_t *cr;          cairo_t *cr;
601          cairo_pattern_t *pat;          cairo_pattern_t *pat;
602  #else  #else
         int lw = priv->ui_gps_track_width;  
603          GdkColor color;          GdkColor color;
604          GdkGC *marker;          GdkGC *marker;
605  #endif  #endif
# Line 614  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 674  osm_gps_map_draw_gps_point (OsmGpsMap *m
674                                      (mr*2)+lw+lw);                                      (mr*2)+lw+lw);
675  #endif  #endif
676      }      }
677    }
678    
679    #ifdef ENABLE_BALLOON
680    /* most visual effects are hardcoded by now, but may be made */
681    /* available via properties later */
682    #ifndef BALLOON_AREA_WIDTH
683    #define BALLOON_AREA_WIDTH           290
684    #endif
685    #ifndef BALLOON_AREA_HEIGHT
686    #define BALLOON_AREA_HEIGHT           75
687    #endif
688    #ifndef BALLOON_CORNER_RADIUS
689    #define BALLOON_CORNER_RADIUS         10
690    #endif
691    
692    #define BALLOON_BORDER               (BALLOON_CORNER_RADIUS/2)
693    #define BALLOON_WIDTH                (BALLOON_AREA_WIDTH + 2 * BALLOON_BORDER)
694    #define BALLOON_HEIGHT               (BALLOON_AREA_HEIGHT + 2 * BALLOON_BORDER)
695    #define BALLOON_TRANSPARENCY         0.8
696    #define POINTER_HEIGHT                20
697    #define POINTER_FOOT_WIDTH            20
698    #define POINTER_OFFSET               (BALLOON_CORNER_RADIUS*3/4)
699    #define BALLOON_SHADOW               (BALLOON_CORNER_RADIUS/2)
700    #define BALLOON_SHADOW_TRANSPARENCY  0.2
701    
702    #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
703    
704    
705    /* draw the bubble shape. this is used twice, once for the shape and once */
706    /* for the shadow */
707    static void
708    osm_gps_map_draw_balloon_shape (cairo_t *cr, int x0, int y0, int x1, int y1,
709           gboolean bottom, int px, int py, int px0, int px1) {
710    
711        cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);
712        cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
713                   BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);
714        if(!bottom) {
715            /* insert top pointer */
716            cairo_line_to (cr, px1, y0);
717            cairo_line_to (cr, px, py);
718            cairo_line_to (cr, px0, y0);
719        }
720    
721        cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0);
722        cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
723                   BALLOON_CORNER_RADIUS, -M_PI/2, 0);
724        cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS);
725        cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
726                   BALLOON_CORNER_RADIUS, 0, M_PI/2);
727        if(bottom) {
728            /* insert bottom pointer */
729            cairo_line_to (cr, px0, y1);
730            cairo_line_to (cr, px, py);
731            cairo_line_to (cr, px1, y1);
732        }
733    
734        cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1);
735        cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
736                   BALLOON_CORNER_RADIUS, M_PI/2, M_PI);
737    
738        cairo_close_path (cr);
739    }
740    
741    static void
742    osm_gps_map_draw_balloon_int (OsmGpsMap *map)
743    {
744        OsmGpsMapPrivate *priv = map->priv;
745    
746        if (priv->balloon.valid) {
747    
748            /* ------- convert given coordinate into screen position --------- */
749            int x0 = lon2pixel(priv->map_zoom, priv->balloon.coo->rlon) -
750                priv->map_x + EXTRA_BORDER;
751            int y0 = lat2pixel(priv->map_zoom, priv->balloon.coo->rlat) -
752                priv->map_y + EXTRA_BORDER;
753    
754            /* check position of this relative to screen center to determine */
755            /* pointer direction ... */
756            int pointer_x = x0, pointer_x0, pointer_x1;
757            int pointer_y = y0;
758    
759            /* ... and calculate position */
760            if((x0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.width/2) {
761                x0 -= BALLOON_WIDTH - POINTER_OFFSET;
762                pointer_x0 = pointer_x - (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
763                pointer_x1 = pointer_x0 - POINTER_FOOT_WIDTH;
764            } else {
765                x0 -= POINTER_OFFSET;
766                pointer_x1 = pointer_x + (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
767                pointer_x0 = pointer_x1 + POINTER_FOOT_WIDTH;
768            }
769    
770            gboolean bottom = FALSE;
771            if((y0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.height/2) {
772                bottom = TRUE;
773                y0 -= BALLOON_HEIGHT + POINTER_HEIGHT;
774            } else
775                y0 += POINTER_HEIGHT;
776    
777            /* calculate bottom/right of box */
778            int x1 = x0 + BALLOON_WIDTH, y1 = y0 + BALLOON_HEIGHT;
779    
780            /* save balloon screen coordinates for later use */
781            priv->balloon.rect.x = x0 + BALLOON_BORDER;
782            priv->balloon.rect.y = y0 + BALLOON_BORDER;
783            priv->balloon.rect.w = x1 - x0 - 2*BALLOON_BORDER;
784            priv->balloon.rect.h = y1 - y0 - 2*BALLOON_BORDER;
785    
786    #ifdef USE_CAIRO
787            cairo_t *cr = gdk_cairo_create(priv->pixmap);
788    
789            /* --------- draw shadow --------------- */
790            osm_gps_map_draw_balloon_shape (cr,
791                        x0 + BALLOON_SHADOW, y0 + BALLOON_SHADOW,
792                        x1 + BALLOON_SHADOW, y1 + BALLOON_SHADOW,
793                        bottom, pointer_x, pointer_y,
794                        pointer_x0 + BALLOON_SHADOW, pointer_x1 + BALLOON_SHADOW);
795    
796            cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_SHADOW_TRANSPARENCY);
797            cairo_fill_preserve (cr);
798            cairo_set_source_rgba (cr, 1, 0, 0, 1.0);
799            cairo_set_line_width (cr, 0);
800            cairo_stroke (cr);
801    
802            /* --------- draw main shape ----------- */
803            osm_gps_map_draw_balloon_shape (cr, x0, y0, x1, y1,
804                        bottom, pointer_x, pointer_y, pointer_x0, pointer_x1);
805    
806            cairo_set_source_rgba (cr, 1, 1, 1, BALLOON_TRANSPARENCY);
807            cairo_fill_preserve (cr);
808            cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_TRANSPARENCY);
809            cairo_set_line_width (cr, 1);
810            cairo_stroke (cr);
811    
812    
813            /* ---------- draw close button --------- */
814    
815            int cx = x1 - BALLOON_BORDER - CLOSE_BUTTON_RADIUS;
816            int cy = y0 + BALLOON_BORDER + CLOSE_BUTTON_RADIUS;
817            int crad = CLOSE_BUTTON_RADIUS;
818    
819            cairo_arc (cr, cx, cy, crad, 0, 2 * M_PI);
820            cairo_set_source_rgba (cr, 0.8, 0, 0, 1.0);
821            cairo_fill_preserve (cr);
822            cairo_set_source_rgba (cr, 0.3, 0, 0, 1.0);
823            cairo_set_line_width (cr, 2);
824            cairo_stroke(cr);
825    
826            cairo_set_source_rgba (cr, 1, 1, 1, 1.0);
827            cairo_set_line_width (cr, BALLOON_CORNER_RADIUS/3.3);
828            cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
829            cairo_move_to (cr, cx - crad/2, cy - crad/2);
830            cairo_line_to (cr, cx + crad/2, cy + crad/2);
831            cairo_stroke (cr);
832            cairo_move_to (cr, cx + crad/2, cy - crad/2);
833            cairo_line_to (cr, cx - crad/2, cy + crad/2);
834            cairo_stroke (cr);
835    
836            if (priv->balloon.cb) {
837                /* clip in case application tries to draw in */
838                /* exceed of the balloon */
839                cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,
840                                 priv->balloon.rect.w, priv->balloon.rect.h);
841                cairo_clip (cr);
842                cairo_new_path (cr);  /* current path is not
843                                         consumed by cairo_clip() */
844    
845                priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);
846            }
847    
848            cairo_destroy(cr);
849    
850            gtk_widget_queue_draw_area (GTK_WIDGET(map),
851                                        x0, y0, BALLOON_WIDTH,
852                                        BALLOON_HEIGHT + POINTER_HEIGHT);
853    #else
854    #warning "Balloon display lacks a non-cairo implementation!"
855    #endif
856        }
857    }
858    
859    /* the user clicked into the balloons main area. handle this */
860    static void
861    osm_gps_map_handle_balloon_click(OsmGpsMap *map, gint x, gint y)
862    {
863        OsmGpsMapPrivate *priv = map->priv;
864    
865        if (!priv->balloon.valid)
866            return;
867    
868        /* check if the close button was clicked */
869        if ((x > priv->balloon.rect.w - 2*CLOSE_BUTTON_RADIUS) &&
870            (x < priv->balloon.rect.w) &&
871            (y > 0) && (y < 2*CLOSE_BUTTON_RADIUS)) {
872    
873            priv->balloon.valid = FALSE;
874            osm_gps_map_map_redraw_idle(map);
875        }
876  }  }
877    
878    /* return true if balloon is being displayed and if */
879    /* the given coordinate is within this balloon */
880    static gboolean
881    osm_gps_map_in_balloon(OsmGpsMapPrivate *priv, gint x, gint y)
882    {
883        return (priv->balloon.valid &&
884                (x > priv->balloon.rect.x) &&
885                (x < priv->balloon.rect.x + priv->balloon.rect.w) &&
886                (y > priv->balloon.rect.y) &&
887                (y < priv->balloon.rect.y + priv->balloon.rect.h));
888    }
889    #endif // ENABLE_BALLOON
890    
891  static void  static void
892  osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)  osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)
893  {  {
894      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
895    
896      g_debug("Queing redraw @ %d,%d (w:%d h:%d)", offset_x,offset_y,      g_debug("Queing redraw @ %d,%d (w:%d h:%d)", offset_x,offset_y, TILESIZE,TILESIZE);
             TILESIZE,TILESIZE);  
897    
898      /* draw pixbuf onto pixmap */      /* draw pixbuf onto pixmap */
899      gdk_draw_pixbuf (priv->pixmap,      gdk_draw_pixbuf (priv->pixmap,
# Line 654  static void Line 925  static void
925  osm_gps_map_tile_download_complete (SoupSession *session, SoupMessage *msg, gpointer user_data)  osm_gps_map_tile_download_complete (SoupSession *session, SoupMessage *msg, gpointer user_data)
926  #endif  #endif
927  {  {
928      int fd;      FILE *file;
929      tile_download_t *dl = (tile_download_t *)user_data;      tile_download_t *dl = (tile_download_t *)user_data;
930      OsmGpsMap *map = OSM_GPS_MAP(dl->map);      OsmGpsMap *map = OSM_GPS_MAP(dl->map);
931      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
# Line 667  osm_gps_map_tile_download_complete (Soup Line 938  osm_gps_map_tile_download_complete (Soup
938          {          {
939              if (g_mkdir_with_parents(dl->folder,0700) == 0)              if (g_mkdir_with_parents(dl->folder,0700) == 0)
940              {              {
941                  fd = open(dl->filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);                  file = g_fopen(dl->filename, "wb");
942                  if (fd != -1)                  if (file != NULL)
943                  {                  {
944                      write (fd, MSG_RESPONSE_BODY(msg), MSG_RESPONSE_LEN(msg));                      fwrite (MSG_RESPONSE_BODY(msg), 1, MSG_RESPONSE_LEN(msg), file);
945                      file_saved = TRUE;                      file_saved = TRUE;
946                        g_debug("Wrote "MSG_RESPONSE_LEN_FORMAT" bytes to %s", MSG_RESPONSE_LEN(msg), dl->filename);
947                        fclose (file);
948    
                     g_debug("Wrote " MSG_RESPONSE_LEN_FORMAT " bytes to %s", MSG_RESPONSE_LEN(msg), dl->filename);  
                     close (fd);  
949                  }                  }
950              }              }
951              else              else
952              {              {
953                  g_warning("Error creating tile download directory: %s", dl->folder);                  g_warning("Error creating tile download directory: %s",
954                              dl->folder);
955                    perror("perror:");
956              }              }
957          }          }
958    
# Line 687  osm_gps_map_tile_download_complete (Soup Line 960  osm_gps_map_tile_download_complete (Soup
960          {          {
961              GdkPixbuf *pixbuf = NULL;              GdkPixbuf *pixbuf = NULL;
962    
963                /* if the file was actually stored on disk, we can simply */
964                /* load and decode it from that file */
965              if (priv->cache_dir)              if (priv->cache_dir)
966              {              {
967                  if (file_saved)                  if (file_saved)
# Line 720  osm_gps_map_tile_download_complete (Soup Line 995  osm_gps_map_tile_download_complete (Soup
995                      g_warning("Error: Unable to determine image file format");                      g_warning("Error: Unable to determine image file format");
996                  }                  }
997              }              }
998    
999              /* Store the tile into the cache */              /* Store the tile into the cache */
1000              if (G_LIKELY (pixbuf))              if (G_LIKELY (pixbuf))
1001              {              {
# Line 735  osm_gps_map_tile_download_complete (Soup Line 1010  osm_gps_map_tile_download_complete (Soup
1010                   * we are using it as a key in the hash table */                   * we are using it as a key in the hash table */
1011                  dl->filename = NULL;                  dl->filename = NULL;
1012              }              }
   
1013              osm_gps_map_map_redraw_idle (map);              osm_gps_map_map_redraw_idle (map);
1014          }          }
1015          g_hash_table_remove(priv->tile_queue, dl->uri);          g_hash_table_remove(priv->tile_queue, dl->uri);
# Line 794  osm_gps_map_download_tile (OsmGpsMap *ma Line 1068  osm_gps_map_download_tile (OsmGpsMap *ma
1068          g_free(dl->uri);          g_free(dl->uri);
1069          g_free(dl);          g_free(dl);
1070      } else {      } else {
1071          dl->folder = g_strdup_printf("%s/%d/%d/",priv->cache_dir, zoom, x);          dl->folder = g_strdup_printf("%s%c%d%c%d%c",
1072          dl->filename = g_strdup_printf("%s/%d/%d/%d.png",priv->cache_dir, zoom, x, y);                              priv->cache_dir, G_DIR_SEPARATOR,
1073                                zoom, G_DIR_SEPARATOR,
1074                                x, G_DIR_SEPARATOR);
1075            dl->filename = g_strdup_printf("%s%c%d%c%d%c%d.%s",
1076                                priv->cache_dir, G_DIR_SEPARATOR,
1077                                zoom, G_DIR_SEPARATOR,
1078                                x, G_DIR_SEPARATOR,
1079                                y,
1080                                priv->image_format);
1081          dl->map = map;          dl->map = map;
1082          dl->redraw = redraw;          dl->redraw = redraw;
1083    
# Line 813  osm_gps_map_download_tile (OsmGpsMap *ma Line 1095  osm_gps_map_download_tile (OsmGpsMap *ma
1095                      if (cookie) {                      if (cookie) {
1096                          g_debug("Adding Google Cookie");                          g_debug("Adding Google Cookie");
1097                          soup_message_headers_append(msg->request_headers, "Cookie", cookie);                          soup_message_headers_append(msg->request_headers, "Cookie", cookie);
   
1098                      }                      }
1099                  }                  }
1100              }              }
1101    
1102    #ifdef LIBSOUP22
1103                soup_message_headers_append(msg->request_headers,
1104                                            "User-Agent", USER_AGENT);
1105    #endif
1106    
1107              g_hash_table_insert (priv->tile_queue, dl->uri, msg);              g_hash_table_insert (priv->tile_queue, dl->uri, msg);
1108              soup_session_queue_message (priv->soup_session, msg, osm_gps_map_tile_download_complete, dl);              soup_session_queue_message (priv->soup_session, msg, osm_gps_map_tile_download_complete, dl);
1109          } else {          } else {
# Line 835  osm_gps_map_load_cached_tile (OsmGpsMap Line 1121  osm_gps_map_load_cached_tile (OsmGpsMap
1121  {  {
1122      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1123      gchar *filename;      gchar *filename;
1124      GdkPixbuf *pixbuf;      GdkPixbuf *pixbuf = NULL;
1125      OsmCachedTile *tile;      OsmCachedTile *tile;
1126    
1127      filename = g_strdup_printf("%s/%u/%u/%u.png",      filename = g_strdup_printf("%s%c%d%c%d%c%d.%s",
1128                                 priv->cache_dir,                  priv->cache_dir, G_DIR_SEPARATOR,
1129                                 zoom, x, y);                  zoom, G_DIR_SEPARATOR,
1130                    x, G_DIR_SEPARATOR,
1131                    y,
1132                    priv->image_format);
1133    
1134      tile = g_hash_table_lookup (priv->tile_cache, filename);      tile = g_hash_table_lookup (priv->tile_cache, filename);
1135      if (tile)      if (tile)
1136      {      {
1137          g_free (filename);          g_free (filename);
1138      }      }
1139      else if (priv->cache_dir)      else
1140      {      {
1141          pixbuf = gdk_pixbuf_new_from_file (filename, NULL);          pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
1142          if (pixbuf)          if (pixbuf)
# Line 863  osm_gps_map_load_cached_tile (OsmGpsMap Line 1152  osm_gps_map_load_cached_tile (OsmGpsMap
1152      {      {
1153          tile->redraw_cycle = priv->redraw_cycle;          tile->redraw_cycle = priv->redraw_cycle;
1154          pixbuf = g_object_ref (tile->pixbuf);          pixbuf = g_object_ref (tile->pixbuf);
1155      } else      }
         pixbuf = NULL;  
1156    
1157      return pixbuf;      return pixbuf;
1158  }  }
# Line 928  static void Line 1216  static void
1216  osm_gps_map_load_tile (OsmGpsMap *map, int zoom, int x, int y, int offset_x, int offset_y)  osm_gps_map_load_tile (OsmGpsMap *map, int zoom, int x, int y, int offset_x, int offset_y)
1217  {  {
1218      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1219        gchar *filename;
1220      GdkPixbuf *pixbuf;      GdkPixbuf *pixbuf;
1221    
1222      g_debug("Load tile %d,%d (%d,%d) z:%d", x, y, offset_x, offset_y, zoom);      g_debug("Load tile %d,%d (%d,%d) z:%d", x, y, offset_x, offset_y, zoom);
1223    
1224      /* try to get file from internal cache */      if (priv->map_source == OSM_GPS_MAP_SOURCE_NULL) {
1225      pixbuf = osm_gps_map_load_cached_tile(map, zoom, x, y);          osm_gps_map_blit_tile(map, priv->null_tile, offset_x,offset_y);
1226            return;
1227        }
1228    
1229      /* if a disk cache is being used, try to read the file from there */      filename = g_strdup_printf("%s%c%d%c%d%c%d.%s",
1230      if (priv->cache_dir && !pixbuf)                  priv->cache_dir, G_DIR_SEPARATOR,
1231      {                  zoom, G_DIR_SEPARATOR,
1232          gchar *filename;                  x, G_DIR_SEPARATOR,
1233          filename = g_strdup_printf("%s/%u/%u/%u.png",                  y,
1234                                     priv->cache_dir,                  priv->image_format);
                                    zoom, x, y);  
   
         pixbuf = gdk_pixbuf_new_from_file (filename, NULL);  
         if (pixbuf)  
         {  
             g_debug("Found tile %s", filename);  
         }  
1235    
1236          g_free(filename);      /* try to get file from internal cache first */
1237      }      if(!(pixbuf = osm_gps_map_load_cached_tile(map, zoom, x, y)))
1238            pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
1239    
1240      if (G_LIKELY(pixbuf))      if(pixbuf)
1241      {      {
1242            g_debug("Found tile %s", filename);
1243          osm_gps_map_blit_tile(map, pixbuf, offset_x,offset_y);          osm_gps_map_blit_tile(map, pixbuf, offset_x,offset_y);
1244          g_object_unref (pixbuf);          g_object_unref (pixbuf);
1245      }      }
# Line 984  osm_gps_map_load_tile (OsmGpsMap *map, i Line 1270  osm_gps_map_load_tile (OsmGpsMap *map, i
1270                                  TRUE, offset_x, offset_y, TILESIZE, TILESIZE);                                  TRUE, offset_x, offset_y, TILESIZE, TILESIZE);
1271          }          }
1272      }      }
1273        g_free(filename);
1274  }  }
1275    
1276  static void  static void
# Line 1077  osm_gps_map_print_track (OsmGpsMap *map, Line 1364  osm_gps_map_print_track (OsmGpsMap *map,
1364    
1365      map_x0 = priv->map_x - EXTRA_BORDER;      map_x0 = priv->map_x - EXTRA_BORDER;
1366      map_y0 = priv->map_y - EXTRA_BORDER;      map_y0 = priv->map_y - EXTRA_BORDER;
   
1367      for(list = trackpoint_list; list != NULL; list = list->next)      for(list = trackpoint_list; list != NULL; list = list->next)
1368      {      {
1369          coord_t *tp = list->data;          coord_t *tp = list->data;
# Line 1132  osm_gps_map_print_tracks (OsmGpsMap *map Line 1418  osm_gps_map_print_tracks (OsmGpsMap *map
1418    
1419      if (priv->show_trip_history)      if (priv->show_trip_history)
1420          osm_gps_map_print_track (map, priv->trip_history);          osm_gps_map_print_track (map, priv->trip_history);
1421    
1422      if (priv->tracks)      if (priv->tracks)
1423      {      {
         g_debug("TRACK");  
1424          GSList* tmp = priv->tracks;          GSList* tmp = priv->tracks;
1425          while (tmp != NULL)          while (tmp != NULL)
1426          {          {
# Line 1144  osm_gps_map_print_tracks (OsmGpsMap *map Line 1430  osm_gps_map_print_tracks (OsmGpsMap *map
1430      }      }
1431  }  }
1432    
1433  static gboolean  static gboolean
1434  osm_gps_map_purge_cache_check(gpointer key, gpointer value, gpointer user)  osm_gps_map_purge_cache_check(gpointer key, gpointer value, gpointer user)
1435  {  {
1436      return(((OsmCachedTile*)value)->redraw_cycle != ((OsmGpsMapPrivate*)user)->redraw_cycle);     return (((OsmCachedTile*)value)->redraw_cycle != ((OsmGpsMapPrivate*)user)->redraw_cycle);
1437  }  }
1438    
1439  static void  static void
1440  osm_gps_map_purge_cache (OsmGpsMap *map)  osm_gps_map_purge_cache (OsmGpsMap *map)
1441  {  {
1442      OsmGpsMapPrivate *priv = map->priv;     OsmGpsMapPrivate *priv = map->priv;
1443    
1444      if (g_hash_table_size (priv->tile_cache) < priv->max_tile_cache_size)     if (g_hash_table_size (priv->tile_cache) < priv->max_tile_cache_size)
1445          return;         return;
1446    
1447      /* run through the cache, and remove the tiles which have not been used     /* run through the cache, and remove the tiles which have not been used
1448       * during the last redraw operation */      * during the last redraw operation */
1449      g_hash_table_foreach_remove(priv->tile_cache, osm_gps_map_purge_cache_check, priv);     g_hash_table_foreach_remove(priv->tile_cache, osm_gps_map_purge_cache_check, priv);
1450  }  }
1451    
1452  static gboolean  static gboolean
# Line 1170  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1456  osm_gps_map_map_redraw (OsmGpsMap *map)
1456    
1457      priv->idle_map_redraw = 0;      priv->idle_map_redraw = 0;
1458    
1459        /* don't redraw the entire map while the OSD is doing */
1460        /* some animation or the like. This is to keep the animation */
1461        /* fluid */
1462        if (priv->osd->busy(priv->osd))
1463            return FALSE;
1464    
1465      /* the motion_notify handler uses priv->pixmap to redraw the area; if we      /* the motion_notify handler uses priv->pixmap to redraw the area; if we
1466       * change it while we are dragging, we will end up showing it in the wrong       * change it while we are dragging, we will end up showing it in the wrong
1467       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1193  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1485  osm_gps_map_map_redraw (OsmGpsMap *map)
1485      osm_gps_map_print_tracks(map);      osm_gps_map_print_tracks(map);
1486      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1487      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1488    #ifdef ENABLE_BALLOON
1489        osm_gps_map_draw_balloon_int(map);
1490    #endif
1491    
1492      //osm_gps_map_osd_speed(map, 1.5);      //osm_gps_map_osd_speed(map, 1.5);
1493      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
# Line 1210  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1505  osm_gps_map_map_redraw_idle (OsmGpsMap *
1505          priv->idle_map_redraw = g_idle_add ((GSourceFunc)osm_gps_map_map_redraw, map);          priv->idle_map_redraw = g_idle_add ((GSourceFunc)osm_gps_map_map_redraw, map);
1506  }  }
1507    
1508    #ifdef OSM_GPS_MAP_KEYS
1509    static gboolean
1510    on_window_key_press(GtkWidget *widget,
1511                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1512      gboolean handled = FALSE;
1513      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1514    
1515      // the map handles some keys on its own ...
1516      switch(event->keyval) {
1517    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1518      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1519          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1520          if(!priv->fullscreen)
1521              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1522          else
1523              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1524    
1525          priv->fullscreen = !priv->fullscreen;
1526          handled = TRUE;
1527          } break;
1528    #endif
1529    
1530    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1531      case OSM_GPS_MAP_KEY_ZOOMIN:
1532          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1533          handled = TRUE;
1534          break;
1535    #endif
1536    
1537    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1538      case OSM_GPS_MAP_KEY_ZOOMOUT:
1539          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1540          handled = TRUE;
1541          break;
1542    #endif
1543    
1544    #ifdef OSM_GPS_MAP_KEY_UP
1545      case OSM_GPS_MAP_KEY_UP:
1546          priv->map_y -= step;
1547          priv->center_coord_set = FALSE;
1548          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1549          handled = TRUE;
1550          break;
1551    #endif
1552    
1553    #ifdef OSM_GPS_MAP_KEY_DOWN
1554      case OSM_GPS_MAP_KEY_DOWN:
1555          priv->map_y += step;
1556          priv->center_coord_set = FALSE;
1557          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1558          handled = TRUE;
1559          break;
1560    #endif
1561    
1562    #ifdef OSM_GPS_MAP_KEY_LEFT
1563      case OSM_GPS_MAP_KEY_LEFT:
1564          priv->map_x -= step;
1565          priv->center_coord_set = FALSE;
1566          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1567          handled = TRUE;
1568          break;
1569    #endif
1570    
1571    #ifdef OSM_GPS_MAP_KEY_RIGHT
1572      case OSM_GPS_MAP_KEY_RIGHT:
1573          priv->map_x += step;
1574          priv->center_coord_set = FALSE;
1575          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1576          handled = TRUE;
1577          break;
1578    #endif
1579    
1580      default:
1581          break;
1582      }
1583    
1584      return handled;
1585    }
1586    #endif
1587    
1588  static void  static void
1589  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1590  {  {
# Line 1224  osm_gps_map_init (OsmGpsMap *object) Line 1599  osm_gps_map_init (OsmGpsMap *object)
1599      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1600      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1601    
1602    #ifdef ENABLE_BALLOON
1603        priv->balloon.coo = g_new0(coord_t, 1);
1604        priv->balloon.valid = FALSE;
1605        priv->balloon.cb = NULL;
1606    #endif
1607    
1608    #ifdef ENABLE_OSD
1609        priv->osd = NULL;
1610    #endif
1611    
1612    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1613        priv->fullscreen = FALSE;
1614    #endif
1615    
1616      priv->tracks = NULL;      priv->tracks = NULL;
1617      priv->images = NULL;      priv->images = NULL;
1618    
# Line 1236  osm_gps_map_init (OsmGpsMap *object) Line 1625  osm_gps_map_init (OsmGpsMap *object)
1625      priv->uri_format = 0;      priv->uri_format = 0;
1626      priv->the_google = FALSE;      priv->the_google = FALSE;
1627    
1628        priv->map_source = -1;
1629    
1630  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1631      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1632      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session =
1633                                                               SOUP_SESSION_USER_AGENT,          soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
1634                                                               "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11",                                              USER_AGENT, NULL);
                                                              NULL);  
1635  #else  #else
1636      /* libsoup-2.2 seems not to be able to set the user agent */      /* libsoup-2.2 has no special way to set the user agent, so we */
1637        /* set it seperately as an extra header field for each reuest */
1638      priv->soup_session = soup_session_async_new();      priv->soup_session = soup_session_async_new();
1639  #endif  #endif
1640    
# Line 1266  osm_gps_map_init (OsmGpsMap *object) Line 1657  osm_gps_map_init (OsmGpsMap *object)
1657      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1658    
1659      g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, my_log_handler, NULL);      g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, my_log_handler, NULL);
 }  
1660    
1661  #ifndef G_CHECKSUM_MD5  #ifdef OSM_GPS_MAP_KEYS
1662  /* simple hash algorithm hack if md5 is not present */      g_signal_connect(G_OBJECT(object), "key_press_event",
1663  static char *simple_hash(char *str) {                       G_CALLBACK(on_window_key_press), priv);
     union {  
         char str[4];  
         gulong val;  
     } hash = { .val = 0x55555555 };  
   
     while(*str) {  
         hash.str[(int)str & 3] ^= *str;  
         str++;  
     }  
     return g_strdup_printf("%08lX", hash.val);  
 }  
1664  #endif  #endif
1665    }
1666    
1667  static GObject *  static GObject *
1668  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
1669  {  {
1670      GObject *object;      GObject *object;
1671      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
1672        OsmGpsMap *map;
1673        const char *uri;
1674    
1675      //Always chain up to the parent constructor      //Always chain up to the parent constructor
1676      object = G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);      object = G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1677        map = OSM_GPS_MAP(object);
1678      priv = OSM_GPS_MAP_PRIVATE(object);      priv = OSM_GPS_MAP_PRIVATE(object);
1679    
1680      if (!priv->cache_dir_is_full_path) {      //user can specify a map source ID, or a repo URI as the map source
1681  #ifdef G_CHECKSUM_MD5      uri = osm_gps_map_source_get_repo_uri(OSM_GPS_MAP_SOURCE_NULL);
1682          char *md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, priv->repo_uri, -1);      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
1683  #else          g_debug("Using null source");
1684          char *md5 = simple_hash(priv->repo_uri);          priv->map_source = OSM_GPS_MAP_SOURCE_NULL;
 #endif  
1685    
1686          if (priv->cache_dir) {          priv->null_tile = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, 256, 256);
1687              char *old = priv->cache_dir;          gdk_pixbuf_fill(priv->null_tile, 0xcccccc00);
1688              //the new cachedir is the given cache dir + the md5 of the repo_uri      }
1689              priv->cache_dir = g_strdup_printf("%s/%s", old, md5);      else if (priv->map_source >= 0) {
1690              g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);          //check if the source given is valid
1691              g_free(old);          uri = osm_gps_map_source_get_repo_uri(priv->map_source);
1692            if (uri) {
1693                g_debug("Setting map source from ID");
1694                g_free(priv->repo_uri);
1695    
1696                priv->repo_uri = g_strdup(uri);
1697                priv->image_format = g_strdup(
1698                    osm_gps_map_source_get_image_format(priv->map_source));
1699                priv->max_zoom = osm_gps_map_source_get_max_zoom(priv->map_source);
1700                priv->min_zoom = osm_gps_map_source_get_min_zoom(priv->map_source);
1701          }          }
1702        }
1703    
1704          g_free(md5);      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1705        if(!fname) fname = "_unknown_";
1706    
1707        if (priv->tile_dir) {
1708            //the new cachedir is the given cache dir + the friendly name of the repo_uri
1709            priv->cache_dir = g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);
1710            g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);
1711      }      }
1712    
1713        inspect_map_uri(map);
1714    
1715      return object;      return object;
1716  }  }
1717    
# Line 1338  osm_gps_map_dispose (GObject *object) Line 1738  osm_gps_map_dispose (GObject *object)
1738      if(priv->pixmap)      if(priv->pixmap)
1739          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
1740    
1741        if (priv->null_tile)
1742            g_object_unref (priv->null_tile);
1743    
1744      if(priv->gc_map)      if(priv->gc_map)
1745          g_object_unref(priv->gc_map);          g_object_unref(priv->gc_map);
1746    
1747      if (priv->idle_map_redraw != 0)      if (priv->idle_map_redraw != 0)
1748          g_source_remove (priv->idle_map_redraw);          g_source_remove (priv->idle_map_redraw);
1749    
1750        g_free(priv->gps);
1751    
1752    #ifdef ENABLE_BALLOON
1753        g_free(priv->balloon.coo);
1754    #endif
1755    
1756    #ifdef ENABLE_OSD
1757        if(priv->osd)
1758            priv->osd->free(priv->osd);
1759    
1760    #ifdef OSD_DOUBLE_BUFFER
1761        if(priv->dbuf_pixmap)
1762            g_object_unref (priv->dbuf_pixmap);
1763    #endif
1764    #endif
1765    
1766      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
1767  }  }
1768    
# Line 1353  osm_gps_map_finalize (GObject *object) Line 1772  osm_gps_map_finalize (GObject *object)
1772      OsmGpsMap *map = OSM_GPS_MAP(object);      OsmGpsMap *map = OSM_GPS_MAP(object);
1773      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1774    
1775      g_free(priv->cache_dir);      if(priv->tile_dir)
1776            g_free(priv->tile_dir);
1777    
1778        if(priv->cache_dir)
1779            g_free(priv->cache_dir);
1780    
1781      g_free(priv->repo_uri);      g_free(priv->repo_uri);
1782        g_free(priv->image_format);
1783    
1784      osm_gps_map_free_trip(map);      osm_gps_map_free_trip(map);
1785      osm_gps_map_free_tracks(map);      osm_gps_map_free_tracks(map);
# Line 1385  osm_gps_map_set_property (GObject *objec Line 1810  osm_gps_map_set_property (GObject *objec
1810              break;              break;
1811          case PROP_REPO_URI:          case PROP_REPO_URI:
1812              priv->repo_uri = g_value_dup_string (value);              priv->repo_uri = g_value_dup_string (value);
             inspect_map_uri(map);  
1813              break;              break;
1814          case PROP_PROXY_URI:          case PROP_PROXY_URI:
1815              if ( g_value_get_string(value) ) {              if ( g_value_get_string(value) ) {
   
1816                  priv->proxy_uri = g_value_dup_string (value);                  priv->proxy_uri = g_value_dup_string (value);
1817                  g_debug("Setting proxy server: %s", priv->proxy_uri);                  g_debug("Setting proxy server: %s", priv->proxy_uri);
1818    
1819  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1820                  GValue val = {0};                  GValue val = {0};
1821    
1822                  SoupURI* uri = soup_uri_new(priv->proxy_uri);                  SoupURI* uri = soup_uri_new(priv->proxy_uri);
1823                  g_value_init(&val, SOUP_TYPE_URI);                  g_value_init(&val, SOUP_TYPE_URI);
1824                  g_value_take_boxed(&val, uri);                  g_value_take_boxed(&val, uri);
# Line 1403  osm_gps_map_set_property (GObject *objec Line 1828  osm_gps_map_set_property (GObject *objec
1828                  SoupUri* uri = soup_uri_new(priv->proxy_uri);                  SoupUri* uri = soup_uri_new(priv->proxy_uri);
1829                  g_object_set(G_OBJECT(priv->soup_session), SOUP_SESSION_PROXY_URI, uri, NULL);                  g_object_set(G_OBJECT(priv->soup_session), SOUP_SESSION_PROXY_URI, uri, NULL);
1830  #endif  #endif
                 soup_uri_free(uri);  
1831              } else              } else
1832                  priv->proxy_uri = NULL;                  priv->proxy_uri = NULL;
1833    
1834              break;              break;
1835          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1836              priv->cache_dir = g_value_dup_string (value);              if ( g_value_get_string(value) )
1837              break;                  priv->tile_dir = g_value_dup_string (value);
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             priv->cache_dir_is_full_path = g_value_get_boolean (value);  
1838              break;              break;
1839          case PROP_ZOOM:          case PROP_ZOOM:
1840              priv->map_zoom = g_value_get_int (value);              priv->map_zoom = g_value_get_int (value);
# Line 1440  osm_gps_map_set_property (GObject *objec Line 1862  osm_gps_map_set_property (GObject *objec
1862          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1863              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
1864              break;              break;
1865            case PROP_MAP_SOURCE: {
1866                gint old = priv->map_source;
1867                priv->map_source = g_value_get_int (value);
1868                if(old >= OSM_GPS_MAP_SOURCE_NULL &&
1869                   priv->map_source != old &&
1870                   priv->map_source >= OSM_GPS_MAP_SOURCE_NULL &&
1871                   priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) {
1872    
1873                    /* we now have to switch the entire map */
1874    
1875                    /* flush the ram cache */
1876                    g_hash_table_remove_all(priv->tile_cache);
1877    
1878                    //check if the source given is valid
1879                    const char *uri = osm_gps_map_source_get_repo_uri(priv->map_source);
1880                    if (uri) {
1881                        g_debug("Setting map source from ID");
1882                        g_free(priv->repo_uri);
1883    
1884                        priv->repo_uri = g_strdup(uri);
1885                        priv->image_format = g_strdup(
1886                               osm_gps_map_source_get_image_format(priv->map_source));
1887                        priv->max_zoom = osm_gps_map_source_get_max_zoom(priv->map_source);
1888                        priv->min_zoom = osm_gps_map_source_get_min_zoom(priv->map_source);
1889                    }
1890    
1891                    /* create a new disk cache path */
1892                    const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1893                    if(!fname) fname = "_unknown_";
1894    
1895                    if (priv->tile_dir) {
1896                        //the new cachedir is the given cache dir + the friendly name of the repo_uri
1897                        priv->cache_dir =
1898                            g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);
1899                        g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);
1900                    }
1901    
1902                    /* adjust zoom if necessary */
1903                    if(priv->map_zoom > priv->max_zoom)
1904                        osm_gps_map_set_zoom(map, priv->max_zoom);
1905    
1906                    if(priv->map_zoom < priv->min_zoom)
1907                        osm_gps_map_set_zoom(map, priv->min_zoom);
1908    
1909                    inspect_map_uri(map);
1910    
1911                } } break;
1912            case PROP_IMAGE_FORMAT:
1913                priv->image_format = g_value_dup_string (value);
1914                break;
1915          default:          default:
1916              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
1917              break;              break;
# Line 1477  osm_gps_map_get_property (GObject *objec Line 1949  osm_gps_map_get_property (GObject *objec
1949          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1950              g_value_set_string(value, priv->cache_dir);              g_value_set_string(value, priv->cache_dir);
1951              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             g_value_set_boolean(value, priv->cache_dir_is_full_path);  
             break;  
1952          case PROP_ZOOM:          case PROP_ZOOM:
1953              g_value_set_int(value, priv->map_zoom);              g_value_set_int(value, priv->map_zoom);
1954              break;              break;
# Line 1517  osm_gps_map_get_property (GObject *objec Line 1986  osm_gps_map_get_property (GObject *objec
1986          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1987              g_value_set_int(value, priv->ui_gps_point_outer_radius);              g_value_set_int(value, priv->ui_gps_point_outer_radius);
1988              break;              break;
1989            case PROP_MAP_SOURCE:
1990                g_value_set_int(value, priv->map_source);
1991                break;
1992            case PROP_IMAGE_FORMAT:
1993                g_value_set_string(value, priv->image_format);
1994                break;
1995          default:          default:
1996              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
1997              break;              break;
# Line 1524  osm_gps_map_get_property (GObject *objec Line 1999  osm_gps_map_get_property (GObject *objec
1999  }  }
2000    
2001  static gboolean  static gboolean
2002  _osm_gps_map_scroll (GtkWidget *widget, GdkEventScroll  *event)  osm_gps_map_scroll_event (GtkWidget *widget, GdkEventScroll  *event)
2003  {  {
2004      OsmGpsMap *map = OSM_GPS_MAP(widget);      OsmGpsMap *map = OSM_GPS_MAP(widget);
2005      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
# Line 1546  osm_gps_map_button_press (GtkWidget *wid Line 2021  osm_gps_map_button_press (GtkWidget *wid
2021  {  {
2022      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2023    
2024    #ifdef ENABLE_BALLOON
2025        /* don't drag if the user clicked within the balloon */
2026        if (osm_gps_map_in_balloon(priv,
2027                       event->x + EXTRA_BORDER,
2028                       event->y + EXTRA_BORDER))
2029        {
2030            priv->drag_counter = -1;
2031            return FALSE;
2032        }
2033    #endif
2034    
2035    #ifdef ENABLE_OSD
2036        /* pressed inside OSD control? */
2037        if(priv->osd) {
2038            osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);
2039            if(but != OSD_NONE)
2040            {
2041                int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
2042                priv->drag_counter = -1;
2043    
2044                switch(but) {
2045                case OSD_UP:
2046                    priv->map_y -= step;
2047                    priv->center_coord_set = FALSE;
2048                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2049                    break;
2050    
2051                case OSD_DOWN:
2052                    priv->map_y += step;
2053                    priv->center_coord_set = FALSE;
2054                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2055                    break;
2056    
2057                case OSD_LEFT:
2058                    priv->map_x -= step;
2059                    priv->center_coord_set = FALSE;
2060                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2061                    break;
2062    
2063                case OSD_RIGHT:
2064                    priv->map_x += step;
2065                    priv->center_coord_set = FALSE;
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 1560  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 1577  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 1602  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 1616  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 1679  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 1700  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 1730  osm_gps_map_class_init (OsmGpsMapClass * Line 2336  osm_gps_map_class_init (OsmGpsMapClass *
2336      widget_class->button_press_event = osm_gps_map_button_press;      widget_class->button_press_event = osm_gps_map_button_press;
2337      widget_class->button_release_event = osm_gps_map_button_release;      widget_class->button_release_event = osm_gps_map_button_release;
2338      widget_class->motion_notify_event = osm_gps_map_motion_notify;      widget_class->motion_notify_event = osm_gps_map_motion_notify;
2339      widget_class->scroll_event = _osm_gps_map_scroll;      widget_class->scroll_event = osm_gps_map_scroll_event;
2340    
2341      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2342                                       PROP_AUTO_CENTER,                                       PROP_AUTO_CENTER,
# Line 1768  osm_gps_map_class_init (OsmGpsMapClass * Line 2374  osm_gps_map_class_init (OsmGpsMapClass *
2374                                       PROP_REPO_URI,                                       PROP_REPO_URI,
2375                                       g_param_spec_string ("repo-uri",                                       g_param_spec_string ("repo-uri",
2376                                                            "repo uri",                                                            "repo uri",
2377                                                            "osm repo uri",                                                            "map source tile repository uri",
2378                                                            "http://tile.openstreetmap.org/#Z/#X/#Y.png",                                                            OSM_REPO_URI,
2379                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2380    
2381      g_object_class_install_property (object_class,       g_object_class_install_property (object_class,
2382                                       PROP_PROXY_URI,                                       PROP_PROXY_URI,
2383                                       g_param_spec_string ("proxy-uri",                                       g_param_spec_string ("proxy-uri",
2384                                                            "proxy uri",                                                            "proxy uri",
# Line 1785  osm_gps_map_class_init (OsmGpsMapClass * Line 2391  osm_gps_map_class_init (OsmGpsMapClass *
2391                                       g_param_spec_string ("tile-cache",                                       g_param_spec_string ("tile-cache",
2392                                                            "tile cache",                                                            "tile cache",
2393                                                            "osm local tile cache dir",                                                            "osm local tile cache dir",
2394                                                            "/tmp/Maps",                                                            NULL,
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 1813  osm_gps_map_class_init (OsmGpsMapClass * Line 2411  osm_gps_map_class_init (OsmGpsMapClass *
2411                                                         "maximum zoom level",                                                         "maximum zoom level",
2412                                                         MIN_ZOOM, /* minimum property value */                                                         MIN_ZOOM, /* minimum property value */
2413                                                         MAX_ZOOM, /* maximum property value */                                                         MAX_ZOOM, /* maximum property value */
2414                                                         17,                                                         OSM_MAX_ZOOM,
2415                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2416    
2417      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1823  osm_gps_map_class_init (OsmGpsMapClass * Line 2421  osm_gps_map_class_init (OsmGpsMapClass *
2421                                                         "minimum zoom level",                                                         "minimum zoom level",
2422                                                         MIN_ZOOM, /* minimum property value */                                                         MIN_ZOOM, /* minimum property value */
2423                                                         MAX_ZOOM, /* maximum property value */                                                         MAX_ZOOM, /* maximum property value */
2424                                                         1,                                                         OSM_MIN_ZOOM,
2425                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2426    
2427      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1893  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 1906  osm_gps_map_class_init (OsmGpsMapClass * Line 2504  osm_gps_map_class_init (OsmGpsMapClass *
2504                                                         20,                                                         20,
2505                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2506    
2507        g_object_class_install_property (object_class,
2508                                         PROP_MAP_SOURCE,
2509                                         g_param_spec_int ("map-source",
2510                                                           "map source",
2511                                                           "map source ID",
2512                                                           -1,           /* minimum property value */
2513                                                           G_MAXINT,    /* maximum property value */
2514                                                           -1,
2515                                                           G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2516    
2517        g_object_class_install_property (object_class,
2518                                         PROP_IMAGE_FORMAT,
2519                                         g_param_spec_string ("image-format",
2520                                                              "image format",
2521                                                              "map source tile repository image format (jpg, png)",
2522                                                              OSM_IMAGE_FORMAT,
2523                                                              G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2524    }
2525    
2526    const char*
2527    osm_gps_map_source_get_friendly_name(OsmGpsMapSource_t source)
2528    {
2529        switch(source)
2530        {
2531            case OSM_GPS_MAP_SOURCE_NULL:
2532                return "None";
2533            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2534                return "OpenStreetMap";
2535            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2536                return "OpenStreetMap Tiles@Home";
2537            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2538                return "OpenCycleMap";
2539            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2540                return "Maps-For-Free";
2541            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2542                return "Google Maps";
2543            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2544                return "Google Satellite";
2545            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2546                return "Google Hybrid";
2547            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2548                return "Virtual Earth";
2549            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2550                return "Virtual Earth Satellite";
2551            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2552                return "Virtual Earth Hybrid";
2553            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2554                return "Yahoo Maps";
2555            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2556                return "Yahoo Satellite";
2557            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2558                return "Yahoo Hybrid";
2559            default:
2560                return NULL;
2561        }
2562        return NULL;
2563    }
2564    
2565    //http://www.internettablettalk.com/forums/showthread.php?t=5209
2566    //https://garage.maemo.org/plugins/scmsvn/viewcvs.php/trunk/src/maps.c?root=maemo-mapper&view=markup
2567    //http://www.ponies.me.uk/maps/GoogleTileUtils.java
2568    //http://www.mgmaps.com/cache/MapTileCacher.perl
2569    const char*
2570    osm_gps_map_source_get_repo_uri(OsmGpsMapSource_t source)
2571    {
2572        switch(source)
2573        {
2574            case OSM_GPS_MAP_SOURCE_NULL:
2575                return "none://";
2576            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2577                return OSM_REPO_URI;
2578            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2579                return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2580            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2581                return "http://c.andy.sandbox.cloudmade.com/tiles/cycle/#Z/#X/#Y.png";
2582            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2583                return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";
2584            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2585                return "http://mt#R.google.com/vt/v=w2.97&x=#X&y=#Y&z=#Z";
2586            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2587                return "http://khm#R.google.com/kh?n=404&v=3&t=#Q";
2588            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2589                return NULL; /* No longer working  "http://mt#R.google.com/mt?n=404&v=w2t.99&x=#X&y=#Y&zoom=#S" */
2590            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2591                return "http://a#R.ortho.tiles.virtualearth.net/tiles/r#W.jpeg?g=50";
2592            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2593                return "http://a#R.ortho.tiles.virtualearth.net/tiles/a#W.jpeg?g=50";
2594            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2595                return "http://a#R.ortho.tiles.virtualearth.net/tiles/h#W.jpeg?g=50";
2596            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2597            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2598            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2599                /* TODO: Implement signed Y, aka U
2600                 * http://us.maps3.yimg.com/aerial.maps.yimg.com/ximg?v=1.7&t=a&s=256&x=%d&y=%-d&z=%d
2601                 *  x = tilex,
2602                 *  y = (1 << (MAX_ZOOM - zoom)) - tiley - 1,
2603                 *  z = zoom - (MAX_ZOOM - 17));
2604                 */
2605                return NULL;
2606            default:
2607                return NULL;
2608        }
2609        return NULL;
2610    }
2611    
2612    const char *
2613    osm_gps_map_source_get_image_format(OsmGpsMapSource_t source)
2614    {
2615        switch(source) {
2616            case OSM_GPS_MAP_SOURCE_NULL:
2617            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2618            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2619            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2620                return "png";
2621            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2622            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2623            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2624            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2625            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2626            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2627            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2628            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2629            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2630            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2631                return "jpg";
2632            default:
2633                return "bin";
2634        }
2635        return "bin";
2636    }
2637    
2638    
2639    int
2640    osm_gps_map_source_get_min_zoom(OsmGpsMapSource_t source)
2641    {
2642        return 1;
2643    }
2644    
2645    int
2646    osm_gps_map_source_get_max_zoom(OsmGpsMapSource_t source)
2647    {
2648        switch(source) {
2649            case OSM_GPS_MAP_SOURCE_NULL:
2650                return 18;
2651            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2652                return OSM_MAX_ZOOM;
2653            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2654            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2655            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2656            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2657            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2658            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2659            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2660            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2661            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2662            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2663                return 17;
2664            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2665                return 11;
2666            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2667                return 18;
2668            default:
2669                return 17;
2670        }
2671        return 17;
2672  }  }
2673    
2674  void  void
# Line 1938  osm_gps_map_download_maps (OsmGpsMap *ma Line 2701  osm_gps_map_download_maps (OsmGpsMap *ma
2701                  for(j=y1; j<=y2; j++)                  for(j=y1; j<=y2; j++)
2702                  {                  {
2703                      // x = i, y = j                      // x = i, y = j
2704                      filename = g_strdup_printf("%s/%u/%u/%u.png", priv->cache_dir, zoom, i, j);                      filename = g_strdup_printf("%s%c%d%c%d%c%d.%s",
2705                      if (!priv->cache_dir || !g_file_test(filename, G_FILE_TEST_EXISTS))                                      priv->cache_dir, G_DIR_SEPARATOR,
2706                                        zoom, G_DIR_SEPARATOR,
2707                                        i, G_DIR_SEPARATOR,
2708                                        j,
2709                                        priv->image_format);
2710                        if (!g_file_test(filename, G_FILE_TEST_EXISTS))
2711                      {                      {
2712                          osm_gps_map_download_tile(map, zoom, i, j, FALSE);                          osm_gps_map_download_tile(map, zoom, i, j, FALSE);
2713                          num_tiles++;                          num_tiles++;
# Line 2001  int Line 2769  int
2769  osm_gps_map_set_zoom (OsmGpsMap *map, int zoom)  osm_gps_map_set_zoom (OsmGpsMap *map, int zoom)
2770  {  {
2771      int zoom_old;      int zoom_old;
2772      double factor = 1.0;      double factor = 0.0;
2773      int width_center, height_center;      int width_center, height_center;
2774      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
2775    
# Line 2072  osm_gps_map_add_image (OsmGpsMap *map, f Line 2840  osm_gps_map_add_image (OsmGpsMap *map, f
2840          //cache w/h for speed, and add image to list          //cache w/h for speed, and add image to list
2841          im = g_new0(image_t,1);          im = g_new0(image_t,1);
2842          im->w = gdk_pixbuf_get_width(image);          im->w = gdk_pixbuf_get_width(image);
2843          im->h = gdk_pixbuf_get_width(image);          im->h = gdk_pixbuf_get_height(image);
2844          im->pt.rlat = deg2rad(latitude);          im->pt.rlat = deg2rad(latitude);
2845          im->pt.rlon = deg2rad(longitude);          im->pt.rlon = deg2rad(longitude);
2846    
# Line 2085  osm_gps_map_add_image (OsmGpsMap *map, f Line 2853  osm_gps_map_add_image (OsmGpsMap *map, f
2853      }      }
2854  }  }
2855    
2856  void  gboolean
2857  osm_gps_map_clear_images (OsmGpsMap *map)  osm_gps_map_remove_image (OsmGpsMap *map, GdkPixbuf *image)
2858  {  {
2859      g_return_if_fail (OSM_IS_GPS_MAP (map));      OsmGpsMapPrivate *priv = map->priv;
2860        if (priv->images) {
2861      osm_gps_map_free_images(map);          GSList *list;
2862      osm_gps_map_map_redraw_idle(map);          for(list = priv->images; list != NULL; list = list->next)
2863            {
2864                image_t *im = list->data;
2865                    if (im->image == image)
2866                    {
2867                            priv->images = g_slist_remove_link(priv->images, list);
2868                            g_object_unref(im->image);
2869                            g_free(im);
2870                            osm_gps_map_map_redraw_idle(map);
2871                            return TRUE;
2872                    }
2873            }
2874        }
2875        return FALSE;
2876  }  }
2877    
2878  void  void
2879  osm_gps_map_osd_speed (OsmGpsMap *map, float speed)  osm_gps_map_clear_images (OsmGpsMap *map)
2880  {  {
     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;  
   
2881      g_return_if_fail (OSM_IS_GPS_MAP (map));      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;  
2882    
2883      gdk_gc_set_rgb_fg_color (gc, &color);      osm_gps_map_free_images(map);
2884        osm_gps_map_map_redraw_idle(map);
     /* 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);  
2885  }  }
2886    
2887  void  void
# Line 2276  osm_gps_map_scroll (OsmGpsMap *map, gint Line 3005  osm_gps_map_scroll (OsmGpsMap *map, gint
3005      osm_gps_map_map_redraw_idle (map);      osm_gps_map_map_redraw_idle (map);
3006  }  }
3007    
3008    float
3009    osm_gps_map_get_scale(OsmGpsMap *map)
3010    {
3011        OsmGpsMapPrivate *priv;
3012    
3013        g_return_val_if_fail (OSM_IS_GPS_MAP (map), OSM_NAN);
3014        priv = map->priv;
3015    
3016        return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);
3017    }
3018    
3019    #ifdef ENABLE_BALLOON
3020    void
3021    osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
3022                              OsmGpsMapBalloonCallback cb, gpointer data)
3023    {
3024        OsmGpsMapPrivate *priv;
3025    
3026        /* remove and previously installed balloon */
3027        osm_gps_map_clear_balloon (map);
3028    
3029        g_return_if_fail (OSM_IS_GPS_MAP (map));
3030        priv = map->priv;
3031    
3032        priv->balloon.coo->rlat = deg2rad(latitude);
3033        priv->balloon.coo->rlon = deg2rad(longitude);
3034        priv->balloon.valid = TRUE;
3035    
3036        priv->balloon.cb = cb;
3037        priv->balloon.data = data;
3038    
3039        // this redraws the map
3040        osm_gps_map_map_redraw_idle(map);
3041    }
3042    
3043    void
3044    osm_gps_map_clear_balloon (OsmGpsMap *map)
3045    {
3046        OsmGpsMapPrivate *priv;
3047    
3048        g_return_if_fail (OSM_IS_GPS_MAP (map));
3049        priv = map->priv;
3050    
3051        priv->balloon.valid = FALSE;
3052    
3053        osm_gps_map_map_redraw_idle(map);
3054    }
3055    #endif
3056    
3057    #ifdef ENABLE_OSD
3058    
3059    void
3060    osm_gps_map_redraw (OsmGpsMap *map)
3061    {
3062        osm_gps_map_map_redraw_idle(map);
3063    }
3064    
3065    osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {
3066        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
3067        return map->priv->osd;
3068    }
3069    
3070    void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {
3071        OsmGpsMapPrivate *priv;
3072    
3073        g_return_if_fail (OSM_IS_GPS_MAP (map));
3074    
3075        priv = map->priv;
3076        g_return_if_fail (!priv->osd);
3077    
3078        priv->osd = osd;
3079    }
3080    
3081    void
3082    osm_gps_map_repaint (OsmGpsMap *map) {
3083        osm_gps_map_expose (GTK_WIDGET(map), NULL);
3084    }
3085    
3086    #endif
Legend:
Removed from v.32  
changed lines
  Added in v.89