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 132 by harbaum, Thu Oct 1 08:09:00 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 114  struct _OsmGpsMapPrivate Line 149  struct _OsmGpsMapPrivate
149      int drag_start_mouse_y;      int drag_start_mouse_y;
150      int drag_start_map_x;      int drag_start_map_x;
151      int drag_start_map_y;      int drag_start_map_y;
152        guint drag_expose;
153    
154      //for customizing the redering of the gps track      //for customizing the redering of the gps track
155      int ui_gps_track_width;      int ui_gps_track_width;
# Line 146  enum Line 182  enum
182      PROP_REPO_URI,      PROP_REPO_URI,
183      PROP_PROXY_URI,      PROP_PROXY_URI,
184      PROP_TILE_CACHE_DIR,      PROP_TILE_CACHE_DIR,
     PROP_TILE_CACHE_DIR_IS_FULL_PATH,  
185      PROP_ZOOM,      PROP_ZOOM,
186      PROP_MAX_ZOOM,      PROP_MAX_ZOOM,
187      PROP_MIN_ZOOM,      PROP_MIN_ZOOM,
# Line 157  enum Line 192  enum
192      PROP_TILES_QUEUED,      PROP_TILES_QUEUED,
193      PROP_GPS_TRACK_WIDTH,      PROP_GPS_TRACK_WIDTH,
194      PROP_GPS_POINT_R1,      PROP_GPS_POINT_R1,
195      PROP_GPS_POINT_R2      PROP_GPS_POINT_R2,
196        PROP_MAP_SOURCE,
197        PROP_IMAGE_FORMAT
198  };  };
199    
200  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 208  static gchar    *replace_map_uri(OsmGpsM
208  static void     osm_gps_map_print_images (OsmGpsMap *map);  static void     osm_gps_map_print_images (OsmGpsMap *map);
209  static void     osm_gps_map_draw_gps_point (OsmGpsMap *map);  static void     osm_gps_map_draw_gps_point (OsmGpsMap *map);
210  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);
211    #ifdef LIBSOUP22
212    static void     osm_gps_map_tile_download_complete (SoupMessage *msg, gpointer user_data);
213    #else
214    static void     osm_gps_map_tile_download_complete (SoupSession *session, SoupMessage *msg, gpointer user_data);
215    #endif
216  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);
217  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);
218  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 342  static void
342  inspect_map_uri(OsmGpsMap *map)  inspect_map_uri(OsmGpsMap *map)
343  {  {
344      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
345        priv->uri_format = 0;
346        priv->the_google = FALSE;
347    
348      if (g_strrstr(priv->repo_uri, URI_MARKER_X))      if (g_strrstr(priv->repo_uri, URI_MARKER_X))
349          priv->uri_format |= URI_HAS_X;          priv->uri_format |= URI_HAS_X;
# Line 420  my_log_handler (const gchar * log_domain Line 464  my_log_handler (const gchar * log_domain
464          g_log_default_handler (log_domain, log_level, message, user_data);          g_log_default_handler (log_domain, log_level, message, user_data);
465  }  }
466    
467    static float
468    osm_gps_map_get_scale_at_point(int zoom, float rlat, float rlon)
469    {
470        /* world at zoom 1 == 512 pixels */
471        return cos(rlat) * M_PI * OSM_EQ_RADIUS / (1<<(7+zoom));
472    }
473    
474  /* clears the trip list and all resources */  /* clears the trip list and all resources */
475  static void  static void
476  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 580  osm_gps_map_draw_gps_point (OsmGpsMap *m
580          int x, y;          int x, y;
581          int r = priv->ui_gps_point_inner_radius;          int r = priv->ui_gps_point_inner_radius;
582          int r2 = priv->ui_gps_point_outer_radius;          int r2 = priv->ui_gps_point_outer_radius;
583          int mr = MAX(r,r2);          int mr = MAX(3*r,r2);
584    
585          map_x0 = priv->map_x - EXTRA_BORDER;          map_x0 = priv->map_x - EXTRA_BORDER;
586          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 590  osm_gps_map_draw_gps_point (OsmGpsMap *m
590          cairo_t *cr;          cairo_t *cr;
591          cairo_pattern_t *pat;          cairo_pattern_t *pat;
592  #else  #else
         int lw = priv->ui_gps_track_width;  
593          GdkColor color;          GdkColor color;
594          GdkGC *marker;          GdkGC *marker;
595  #endif  #endif
# Line 561  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 611  osm_gps_map_draw_gps_point (OsmGpsMap *m
611    
612          // draw ball gradient          // draw ball gradient
613          if (r > 0) {          if (r > 0) {
614                // draw direction arrow
615                if(!isnan(priv->gps_heading))
616                {
617                    cairo_move_to (cr, x-r*cos(priv->gps_heading), y-r*sin(priv->gps_heading));
618                    cairo_line_to (cr, x+3*r*sin(priv->gps_heading), y-3*r*cos(priv->gps_heading));
619                    cairo_line_to (cr, x+r*cos(priv->gps_heading), y+r*sin(priv->gps_heading));
620                    cairo_close_path (cr);
621    
622                    cairo_set_source_rgba (cr, 0.3, 0.3, 1.0, 0.5);
623                    cairo_fill_preserve (cr);
624    
625                    cairo_set_line_width (cr, 1.0);
626                    cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5);
627                    cairo_stroke(cr);
628                }
629    
630              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);
631              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);
632              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 640  osm_gps_map_draw_gps_point (OsmGpsMap *m
640              cairo_arc (cr, x, y, r, 0, 2 * M_PI);              cairo_arc (cr, x, y, r, 0, 2 * M_PI);
641              cairo_stroke(cr);              cairo_stroke(cr);
642          }          }
643    
644          cairo_destroy(cr);          cairo_destroy(cr);
645          gtk_widget_queue_draw_area (GTK_WIDGET(map),          gtk_widget_queue_draw_area (GTK_WIDGET(map),
646                                      x-mr,                                      x-mr,
# Line 614  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 680  osm_gps_map_draw_gps_point (OsmGpsMap *m
680                                      (mr*2)+lw+lw);                                      (mr*2)+lw+lw);
681  #endif  #endif
682      }      }
683  }  }
684    
685  static void  static void
686  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)
687  {  {
688      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
689    
690      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);  
691    
692      /* draw pixbuf onto pixmap */      /* draw pixbuf onto pixmap */
693      gdk_draw_pixbuf (priv->pixmap,      gdk_draw_pixbuf (priv->pixmap,
# Line 654  static void Line 719  static void
719  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)
720  #endif  #endif
721  {  {
722      int fd;      FILE *file;
723      tile_download_t *dl = (tile_download_t *)user_data;      tile_download_t *dl = (tile_download_t *)user_data;
724      OsmGpsMap *map = OSM_GPS_MAP(dl->map);      OsmGpsMap *map = OSM_GPS_MAP(dl->map);
725      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
# Line 667  osm_gps_map_tile_download_complete (Soup Line 732  osm_gps_map_tile_download_complete (Soup
732          {          {
733              if (g_mkdir_with_parents(dl->folder,0700) == 0)              if (g_mkdir_with_parents(dl->folder,0700) == 0)
734              {              {
735                  fd = open(dl->filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);                  file = g_fopen(dl->filename, "wb");
736                  if (fd != -1)                  if (file != NULL)
737                  {                  {
738                      write (fd, MSG_RESPONSE_BODY(msg), MSG_RESPONSE_LEN(msg));                      fwrite (MSG_RESPONSE_BODY(msg), 1, MSG_RESPONSE_LEN(msg), file);
739                      file_saved = TRUE;                      file_saved = TRUE;
740                        g_debug("Wrote "MSG_RESPONSE_LEN_FORMAT" bytes to %s", MSG_RESPONSE_LEN(msg), dl->filename);
741                        fclose (file);
742    
                     g_debug("Wrote " MSG_RESPONSE_LEN_FORMAT " bytes to %s", MSG_RESPONSE_LEN(msg), dl->filename);  
                     close (fd);  
743                  }                  }
744              }              }
745              else              else
746              {              {
747                  g_warning("Error creating tile download directory: %s", dl->folder);                  g_warning("Error creating tile download directory: %s",
748                              dl->folder);
749                    perror("perror:");
750              }              }
751          }          }
752    
# Line 687  osm_gps_map_tile_download_complete (Soup Line 754  osm_gps_map_tile_download_complete (Soup
754          {          {
755              GdkPixbuf *pixbuf = NULL;              GdkPixbuf *pixbuf = NULL;
756    
757                /* if the file was actually stored on disk, we can simply */
758                /* load and decode it from that file */
759              if (priv->cache_dir)              if (priv->cache_dir)
760              {              {
761                  if (file_saved)                  if (file_saved)
# Line 720  osm_gps_map_tile_download_complete (Soup Line 789  osm_gps_map_tile_download_complete (Soup
789                      g_warning("Error: Unable to determine image file format");                      g_warning("Error: Unable to determine image file format");
790                  }                  }
791              }              }
792    
793              /* Store the tile into the cache */              /* Store the tile into the cache */
794              if (G_LIKELY (pixbuf))              if (G_LIKELY (pixbuf))
795              {              {
# Line 735  osm_gps_map_tile_download_complete (Soup Line 804  osm_gps_map_tile_download_complete (Soup
804                   * we are using it as a key in the hash table */                   * we are using it as a key in the hash table */
805                  dl->filename = NULL;                  dl->filename = NULL;
806              }              }
   
807              osm_gps_map_map_redraw_idle (map);              osm_gps_map_map_redraw_idle (map);
808          }          }
809          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 862  osm_gps_map_download_tile (OsmGpsMap *ma
862          g_free(dl->uri);          g_free(dl->uri);
863          g_free(dl);          g_free(dl);
864      } else {      } else {
865          dl->folder = g_strdup_printf("%s/%d/%d/",priv->cache_dir, zoom, x);          dl->folder = g_strdup_printf("%s%c%d%c%d%c",
866          dl->filename = g_strdup_printf("%s/%d/%d/%d.png",priv->cache_dir, zoom, x, y);                              priv->cache_dir, G_DIR_SEPARATOR,
867                                zoom, G_DIR_SEPARATOR,
868                                x, G_DIR_SEPARATOR);
869            dl->filename = g_strdup_printf("%s%c%d%c%d%c%d.%s",
870                                priv->cache_dir, G_DIR_SEPARATOR,
871                                zoom, G_DIR_SEPARATOR,
872                                x, G_DIR_SEPARATOR,
873                                y,
874                                priv->image_format);
875          dl->map = map;          dl->map = map;
876          dl->redraw = redraw;          dl->redraw = redraw;
877    
# Line 813  osm_gps_map_download_tile (OsmGpsMap *ma Line 889  osm_gps_map_download_tile (OsmGpsMap *ma
889                      if (cookie) {                      if (cookie) {
890                          g_debug("Adding Google Cookie");                          g_debug("Adding Google Cookie");
891                          soup_message_headers_append(msg->request_headers, "Cookie", cookie);                          soup_message_headers_append(msg->request_headers, "Cookie", cookie);
   
892                      }                      }
893                  }                  }
894              }              }
895    
896    #ifdef LIBSOUP22
897                soup_message_headers_append(msg->request_headers,
898                                            "User-Agent", USER_AGENT);
899    #endif
900    
901              g_hash_table_insert (priv->tile_queue, dl->uri, msg);              g_hash_table_insert (priv->tile_queue, dl->uri, msg);
902              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);
903          } else {          } else {
# Line 835  osm_gps_map_load_cached_tile (OsmGpsMap Line 915  osm_gps_map_load_cached_tile (OsmGpsMap
915  {  {
916      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
917      gchar *filename;      gchar *filename;
918      GdkPixbuf *pixbuf;      GdkPixbuf *pixbuf = NULL;
919      OsmCachedTile *tile;      OsmCachedTile *tile;
920    
921      filename = g_strdup_printf("%s/%u/%u/%u.png",      filename = g_strdup_printf("%s%c%d%c%d%c%d.%s",
922                                 priv->cache_dir,                  priv->cache_dir, G_DIR_SEPARATOR,
923                                 zoom, x, y);                  zoom, G_DIR_SEPARATOR,
924                    x, G_DIR_SEPARATOR,
925                    y,
926                    priv->image_format);
927    
928      tile = g_hash_table_lookup (priv->tile_cache, filename);      tile = g_hash_table_lookup (priv->tile_cache, filename);
929      if (tile)      if (tile)
930      {      {
931          g_free (filename);          g_free (filename);
932      }      }
933      else if (priv->cache_dir)      else
934      {      {
935          pixbuf = gdk_pixbuf_new_from_file (filename, NULL);          pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
936          if (pixbuf)          if (pixbuf)
# Line 863  osm_gps_map_load_cached_tile (OsmGpsMap Line 946  osm_gps_map_load_cached_tile (OsmGpsMap
946      {      {
947          tile->redraw_cycle = priv->redraw_cycle;          tile->redraw_cycle = priv->redraw_cycle;
948          pixbuf = g_object_ref (tile->pixbuf);          pixbuf = g_object_ref (tile->pixbuf);
949      } else      }
         pixbuf = NULL;  
950    
951      return pixbuf;      return pixbuf;
952  }  }
# Line 928  static void Line 1010  static void
1010  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)
1011  {  {
1012      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1013        gchar *filename;
1014      GdkPixbuf *pixbuf;      GdkPixbuf *pixbuf;
1015    
1016      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);
1017    
1018      /* try to get file from internal cache */      if (priv->map_source == OSM_GPS_MAP_SOURCE_NULL) {
1019      pixbuf = osm_gps_map_load_cached_tile(map, zoom, x, y);          osm_gps_map_blit_tile(map, priv->null_tile, offset_x,offset_y);
1020            return;
1021        }
1022    
1023      /* 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",
1024      if (priv->cache_dir && !pixbuf)                  priv->cache_dir, G_DIR_SEPARATOR,
1025      {                  zoom, G_DIR_SEPARATOR,
1026          gchar *filename;                  x, G_DIR_SEPARATOR,
1027          filename = g_strdup_printf("%s/%u/%u/%u.png",                  y,
1028                                     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);  
         }  
1029    
1030          g_free(filename);      /* try to get file from internal cache first */
1031      }      if(!(pixbuf = osm_gps_map_load_cached_tile(map, zoom, x, y)))
1032            pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
1033    
1034      if (G_LIKELY(pixbuf))      if(pixbuf)
1035      {      {
1036            g_debug("Found tile %s", filename);
1037          osm_gps_map_blit_tile(map, pixbuf, offset_x,offset_y);          osm_gps_map_blit_tile(map, pixbuf, offset_x,offset_y);
1038          g_object_unref (pixbuf);          g_object_unref (pixbuf);
1039      }      }
# Line 984  osm_gps_map_load_tile (OsmGpsMap *map, i Line 1064  osm_gps_map_load_tile (OsmGpsMap *map, i
1064                                  TRUE, offset_x, offset_y, TILESIZE, TILESIZE);                                  TRUE, offset_x, offset_y, TILESIZE, TILESIZE);
1065          }          }
1066      }      }
1067        g_free(filename);
1068  }  }
1069    
1070  static void  static void
# Line 1077  osm_gps_map_print_track (OsmGpsMap *map, Line 1158  osm_gps_map_print_track (OsmGpsMap *map,
1158    
1159      map_x0 = priv->map_x - EXTRA_BORDER;      map_x0 = priv->map_x - EXTRA_BORDER;
1160      map_y0 = priv->map_y - EXTRA_BORDER;      map_y0 = priv->map_y - EXTRA_BORDER;
   
1161      for(list = trackpoint_list; list != NULL; list = list->next)      for(list = trackpoint_list; list != NULL; list = list->next)
1162      {      {
1163          coord_t *tp = list->data;          coord_t *tp = list->data;
# Line 1132  osm_gps_map_print_tracks (OsmGpsMap *map Line 1212  osm_gps_map_print_tracks (OsmGpsMap *map
1212    
1213      if (priv->show_trip_history)      if (priv->show_trip_history)
1214          osm_gps_map_print_track (map, priv->trip_history);          osm_gps_map_print_track (map, priv->trip_history);
1215    
1216      if (priv->tracks)      if (priv->tracks)
1217      {      {
         g_debug("TRACK");  
1218          GSList* tmp = priv->tracks;          GSList* tmp = priv->tracks;
1219          while (tmp != NULL)          while (tmp != NULL)
1220          {          {
# Line 1144  osm_gps_map_print_tracks (OsmGpsMap *map Line 1224  osm_gps_map_print_tracks (OsmGpsMap *map
1224      }      }
1225  }  }
1226    
1227  static gboolean  static gboolean
1228  osm_gps_map_purge_cache_check(gpointer key, gpointer value, gpointer user)  osm_gps_map_purge_cache_check(gpointer key, gpointer value, gpointer user)
1229  {  {
1230      return(((OsmCachedTile*)value)->redraw_cycle != ((OsmGpsMapPrivate*)user)->redraw_cycle);     return (((OsmCachedTile*)value)->redraw_cycle != ((OsmGpsMapPrivate*)user)->redraw_cycle);
1231  }  }
1232    
1233  static void  static void
1234  osm_gps_map_purge_cache (OsmGpsMap *map)  osm_gps_map_purge_cache (OsmGpsMap *map)
1235  {  {
1236      OsmGpsMapPrivate *priv = map->priv;     OsmGpsMapPrivate *priv = map->priv;
1237    
1238      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)
1239          return;         return;
1240    
1241      /* 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
1242       * during the last redraw operation */      * during the last redraw operation */
1243      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);
1244  }  }
1245    
1246  static gboolean  static gboolean
# Line 1170  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1250  osm_gps_map_map_redraw (OsmGpsMap *map)
1250    
1251      priv->idle_map_redraw = 0;      priv->idle_map_redraw = 0;
1252    
1253        /* don't redraw the entire map while the OSD is doing */
1254        /* some animation or the like. This is to keep the animation */
1255        /* fluid */
1256        if (priv->osd->busy(priv->osd))
1257            return FALSE;
1258    
1259    #ifdef DRAG_DEBUG
1260        printf("trying redraw\n");
1261    #endif
1262    
1263      /* 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
1264       * 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
1265       * 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 1267  osm_gps_map_map_redraw (OsmGpsMap *map)
1267      if (priv->dragging)      if (priv->dragging)
1268          return FALSE;          return FALSE;
1269    
1270        /* undo all offsets that may have happened when dragging */
1271        priv->drag_mouse_dx = 0;
1272        priv->drag_mouse_dy = 0;
1273    
1274      priv->redraw_cycle++;      priv->redraw_cycle++;
1275    
1276      /* draw white background to initialise pixmap */      /* draw white background to initialise pixmap */
# Line 1194  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1288  osm_gps_map_map_redraw (OsmGpsMap *map)
1288      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1289      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1290    
1291      //osm_gps_map_osd_speed(map, 1.5);  #ifdef ENABLE_OSD
1292        /* OSD may contain a coordinate/scale, so we may have to re-render it */
1293        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
1294            priv->osd->render (priv->osd);
1295    #endif
1296    
1297      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1298      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
1299    
# Line 1210  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1309  osm_gps_map_map_redraw_idle (OsmGpsMap *
1309          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);
1310  }  }
1311    
1312    #ifdef OSM_GPS_MAP_KEYS
1313    static gboolean
1314    on_window_key_press(GtkWidget *widget,
1315                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1316      gboolean handled = FALSE;
1317      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1318    
1319      // the map handles some keys on its own ...
1320      switch(event->keyval) {
1321    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1322      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1323          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1324          if(!priv->fullscreen)
1325              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1326          else
1327              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1328    
1329          priv->fullscreen = !priv->fullscreen;
1330          handled = TRUE;
1331          } break;
1332    #endif
1333    
1334    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1335      case OSM_GPS_MAP_KEY_ZOOMIN:
1336          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1337          handled = TRUE;
1338          break;
1339    #endif
1340    
1341    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1342      case OSM_GPS_MAP_KEY_ZOOMOUT:
1343          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1344          handled = TRUE;
1345          break;
1346    #endif
1347    
1348    #ifdef OSM_GPS_MAP_KEY_UP
1349      case OSM_GPS_MAP_KEY_UP:
1350          priv->map_y -= step;
1351          priv->center_coord_set = FALSE;
1352          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1353          handled = TRUE;
1354          break;
1355    #endif
1356    
1357    #ifdef OSM_GPS_MAP_KEY_DOWN
1358      case OSM_GPS_MAP_KEY_DOWN:
1359          priv->map_y += step;
1360          priv->center_coord_set = FALSE;
1361          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1362          handled = TRUE;
1363          break;
1364    #endif
1365    
1366    #ifdef OSM_GPS_MAP_KEY_LEFT
1367      case OSM_GPS_MAP_KEY_LEFT:
1368          priv->map_x -= step;
1369          priv->center_coord_set = FALSE;
1370          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1371          handled = TRUE;
1372          break;
1373    #endif
1374    
1375    #ifdef OSM_GPS_MAP_KEY_RIGHT
1376      case OSM_GPS_MAP_KEY_RIGHT:
1377          priv->map_x += step;
1378          priv->center_coord_set = FALSE;
1379          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1380          handled = TRUE;
1381          break;
1382    #endif
1383    
1384      default:
1385          break;
1386      }
1387    
1388      return handled;
1389    }
1390    #endif
1391    
1392  static void  static void
1393  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1394  {  {
# Line 1223  osm_gps_map_init (OsmGpsMap *object) Line 1402  osm_gps_map_init (OsmGpsMap *object)
1402      priv->trip_history = NULL;      priv->trip_history = NULL;
1403      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1404      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1405        priv->gps_heading = OSM_GPS_MAP_INVALID;
1406    
1407    #ifdef ENABLE_OSD
1408        priv->osd = NULL;
1409    #endif
1410    
1411    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1412        priv->fullscreen = FALSE;
1413    #endif
1414    
1415      priv->tracks = NULL;      priv->tracks = NULL;
1416      priv->images = NULL;      priv->images = NULL;
# Line 1236  osm_gps_map_init (OsmGpsMap *object) Line 1424  osm_gps_map_init (OsmGpsMap *object)
1424      priv->uri_format = 0;      priv->uri_format = 0;
1425      priv->the_google = FALSE;      priv->the_google = FALSE;
1426    
1427        priv->map_source = -1;
1428    
1429  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1430      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1431      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session =
1432                                                               SOUP_SESSION_USER_AGENT,          soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
1433                                                               "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);  
1434  #else  #else
1435      /* 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 */
1436        /* set it seperately as an extra header field for each reuest */
1437      priv->soup_session = soup_session_async_new();      priv->soup_session = soup_session_async_new();
1438  #endif  #endif
1439    
# Line 1266  osm_gps_map_init (OsmGpsMap *object) Line 1456  osm_gps_map_init (OsmGpsMap *object)
1456      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1457    
1458      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);
1459    
1460    #ifdef OSM_GPS_MAP_KEYS
1461        g_signal_connect(G_OBJECT(object), "key_press_event",
1462                         G_CALLBACK(on_window_key_press), priv);
1463    #endif
1464  }  }
1465    
1466  #ifndef G_CHECKSUM_MD5  static void
1467  /* simple hash algorithm hack if md5 is not present */  osm_gps_map_setup(OsmGpsMapPrivate *priv) {
1468  static char *simple_hash(char *str) {      const char *uri;
1469      union {  
1470          char str[4];      //user can specify a map source ID, or a repo URI as the map source
1471          gulong val;      uri = osm_gps_map_source_get_repo_uri(OSM_GPS_MAP_SOURCE_NULL);
1472      } hash = { .val = 0x55555555 };      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
1473            g_debug("Using null source");
1474      while(*str) {          priv->map_source = OSM_GPS_MAP_SOURCE_NULL;
1475          hash.str[(int)str & 3] ^= *str;  
1476          str++;          priv->null_tile = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, 256, 256);
1477            gdk_pixbuf_fill(priv->null_tile, 0xcccccc00);
1478        }
1479        else if (priv->map_source >= 0) {
1480            //check if the source given is valid
1481            uri = osm_gps_map_source_get_repo_uri(priv->map_source);
1482            if (uri) {
1483                g_debug("Setting map source from ID");
1484                g_free(priv->repo_uri);
1485    
1486                priv->repo_uri = g_strdup(uri);
1487                priv->image_format = g_strdup(
1488                    osm_gps_map_source_get_image_format(priv->map_source));
1489                priv->max_zoom = osm_gps_map_source_get_max_zoom(priv->map_source);
1490                priv->min_zoom = osm_gps_map_source_get_min_zoom(priv->map_source);
1491            }
1492        }
1493    
1494        const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1495        if(!fname) fname = "_unknown_";
1496    
1497        if (priv->tile_dir) {
1498            //the new cachedir is the given cache dir + the friendly name of the repo_uri
1499            priv->cache_dir = g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);
1500            g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);
1501      }      }
     return g_strdup_printf("%08lX", hash.val);  
1502  }  }
 #endif  
1503    
1504  static GObject *  static GObject *
1505  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
1506  {  {
     GObject *object;  
     OsmGpsMapPrivate *priv;  
   
1507      //Always chain up to the parent constructor      //Always chain up to the parent constructor
1508      object = G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);      GObject *object =
1509      priv = OSM_GPS_MAP_PRIVATE(object);          G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1510    
1511      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  
1512    
1513          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);  
     }  
1514    
1515      return object;      return object;
1516  }  }
# Line 1338  osm_gps_map_dispose (GObject *object) Line 1538  osm_gps_map_dispose (GObject *object)
1538      if(priv->pixmap)      if(priv->pixmap)
1539          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
1540    
1541        if (priv->null_tile)
1542            g_object_unref (priv->null_tile);
1543    
1544      if(priv->gc_map)      if(priv->gc_map)
1545          g_object_unref(priv->gc_map);          g_object_unref(priv->gc_map);
1546    
1547      if (priv->idle_map_redraw != 0)      if (priv->idle_map_redraw != 0)
1548          g_source_remove (priv->idle_map_redraw);          g_source_remove (priv->idle_map_redraw);
1549    
1550        if (priv->drag_expose != 0)
1551            g_source_remove (priv->drag_expose);
1552    
1553        g_free(priv->gps);
1554    
1555    #ifdef ENABLE_OSD
1556        if(priv->osd)
1557            priv->osd->free(priv->osd);
1558    
1559    #ifdef OSD_DOUBLE_BUFFER
1560        if(priv->dbuf_pixmap)
1561            g_object_unref (priv->dbuf_pixmap);
1562    #endif
1563    #endif
1564    
1565      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
1566  }  }
1567    
# Line 1353  osm_gps_map_finalize (GObject *object) Line 1571  osm_gps_map_finalize (GObject *object)
1571      OsmGpsMap *map = OSM_GPS_MAP(object);      OsmGpsMap *map = OSM_GPS_MAP(object);
1572      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1573    
1574      g_free(priv->cache_dir);      if(priv->tile_dir)
1575            g_free(priv->tile_dir);
1576    
1577        if(priv->cache_dir)
1578            g_free(priv->cache_dir);
1579    
1580      g_free(priv->repo_uri);      g_free(priv->repo_uri);
1581        g_free(priv->image_format);
1582    
1583      osm_gps_map_free_trip(map);      osm_gps_map_free_trip(map);
1584      osm_gps_map_free_tracks(map);      osm_gps_map_free_tracks(map);
# Line 1385  osm_gps_map_set_property (GObject *objec Line 1609  osm_gps_map_set_property (GObject *objec
1609              break;              break;
1610          case PROP_REPO_URI:          case PROP_REPO_URI:
1611              priv->repo_uri = g_value_dup_string (value);              priv->repo_uri = g_value_dup_string (value);
             inspect_map_uri(map);  
1612              break;              break;
1613          case PROP_PROXY_URI:          case PROP_PROXY_URI:
1614              if ( g_value_get_string(value) ) {              if ( g_value_get_string(value) ) {
   
1615                  priv->proxy_uri = g_value_dup_string (value);                  priv->proxy_uri = g_value_dup_string (value);
1616                  g_debug("Setting proxy server: %s", priv->proxy_uri);                  g_debug("Setting proxy server: %s", priv->proxy_uri);
1617    
1618  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1619                  GValue val = {0};                  GValue val = {0};
1620    
1621                  SoupURI* uri = soup_uri_new(priv->proxy_uri);                  SoupURI* uri = soup_uri_new(priv->proxy_uri);
1622                  g_value_init(&val, SOUP_TYPE_URI);                  g_value_init(&val, SOUP_TYPE_URI);
1623                  g_value_take_boxed(&val, uri);                  g_value_take_boxed(&val, uri);
# Line 1403  osm_gps_map_set_property (GObject *objec Line 1627  osm_gps_map_set_property (GObject *objec
1627                  SoupUri* uri = soup_uri_new(priv->proxy_uri);                  SoupUri* uri = soup_uri_new(priv->proxy_uri);
1628                  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);
1629  #endif  #endif
                 soup_uri_free(uri);  
1630              } else              } else
1631                  priv->proxy_uri = NULL;                  priv->proxy_uri = NULL;
1632    
1633              break;              break;
1634          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1635              priv->cache_dir = g_value_dup_string (value);              if ( g_value_get_string(value) )
1636              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);  
1637              break;              break;
1638          case PROP_ZOOM:          case PROP_ZOOM:
1639              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 1661  osm_gps_map_set_property (GObject *objec
1661          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1662              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
1663              break;              break;
1664            case PROP_MAP_SOURCE: {
1665                gint old = priv->map_source;
1666                priv->map_source = g_value_get_int (value);
1667                if(old >= OSM_GPS_MAP_SOURCE_NULL &&
1668                   priv->map_source != old &&
1669                   priv->map_source >= OSM_GPS_MAP_SOURCE_NULL &&
1670                   priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) {
1671    
1672                    /* we now have to switch the entire map */
1673    
1674                    /* flush the ram cache */
1675                    g_hash_table_remove_all(priv->tile_cache);
1676    
1677                    osm_gps_map_setup(priv);
1678    
1679                    inspect_map_uri(map);
1680    
1681                    /* adjust zoom if necessary */
1682                    if(priv->map_zoom > priv->max_zoom)
1683                        osm_gps_map_set_zoom(map, priv->max_zoom);
1684    
1685                    if(priv->map_zoom < priv->min_zoom)
1686                        osm_gps_map_set_zoom(map, priv->min_zoom);
1687    
1688                } } break;
1689            case PROP_IMAGE_FORMAT:
1690                priv->image_format = g_value_dup_string (value);
1691                break;
1692          default:          default:
1693              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
1694              break;              break;
# Line 1477  osm_gps_map_get_property (GObject *objec Line 1726  osm_gps_map_get_property (GObject *objec
1726          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1727              g_value_set_string(value, priv->cache_dir);              g_value_set_string(value, priv->cache_dir);
1728              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             g_value_set_boolean(value, priv->cache_dir_is_full_path);  
             break;  
1729          case PROP_ZOOM:          case PROP_ZOOM:
1730              g_value_set_int(value, priv->map_zoom);              g_value_set_int(value, priv->map_zoom);
1731              break;              break;
# Line 1517  osm_gps_map_get_property (GObject *objec Line 1763  osm_gps_map_get_property (GObject *objec
1763          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1764              g_value_set_int(value, priv->ui_gps_point_outer_radius);              g_value_set_int(value, priv->ui_gps_point_outer_radius);
1765              break;              break;
1766            case PROP_MAP_SOURCE:
1767                g_value_set_int(value, priv->map_source);
1768                break;
1769            case PROP_IMAGE_FORMAT:
1770                g_value_set_string(value, priv->image_format);
1771                break;
1772          default:          default:
1773              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
1774              break;              break;
# Line 1524  osm_gps_map_get_property (GObject *objec Line 1776  osm_gps_map_get_property (GObject *objec
1776  }  }
1777    
1778  static gboolean  static gboolean
1779  _osm_gps_map_scroll (GtkWidget *widget, GdkEventScroll  *event)  osm_gps_map_scroll_event (GtkWidget *widget, GdkEventScroll  *event)
1780  {  {
1781      OsmGpsMap *map = OSM_GPS_MAP(widget);      OsmGpsMap *map = OSM_GPS_MAP(widget);
1782      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
# Line 1546  osm_gps_map_button_press (GtkWidget *wid Line 1798  osm_gps_map_button_press (GtkWidget *wid
1798  {  {
1799      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1800    
1801    #ifdef ENABLE_OSD
1802        /* pressed inside OSD control? */
1803        if(priv->osd) {
1804            osd_button_t but =
1805                priv->osd->check(priv->osd, TRUE, event->x, event->y);
1806    
1807            if(but != OSD_NONE)
1808            {
1809                int step =
1810                    GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1811                priv->drag_counter = -1;
1812    
1813                switch(but) {
1814                case OSD_UP:
1815                    priv->map_y -= step;
1816                    priv->center_coord_set = FALSE;
1817                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1818                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1819                    break;
1820    
1821                case OSD_DOWN:
1822                    priv->map_y += step;
1823                    priv->center_coord_set = FALSE;
1824                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1825                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1826                    break;
1827    
1828                case OSD_LEFT:
1829                    priv->map_x -= step;
1830                    priv->center_coord_set = FALSE;
1831                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1832                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1833                    break;
1834    
1835                case OSD_RIGHT:
1836                    priv->map_x += step;
1837                    priv->center_coord_set = FALSE;
1838                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1839                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1840                    break;
1841    
1842                case OSD_IN:
1843                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1844                    break;
1845    
1846                case OSD_OUT:
1847                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1848                    break;
1849    
1850                default:
1851                    /* all custom buttons are forwarded to the application */
1852                    if(priv->osd->cb)
1853                        priv->osd->cb(but, priv->osd->data);
1854                    break;
1855                }
1856    
1857                return FALSE;
1858            }
1859        }
1860    #endif
1861    
1862      priv->drag_counter = 0;      priv->drag_counter = 0;
1863      priv->drag_start_mouse_x = (int) event->x;      priv->drag_start_mouse_x = (int) event->x;
1864      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 1887  osm_gps_map_button_release (GtkWidget *w
1887    
1888          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1889      }      }
1890    #ifdef ENABLE_OSD
1891        /* pressed inside OSD control? */
1892        else if(priv->osd)
1893            priv->osd->check(priv->osd, FALSE, event->x, event->y);
1894    #endif
1895    
1896      priv->drag_mouse_dx = 0;  #ifdef DRAG_DEBUG
1897      priv->drag_mouse_dy = 0;      printf("dragging done\n");
1898      priv->drag_counter = 0;  #endif
1899    
1900        priv->drag_counter = -1;
1901    
1902        return FALSE;
1903    }
1904    
1905    static gboolean
1906    osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);
1907    
1908    static gboolean
1909    osm_gps_map_map_expose (GtkWidget *widget)
1910    {
1911        OsmGpsMapPrivate *priv = OSM_GPS_MAP(widget)->priv;
1912    
1913        priv->drag_expose = 0;
1914        osm_gps_map_expose (widget, NULL);
1915      return FALSE;      return FALSE;
1916  }  }
1917    
# Line 1602  osm_gps_map_motion_notify (GtkWidget *wi Line 1935  osm_gps_map_motion_notify (GtkWidget *wi
1935      if (!(state & GDK_BUTTON1_MASK))      if (!(state & GDK_BUTTON1_MASK))
1936          return FALSE;          return FALSE;
1937    
1938      priv->drag_counter++;      if (priv->drag_counter < 0)
1939            return FALSE;
1940    
1941      // we havent dragged more than 6 pixels      /* not yet dragged far enough? */
1942      if (priv->drag_counter < 6)      if(!priv->drag_counter &&
1943           ( (x - priv->drag_start_mouse_x) * (x - priv->drag_start_mouse_x) +
1944             (y - priv->drag_start_mouse_y) * (y - priv->drag_start_mouse_y) <
1945             10*10))
1946          return FALSE;          return FALSE;
1947    
1948        priv->drag_counter++;
1949    
1950      priv->dragging = TRUE;      priv->dragging = TRUE;
1951    
1952      if (priv->map_auto_center)      if (priv->map_auto_center)
# Line 1616  osm_gps_map_motion_notify (GtkWidget *wi Line 1955  osm_gps_map_motion_notify (GtkWidget *wi
1955      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
1956      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
1957    
1958      gdk_draw_drawable (      /* instead of redrawing directly just add an idle function */
1959                         widget->window,      if (!priv->drag_expose)
1960                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],          priv->drag_expose =
1961                         priv->pixmap,              g_idle_add ((GSourceFunc)osm_gps_map_map_expose, widget);
                        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);  
     }  
1962    
1963      return FALSE;      return FALSE;
1964  }  }
# Line 1679  osm_gps_map_configure (GtkWidget *widget Line 1973  osm_gps_map_configure (GtkWidget *widget
1973          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
1974    
1975      priv->pixmap = gdk_pixmap_new (      priv->pixmap = gdk_pixmap_new (
1976                                     widget->window,                          widget->window,
1977                                     widget->allocation.width + EXTRA_BORDER * 2,                          widget->allocation.width + EXTRA_BORDER * 2,
1978                                     widget->allocation.height + EXTRA_BORDER * 2,                          widget->allocation.height + EXTRA_BORDER * 2,
1979                                     -1);                          -1);
1980    
1981    #ifdef ENABLE_OSD
1982    
1983    #ifdef OSD_DOUBLE_BUFFER
1984        if (priv->dbuf_pixmap)
1985            g_object_unref (priv->dbuf_pixmap);
1986    
1987        priv->dbuf_pixmap = gdk_pixmap_new (
1988                            widget->window,
1989                            widget->allocation.width,
1990                            widget->allocation.height,
1991                            -1);
1992    #endif
1993    
1994        /* the osd needs some references to map internal objects */
1995        if(priv->osd)
1996            priv->osd->widget = widget;
1997    #endif
1998    
1999      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
2000      if(priv->gc_map)      if(priv->gc_map)
# Line 1700  osm_gps_map_expose (GtkWidget *widget, G Line 2012  osm_gps_map_expose (GtkWidget *widget, G
2012  {  {
2013      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2014    
2015      gdk_draw_drawable (  #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2016                         widget->window,      GdkDrawable *drawable = priv->dbuf_pixmap;
2017    #else
2018        GdkDrawable *drawable = widget->window;
2019    #endif
2020    
2021    #ifdef DRAG_DEBUG
2022        printf("expose, map %d/%d\n", priv->map_x, priv->map_y);
2023    #endif
2024    
2025        if (!priv->drag_mouse_dx && !priv->drag_mouse_dy && event)
2026        {
2027    #ifdef DRAG_DEBUG
2028            printf("  dragging = %d, event = %p\n", priv->dragging, event);
2029    #endif
2030    
2031            gdk_draw_drawable (drawable,
2032                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2033                               priv->pixmap,
2034                               event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
2035                               event->area.x, event->area.y,
2036                               event->area.width, event->area.height);
2037        }
2038        else
2039        {
2040    #ifdef DRAG_DEBUG
2041            printf("  drag_mouse %d/%d\n",
2042                   priv->drag_mouse_dx - EXTRA_BORDER,
2043                   priv->drag_mouse_dy - EXTRA_BORDER);
2044    #endif
2045    
2046            gdk_draw_drawable (drawable,
2047                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2048                               priv->pixmap,
2049                               0,0,
2050                               priv->drag_mouse_dx - EXTRA_BORDER,
2051                               priv->drag_mouse_dy - EXTRA_BORDER,
2052                               -1,-1);
2053    
2054            //Paint white outside of the map if dragging. Its less
2055            //ugly than painting the corrupted map
2056            if(priv->drag_mouse_dx>EXTRA_BORDER) {
2057                gdk_draw_rectangle (drawable,
2058                                    widget->style->white_gc,
2059                                    TRUE,
2060                                    0, 0,
2061                                    priv->drag_mouse_dx - EXTRA_BORDER,
2062                                    widget->allocation.height);
2063            }
2064            else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2065            {
2066                gdk_draw_rectangle (drawable,
2067                                    widget->style->white_gc,
2068                                    TRUE,
2069                                    priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
2070                                    -priv->drag_mouse_dx - EXTRA_BORDER,
2071                                    widget->allocation.height);
2072            }
2073    
2074            if (priv->drag_mouse_dy>EXTRA_BORDER) {
2075                gdk_draw_rectangle (drawable,
2076                                    widget->style->white_gc,
2077                                    TRUE,
2078                                    0, 0,
2079                                    widget->allocation.width,
2080                                    priv->drag_mouse_dy - EXTRA_BORDER);
2081            }
2082            else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2083            {
2084                gdk_draw_rectangle (drawable,
2085                                    widget->style->white_gc,
2086                                    TRUE,
2087                                    0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
2088                                    widget->allocation.width,
2089                                    -priv->drag_mouse_dy - EXTRA_BORDER);
2090            }
2091        }
2092    
2093    #ifdef ENABLE_OSD
2094        /* draw new OSD */
2095        if(priv->osd)
2096            priv->osd->draw (priv->osd, drawable);
2097    
2098    #ifdef OSD_DOUBLE_BUFFER
2099        gdk_draw_drawable (widget->window,
2100                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2101                         priv->pixmap,                         priv->dbuf_pixmap,
2102                         event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,                         0,0,0,0,-1,-1);
2103                         event->area.x, event->area.y,  #endif
                        event->area.width, event->area.height);  
2104    
2105    #endif
2106    
2107      return FALSE;      return FALSE;
2108  }  }
2109    
# Line 1730  osm_gps_map_class_init (OsmGpsMapClass * Line 2126  osm_gps_map_class_init (OsmGpsMapClass *
2126      widget_class->button_press_event = osm_gps_map_button_press;      widget_class->button_press_event = osm_gps_map_button_press;
2127      widget_class->button_release_event = osm_gps_map_button_release;      widget_class->button_release_event = osm_gps_map_button_release;
2128      widget_class->motion_notify_event = osm_gps_map_motion_notify;      widget_class->motion_notify_event = osm_gps_map_motion_notify;
2129      widget_class->scroll_event = _osm_gps_map_scroll;      widget_class->scroll_event = osm_gps_map_scroll_event;
2130    
2131      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2132                                       PROP_AUTO_CENTER,                                       PROP_AUTO_CENTER,
# Line 1768  osm_gps_map_class_init (OsmGpsMapClass * Line 2164  osm_gps_map_class_init (OsmGpsMapClass *
2164                                       PROP_REPO_URI,                                       PROP_REPO_URI,
2165                                       g_param_spec_string ("repo-uri",                                       g_param_spec_string ("repo-uri",
2166                                                            "repo uri",                                                            "repo uri",
2167                                                            "osm repo uri",                                                            "map source tile repository uri",
2168                                                            "http://tile.openstreetmap.org/#Z/#X/#Y.png",                                                            OSM_REPO_URI,
2169                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2170    
2171      g_object_class_install_property (object_class,       g_object_class_install_property (object_class,
2172                                       PROP_PROXY_URI,                                       PROP_PROXY_URI,
2173                                       g_param_spec_string ("proxy-uri",                                       g_param_spec_string ("proxy-uri",
2174                                                            "proxy uri",                                                            "proxy uri",
# Line 1785  osm_gps_map_class_init (OsmGpsMapClass * Line 2181  osm_gps_map_class_init (OsmGpsMapClass *
2181                                       g_param_spec_string ("tile-cache",                                       g_param_spec_string ("tile-cache",
2182                                                            "tile cache",                                                            "tile cache",
2183                                                            "osm local tile cache dir",                                                            "osm local tile cache dir",
2184                                                            "/tmp/Maps",                                                            NULL,
2185                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2186    
2187      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,  
2188                                       PROP_ZOOM,                                       PROP_ZOOM,
2189                                       g_param_spec_int ("zoom",                                       g_param_spec_int ("zoom",
2190                                                         "zoom",                                                         "zoom",
# Line 1813  osm_gps_map_class_init (OsmGpsMapClass * Line 2201  osm_gps_map_class_init (OsmGpsMapClass *
2201                                                         "maximum zoom level",                                                         "maximum zoom level",
2202                                                         MIN_ZOOM, /* minimum property value */                                                         MIN_ZOOM, /* minimum property value */
2203                                                         MAX_ZOOM, /* maximum property value */                                                         MAX_ZOOM, /* maximum property value */
2204                                                         17,                                                         OSM_MAX_ZOOM,
2205                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2206    
2207      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1823  osm_gps_map_class_init (OsmGpsMapClass * Line 2211  osm_gps_map_class_init (OsmGpsMapClass *
2211                                                         "minimum zoom level",                                                         "minimum zoom level",
2212                                                         MIN_ZOOM, /* minimum property value */                                                         MIN_ZOOM, /* minimum property value */
2213                                                         MAX_ZOOM, /* maximum property value */                                                         MAX_ZOOM, /* maximum property value */
2214                                                         1,                                                         OSM_MIN_ZOOM,
2215                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2216    
2217      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1893  osm_gps_map_class_init (OsmGpsMapClass * Line 2281  osm_gps_map_class_init (OsmGpsMapClass *
2281                                                         "radius of the gps point inner circle",                                                         "radius of the gps point inner circle",
2282                                                         0,           /* minimum property value */                                                         0,           /* minimum property value */
2283                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2284                                                         5,                                                         10,
2285                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2286    
2287      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1906  osm_gps_map_class_init (OsmGpsMapClass * Line 2294  osm_gps_map_class_init (OsmGpsMapClass *
2294                                                         20,                                                         20,
2295                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2296    
2297        g_object_class_install_property (object_class,
2298                                         PROP_MAP_SOURCE,
2299                                         g_param_spec_int ("map-source",
2300                                                           "map source",
2301                                                           "map source ID",
2302                                                           -1,           /* minimum property value */
2303                                                           G_MAXINT,    /* maximum property value */
2304                                                           -1,
2305                                                           G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2306    
2307        g_object_class_install_property (object_class,
2308                                         PROP_IMAGE_FORMAT,
2309                                         g_param_spec_string ("image-format",
2310                                                              "image format",
2311                                                              "map source tile repository image format (jpg, png)",
2312                                                              OSM_IMAGE_FORMAT,
2313                                                              G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2314    }
2315    
2316    const char*
2317    osm_gps_map_source_get_friendly_name(OsmGpsMapSource_t source)
2318    {
2319        switch(source)
2320        {
2321            case OSM_GPS_MAP_SOURCE_NULL:
2322                return "None";
2323            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2324                return "OpenStreetMap I";
2325            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2326                return "OpenStreetMap II";
2327            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2328                return "OpenCycleMap";
2329            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2330                return "OSMC Trails";
2331            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2332                return "Maps-For-Free";
2333            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2334                return "Google Maps";
2335            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2336                return "Google Satellite";
2337            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2338                return "Google Hybrid";
2339            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2340                return "Virtual Earth";
2341            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2342                return "Virtual Earth Satellite";
2343            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2344                return "Virtual Earth Hybrid";
2345            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2346                return "Yahoo Maps";
2347            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2348                return "Yahoo Satellite";
2349            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2350                return "Yahoo Hybrid";
2351            default:
2352                return NULL;
2353        }
2354        return NULL;
2355    }
2356    
2357    //http://www.internettablettalk.com/forums/showthread.php?t=5209
2358    //https://garage.maemo.org/plugins/scmsvn/viewcvs.php/trunk/src/maps.c?root=maemo-mapper&view=markup
2359    //http://www.ponies.me.uk/maps/GoogleTileUtils.java
2360    //http://www.mgmaps.com/cache/MapTileCacher.perl
2361    const char*
2362    osm_gps_map_source_get_repo_uri(OsmGpsMapSource_t source)
2363    {
2364        switch(source)
2365        {
2366            case OSM_GPS_MAP_SOURCE_NULL:
2367                return "none://";
2368            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2369                return OSM_REPO_URI;
2370            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2371                return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2372            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2373                return "http://c.andy.sandbox.cloudmade.com/tiles/cycle/#Z/#X/#Y.png";
2374            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2375                return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
2376            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2377                return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";
2378            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2379                return "http://mt#R.google.com/vt/v=w2.97&x=#X&y=#Y&z=#Z";
2380            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2381                return "http://khm#R.google.com/kh?n=404&v=3&t=#Q";
2382            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2383                return NULL; /* No longer working  "http://mt#R.google.com/mt?n=404&v=w2t.99&x=#X&y=#Y&zoom=#S" */
2384            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2385                return "http://a#R.ortho.tiles.virtualearth.net/tiles/r#W.jpeg?g=50";
2386            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2387                return "http://a#R.ortho.tiles.virtualearth.net/tiles/a#W.jpeg?g=50";
2388            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2389                return "http://a#R.ortho.tiles.virtualearth.net/tiles/h#W.jpeg?g=50";
2390            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2391            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2392            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2393                /* TODO: Implement signed Y, aka U
2394                 * http://us.maps3.yimg.com/aerial.maps.yimg.com/ximg?v=1.7&t=a&s=256&x=%d&y=%-d&z=%d
2395                 *  x = tilex,
2396                 *  y = (1 << (MAX_ZOOM - zoom)) - tiley - 1,
2397                 *  z = zoom - (MAX_ZOOM - 17));
2398                 */
2399                return NULL;
2400            default:
2401                return NULL;
2402        }
2403        return NULL;
2404    }
2405    
2406    const char *
2407    osm_gps_map_source_get_image_format(OsmGpsMapSource_t source)
2408    {
2409        switch(source) {
2410            case OSM_GPS_MAP_SOURCE_NULL:
2411            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2412            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2413            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2414            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2415                return "png";
2416            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2417            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2418            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2419            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2420            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2421            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2422            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2423            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2424            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2425            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2426                return "jpg";
2427            default:
2428                return "bin";
2429        }
2430        return "bin";
2431    }
2432    
2433    
2434    int
2435    osm_gps_map_source_get_min_zoom(OsmGpsMapSource_t source)
2436    {
2437        return 1;
2438    }
2439    
2440    int
2441    osm_gps_map_source_get_max_zoom(OsmGpsMapSource_t source)
2442    {
2443        switch(source) {
2444            case OSM_GPS_MAP_SOURCE_NULL:
2445                return 18;
2446            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2447            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2448                return OSM_MAX_ZOOM;
2449            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2450            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2451            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2452            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2453            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2454            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2455            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2456            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2457            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2458                return 17;
2459            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2460                return 15;
2461            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2462                return 11;
2463            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2464                return 18;
2465            default:
2466                return 17;
2467        }
2468        return 17;
2469  }  }
2470    
2471  void  void
# Line 1938  osm_gps_map_download_maps (OsmGpsMap *ma Line 2498  osm_gps_map_download_maps (OsmGpsMap *ma
2498                  for(j=y1; j<=y2; j++)                  for(j=y1; j<=y2; j++)
2499                  {                  {
2500                      // x = i, y = j                      // x = i, y = j
2501                      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",
2502                      if (!priv->cache_dir || !g_file_test(filename, G_FILE_TEST_EXISTS))                                      priv->cache_dir, G_DIR_SEPARATOR,
2503                                        zoom, G_DIR_SEPARATOR,
2504                                        i, G_DIR_SEPARATOR,
2505                                        j,
2506                                        priv->image_format);
2507                        if (!g_file_test(filename, G_FILE_TEST_EXISTS))
2508                      {                      {
2509                          osm_gps_map_download_tile(map, zoom, i, j, FALSE);                          osm_gps_map_download_tile(map, zoom, i, j, FALSE);
2510                          num_tiles++;                          num_tiles++;
# Line 2001  int Line 2566  int
2566  osm_gps_map_set_zoom (OsmGpsMap *map, int zoom)  osm_gps_map_set_zoom (OsmGpsMap *map, int zoom)
2567  {  {
2568      int zoom_old;      int zoom_old;
2569      double factor = 1.0;      double factor = 0.0;
2570      int width_center, height_center;      int width_center, height_center;
2571      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
2572    
# Line 2032  osm_gps_map_set_zoom (OsmGpsMap *map, in Line 2597  osm_gps_map_set_zoom (OsmGpsMap *map, in
2597          g_debug("Zoom changed from %d to %d factor:%f x:%d",          g_debug("Zoom changed from %d to %d factor:%f x:%d",
2598                  zoom_old, priv->map_zoom, factor, priv->map_x);                  zoom_old, priv->map_zoom, factor, priv->map_x);
2599    
2600    #ifdef ENABLE_OSD
2601            /* OSD may contain a scale, so we may have to re-render it */
2602            if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2603                priv->osd->render (priv->osd);
2604    #endif
2605    
2606          osm_gps_map_map_redraw_idle(map);          osm_gps_map_map_redraw_idle(map);
2607      }      }
2608      return priv->map_zoom;      return priv->map_zoom;
# Line 2072  osm_gps_map_add_image (OsmGpsMap *map, f Line 2643  osm_gps_map_add_image (OsmGpsMap *map, f
2643          //cache w/h for speed, and add image to list          //cache w/h for speed, and add image to list
2644          im = g_new0(image_t,1);          im = g_new0(image_t,1);
2645          im->w = gdk_pixbuf_get_width(image);          im->w = gdk_pixbuf_get_width(image);
2646          im->h = gdk_pixbuf_get_width(image);          im->h = gdk_pixbuf_get_height(image);
2647          im->pt.rlat = deg2rad(latitude);          im->pt.rlat = deg2rad(latitude);
2648          im->pt.rlon = deg2rad(longitude);          im->pt.rlon = deg2rad(longitude);
2649    
# Line 2085  osm_gps_map_add_image (OsmGpsMap *map, f Line 2656  osm_gps_map_add_image (OsmGpsMap *map, f
2656      }      }
2657  }  }
2658    
2659  void  gboolean
2660  osm_gps_map_clear_images (OsmGpsMap *map)  osm_gps_map_remove_image (OsmGpsMap *map, GdkPixbuf *image)
2661  {  {
2662      g_return_if_fail (OSM_IS_GPS_MAP (map));      OsmGpsMapPrivate *priv = map->priv;
2663        if (priv->images) {
2664      osm_gps_map_free_images(map);          GSList *list;
2665      osm_gps_map_map_redraw_idle(map);          for(list = priv->images; list != NULL; list = list->next)
2666            {
2667                image_t *im = list->data;
2668                    if (im->image == image)
2669                    {
2670                            priv->images = g_slist_remove_link(priv->images, list);
2671                            g_object_unref(im->image);
2672                            g_free(im);
2673                            osm_gps_map_map_redraw_idle(map);
2674                            return TRUE;
2675                    }
2676            }
2677        }
2678        return FALSE;
2679  }  }
2680    
2681  void  void
2682  osm_gps_map_osd_speed (OsmGpsMap *map, float speed)  osm_gps_map_clear_images (OsmGpsMap *map)
2683  {  {
     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;  
   
2684      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
     priv = map->priv;  
2685    
2686      buffer = g_strdup_printf("%.0f", speed);      osm_gps_map_free_images(map);
2687        osm_gps_map_map_redraw_idle(map);
     /* pango initialisation */  
     context = gtk_widget_get_pango_context (GTK_WIDGET(map));  
     layout  = pango_layout_new (context);  
     desc    = pango_font_description_new();  
   
     pango_font_description_set_size (desc, 40 * PANGO_SCALE);  
     pango_layout_set_font_description (layout, desc);  
     pango_layout_set_text (layout, buffer, strlen(buffer));  
   
     gc = gdk_gc_new (GTK_WIDGET(map)->window);  
   
     color.red = (0 > 50) ? 0xffff : 0;  
     color.green = 0;  
     color.blue = 0;  
   
     gdk_gc_set_rgb_fg_color (gc, &color);  
   
     /* faster / less flicker alternative:*/  
     gdk_draw_drawable (  
                        GTK_WIDGET(map)->window,  
                        GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(map)],  
                        priv->pixmap,  
                        0,0,  
                        0,0,  
                        width+10,width+10);  
   
     gdk_draw_layout(GTK_WIDGET(map)->window,  
                     gc,  
                     0, 0,  
                     layout);  
   
     /* set width and height */  
     pango_layout_get_pixel_size(layout, &width, &height);  
   
     g_free(buffer);  
     pango_font_description_free (desc);  
     g_object_unref (layout);  
     g_object_unref (gc);  
2688  }  }
2689    
2690  void  void
# Line 2167  osm_gps_map_draw_gps (OsmGpsMap *map, fl Line 2699  osm_gps_map_draw_gps (OsmGpsMap *map, fl
2699      priv->gps->rlat = deg2rad(latitude);      priv->gps->rlat = deg2rad(latitude);
2700      priv->gps->rlon = deg2rad(longitude);      priv->gps->rlon = deg2rad(longitude);
2701      priv->gps_valid = TRUE;      priv->gps_valid = TRUE;
2702        priv->gps_heading = deg2rad(heading);
2703    
2704      // pixel_x,y, offsets      // pixel_x,y, offsets
2705      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 2789  osm_gps_map_geographic_to_screen (OsmGps
2789      priv = map->priv;      priv = map->priv;
2790    
2791      if (pixel_x)      if (pixel_x)
2792          *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) - priv->map_x;          *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) -
2793                priv->map_x + priv->drag_mouse_dx;
2794      if (pixel_y)      if (pixel_y)
2795          *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) - priv->map_y;          *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) -
2796                priv->map_y + priv->drag_mouse_dy;
2797  }  }
2798    
2799  void  void
# Line 2273  osm_gps_map_scroll (OsmGpsMap *map, gint Line 2808  osm_gps_map_scroll (OsmGpsMap *map, gint
2808      priv->map_x += dx;      priv->map_x += dx;
2809      priv->map_y += dy;      priv->map_y += dy;
2810    
2811    #ifdef ENABLE_OSD
2812        /* OSD may contain a coordinate, so we may have to re-render it */
2813        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2814            priv->osd->render (priv->osd);
2815    #endif
2816    
2817      osm_gps_map_map_redraw_idle (map);      osm_gps_map_map_redraw_idle (map);
2818  }  }
2819    
2820    float
2821    osm_gps_map_get_scale(OsmGpsMap *map)
2822    {
2823        OsmGpsMapPrivate *priv;
2824    
2825        g_return_val_if_fail (OSM_IS_GPS_MAP (map), OSM_GPS_MAP_INVALID);
2826        priv = map->priv;
2827    
2828        return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);
2829    }
2830    
2831    #ifdef ENABLE_OSD
2832    
2833    void
2834    osm_gps_map_redraw (OsmGpsMap *map)
2835    {
2836        osm_gps_map_map_redraw_idle(map);
2837    }
2838    
2839    osm_gps_map_osd_t *
2840    osm_gps_map_osd_get(OsmGpsMap *map)
2841    {
2842        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
2843        return map->priv->osd;
2844    }
2845    
2846    void
2847    osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd)
2848    {
2849        OsmGpsMapPrivate *priv;
2850    
2851        g_return_if_fail (OSM_IS_GPS_MAP (map));
2852    
2853        priv = map->priv;
2854        g_return_if_fail (!priv->osd);
2855    
2856        priv->osd = osd;
2857    }
2858    
2859    void
2860    osm_gps_map_repaint (OsmGpsMap *map)
2861    {
2862        osm_gps_map_expose (GTK_WIDGET(map), NULL);
2863    }
2864    
2865    coord_t *
2866    osm_gps_map_get_gps (OsmGpsMap *map)
2867    {
2868        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
2869    
2870        if(!map->priv->gps_valid)
2871            return NULL;
2872    
2873        return map->priv->gps;
2874    }
2875    
2876    #endif
Legend:
Removed from v.32  
changed lines
  Added in v.132