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 114 by harbaum, Wed Sep 16 20:04:38 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 93  struct _OsmGpsMapPrivate Line 115  struct _OsmGpsMapPrivate
115      gboolean show_trip_history;      gboolean show_trip_history;
116      GSList *trip_history;      GSList *trip_history;
117      coord_t *gps;      coord_t *gps;
118        float gps_heading;
119      gboolean gps_valid;      gboolean gps_valid;
120    
121    #ifdef ENABLE_OSD
122        //the osd controls (if present)
123        osm_gps_map_osd_t *osd;
124    #ifdef OSD_DOUBLE_BUFFER
125        GdkPixmap *dbuf_pixmap;
126    #endif
127    #endif
128    
129    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
130        gboolean fullscreen;
131    #endif
132    
133      //additional images or tracks added to the map      //additional images or tracks added to the map
134      GSList *tracks;      GSList *tracks;
135      GSList *images;      GSList *images;
# Line 104  struct _OsmGpsMapPrivate Line 139  struct _OsmGpsMapPrivate
139      GdkGC *gc_map;      GdkGC *gc_map;
140    
141      //The tile painted when one cannot be found      //The tile painted when one cannot be found
142      //GdkPixbuf *missing_tile;      GdkPixbuf *null_tile;
143    
144      //For tracking click and drag      //For tracking click and drag
145      int drag_counter;      int drag_counter;
# Line 146  enum Line 181  enum
181      PROP_REPO_URI,      PROP_REPO_URI,
182      PROP_PROXY_URI,      PROP_PROXY_URI,
183      PROP_TILE_CACHE_DIR,      PROP_TILE_CACHE_DIR,
     PROP_TILE_CACHE_DIR_IS_FULL_PATH,  
184      PROP_ZOOM,      PROP_ZOOM,
185      PROP_MAX_ZOOM,      PROP_MAX_ZOOM,
186      PROP_MIN_ZOOM,      PROP_MIN_ZOOM,
# Line 157  enum Line 191  enum
191      PROP_TILES_QUEUED,      PROP_TILES_QUEUED,
192      PROP_GPS_TRACK_WIDTH,      PROP_GPS_TRACK_WIDTH,
193      PROP_GPS_POINT_R1,      PROP_GPS_POINT_R1,
194      PROP_GPS_POINT_R2      PROP_GPS_POINT_R2,
195        PROP_MAP_SOURCE,
196        PROP_IMAGE_FORMAT
197  };  };
198    
199  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 207  static gchar    *replace_map_uri(OsmGpsM
207  static void     osm_gps_map_print_images (OsmGpsMap *map);  static void     osm_gps_map_print_images (OsmGpsMap *map);
208  static void     osm_gps_map_draw_gps_point (OsmGpsMap *map);  static void     osm_gps_map_draw_gps_point (OsmGpsMap *map);
209  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);
210    #ifdef LIBSOUP22
211    static void     osm_gps_map_tile_download_complete (SoupMessage *msg, gpointer user_data);
212    #else
213    static void     osm_gps_map_tile_download_complete (SoupSession *session, SoupMessage *msg, gpointer user_data);
214    #endif
215  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);
216  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);
217  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 341  static void
341  inspect_map_uri(OsmGpsMap *map)  inspect_map_uri(OsmGpsMap *map)
342  {  {
343      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
344        priv->uri_format = 0;
345        priv->the_google = FALSE;
346    
347      if (g_strrstr(priv->repo_uri, URI_MARKER_X))      if (g_strrstr(priv->repo_uri, URI_MARKER_X))
348          priv->uri_format |= URI_HAS_X;          priv->uri_format |= URI_HAS_X;
# Line 420  my_log_handler (const gchar * log_domain Line 463  my_log_handler (const gchar * log_domain
463          g_log_default_handler (log_domain, log_level, message, user_data);          g_log_default_handler (log_domain, log_level, message, user_data);
464  }  }
465    
466    static float
467    osm_gps_map_get_scale_at_point(int zoom, float rlat, float rlon)
468    {
469        /* world at zoom 1 == 512 pixels */
470        return cos(rlat) * M_PI * OSM_EQ_RADIUS / (1<<(7+zoom));
471    }
472    
473  /* clears the trip list and all resources */  /* clears the trip list and all resources */
474  static void  static void
475  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 579  osm_gps_map_draw_gps_point (OsmGpsMap *m
579          int x, y;          int x, y;
580          int r = priv->ui_gps_point_inner_radius;          int r = priv->ui_gps_point_inner_radius;
581          int r2 = priv->ui_gps_point_outer_radius;          int r2 = priv->ui_gps_point_outer_radius;
582          int mr = MAX(r,r2);          int mr = MAX(3*r,r2);
583    
584          map_x0 = priv->map_x - EXTRA_BORDER;          map_x0 = priv->map_x - EXTRA_BORDER;
585          map_y0 = priv->map_y - EXTRA_BORDER;          map_y0 = priv->map_y - EXTRA_BORDER;
# Line 539  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 589  osm_gps_map_draw_gps_point (OsmGpsMap *m
589          cairo_t *cr;          cairo_t *cr;
590          cairo_pattern_t *pat;          cairo_pattern_t *pat;
591  #else  #else
         int lw = priv->ui_gps_track_width;  
592          GdkColor color;          GdkColor color;
593          GdkGC *marker;          GdkGC *marker;
594  #endif  #endif
# Line 561  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 610  osm_gps_map_draw_gps_point (OsmGpsMap *m
610    
611          // draw ball gradient          // draw ball gradient
612          if (r > 0) {          if (r > 0) {
613                // draw direction arrow
614                if(!isnan(priv->gps_heading))
615                {
616                    cairo_move_to (cr, x-r*cos(priv->gps_heading), y-r*sin(priv->gps_heading));
617                    cairo_line_to (cr, x+3*r*sin(priv->gps_heading), y-3*r*cos(priv->gps_heading));
618                    cairo_line_to (cr, x+r*cos(priv->gps_heading), y+r*sin(priv->gps_heading));
619                    cairo_close_path (cr);
620    
621                    cairo_set_source_rgba (cr, 0.3, 0.3, 1.0, 0.5);
622                    cairo_fill_preserve (cr);
623    
624                    cairo_set_line_width (cr, 1.0);
625                    cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5);
626                    cairo_stroke(cr);
627                }
628    
629              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);
630              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);
631              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 574  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 639  osm_gps_map_draw_gps_point (OsmGpsMap *m
639              cairo_arc (cr, x, y, r, 0, 2 * M_PI);              cairo_arc (cr, x, y, r, 0, 2 * M_PI);
640              cairo_stroke(cr);              cairo_stroke(cr);
641          }          }
642    
643          cairo_destroy(cr);          cairo_destroy(cr);
644          gtk_widget_queue_draw_area (GTK_WIDGET(map),          gtk_widget_queue_draw_area (GTK_WIDGET(map),
645                                      x-mr,                                      x-mr,
# Line 614  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 679  osm_gps_map_draw_gps_point (OsmGpsMap *m
679                                      (mr*2)+lw+lw);                                      (mr*2)+lw+lw);
680  #endif  #endif
681      }      }
682  }  }
683    
684  static void  static void
685  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)
686  {  {
687      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
688    
689      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);  
690    
691      /* draw pixbuf onto pixmap */      /* draw pixbuf onto pixmap */
692      gdk_draw_pixbuf (priv->pixmap,      gdk_draw_pixbuf (priv->pixmap,
# Line 654  static void Line 718  static void
718  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)
719  #endif  #endif
720  {  {
721      int fd;      FILE *file;
722      tile_download_t *dl = (tile_download_t *)user_data;      tile_download_t *dl = (tile_download_t *)user_data;
723      OsmGpsMap *map = OSM_GPS_MAP(dl->map);      OsmGpsMap *map = OSM_GPS_MAP(dl->map);
724      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
# Line 667  osm_gps_map_tile_download_complete (Soup Line 731  osm_gps_map_tile_download_complete (Soup
731          {          {
732              if (g_mkdir_with_parents(dl->folder,0700) == 0)              if (g_mkdir_with_parents(dl->folder,0700) == 0)
733              {              {
734                  fd = open(dl->filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);                  file = g_fopen(dl->filename, "wb");
735                  if (fd != -1)                  if (file != NULL)
736                  {                  {
737                      write (fd, MSG_RESPONSE_BODY(msg), MSG_RESPONSE_LEN(msg));                      fwrite (MSG_RESPONSE_BODY(msg), 1, MSG_RESPONSE_LEN(msg), file);
738                      file_saved = TRUE;                      file_saved = TRUE;
739                        g_debug("Wrote "MSG_RESPONSE_LEN_FORMAT" bytes to %s", MSG_RESPONSE_LEN(msg), dl->filename);
740                        fclose (file);
741    
                     g_debug("Wrote " MSG_RESPONSE_LEN_FORMAT " bytes to %s", MSG_RESPONSE_LEN(msg), dl->filename);  
                     close (fd);  
742                  }                  }
743              }              }
744              else              else
745              {              {
746                  g_warning("Error creating tile download directory: %s", dl->folder);                  g_warning("Error creating tile download directory: %s",
747                              dl->folder);
748                    perror("perror:");
749              }              }
750          }          }
751    
# Line 687  osm_gps_map_tile_download_complete (Soup Line 753  osm_gps_map_tile_download_complete (Soup
753          {          {
754              GdkPixbuf *pixbuf = NULL;              GdkPixbuf *pixbuf = NULL;
755    
756                /* if the file was actually stored on disk, we can simply */
757                /* load and decode it from that file */
758              if (priv->cache_dir)              if (priv->cache_dir)
759              {              {
760                  if (file_saved)                  if (file_saved)
# Line 720  osm_gps_map_tile_download_complete (Soup Line 788  osm_gps_map_tile_download_complete (Soup
788                      g_warning("Error: Unable to determine image file format");                      g_warning("Error: Unable to determine image file format");
789                  }                  }
790              }              }
791    
792              /* Store the tile into the cache */              /* Store the tile into the cache */
793              if (G_LIKELY (pixbuf))              if (G_LIKELY (pixbuf))
794              {              {
# Line 735  osm_gps_map_tile_download_complete (Soup Line 803  osm_gps_map_tile_download_complete (Soup
803                   * we are using it as a key in the hash table */                   * we are using it as a key in the hash table */
804                  dl->filename = NULL;                  dl->filename = NULL;
805              }              }
   
806              osm_gps_map_map_redraw_idle (map);              osm_gps_map_map_redraw_idle (map);
807          }          }
808          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 861  osm_gps_map_download_tile (OsmGpsMap *ma
861          g_free(dl->uri);          g_free(dl->uri);
862          g_free(dl);          g_free(dl);
863      } else {      } else {
864          dl->folder = g_strdup_printf("%s/%d/%d/",priv->cache_dir, zoom, x);          dl->folder = g_strdup_printf("%s%c%d%c%d%c",
865          dl->filename = g_strdup_printf("%s/%d/%d/%d.png",priv->cache_dir, zoom, x, y);                              priv->cache_dir, G_DIR_SEPARATOR,
866                                zoom, G_DIR_SEPARATOR,
867                                x, G_DIR_SEPARATOR);
868            dl->filename = g_strdup_printf("%s%c%d%c%d%c%d.%s",
869                                priv->cache_dir, G_DIR_SEPARATOR,
870                                zoom, G_DIR_SEPARATOR,
871                                x, G_DIR_SEPARATOR,
872                                y,
873                                priv->image_format);
874          dl->map = map;          dl->map = map;
875          dl->redraw = redraw;          dl->redraw = redraw;
876    
# Line 813  osm_gps_map_download_tile (OsmGpsMap *ma Line 888  osm_gps_map_download_tile (OsmGpsMap *ma
888                      if (cookie) {                      if (cookie) {
889                          g_debug("Adding Google Cookie");                          g_debug("Adding Google Cookie");
890                          soup_message_headers_append(msg->request_headers, "Cookie", cookie);                          soup_message_headers_append(msg->request_headers, "Cookie", cookie);
   
891                      }                      }
892                  }                  }
893              }              }
894    
895    #ifdef LIBSOUP22
896                soup_message_headers_append(msg->request_headers,
897                                            "User-Agent", USER_AGENT);
898    #endif
899    
900              g_hash_table_insert (priv->tile_queue, dl->uri, msg);              g_hash_table_insert (priv->tile_queue, dl->uri, msg);
901              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);
902          } else {          } else {
# Line 835  osm_gps_map_load_cached_tile (OsmGpsMap Line 914  osm_gps_map_load_cached_tile (OsmGpsMap
914  {  {
915      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
916      gchar *filename;      gchar *filename;
917      GdkPixbuf *pixbuf;      GdkPixbuf *pixbuf = NULL;
918      OsmCachedTile *tile;      OsmCachedTile *tile;
919    
920      filename = g_strdup_printf("%s/%u/%u/%u.png",      filename = g_strdup_printf("%s%c%d%c%d%c%d.%s",
921                                 priv->cache_dir,                  priv->cache_dir, G_DIR_SEPARATOR,
922                                 zoom, x, y);                  zoom, G_DIR_SEPARATOR,
923                    x, G_DIR_SEPARATOR,
924                    y,
925                    priv->image_format);
926    
927      tile = g_hash_table_lookup (priv->tile_cache, filename);      tile = g_hash_table_lookup (priv->tile_cache, filename);
928      if (tile)      if (tile)
929      {      {
930          g_free (filename);          g_free (filename);
931      }      }
932      else if (priv->cache_dir)      else
933      {      {
934          pixbuf = gdk_pixbuf_new_from_file (filename, NULL);          pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
935          if (pixbuf)          if (pixbuf)
# Line 863  osm_gps_map_load_cached_tile (OsmGpsMap Line 945  osm_gps_map_load_cached_tile (OsmGpsMap
945      {      {
946          tile->redraw_cycle = priv->redraw_cycle;          tile->redraw_cycle = priv->redraw_cycle;
947          pixbuf = g_object_ref (tile->pixbuf);          pixbuf = g_object_ref (tile->pixbuf);
948      } else      }
         pixbuf = NULL;  
949    
950      return pixbuf;      return pixbuf;
951  }  }
# Line 928  static void Line 1009  static void
1009  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)
1010  {  {
1011      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1012        gchar *filename;
1013      GdkPixbuf *pixbuf;      GdkPixbuf *pixbuf;
1014    
1015      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);
1016    
1017      /* try to get file from internal cache */      if (priv->map_source == OSM_GPS_MAP_SOURCE_NULL) {
1018      pixbuf = osm_gps_map_load_cached_tile(map, zoom, x, y);          osm_gps_map_blit_tile(map, priv->null_tile, offset_x,offset_y);
1019            return;
1020        }
1021    
1022        filename = g_strdup_printf("%s%c%d%c%d%c%d.%s",
1023                    priv->cache_dir, G_DIR_SEPARATOR,
1024                    zoom, G_DIR_SEPARATOR,
1025                    x, G_DIR_SEPARATOR,
1026                    y,
1027                    priv->image_format);
1028    
1029      /* if a disk cache is being used, try to read the file from there */      /* try to get file from internal cache first */
1030      if (priv->cache_dir && !pixbuf)      if(!(pixbuf = osm_gps_map_load_cached_tile(map, zoom, x, y)))
     {  
         gchar *filename;  
         filename = g_strdup_printf("%s/%u/%u/%u.png",  
                                    priv->cache_dir,  
                                    zoom, x, y);  
   
1031          pixbuf = gdk_pixbuf_new_from_file (filename, NULL);          pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
         if (pixbuf)  
         {  
             g_debug("Found tile %s", filename);  
         }  
   
         g_free(filename);  
     }  
1032    
1033      if (G_LIKELY(pixbuf))      if(pixbuf)
1034      {      {
1035            g_debug("Found tile %s", filename);
1036          osm_gps_map_blit_tile(map, pixbuf, offset_x,offset_y);          osm_gps_map_blit_tile(map, pixbuf, offset_x,offset_y);
1037          g_object_unref (pixbuf);          g_object_unref (pixbuf);
1038      }      }
# Line 984  osm_gps_map_load_tile (OsmGpsMap *map, i Line 1063  osm_gps_map_load_tile (OsmGpsMap *map, i
1063                                  TRUE, offset_x, offset_y, TILESIZE, TILESIZE);                                  TRUE, offset_x, offset_y, TILESIZE, TILESIZE);
1064          }          }
1065      }      }
1066        g_free(filename);
1067  }  }
1068    
1069  static void  static void
# Line 1077  osm_gps_map_print_track (OsmGpsMap *map, Line 1157  osm_gps_map_print_track (OsmGpsMap *map,
1157    
1158      map_x0 = priv->map_x - EXTRA_BORDER;      map_x0 = priv->map_x - EXTRA_BORDER;
1159      map_y0 = priv->map_y - EXTRA_BORDER;      map_y0 = priv->map_y - EXTRA_BORDER;
   
1160      for(list = trackpoint_list; list != NULL; list = list->next)      for(list = trackpoint_list; list != NULL; list = list->next)
1161      {      {
1162          coord_t *tp = list->data;          coord_t *tp = list->data;
# Line 1132  osm_gps_map_print_tracks (OsmGpsMap *map Line 1211  osm_gps_map_print_tracks (OsmGpsMap *map
1211    
1212      if (priv->show_trip_history)      if (priv->show_trip_history)
1213          osm_gps_map_print_track (map, priv->trip_history);          osm_gps_map_print_track (map, priv->trip_history);
1214    
1215      if (priv->tracks)      if (priv->tracks)
1216      {      {
         g_debug("TRACK");  
1217          GSList* tmp = priv->tracks;          GSList* tmp = priv->tracks;
1218          while (tmp != NULL)          while (tmp != NULL)
1219          {          {
# Line 1144  osm_gps_map_print_tracks (OsmGpsMap *map Line 1223  osm_gps_map_print_tracks (OsmGpsMap *map
1223      }      }
1224  }  }
1225    
1226  static gboolean  static gboolean
1227  osm_gps_map_purge_cache_check(gpointer key, gpointer value, gpointer user)  osm_gps_map_purge_cache_check(gpointer key, gpointer value, gpointer user)
1228  {  {
1229      return(((OsmCachedTile*)value)->redraw_cycle != ((OsmGpsMapPrivate*)user)->redraw_cycle);     return (((OsmCachedTile*)value)->redraw_cycle != ((OsmGpsMapPrivate*)user)->redraw_cycle);
1230  }  }
1231    
1232  static void  static void
1233  osm_gps_map_purge_cache (OsmGpsMap *map)  osm_gps_map_purge_cache (OsmGpsMap *map)
1234  {  {
1235      OsmGpsMapPrivate *priv = map->priv;     OsmGpsMapPrivate *priv = map->priv;
1236    
1237      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)
1238          return;         return;
1239    
1240      /* 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
1241       * during the last redraw operation */      * during the last redraw operation */
1242      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);
1243  }  }
1244    
1245  static gboolean  static gboolean
# Line 1170  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1249  osm_gps_map_map_redraw (OsmGpsMap *map)
1249    
1250      priv->idle_map_redraw = 0;      priv->idle_map_redraw = 0;
1251    
1252        /* don't redraw the entire map while the OSD is doing */
1253        /* some animation or the like. This is to keep the animation */
1254        /* fluid */
1255        if (priv->osd->busy(priv->osd))
1256            return FALSE;
1257    
1258    #ifdef DRAG_DEBUG
1259        printf("trying redraw\n");
1260    #endif
1261    
1262      /* 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
1263       * 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
1264       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1177  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1266  osm_gps_map_map_redraw (OsmGpsMap *map)
1266      if (priv->dragging)      if (priv->dragging)
1267          return FALSE;          return FALSE;
1268    
1269        /* undo all offsets that may have happened when dragging */
1270        priv->drag_mouse_dx = 0;
1271        priv->drag_mouse_dy = 0;
1272    
1273      priv->redraw_cycle++;      priv->redraw_cycle++;
1274    
1275      /* draw white background to initialise pixmap */      /* draw white background to initialise pixmap */
# Line 1194  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1287  osm_gps_map_map_redraw (OsmGpsMap *map)
1287      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1288      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1289    
1290      //osm_gps_map_osd_speed(map, 1.5);  #ifdef ENABLE_OSD
1291        /* OSD may contain a coordinate/scale, so we may have to re-render it */
1292        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
1293            priv->osd->render (priv->osd);
1294    #endif
1295    
1296      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1297      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
1298    
# Line 1210  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1308  osm_gps_map_map_redraw_idle (OsmGpsMap *
1308          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);
1309  }  }
1310    
1311    #ifdef OSM_GPS_MAP_KEYS
1312    static gboolean
1313    on_window_key_press(GtkWidget *widget,
1314                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1315      gboolean handled = FALSE;
1316      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1317    
1318      // the map handles some keys on its own ...
1319      switch(event->keyval) {
1320    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1321      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1322          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1323          if(!priv->fullscreen)
1324              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1325          else
1326              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1327    
1328          priv->fullscreen = !priv->fullscreen;
1329          handled = TRUE;
1330          } break;
1331    #endif
1332    
1333    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1334      case OSM_GPS_MAP_KEY_ZOOMIN:
1335          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1336          handled = TRUE;
1337          break;
1338    #endif
1339    
1340    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1341      case OSM_GPS_MAP_KEY_ZOOMOUT:
1342          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1343          handled = TRUE;
1344          break;
1345    #endif
1346    
1347    #ifdef OSM_GPS_MAP_KEY_UP
1348      case OSM_GPS_MAP_KEY_UP:
1349          priv->map_y -= step;
1350          priv->center_coord_set = FALSE;
1351          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1352          handled = TRUE;
1353          break;
1354    #endif
1355    
1356    #ifdef OSM_GPS_MAP_KEY_DOWN
1357      case OSM_GPS_MAP_KEY_DOWN:
1358          priv->map_y += step;
1359          priv->center_coord_set = FALSE;
1360          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1361          handled = TRUE;
1362          break;
1363    #endif
1364    
1365    #ifdef OSM_GPS_MAP_KEY_LEFT
1366      case OSM_GPS_MAP_KEY_LEFT:
1367          priv->map_x -= step;
1368          priv->center_coord_set = FALSE;
1369          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1370          handled = TRUE;
1371          break;
1372    #endif
1373    
1374    #ifdef OSM_GPS_MAP_KEY_RIGHT
1375      case OSM_GPS_MAP_KEY_RIGHT:
1376          priv->map_x += step;
1377          priv->center_coord_set = FALSE;
1378          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1379          handled = TRUE;
1380          break;
1381    #endif
1382    
1383      default:
1384          break;
1385      }
1386    
1387      return handled;
1388    }
1389    #endif
1390    
1391  static void  static void
1392  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1393  {  {
# Line 1223  osm_gps_map_init (OsmGpsMap *object) Line 1401  osm_gps_map_init (OsmGpsMap *object)
1401      priv->trip_history = NULL;      priv->trip_history = NULL;
1402      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1403      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1404        priv->gps_heading = OSM_GPS_MAP_INVALID;
1405    
1406    #ifdef ENABLE_OSD
1407        priv->osd = NULL;
1408    #endif
1409    
1410    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1411        priv->fullscreen = FALSE;
1412    #endif
1413    
1414      priv->tracks = NULL;      priv->tracks = NULL;
1415      priv->images = NULL;      priv->images = NULL;
# Line 1236  osm_gps_map_init (OsmGpsMap *object) Line 1423  osm_gps_map_init (OsmGpsMap *object)
1423      priv->uri_format = 0;      priv->uri_format = 0;
1424      priv->the_google = FALSE;      priv->the_google = FALSE;
1425    
1426        priv->map_source = -1;
1427    
1428  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1429      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1430      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session =
1431                                                               SOUP_SESSION_USER_AGENT,          soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
1432                                                               "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);  
1433  #else  #else
1434      /* 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 */
1435        /* set it seperately as an extra header field for each reuest */
1436      priv->soup_session = soup_session_async_new();      priv->soup_session = soup_session_async_new();
1437  #endif  #endif
1438    
# Line 1266  osm_gps_map_init (OsmGpsMap *object) Line 1455  osm_gps_map_init (OsmGpsMap *object)
1455      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1456    
1457      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);
1458    
1459    #ifdef OSM_GPS_MAP_KEYS
1460        g_signal_connect(G_OBJECT(object), "key_press_event",
1461                         G_CALLBACK(on_window_key_press), priv);
1462    #endif
1463  }  }
1464    
1465  #ifndef G_CHECKSUM_MD5  static void
1466  /* simple hash algorithm hack if md5 is not present */  osm_gps_map_setup(OsmGpsMapPrivate *priv) {
1467  static char *simple_hash(char *str) {      const char *uri;
1468      union {  
1469          char str[4];      //user can specify a map source ID, or a repo URI as the map source
1470          gulong val;      uri = osm_gps_map_source_get_repo_uri(OSM_GPS_MAP_SOURCE_NULL);
1471      } hash = { .val = 0x55555555 };      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
1472            g_debug("Using null source");
1473      while(*str) {          priv->map_source = OSM_GPS_MAP_SOURCE_NULL;
1474          hash.str[(int)str & 3] ^= *str;  
1475          str++;          priv->null_tile = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, 256, 256);
1476            gdk_pixbuf_fill(priv->null_tile, 0xcccccc00);
1477        }
1478        else if (priv->map_source >= 0) {
1479            //check if the source given is valid
1480            uri = osm_gps_map_source_get_repo_uri(priv->map_source);
1481            if (uri) {
1482                g_debug("Setting map source from ID");
1483                g_free(priv->repo_uri);
1484    
1485                priv->repo_uri = g_strdup(uri);
1486                priv->image_format = g_strdup(
1487                    osm_gps_map_source_get_image_format(priv->map_source));
1488                priv->max_zoom = osm_gps_map_source_get_max_zoom(priv->map_source);
1489                priv->min_zoom = osm_gps_map_source_get_min_zoom(priv->map_source);
1490            }
1491        }
1492    
1493        const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1494        if(!fname) fname = "_unknown_";
1495    
1496        if (priv->tile_dir) {
1497            //the new cachedir is the given cache dir + the friendly name of the repo_uri
1498            priv->cache_dir = g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);
1499            g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);
1500      }      }
     return g_strdup_printf("%08lX", hash.val);  
1501  }  }
 #endif  
1502    
1503  static GObject *  static GObject *
1504  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
1505  {  {
     GObject *object;  
     OsmGpsMapPrivate *priv;  
   
1506      //Always chain up to the parent constructor      //Always chain up to the parent constructor
1507      object = G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);      GObject *object =
1508      priv = OSM_GPS_MAP_PRIVATE(object);          G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1509    
1510      if (!priv->cache_dir_is_full_path) {      osm_gps_map_setup(OSM_GPS_MAP_PRIVATE(object));
 #ifdef G_CHECKSUM_MD5  
         char *md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, priv->repo_uri, -1);  
 #else  
         char *md5 = simple_hash(priv->repo_uri);  
 #endif  
1511    
1512          if (priv->cache_dir) {      inspect_map_uri(OSM_GPS_MAP(object));
             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/%s", old, md5);  
             g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);  
             g_free(old);  
         }  
   
         g_free(md5);  
     }  
1513    
1514      return object;      return object;
1515  }  }
# Line 1338  osm_gps_map_dispose (GObject *object) Line 1537  osm_gps_map_dispose (GObject *object)
1537      if(priv->pixmap)      if(priv->pixmap)
1538          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
1539    
1540        if (priv->null_tile)
1541            g_object_unref (priv->null_tile);
1542    
1543      if(priv->gc_map)      if(priv->gc_map)
1544          g_object_unref(priv->gc_map);          g_object_unref(priv->gc_map);
1545    
1546      if (priv->idle_map_redraw != 0)      if (priv->idle_map_redraw != 0)
1547          g_source_remove (priv->idle_map_redraw);          g_source_remove (priv->idle_map_redraw);
1548    
1549        g_free(priv->gps);
1550    
1551    #ifdef ENABLE_OSD
1552        if(priv->osd)
1553            priv->osd->free(priv->osd);
1554    
1555    #ifdef OSD_DOUBLE_BUFFER
1556        if(priv->dbuf_pixmap)
1557            g_object_unref (priv->dbuf_pixmap);
1558    #endif
1559    #endif
1560    
1561      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
1562  }  }
1563    
# Line 1353  osm_gps_map_finalize (GObject *object) Line 1567  osm_gps_map_finalize (GObject *object)
1567      OsmGpsMap *map = OSM_GPS_MAP(object);      OsmGpsMap *map = OSM_GPS_MAP(object);
1568      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1569    
1570      g_free(priv->cache_dir);      if(priv->tile_dir)
1571            g_free(priv->tile_dir);
1572    
1573        if(priv->cache_dir)
1574            g_free(priv->cache_dir);
1575    
1576      g_free(priv->repo_uri);      g_free(priv->repo_uri);
1577        g_free(priv->image_format);
1578    
1579      osm_gps_map_free_trip(map);      osm_gps_map_free_trip(map);
1580      osm_gps_map_free_tracks(map);      osm_gps_map_free_tracks(map);
# Line 1385  osm_gps_map_set_property (GObject *objec Line 1605  osm_gps_map_set_property (GObject *objec
1605              break;              break;
1606          case PROP_REPO_URI:          case PROP_REPO_URI:
1607              priv->repo_uri = g_value_dup_string (value);              priv->repo_uri = g_value_dup_string (value);
             inspect_map_uri(map);  
1608              break;              break;
1609          case PROP_PROXY_URI:          case PROP_PROXY_URI:
1610              if ( g_value_get_string(value) ) {              if ( g_value_get_string(value) ) {
   
1611                  priv->proxy_uri = g_value_dup_string (value);                  priv->proxy_uri = g_value_dup_string (value);
1612                  g_debug("Setting proxy server: %s", priv->proxy_uri);                  g_debug("Setting proxy server: %s", priv->proxy_uri);
1613    
1614  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1615                  GValue val = {0};                  GValue val = {0};
1616    
1617                  SoupURI* uri = soup_uri_new(priv->proxy_uri);                  SoupURI* uri = soup_uri_new(priv->proxy_uri);
1618                  g_value_init(&val, SOUP_TYPE_URI);                  g_value_init(&val, SOUP_TYPE_URI);
1619                  g_value_take_boxed(&val, uri);                  g_value_take_boxed(&val, uri);
# Line 1403  osm_gps_map_set_property (GObject *objec Line 1623  osm_gps_map_set_property (GObject *objec
1623                  SoupUri* uri = soup_uri_new(priv->proxy_uri);                  SoupUri* uri = soup_uri_new(priv->proxy_uri);
1624                  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);
1625  #endif  #endif
                 soup_uri_free(uri);  
1626              } else              } else
1627                  priv->proxy_uri = NULL;                  priv->proxy_uri = NULL;
1628    
1629              break;              break;
1630          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1631              priv->cache_dir = g_value_dup_string (value);              if ( g_value_get_string(value) )
1632              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);  
1633              break;              break;
1634          case PROP_ZOOM:          case PROP_ZOOM:
1635              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 1657  osm_gps_map_set_property (GObject *objec
1657          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1658              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
1659              break;              break;
1660            case PROP_MAP_SOURCE: {
1661                gint old = priv->map_source;
1662                priv->map_source = g_value_get_int (value);
1663                if(old >= OSM_GPS_MAP_SOURCE_NULL &&
1664                   priv->map_source != old &&
1665                   priv->map_source >= OSM_GPS_MAP_SOURCE_NULL &&
1666                   priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) {
1667    
1668                    /* we now have to switch the entire map */
1669    
1670                    /* flush the ram cache */
1671                    g_hash_table_remove_all(priv->tile_cache);
1672    
1673                    osm_gps_map_setup(priv);
1674    
1675                    inspect_map_uri(map);
1676    
1677                    /* adjust zoom if necessary */
1678                    if(priv->map_zoom > priv->max_zoom)
1679                        osm_gps_map_set_zoom(map, priv->max_zoom);
1680    
1681                    if(priv->map_zoom < priv->min_zoom)
1682                        osm_gps_map_set_zoom(map, priv->min_zoom);
1683    
1684                } } break;
1685            case PROP_IMAGE_FORMAT:
1686                priv->image_format = g_value_dup_string (value);
1687                break;
1688          default:          default:
1689              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
1690              break;              break;
# Line 1477  osm_gps_map_get_property (GObject *objec Line 1722  osm_gps_map_get_property (GObject *objec
1722          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1723              g_value_set_string(value, priv->cache_dir);              g_value_set_string(value, priv->cache_dir);
1724              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             g_value_set_boolean(value, priv->cache_dir_is_full_path);  
             break;  
1725          case PROP_ZOOM:          case PROP_ZOOM:
1726              g_value_set_int(value, priv->map_zoom);              g_value_set_int(value, priv->map_zoom);
1727              break;              break;
# Line 1517  osm_gps_map_get_property (GObject *objec Line 1759  osm_gps_map_get_property (GObject *objec
1759          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1760              g_value_set_int(value, priv->ui_gps_point_outer_radius);              g_value_set_int(value, priv->ui_gps_point_outer_radius);
1761              break;              break;
1762            case PROP_MAP_SOURCE:
1763                g_value_set_int(value, priv->map_source);
1764                break;
1765            case PROP_IMAGE_FORMAT:
1766                g_value_set_string(value, priv->image_format);
1767                break;
1768          default:          default:
1769              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
1770              break;              break;
# Line 1524  osm_gps_map_get_property (GObject *objec Line 1772  osm_gps_map_get_property (GObject *objec
1772  }  }
1773    
1774  static gboolean  static gboolean
1775  _osm_gps_map_scroll (GtkWidget *widget, GdkEventScroll  *event)  osm_gps_map_scroll_event (GtkWidget *widget, GdkEventScroll  *event)
1776  {  {
1777      OsmGpsMap *map = OSM_GPS_MAP(widget);      OsmGpsMap *map = OSM_GPS_MAP(widget);
1778      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
# Line 1546  osm_gps_map_button_press (GtkWidget *wid Line 1794  osm_gps_map_button_press (GtkWidget *wid
1794  {  {
1795      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1796    
1797    #ifdef ENABLE_OSD
1798        /* pressed inside OSD control? */
1799        if(priv->osd) {
1800            osd_button_t but =
1801                priv->osd->check(priv->osd, TRUE, event->x, event->y);
1802    
1803            if(but != OSD_NONE)
1804            {
1805                int step =
1806                    GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1807                priv->drag_counter = -1;
1808    
1809                switch(but) {
1810                case OSD_UP:
1811                    priv->map_y -= step;
1812                    priv->center_coord_set = FALSE;
1813                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1814                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1815                    break;
1816    
1817                case OSD_DOWN:
1818                    priv->map_y += step;
1819                    priv->center_coord_set = FALSE;
1820                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1821                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1822                    break;
1823    
1824                case OSD_LEFT:
1825                    priv->map_x -= step;
1826                    priv->center_coord_set = FALSE;
1827                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1828                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1829                    break;
1830    
1831                case OSD_RIGHT:
1832                    priv->map_x += step;
1833                    priv->center_coord_set = FALSE;
1834                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1835                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1836                    break;
1837    
1838                case OSD_IN:
1839                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1840                    break;
1841    
1842                case OSD_OUT:
1843                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1844                    break;
1845    
1846                default:
1847                    /* all custom buttons are forwarded to the application */
1848                    if(priv->osd->cb)
1849                        priv->osd->cb(but, priv->osd->data);
1850                    break;
1851                }
1852    
1853                return FALSE;
1854            }
1855        }
1856    #endif
1857    
1858      priv->drag_counter = 0;      priv->drag_counter = 0;
1859      priv->drag_start_mouse_x = (int) event->x;      priv->drag_start_mouse_x = (int) event->x;
1860      priv->drag_start_mouse_y = (int) event->y;      priv->drag_start_mouse_y = (int) event->y;
# Line 1574  osm_gps_map_button_release (GtkWidget *w Line 1883  osm_gps_map_button_release (GtkWidget *w
1883    
1884          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1885      }      }
1886    #ifdef ENABLE_OSD
1887        /* pressed inside OSD control? */
1888        else if(priv->osd)
1889            priv->osd->check(priv->osd, FALSE, event->x, event->y);
1890    #endif
1891    
1892      priv->drag_mouse_dx = 0;  
1893      priv->drag_mouse_dy = 0;  #ifdef DRAG_DEBUG
1894      priv->drag_counter = 0;      printf("dragging done\n");
1895    #endif
1896    
1897        priv->drag_counter = -1;
1898    
1899      return FALSE;      return FALSE;
1900  }  }
1901    
1902  static gboolean  static gboolean
1903    osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);
1904    
1905    static gboolean
1906  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)
1907  {  {
1908      int x, y;      int x, y;
# Line 1602  osm_gps_map_motion_notify (GtkWidget *wi Line 1922  osm_gps_map_motion_notify (GtkWidget *wi
1922      if (!(state & GDK_BUTTON1_MASK))      if (!(state & GDK_BUTTON1_MASK))
1923          return FALSE;          return FALSE;
1924    
1925        if (priv->drag_counter < 0)
1926            return FALSE;
1927    
1928      priv->drag_counter++;      priv->drag_counter++;
1929    
1930      // we havent dragged more than 6 pixels      // we havent dragged more than 6 pixels
1931      if (priv->drag_counter < 6)      if (priv->drag_counter < 6)
1932          return FALSE;          return FALSE;
1933    
1934    #ifdef OSM_GPS_MAP_REFRESH
1935        /* reduce update frequency on maemo to keep screen update fluid */
1936        static guint32 last_time = 0;
1937    
1938        if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE;
1939        last_time = event->time;
1940    #endif
1941    
1942      priv->dragging = TRUE;      priv->dragging = TRUE;
1943    
1944      if (priv->map_auto_center)      if (priv->map_auto_center)
# Line 1616  osm_gps_map_motion_notify (GtkWidget *wi Line 1947  osm_gps_map_motion_notify (GtkWidget *wi
1947      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
1948      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
1949    
1950      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);  
     }  
1951    
1952      return FALSE;      return FALSE;
1953  }  }
# Line 1679  osm_gps_map_configure (GtkWidget *widget Line 1962  osm_gps_map_configure (GtkWidget *widget
1962          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
1963    
1964      priv->pixmap = gdk_pixmap_new (      priv->pixmap = gdk_pixmap_new (
1965                                     widget->window,                          widget->window,
1966                                     widget->allocation.width + EXTRA_BORDER * 2,                          widget->allocation.width + EXTRA_BORDER * 2,
1967                                     widget->allocation.height + EXTRA_BORDER * 2,                          widget->allocation.height + EXTRA_BORDER * 2,
1968                                     -1);                          -1);
1969    
1970    #ifdef ENABLE_OSD
1971    
1972    #ifdef OSD_DOUBLE_BUFFER
1973        if (priv->dbuf_pixmap)
1974            g_object_unref (priv->dbuf_pixmap);
1975    
1976        priv->dbuf_pixmap = gdk_pixmap_new (
1977                            widget->window,
1978                            widget->allocation.width,
1979                            widget->allocation.height,
1980                            -1);
1981    #endif
1982    
1983        /* the osd needs some references to map internal objects */
1984        if(priv->osd)
1985            priv->osd->widget = widget;
1986    #endif
1987    
1988      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
1989      if(priv->gc_map)      if(priv->gc_map)
# Line 1700  osm_gps_map_expose (GtkWidget *widget, G Line 2001  osm_gps_map_expose (GtkWidget *widget, G
2001  {  {
2002      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2003    
2004      gdk_draw_drawable (  #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2005                         widget->window,      GdkDrawable *drawable = priv->dbuf_pixmap;
2006    #else
2007        GdkDrawable *drawable = widget->window;
2008    #endif
2009    
2010    #ifdef DRAG_DEBUG
2011        printf("expose, map %d/%d\n", priv->map_x, priv->map_y);
2012    #endif
2013    
2014        if (!priv->drag_mouse_dx && !priv->drag_mouse_dy && event)
2015        {
2016    #ifdef DRAG_DEBUG
2017            printf("  dragging = %d, event = %p\n", priv->dragging, event);
2018    #endif
2019    
2020            gdk_draw_drawable (drawable,
2021                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2022                               priv->pixmap,
2023                               event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
2024                               event->area.x, event->area.y,
2025                               event->area.width, event->area.height);
2026        }
2027        else
2028        {
2029    #ifdef DRAG_DEBUG
2030            printf("  drag_mouse %d/%d\n",
2031                   priv->drag_mouse_dx - EXTRA_BORDER,
2032                   priv->drag_mouse_dy - EXTRA_BORDER);
2033    #endif
2034    
2035            gdk_draw_drawable (drawable,
2036                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2037                               priv->pixmap,
2038                               0,0,
2039                               priv->drag_mouse_dx - EXTRA_BORDER,
2040                               priv->drag_mouse_dy - EXTRA_BORDER,
2041                               -1,-1);
2042    
2043            //Paint white outside of the map if dragging. Its less
2044            //ugly than painting the corrupted map
2045            if(priv->drag_mouse_dx>EXTRA_BORDER) {
2046                gdk_draw_rectangle (drawable,
2047                                    widget->style->white_gc,
2048                                    TRUE,
2049                                    0, 0,
2050                                    priv->drag_mouse_dx - EXTRA_BORDER,
2051                                    widget->allocation.height);
2052            }
2053            else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2054            {
2055                gdk_draw_rectangle (drawable,
2056                                    widget->style->white_gc,
2057                                    TRUE,
2058                                    priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
2059                                    -priv->drag_mouse_dx - EXTRA_BORDER,
2060                                    widget->allocation.height);
2061            }
2062    
2063            if (priv->drag_mouse_dy>EXTRA_BORDER) {
2064                gdk_draw_rectangle (drawable,
2065                                    widget->style->white_gc,
2066                                    TRUE,
2067                                    0, 0,
2068                                    widget->allocation.width,
2069                                    priv->drag_mouse_dy - EXTRA_BORDER);
2070            }
2071            else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2072            {
2073                gdk_draw_rectangle (drawable,
2074                                    widget->style->white_gc,
2075                                    TRUE,
2076                                    0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
2077                                    widget->allocation.width,
2078                                    -priv->drag_mouse_dy - EXTRA_BORDER);
2079            }
2080        }
2081    
2082    #ifdef ENABLE_OSD
2083        /* draw new OSD */
2084        if(priv->osd)
2085            priv->osd->draw (priv->osd, drawable);
2086    
2087    #ifdef OSD_DOUBLE_BUFFER
2088        gdk_draw_drawable (widget->window,
2089                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2090                         priv->pixmap,                         priv->dbuf_pixmap,
2091                         event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,                         0,0,0,0,-1,-1);
2092                         event->area.x, event->area.y,  #endif
                        event->area.width, event->area.height);  
2093    
2094    #endif
2095    
2096      return FALSE;      return FALSE;
2097  }  }
2098    
# Line 1730  osm_gps_map_class_init (OsmGpsMapClass * Line 2115  osm_gps_map_class_init (OsmGpsMapClass *
2115      widget_class->button_press_event = osm_gps_map_button_press;      widget_class->button_press_event = osm_gps_map_button_press;
2116      widget_class->button_release_event = osm_gps_map_button_release;      widget_class->button_release_event = osm_gps_map_button_release;
2117      widget_class->motion_notify_event = osm_gps_map_motion_notify;      widget_class->motion_notify_event = osm_gps_map_motion_notify;
2118      widget_class->scroll_event = _osm_gps_map_scroll;      widget_class->scroll_event = osm_gps_map_scroll_event;
2119    
2120      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2121                                       PROP_AUTO_CENTER,                                       PROP_AUTO_CENTER,
# Line 1768  osm_gps_map_class_init (OsmGpsMapClass * Line 2153  osm_gps_map_class_init (OsmGpsMapClass *
2153                                       PROP_REPO_URI,                                       PROP_REPO_URI,
2154                                       g_param_spec_string ("repo-uri",                                       g_param_spec_string ("repo-uri",
2155                                                            "repo uri",                                                            "repo uri",
2156                                                            "osm repo uri",                                                            "map source tile repository uri",
2157                                                            "http://tile.openstreetmap.org/#Z/#X/#Y.png",                                                            OSM_REPO_URI,
2158                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2159    
2160      g_object_class_install_property (object_class,       g_object_class_install_property (object_class,
2161                                       PROP_PROXY_URI,                                       PROP_PROXY_URI,
2162                                       g_param_spec_string ("proxy-uri",                                       g_param_spec_string ("proxy-uri",
2163                                                            "proxy uri",                                                            "proxy uri",
# Line 1785  osm_gps_map_class_init (OsmGpsMapClass * Line 2170  osm_gps_map_class_init (OsmGpsMapClass *
2170                                       g_param_spec_string ("tile-cache",                                       g_param_spec_string ("tile-cache",
2171                                                            "tile cache",                                                            "tile cache",
2172                                                            "osm local tile cache dir",                                                            "osm local tile cache dir",
2173                                                            "/tmp/Maps",                                                            NULL,
2174                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2175    
2176      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,  
2177                                       PROP_ZOOM,                                       PROP_ZOOM,
2178                                       g_param_spec_int ("zoom",                                       g_param_spec_int ("zoom",
2179                                                         "zoom",                                                         "zoom",
# Line 1813  osm_gps_map_class_init (OsmGpsMapClass * Line 2190  osm_gps_map_class_init (OsmGpsMapClass *
2190                                                         "maximum zoom level",                                                         "maximum zoom level",
2191                                                         MIN_ZOOM, /* minimum property value */                                                         MIN_ZOOM, /* minimum property value */
2192                                                         MAX_ZOOM, /* maximum property value */                                                         MAX_ZOOM, /* maximum property value */
2193                                                         17,                                                         OSM_MAX_ZOOM,
2194                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2195    
2196      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1823  osm_gps_map_class_init (OsmGpsMapClass * Line 2200  osm_gps_map_class_init (OsmGpsMapClass *
2200                                                         "minimum zoom level",                                                         "minimum zoom level",
2201                                                         MIN_ZOOM, /* minimum property value */                                                         MIN_ZOOM, /* minimum property value */
2202                                                         MAX_ZOOM, /* maximum property value */                                                         MAX_ZOOM, /* maximum property value */
2203                                                         1,                                                         OSM_MIN_ZOOM,
2204                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2205    
2206      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1893  osm_gps_map_class_init (OsmGpsMapClass * Line 2270  osm_gps_map_class_init (OsmGpsMapClass *
2270                                                         "radius of the gps point inner circle",                                                         "radius of the gps point inner circle",
2271                                                         0,           /* minimum property value */                                                         0,           /* minimum property value */
2272                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2273                                                         5,                                                         10,
2274                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2275    
2276      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1906  osm_gps_map_class_init (OsmGpsMapClass * Line 2283  osm_gps_map_class_init (OsmGpsMapClass *
2283                                                         20,                                                         20,
2284                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2285    
2286        g_object_class_install_property (object_class,
2287                                         PROP_MAP_SOURCE,
2288                                         g_param_spec_int ("map-source",
2289                                                           "map source",
2290                                                           "map source ID",
2291                                                           -1,           /* minimum property value */
2292                                                           G_MAXINT,    /* maximum property value */
2293                                                           -1,
2294                                                           G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2295    
2296        g_object_class_install_property (object_class,
2297                                         PROP_IMAGE_FORMAT,
2298                                         g_param_spec_string ("image-format",
2299                                                              "image format",
2300                                                              "map source tile repository image format (jpg, png)",
2301                                                              OSM_IMAGE_FORMAT,
2302                                                              G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2303    }
2304    
2305    const char*
2306    osm_gps_map_source_get_friendly_name(OsmGpsMapSource_t source)
2307    {
2308        switch(source)
2309        {
2310            case OSM_GPS_MAP_SOURCE_NULL:
2311                return "None";
2312            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2313                return "OpenStreetMap I";
2314            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2315                return "OpenStreetMap II";
2316            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2317                return "OpenCycleMap";
2318            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2319                return "OSMC Trails";
2320            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2321                return "Maps-For-Free";
2322            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2323                return "Google Maps";
2324            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2325                return "Google Satellite";
2326            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2327                return "Google Hybrid";
2328            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2329                return "Virtual Earth";
2330            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2331                return "Virtual Earth Satellite";
2332            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2333                return "Virtual Earth Hybrid";
2334            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2335                return "Yahoo Maps";
2336            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2337                return "Yahoo Satellite";
2338            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2339                return "Yahoo Hybrid";
2340            default:
2341                return NULL;
2342        }
2343        return NULL;
2344    }
2345    
2346    //http://www.internettablettalk.com/forums/showthread.php?t=5209
2347    //https://garage.maemo.org/plugins/scmsvn/viewcvs.php/trunk/src/maps.c?root=maemo-mapper&view=markup
2348    //http://www.ponies.me.uk/maps/GoogleTileUtils.java
2349    //http://www.mgmaps.com/cache/MapTileCacher.perl
2350    const char*
2351    osm_gps_map_source_get_repo_uri(OsmGpsMapSource_t source)
2352    {
2353        switch(source)
2354        {
2355            case OSM_GPS_MAP_SOURCE_NULL:
2356                return "none://";
2357            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2358                return OSM_REPO_URI;
2359            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2360                return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2361            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2362                return "http://c.andy.sandbox.cloudmade.com/tiles/cycle/#Z/#X/#Y.png";
2363            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2364                return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
2365            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2366                return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";
2367            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2368                return "http://mt#R.google.com/vt/v=w2.97&x=#X&y=#Y&z=#Z";
2369            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2370                return "http://khm#R.google.com/kh?n=404&v=3&t=#Q";
2371            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2372                return NULL; /* No longer working  "http://mt#R.google.com/mt?n=404&v=w2t.99&x=#X&y=#Y&zoom=#S" */
2373            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2374                return "http://a#R.ortho.tiles.virtualearth.net/tiles/r#W.jpeg?g=50";
2375            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2376                return "http://a#R.ortho.tiles.virtualearth.net/tiles/a#W.jpeg?g=50";
2377            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2378                return "http://a#R.ortho.tiles.virtualearth.net/tiles/h#W.jpeg?g=50";
2379            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2380            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2381            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2382                /* TODO: Implement signed Y, aka U
2383                 * http://us.maps3.yimg.com/aerial.maps.yimg.com/ximg?v=1.7&t=a&s=256&x=%d&y=%-d&z=%d
2384                 *  x = tilex,
2385                 *  y = (1 << (MAX_ZOOM - zoom)) - tiley - 1,
2386                 *  z = zoom - (MAX_ZOOM - 17));
2387                 */
2388                return NULL;
2389            default:
2390                return NULL;
2391        }
2392        return NULL;
2393    }
2394    
2395    const char *
2396    osm_gps_map_source_get_image_format(OsmGpsMapSource_t source)
2397    {
2398        switch(source) {
2399            case OSM_GPS_MAP_SOURCE_NULL:
2400            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2401            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2402            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2403            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2404                return "png";
2405            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2406            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2407            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2408            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2409            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2410            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2411            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2412            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2413            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2414            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2415                return "jpg";
2416            default:
2417                return "bin";
2418        }
2419        return "bin";
2420    }
2421    
2422    
2423    int
2424    osm_gps_map_source_get_min_zoom(OsmGpsMapSource_t source)
2425    {
2426        return 1;
2427    }
2428    
2429    int
2430    osm_gps_map_source_get_max_zoom(OsmGpsMapSource_t source)
2431    {
2432        switch(source) {
2433            case OSM_GPS_MAP_SOURCE_NULL:
2434                return 18;
2435            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2436            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2437                return OSM_MAX_ZOOM;
2438            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2439            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2440            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2441            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2442            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2443            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2444            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2445            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2446            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2447                return 17;
2448            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2449                return 15;
2450            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2451                return 11;
2452            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2453                return 18;
2454            default:
2455                return 17;
2456        }
2457        return 17;
2458  }  }
2459    
2460  void  void
# Line 1938  osm_gps_map_download_maps (OsmGpsMap *ma Line 2487  osm_gps_map_download_maps (OsmGpsMap *ma
2487                  for(j=y1; j<=y2; j++)                  for(j=y1; j<=y2; j++)
2488                  {                  {
2489                      // x = i, y = j                      // x = i, y = j
2490                      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",
2491                      if (!priv->cache_dir || !g_file_test(filename, G_FILE_TEST_EXISTS))                                      priv->cache_dir, G_DIR_SEPARATOR,
2492                                        zoom, G_DIR_SEPARATOR,
2493                                        i, G_DIR_SEPARATOR,
2494                                        j,
2495                                        priv->image_format);
2496                        if (!g_file_test(filename, G_FILE_TEST_EXISTS))
2497                      {                      {
2498                          osm_gps_map_download_tile(map, zoom, i, j, FALSE);                          osm_gps_map_download_tile(map, zoom, i, j, FALSE);
2499                          num_tiles++;                          num_tiles++;
# Line 2001  int Line 2555  int
2555  osm_gps_map_set_zoom (OsmGpsMap *map, int zoom)  osm_gps_map_set_zoom (OsmGpsMap *map, int zoom)
2556  {  {
2557      int zoom_old;      int zoom_old;
2558      double factor = 1.0;      double factor = 0.0;
2559      int width_center, height_center;      int width_center, height_center;
2560      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
2561    
# Line 2032  osm_gps_map_set_zoom (OsmGpsMap *map, in Line 2586  osm_gps_map_set_zoom (OsmGpsMap *map, in
2586          g_debug("Zoom changed from %d to %d factor:%f x:%d",          g_debug("Zoom changed from %d to %d factor:%f x:%d",
2587                  zoom_old, priv->map_zoom, factor, priv->map_x);                  zoom_old, priv->map_zoom, factor, priv->map_x);
2588    
2589    #ifdef ENABLE_OSD
2590            /* OSD may contain a scale, so we may have to re-render it */
2591            if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2592                priv->osd->render (priv->osd);
2593    #endif
2594    
2595          osm_gps_map_map_redraw_idle(map);          osm_gps_map_map_redraw_idle(map);
2596      }      }
2597      return priv->map_zoom;      return priv->map_zoom;
# Line 2072  osm_gps_map_add_image (OsmGpsMap *map, f Line 2632  osm_gps_map_add_image (OsmGpsMap *map, f
2632          //cache w/h for speed, and add image to list          //cache w/h for speed, and add image to list
2633          im = g_new0(image_t,1);          im = g_new0(image_t,1);
2634          im->w = gdk_pixbuf_get_width(image);          im->w = gdk_pixbuf_get_width(image);
2635          im->h = gdk_pixbuf_get_width(image);          im->h = gdk_pixbuf_get_height(image);
2636          im->pt.rlat = deg2rad(latitude);          im->pt.rlat = deg2rad(latitude);
2637          im->pt.rlon = deg2rad(longitude);          im->pt.rlon = deg2rad(longitude);
2638    
# Line 2085  osm_gps_map_add_image (OsmGpsMap *map, f Line 2645  osm_gps_map_add_image (OsmGpsMap *map, f
2645      }      }
2646  }  }
2647    
2648  void  gboolean
2649  osm_gps_map_clear_images (OsmGpsMap *map)  osm_gps_map_remove_image (OsmGpsMap *map, GdkPixbuf *image)
2650  {  {
2651      g_return_if_fail (OSM_IS_GPS_MAP (map));      OsmGpsMapPrivate *priv = map->priv;
2652        if (priv->images) {
2653      osm_gps_map_free_images(map);          GSList *list;
2654      osm_gps_map_map_redraw_idle(map);          for(list = priv->images; list != NULL; list = list->next)
2655            {
2656                image_t *im = list->data;
2657                    if (im->image == image)
2658                    {
2659                            priv->images = g_slist_remove_link(priv->images, list);
2660                            g_object_unref(im->image);
2661                            g_free(im);
2662                            osm_gps_map_map_redraw_idle(map);
2663                            return TRUE;
2664                    }
2665            }
2666        }
2667        return FALSE;
2668  }  }
2669    
2670  void  void
2671  osm_gps_map_osd_speed (OsmGpsMap *map, float speed)  osm_gps_map_clear_images (OsmGpsMap *map)
2672  {  {
     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;  
   
2673      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);  
2674    
2675      color.red = (0 > 50) ? 0xffff : 0;      osm_gps_map_free_images(map);
2676      color.green = 0;      osm_gps_map_map_redraw_idle(map);
     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);  
2677  }  }
2678    
2679  void  void
# Line 2167  osm_gps_map_draw_gps (OsmGpsMap *map, fl Line 2688  osm_gps_map_draw_gps (OsmGpsMap *map, fl
2688      priv->gps->rlat = deg2rad(latitude);      priv->gps->rlat = deg2rad(latitude);
2689      priv->gps->rlon = deg2rad(longitude);      priv->gps->rlon = deg2rad(longitude);
2690      priv->gps_valid = TRUE;      priv->gps_valid = TRUE;
2691        priv->gps_heading = deg2rad(heading);
2692    
2693      // pixel_x,y, offsets      // pixel_x,y, offsets
2694      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);
# Line 2256  osm_gps_map_geographic_to_screen (OsmGps Line 2778  osm_gps_map_geographic_to_screen (OsmGps
2778      priv = map->priv;      priv = map->priv;
2779    
2780      if (pixel_x)      if (pixel_x)
2781          *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) - priv->map_x;          *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) -
2782                priv->map_x + priv->drag_mouse_dx;
2783      if (pixel_y)      if (pixel_y)
2784          *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) - priv->map_y;          *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) -
2785                priv->map_y + priv->drag_mouse_dy;
2786  }  }
2787    
2788  void  void
# Line 2273  osm_gps_map_scroll (OsmGpsMap *map, gint Line 2797  osm_gps_map_scroll (OsmGpsMap *map, gint
2797      priv->map_x += dx;      priv->map_x += dx;
2798      priv->map_y += dy;      priv->map_y += dy;
2799    
2800    #ifdef ENABLE_OSD
2801        /* OSD may contain a coordinate, so we may have to re-render it */
2802        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2803            priv->osd->render (priv->osd);
2804    #endif
2805    
2806      osm_gps_map_map_redraw_idle (map);      osm_gps_map_map_redraw_idle (map);
2807  }  }
2808    
2809    float
2810    osm_gps_map_get_scale(OsmGpsMap *map)
2811    {
2812        OsmGpsMapPrivate *priv;
2813    
2814        g_return_val_if_fail (OSM_IS_GPS_MAP (map), OSM_GPS_MAP_INVALID);
2815        priv = map->priv;
2816    
2817        return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);
2818    }
2819    
2820    #ifdef ENABLE_OSD
2821    
2822    void
2823    osm_gps_map_redraw (OsmGpsMap *map)
2824    {
2825        osm_gps_map_map_redraw_idle(map);
2826    }
2827    
2828    osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {
2829        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
2830        return map->priv->osd;
2831    }
2832    
2833    void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {
2834        OsmGpsMapPrivate *priv;
2835    
2836        g_return_if_fail (OSM_IS_GPS_MAP (map));
2837    
2838        priv = map->priv;
2839        g_return_if_fail (!priv->osd);
2840    
2841        priv->osd = osd;
2842    }
2843    
2844    void
2845    osm_gps_map_repaint (OsmGpsMap *map) {
2846        osm_gps_map_expose (GTK_WIDGET(map), NULL);
2847    }
2848    
2849    #endif
Legend:
Removed from v.32  
changed lines
  Added in v.114