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 95 by harbaum, Thu Sep 3 13:20:01 2009 UTC
# Line 33  Line 33 
33    
34  #include <gdk/gdk.h>  #include <gdk/gdk.h>
35  #include <glib.h>  #include <glib.h>
36    #include <glib/gstdio.h>
37  #include <glib/gprintf.h>  #include <glib/gprintf.h>
38  #include <libsoup/soup.h>  #include <libsoup/soup.h>
39    
# Line 48  Line 49 
49    
50  #define EXTRA_BORDER (TILESIZE / 2)  #define EXTRA_BORDER (TILESIZE / 2)
51    
52    #define OSM_GPS_MAP_SCROLL_STEP 10
53    
54    /* any defined key enables key support */
55    #if (defined(OSM_GPS_MAP_KEY_FULLSCREEN) || \
56         defined(OSM_GPS_MAP_KEY_ZOOMIN) || \
57         defined(OSM_GPS_MAP_KEY_ZOOMOUT) || \
58         defined(OSM_GPS_MAP_KEY_UP) || \
59         defined(OSM_GPS_MAP_KEY_DOWN) || \
60         defined(OSM_GPS_MAP_KEY_LEFT) || \
61         defined(OSM_GPS_MAP_KEY_RIGHT))
62    #define OSM_GPS_MAP_KEYS
63    #endif
64    
65    #ifdef OSM_GPS_MAP_KEYS
66    #include <gdk/gdkkeysyms.h>
67    #endif
68    
69    #define USER_AGENT "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11"
70    
71  struct _OsmGpsMapPrivate  struct _OsmGpsMapPrivate
72  {  {
73      GHashTable *tile_queue;      GHashTable *tile_queue;
# Line 77  struct _OsmGpsMapPrivate Line 97  struct _OsmGpsMapPrivate
97      char *proxy_uri;      char *proxy_uri;
98    
99      //where downloaded tiles are cached      //where downloaded tiles are cached
100        char *tile_dir;
101      char *cache_dir;      char *cache_dir;
     gboolean cache_dir_is_full_path;  
102    
103      //contains flags indicating the various special characters      //contains flags indicating the various special characters
104      //the uri string contains, that will be replaced when calculating      //the uri string contains, that will be replaced when calculating
105      //the uri to download.      //the uri to download.
106        OsmGpsMapSource_t map_source;
107      char *repo_uri;      char *repo_uri;
108        char *image_format;
109      int uri_format;      int uri_format;
110      //flag indicating if the map source is located on the google      //flag indicating if the map source is located on the google
111      gboolean the_google;      gboolean the_google;
# Line 95  struct _OsmGpsMapPrivate Line 117  struct _OsmGpsMapPrivate
117      coord_t *gps;      coord_t *gps;
118      gboolean gps_valid;      gboolean gps_valid;
119    
120    #ifdef ENABLE_BALLOON
121        //a balloon with additional info
122        struct {
123            coord_t *coo;
124            gboolean valid;
125            OsmGpsMapRect_t rect;
126            OsmGpsMapBalloonCallback cb;
127            gpointer data;
128        } balloon;
129    #endif
130    
131    #ifdef ENABLE_OSD
132        //the osd controls (if present)
133        osm_gps_map_osd_t *osd;
134    #ifdef OSD_DOUBLE_BUFFER
135        GdkPixmap *dbuf_pixmap;
136    #endif
137    #endif
138    
139    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
140        gboolean fullscreen;
141    #endif
142    
143      //additional images or tracks added to the map      //additional images or tracks added to the map
144      GSList *tracks;      GSList *tracks;
145      GSList *images;      GSList *images;
# Line 104  struct _OsmGpsMapPrivate Line 149  struct _OsmGpsMapPrivate
149      GdkGC *gc_map;      GdkGC *gc_map;
150    
151      //The tile painted when one cannot be found      //The tile painted when one cannot be found
152      //GdkPixbuf *missing_tile;      GdkPixbuf *null_tile;
153    
154      //For tracking click and drag      //For tracking click and drag
155      int drag_counter;      int drag_counter;
# Line 146  enum Line 191  enum
191      PROP_REPO_URI,      PROP_REPO_URI,
192      PROP_PROXY_URI,      PROP_PROXY_URI,
193      PROP_TILE_CACHE_DIR,      PROP_TILE_CACHE_DIR,
     PROP_TILE_CACHE_DIR_IS_FULL_PATH,  
194      PROP_ZOOM,      PROP_ZOOM,
195      PROP_MAX_ZOOM,      PROP_MAX_ZOOM,
196      PROP_MIN_ZOOM,      PROP_MIN_ZOOM,
# Line 157  enum Line 201  enum
201      PROP_TILES_QUEUED,      PROP_TILES_QUEUED,
202      PROP_GPS_TRACK_WIDTH,      PROP_GPS_TRACK_WIDTH,
203      PROP_GPS_POINT_R1,      PROP_GPS_POINT_R1,
204      PROP_GPS_POINT_R2      PROP_GPS_POINT_R2,
205        PROP_MAP_SOURCE,
206        PROP_IMAGE_FORMAT
207  };  };
208    
209  G_DEFINE_TYPE (OsmGpsMap, osm_gps_map, GTK_TYPE_DRAWING_AREA);  G_DEFINE_TYPE (OsmGpsMap, osm_gps_map, GTK_TYPE_DRAWING_AREA);
# Line 171  static gchar    *replace_map_uri(OsmGpsM Line 217  static gchar    *replace_map_uri(OsmGpsM
217  static void     osm_gps_map_print_images (OsmGpsMap *map);  static void     osm_gps_map_print_images (OsmGpsMap *map);
218  static void     osm_gps_map_draw_gps_point (OsmGpsMap *map);  static void     osm_gps_map_draw_gps_point (OsmGpsMap *map);
219  static void     osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y);  static void     osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y);
220    #ifdef LIBSOUP22
221    static void     osm_gps_map_tile_download_complete (SoupMessage *msg, gpointer user_data);
222    #else
223    static void     osm_gps_map_tile_download_complete (SoupSession *session, SoupMessage *msg, gpointer user_data);
224    #endif
225  static void     osm_gps_map_download_tile (OsmGpsMap *map, int zoom, int x, int y, gboolean redraw);  static void     osm_gps_map_download_tile (OsmGpsMap *map, int zoom, int x, int y, gboolean redraw);
226  static void     osm_gps_map_load_tile (OsmGpsMap *map, int zoom, int x, int y, int offset_x, int offset_y);  static void     osm_gps_map_load_tile (OsmGpsMap *map, int zoom, int x, int y, int offset_x, int offset_y);
227  static void     osm_gps_map_fill_tiles_pixel (OsmGpsMap *map);  static void     osm_gps_map_fill_tiles_pixel (OsmGpsMap *map);
# Line 300  static void Line 351  static void
351  inspect_map_uri(OsmGpsMap *map)  inspect_map_uri(OsmGpsMap *map)
352  {  {
353      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
354        priv->uri_format = 0;
355        priv->the_google = FALSE;
356    
357      if (g_strrstr(priv->repo_uri, URI_MARKER_X))      if (g_strrstr(priv->repo_uri, URI_MARKER_X))
358          priv->uri_format |= URI_HAS_X;          priv->uri_format |= URI_HAS_X;
# Line 420  my_log_handler (const gchar * log_domain Line 473  my_log_handler (const gchar * log_domain
473          g_log_default_handler (log_domain, log_level, message, user_data);          g_log_default_handler (log_domain, log_level, message, user_data);
474  }  }
475    
476    static float
477    osm_gps_map_get_scale_at_point(int zoom, float rlat, float rlon)
478    {
479        /* world at zoom 1 == 512 pixels */
480        return cos(rlat) * M_PI * OSM_EQ_RADIUS / (1<<(7+zoom));
481    }
482    
483  /* clears the trip list and all resources */  /* clears the trip list and all resources */
484  static void  static void
485  osm_gps_map_free_trip (OsmGpsMap *map)  osm_gps_map_free_trip (OsmGpsMap *map)
# Line 529  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 589  osm_gps_map_draw_gps_point (OsmGpsMap *m
589          int x, y;          int x, y;
590          int r = priv->ui_gps_point_inner_radius;          int r = priv->ui_gps_point_inner_radius;
591          int r2 = priv->ui_gps_point_outer_radius;          int r2 = priv->ui_gps_point_outer_radius;
592            // int lw = priv->ui_gps_track_width;
593          int mr = MAX(r,r2);          int mr = MAX(r,r2);
594    
595          map_x0 = priv->map_x - EXTRA_BORDER;          map_x0 = priv->map_x - EXTRA_BORDER;
# Line 539  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 600  osm_gps_map_draw_gps_point (OsmGpsMap *m
600          cairo_t *cr;          cairo_t *cr;
601          cairo_pattern_t *pat;          cairo_pattern_t *pat;
602  #else  #else
         int lw = priv->ui_gps_track_width;  
603          GdkColor color;          GdkColor color;
604          GdkGC *marker;          GdkGC *marker;
605  #endif  #endif
# Line 614  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 674  osm_gps_map_draw_gps_point (OsmGpsMap *m
674                                      (mr*2)+lw+lw);                                      (mr*2)+lw+lw);
675  #endif  #endif
676      }      }
677    }
678    
679    #ifdef ENABLE_BALLOON
680    /* most visual effects are hardcoded by now, but may be made */
681    /* available via properties later */
682    #ifndef BALLOON_AREA_WIDTH
683    #define BALLOON_AREA_WIDTH           290
684    #endif
685    #ifndef BALLOON_AREA_HEIGHT
686    #define BALLOON_AREA_HEIGHT           75
687    #endif
688    #ifndef BALLOON_CORNER_RADIUS
689    #define BALLOON_CORNER_RADIUS         10
690    #endif
691    
692    #define BALLOON_BORDER               (BALLOON_CORNER_RADIUS/2)
693    #define BALLOON_WIDTH                (BALLOON_AREA_WIDTH + 2 * BALLOON_BORDER)
694    #define BALLOON_HEIGHT               (BALLOON_AREA_HEIGHT + 2 * BALLOON_BORDER)
695    #define BALLOON_TRANSPARENCY         0.8
696    #define POINTER_HEIGHT                20
697    #define POINTER_FOOT_WIDTH            20
698    #define POINTER_OFFSET               (BALLOON_CORNER_RADIUS*3/4)
699    #define BALLOON_SHADOW               (BALLOON_CORNER_RADIUS/2)
700    #define BALLOON_SHADOW_TRANSPARENCY  0.2
701    
702    #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
703    
704    
705    /* draw the bubble shape. this is used twice, once for the shape and once */
706    /* for the shadow */
707    static void
708    osm_gps_map_draw_balloon_shape (cairo_t *cr, int x0, int y0, int x1, int y1,
709           gboolean bottom, int px, int py, int px0, int px1) {
710    
711        cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);
712        cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
713                   BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);
714        if(!bottom) {
715            /* insert top pointer */
716            cairo_line_to (cr, px1, y0);
717            cairo_line_to (cr, px, py);
718            cairo_line_to (cr, px0, y0);
719        }
720    
721        cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0);
722        cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
723                   BALLOON_CORNER_RADIUS, -M_PI/2, 0);
724        cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS);
725        cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
726                   BALLOON_CORNER_RADIUS, 0, M_PI/2);
727        if(bottom) {
728            /* insert bottom pointer */
729            cairo_line_to (cr, px0, y1);
730            cairo_line_to (cr, px, py);
731            cairo_line_to (cr, px1, y1);
732        }
733    
734        cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1);
735        cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
736                   BALLOON_CORNER_RADIUS, M_PI/2, M_PI);
737    
738        cairo_close_path (cr);
739    }
740    
741    static void
742    osm_gps_map_draw_balloon_int (OsmGpsMap *map)
743    {
744        OsmGpsMapPrivate *priv = map->priv;
745    
746        if (priv->balloon.valid) {
747    
748            /* ------- convert given coordinate into screen position --------- */
749            int x0 = lon2pixel(priv->map_zoom, priv->balloon.coo->rlon) -
750                priv->map_x + EXTRA_BORDER;
751            int y0 = lat2pixel(priv->map_zoom, priv->balloon.coo->rlat) -
752                priv->map_y + EXTRA_BORDER;
753    
754            /* check position of this relative to screen center to determine */
755            /* pointer direction ... */
756            int pointer_x = x0, pointer_x0, pointer_x1;
757            int pointer_y = y0;
758    
759            /* ... and calculate position */
760            if((x0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.width/2) {
761                x0 -= BALLOON_WIDTH - POINTER_OFFSET;
762                pointer_x0 = pointer_x - (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
763                pointer_x1 = pointer_x0 - POINTER_FOOT_WIDTH;
764            } else {
765                x0 -= POINTER_OFFSET;
766                pointer_x1 = pointer_x + (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
767                pointer_x0 = pointer_x1 + POINTER_FOOT_WIDTH;
768            }
769    
770            gboolean bottom = FALSE;
771            if((y0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.height/2) {
772                bottom = TRUE;
773                y0 -= BALLOON_HEIGHT + POINTER_HEIGHT;
774            } else
775                y0 += POINTER_HEIGHT;
776    
777            /* calculate bottom/right of box */
778            int x1 = x0 + BALLOON_WIDTH, y1 = y0 + BALLOON_HEIGHT;
779    
780            /* save balloon screen coordinates for later use */
781            priv->balloon.rect.x = x0 + BALLOON_BORDER;
782            priv->balloon.rect.y = y0 + BALLOON_BORDER;
783            priv->balloon.rect.w = x1 - x0 - 2*BALLOON_BORDER;
784            priv->balloon.rect.h = y1 - y0 - 2*BALLOON_BORDER;
785    
786    #ifdef USE_CAIRO
787            cairo_t *cr = gdk_cairo_create(priv->pixmap);
788    
789            /* --------- draw shadow --------------- */
790            osm_gps_map_draw_balloon_shape (cr,
791                        x0 + BALLOON_SHADOW, y0 + BALLOON_SHADOW,
792                        x1 + BALLOON_SHADOW, y1 + BALLOON_SHADOW,
793                        bottom, pointer_x, pointer_y,
794                        pointer_x0 + BALLOON_SHADOW, pointer_x1 + BALLOON_SHADOW);
795    
796            cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_SHADOW_TRANSPARENCY);
797            cairo_fill_preserve (cr);
798            cairo_set_source_rgba (cr, 1, 0, 0, 1.0);
799            cairo_set_line_width (cr, 0);
800            cairo_stroke (cr);
801    
802            /* --------- draw main shape ----------- */
803            osm_gps_map_draw_balloon_shape (cr, x0, y0, x1, y1,
804                        bottom, pointer_x, pointer_y, pointer_x0, pointer_x1);
805    
806            cairo_set_source_rgba (cr, 1, 1, 1, BALLOON_TRANSPARENCY);
807            cairo_fill_preserve (cr);
808            cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_TRANSPARENCY);
809            cairo_set_line_width (cr, 1);
810            cairo_stroke (cr);
811    
812    
813            /* ---------- draw close button --------- */
814    
815            int cx = x1 - BALLOON_BORDER - CLOSE_BUTTON_RADIUS;
816            int cy = y0 + BALLOON_BORDER + CLOSE_BUTTON_RADIUS;
817            int crad = CLOSE_BUTTON_RADIUS;
818    
819            cairo_arc (cr, cx, cy, crad, 0, 2 * M_PI);
820            cairo_set_source_rgba (cr, 0.8, 0, 0, 1.0);
821            cairo_fill_preserve (cr);
822            cairo_set_source_rgba (cr, 0.3, 0, 0, 1.0);
823            cairo_set_line_width (cr, 2);
824            cairo_stroke(cr);
825    
826            cairo_set_source_rgba (cr, 1, 1, 1, 1.0);
827            cairo_set_line_width (cr, BALLOON_CORNER_RADIUS/3.3);
828            cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
829            cairo_move_to (cr, cx - crad/2, cy - crad/2);
830            cairo_line_to (cr, cx + crad/2, cy + crad/2);
831            cairo_stroke (cr);
832            cairo_move_to (cr, cx + crad/2, cy - crad/2);
833            cairo_line_to (cr, cx - crad/2, cy + crad/2);
834            cairo_stroke (cr);
835    
836            if (priv->balloon.cb) {
837                /* clip in case application tries to draw in */
838                /* exceed of the balloon */
839                cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,
840                                 priv->balloon.rect.w, priv->balloon.rect.h);
841                cairo_clip (cr);
842                cairo_new_path (cr);  /* current path is not
843                                         consumed by cairo_clip() */
844    
845                priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);
846            }
847    
848            cairo_destroy(cr);
849    
850            gtk_widget_queue_draw_area (GTK_WIDGET(map),
851                                        x0, y0, BALLOON_WIDTH,
852                                        BALLOON_HEIGHT + POINTER_HEIGHT);
853    #else
854    #warning "Balloon display lacks a non-cairo implementation!"
855    #endif
856        }
857  }  }
858    
859    /* the user clicked into the balloons main area. handle this */
860    static void
861    osm_gps_map_handle_balloon_click(OsmGpsMap *map, gint x, gint y)
862    {
863        OsmGpsMapPrivate *priv = map->priv;
864    
865        if (!priv->balloon.valid)
866            return;
867    
868        /* check if the close button was clicked */
869        if ((x > priv->balloon.rect.w - 2*CLOSE_BUTTON_RADIUS) &&
870            (x < priv->balloon.rect.w) &&
871            (y > 0) && (y < 2*CLOSE_BUTTON_RADIUS)) {
872    
873            priv->balloon.valid = FALSE;
874            osm_gps_map_map_redraw_idle(map);
875        }
876    }
877    
878    /* return true if balloon is being displayed and if */
879    /* the given coordinate is within this balloon */
880    static gboolean
881    osm_gps_map_in_balloon(OsmGpsMapPrivate *priv, gint x, gint y)
882    {
883        return (priv->balloon.valid &&
884                (x > priv->balloon.rect.x) &&
885                (x < priv->balloon.rect.x + priv->balloon.rect.w) &&
886                (y > priv->balloon.rect.y) &&
887                (y < priv->balloon.rect.y + priv->balloon.rect.h));
888    }
889    #endif // ENABLE_BALLOON
890    
891  static void  static void
892  osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)  osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)
893  {  {
894      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
895    
896      g_debug("Queing redraw @ %d,%d (w:%d h:%d)", offset_x,offset_y,      g_debug("Queing redraw @ %d,%d (w:%d h:%d)", offset_x,offset_y, TILESIZE,TILESIZE);
             TILESIZE,TILESIZE);  
897    
898      /* draw pixbuf onto pixmap */      /* draw pixbuf onto pixmap */
899      gdk_draw_pixbuf (priv->pixmap,      gdk_draw_pixbuf (priv->pixmap,
# Line 654  static void Line 925  static void
925  osm_gps_map_tile_download_complete (SoupSession *session, SoupMessage *msg, gpointer user_data)  osm_gps_map_tile_download_complete (SoupSession *session, SoupMessage *msg, gpointer user_data)
926  #endif  #endif
927  {  {
928      int fd;      FILE *file;
929      tile_download_t *dl = (tile_download_t *)user_data;      tile_download_t *dl = (tile_download_t *)user_data;
930      OsmGpsMap *map = OSM_GPS_MAP(dl->map);      OsmGpsMap *map = OSM_GPS_MAP(dl->map);
931      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
# Line 667  osm_gps_map_tile_download_complete (Soup Line 938  osm_gps_map_tile_download_complete (Soup
938          {          {
939              if (g_mkdir_with_parents(dl->folder,0700) == 0)              if (g_mkdir_with_parents(dl->folder,0700) == 0)
940              {              {
941                  fd = open(dl->filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);                  file = g_fopen(dl->filename, "wb");
942                  if (fd != -1)                  if (file != NULL)
943                  {                  {
944                      write (fd, MSG_RESPONSE_BODY(msg), MSG_RESPONSE_LEN(msg));                      fwrite (MSG_RESPONSE_BODY(msg), 1, MSG_RESPONSE_LEN(msg), file);
945                      file_saved = TRUE;                      file_saved = TRUE;
946                        g_debug("Wrote "MSG_RESPONSE_LEN_FORMAT" bytes to %s", MSG_RESPONSE_LEN(msg), dl->filename);
947                        fclose (file);
948    
                     g_debug("Wrote " MSG_RESPONSE_LEN_FORMAT " bytes to %s", MSG_RESPONSE_LEN(msg), dl->filename);  
                     close (fd);  
949                  }                  }
950              }              }
951              else              else
952              {              {
953                  g_warning("Error creating tile download directory: %s", dl->folder);                  g_warning("Error creating tile download directory: %s",
954                              dl->folder);
955                    perror("perror:");
956              }              }
957          }          }
958    
# Line 687  osm_gps_map_tile_download_complete (Soup Line 960  osm_gps_map_tile_download_complete (Soup
960          {          {
961              GdkPixbuf *pixbuf = NULL;              GdkPixbuf *pixbuf = NULL;
962    
963                /* if the file was actually stored on disk, we can simply */
964                /* load and decode it from that file */
965              if (priv->cache_dir)              if (priv->cache_dir)
966              {              {
967                  if (file_saved)                  if (file_saved)
# Line 720  osm_gps_map_tile_download_complete (Soup Line 995  osm_gps_map_tile_download_complete (Soup
995                      g_warning("Error: Unable to determine image file format");                      g_warning("Error: Unable to determine image file format");
996                  }                  }
997              }              }
998    
999              /* Store the tile into the cache */              /* Store the tile into the cache */
1000              if (G_LIKELY (pixbuf))              if (G_LIKELY (pixbuf))
1001              {              {
# Line 735  osm_gps_map_tile_download_complete (Soup Line 1010  osm_gps_map_tile_download_complete (Soup
1010                   * we are using it as a key in the hash table */                   * we are using it as a key in the hash table */
1011                  dl->filename = NULL;                  dl->filename = NULL;
1012              }              }
   
1013              osm_gps_map_map_redraw_idle (map);              osm_gps_map_map_redraw_idle (map);
1014          }          }
1015          g_hash_table_remove(priv->tile_queue, dl->uri);          g_hash_table_remove(priv->tile_queue, dl->uri);
# Line 794  osm_gps_map_download_tile (OsmGpsMap *ma Line 1068  osm_gps_map_download_tile (OsmGpsMap *ma
1068          g_free(dl->uri);          g_free(dl->uri);
1069          g_free(dl);          g_free(dl);
1070      } else {      } else {
1071          dl->folder = g_strdup_printf("%s/%d/%d/",priv->cache_dir, zoom, x);          dl->folder = g_strdup_printf("%s%c%d%c%d%c",
1072          dl->filename = g_strdup_printf("%s/%d/%d/%d.png",priv->cache_dir, zoom, x, y);                              priv->cache_dir, G_DIR_SEPARATOR,
1073                                zoom, G_DIR_SEPARATOR,
1074                                x, G_DIR_SEPARATOR);
1075            dl->filename = g_strdup_printf("%s%c%d%c%d%c%d.%s",
1076                                priv->cache_dir, G_DIR_SEPARATOR,
1077                                zoom, G_DIR_SEPARATOR,
1078                                x, G_DIR_SEPARATOR,
1079                                y,
1080                                priv->image_format);
1081          dl->map = map;          dl->map = map;
1082          dl->redraw = redraw;          dl->redraw = redraw;
1083    
# Line 813  osm_gps_map_download_tile (OsmGpsMap *ma Line 1095  osm_gps_map_download_tile (OsmGpsMap *ma
1095                      if (cookie) {                      if (cookie) {
1096                          g_debug("Adding Google Cookie");                          g_debug("Adding Google Cookie");
1097                          soup_message_headers_append(msg->request_headers, "Cookie", cookie);                          soup_message_headers_append(msg->request_headers, "Cookie", cookie);
   
1098                      }                      }
1099                  }                  }
1100              }              }
1101    
1102    #ifdef LIBSOUP22
1103                soup_message_headers_append(msg->request_headers,
1104                                            "User-Agent", USER_AGENT);
1105    #endif
1106    
1107              g_hash_table_insert (priv->tile_queue, dl->uri, msg);              g_hash_table_insert (priv->tile_queue, dl->uri, msg);
1108              soup_session_queue_message (priv->soup_session, msg, osm_gps_map_tile_download_complete, dl);              soup_session_queue_message (priv->soup_session, msg, osm_gps_map_tile_download_complete, dl);
1109          } else {          } else {
# Line 835  osm_gps_map_load_cached_tile (OsmGpsMap Line 1121  osm_gps_map_load_cached_tile (OsmGpsMap
1121  {  {
1122      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1123      gchar *filename;      gchar *filename;
1124      GdkPixbuf *pixbuf;      GdkPixbuf *pixbuf = NULL;
1125      OsmCachedTile *tile;      OsmCachedTile *tile;
1126    
1127      filename = g_strdup_printf("%s/%u/%u/%u.png",      filename = g_strdup_printf("%s%c%d%c%d%c%d.%s",
1128                                 priv->cache_dir,                  priv->cache_dir, G_DIR_SEPARATOR,
1129                                 zoom, x, y);                  zoom, G_DIR_SEPARATOR,
1130                    x, G_DIR_SEPARATOR,
1131                    y,
1132                    priv->image_format);
1133    
1134      tile = g_hash_table_lookup (priv->tile_cache, filename);      tile = g_hash_table_lookup (priv->tile_cache, filename);
1135      if (tile)      if (tile)
1136      {      {
1137          g_free (filename);          g_free (filename);
1138      }      }
1139      else if (priv->cache_dir)      else
1140      {      {
1141          pixbuf = gdk_pixbuf_new_from_file (filename, NULL);          pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
1142          if (pixbuf)          if (pixbuf)
# Line 863  osm_gps_map_load_cached_tile (OsmGpsMap Line 1152  osm_gps_map_load_cached_tile (OsmGpsMap
1152      {      {
1153          tile->redraw_cycle = priv->redraw_cycle;          tile->redraw_cycle = priv->redraw_cycle;
1154          pixbuf = g_object_ref (tile->pixbuf);          pixbuf = g_object_ref (tile->pixbuf);
1155      } else      }
         pixbuf = NULL;  
1156    
1157      return pixbuf;      return pixbuf;
1158  }  }
# Line 928  static void Line 1216  static void
1216  osm_gps_map_load_tile (OsmGpsMap *map, int zoom, int x, int y, int offset_x, int offset_y)  osm_gps_map_load_tile (OsmGpsMap *map, int zoom, int x, int y, int offset_x, int offset_y)
1217  {  {
1218      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1219        gchar *filename;
1220      GdkPixbuf *pixbuf;      GdkPixbuf *pixbuf;
1221    
1222      g_debug("Load tile %d,%d (%d,%d) z:%d", x, y, offset_x, offset_y, zoom);      g_debug("Load tile %d,%d (%d,%d) z:%d", x, y, offset_x, offset_y, zoom);
1223    
1224      /* try to get file from internal cache */      if (priv->map_source == OSM_GPS_MAP_SOURCE_NULL) {
1225      pixbuf = osm_gps_map_load_cached_tile(map, zoom, x, y);          osm_gps_map_blit_tile(map, priv->null_tile, offset_x,offset_y);
1226            return;
1227        }
1228    
1229      /* if a disk cache is being used, try to read the file from there */      filename = g_strdup_printf("%s%c%d%c%d%c%d.%s",
1230      if (priv->cache_dir && !pixbuf)                  priv->cache_dir, G_DIR_SEPARATOR,
1231      {                  zoom, G_DIR_SEPARATOR,
1232          gchar *filename;                  x, G_DIR_SEPARATOR,
1233          filename = g_strdup_printf("%s/%u/%u/%u.png",                  y,
1234                                     priv->cache_dir,                  priv->image_format);
                                    zoom, x, y);  
   
         pixbuf = gdk_pixbuf_new_from_file (filename, NULL);  
         if (pixbuf)  
         {  
             g_debug("Found tile %s", filename);  
         }  
1235    
1236          g_free(filename);      /* try to get file from internal cache first */
1237      }      if(!(pixbuf = osm_gps_map_load_cached_tile(map, zoom, x, y)))
1238            pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
1239    
1240      if (G_LIKELY(pixbuf))      if(pixbuf)
1241      {      {
1242            g_debug("Found tile %s", filename);
1243          osm_gps_map_blit_tile(map, pixbuf, offset_x,offset_y);          osm_gps_map_blit_tile(map, pixbuf, offset_x,offset_y);
1244          g_object_unref (pixbuf);          g_object_unref (pixbuf);
1245      }      }
# Line 984  osm_gps_map_load_tile (OsmGpsMap *map, i Line 1270  osm_gps_map_load_tile (OsmGpsMap *map, i
1270                                  TRUE, offset_x, offset_y, TILESIZE, TILESIZE);                                  TRUE, offset_x, offset_y, TILESIZE, TILESIZE);
1271          }          }
1272      }      }
1273        g_free(filename);
1274  }  }
1275    
1276  static void  static void
# Line 1077  osm_gps_map_print_track (OsmGpsMap *map, Line 1364  osm_gps_map_print_track (OsmGpsMap *map,
1364    
1365      map_x0 = priv->map_x - EXTRA_BORDER;      map_x0 = priv->map_x - EXTRA_BORDER;
1366      map_y0 = priv->map_y - EXTRA_BORDER;      map_y0 = priv->map_y - EXTRA_BORDER;
   
1367      for(list = trackpoint_list; list != NULL; list = list->next)      for(list = trackpoint_list; list != NULL; list = list->next)
1368      {      {
1369          coord_t *tp = list->data;          coord_t *tp = list->data;
# Line 1132  osm_gps_map_print_tracks (OsmGpsMap *map Line 1418  osm_gps_map_print_tracks (OsmGpsMap *map
1418    
1419      if (priv->show_trip_history)      if (priv->show_trip_history)
1420          osm_gps_map_print_track (map, priv->trip_history);          osm_gps_map_print_track (map, priv->trip_history);
1421    
1422      if (priv->tracks)      if (priv->tracks)
1423      {      {
         g_debug("TRACK");  
1424          GSList* tmp = priv->tracks;          GSList* tmp = priv->tracks;
1425          while (tmp != NULL)          while (tmp != NULL)
1426          {          {
# Line 1144  osm_gps_map_print_tracks (OsmGpsMap *map Line 1430  osm_gps_map_print_tracks (OsmGpsMap *map
1430      }      }
1431  }  }
1432    
1433  static gboolean  static gboolean
1434  osm_gps_map_purge_cache_check(gpointer key, gpointer value, gpointer user)  osm_gps_map_purge_cache_check(gpointer key, gpointer value, gpointer user)
1435  {  {
1436      return(((OsmCachedTile*)value)->redraw_cycle != ((OsmGpsMapPrivate*)user)->redraw_cycle);     return (((OsmCachedTile*)value)->redraw_cycle != ((OsmGpsMapPrivate*)user)->redraw_cycle);
1437  }  }
1438    
1439  static void  static void
1440  osm_gps_map_purge_cache (OsmGpsMap *map)  osm_gps_map_purge_cache (OsmGpsMap *map)
1441  {  {
1442      OsmGpsMapPrivate *priv = map->priv;     OsmGpsMapPrivate *priv = map->priv;
1443    
1444      if (g_hash_table_size (priv->tile_cache) < priv->max_tile_cache_size)     if (g_hash_table_size (priv->tile_cache) < priv->max_tile_cache_size)
1445          return;         return;
1446    
1447      /* run through the cache, and remove the tiles which have not been used     /* run through the cache, and remove the tiles which have not been used
1448       * during the last redraw operation */      * during the last redraw operation */
1449      g_hash_table_foreach_remove(priv->tile_cache, osm_gps_map_purge_cache_check, priv);     g_hash_table_foreach_remove(priv->tile_cache, osm_gps_map_purge_cache_check, priv);
1450  }  }
1451    
1452  static gboolean  static gboolean
# Line 1170  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1456  osm_gps_map_map_redraw (OsmGpsMap *map)
1456    
1457      priv->idle_map_redraw = 0;      priv->idle_map_redraw = 0;
1458    
1459        /* don't redraw the entire map while the OSD is doing */
1460        /* some animation or the like. This is to keep the animation */
1461        /* fluid */
1462        if (priv->osd->busy(priv->osd))
1463            return FALSE;
1464    
1465      /* the motion_notify handler uses priv->pixmap to redraw the area; if we      /* the motion_notify handler uses priv->pixmap to redraw the area; if we
1466       * change it while we are dragging, we will end up showing it in the wrong       * change it while we are dragging, we will end up showing it in the wrong
1467       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1193  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1485  osm_gps_map_map_redraw (OsmGpsMap *map)
1485      osm_gps_map_print_tracks(map);      osm_gps_map_print_tracks(map);
1486      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1487      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1488    #ifdef ENABLE_BALLOON
1489        osm_gps_map_draw_balloon_int(map);
1490    #endif
1491    
1492      //osm_gps_map_osd_speed(map, 1.5);      //osm_gps_map_osd_speed(map, 1.5);
1493      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
# Line 1210  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1505  osm_gps_map_map_redraw_idle (OsmGpsMap *
1505          priv->idle_map_redraw = g_idle_add ((GSourceFunc)osm_gps_map_map_redraw, map);          priv->idle_map_redraw = g_idle_add ((GSourceFunc)osm_gps_map_map_redraw, map);
1506  }  }
1507    
1508    #ifdef OSM_GPS_MAP_KEYS
1509    static gboolean
1510    on_window_key_press(GtkWidget *widget,
1511                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1512      gboolean handled = FALSE;
1513      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1514    
1515      // the map handles some keys on its own ...
1516      switch(event->keyval) {
1517    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1518      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1519          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1520          if(!priv->fullscreen)
1521              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1522          else
1523              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1524    
1525          priv->fullscreen = !priv->fullscreen;
1526          handled = TRUE;
1527          } break;
1528    #endif
1529    
1530    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1531      case OSM_GPS_MAP_KEY_ZOOMIN:
1532          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1533          handled = TRUE;
1534          break;
1535    #endif
1536    
1537    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1538      case OSM_GPS_MAP_KEY_ZOOMOUT:
1539          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1540          handled = TRUE;
1541          break;
1542    #endif
1543    
1544    #ifdef OSM_GPS_MAP_KEY_UP
1545      case OSM_GPS_MAP_KEY_UP:
1546          priv->map_y -= step;
1547          priv->center_coord_set = FALSE;
1548          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1549          handled = TRUE;
1550          break;
1551    #endif
1552    
1553    #ifdef OSM_GPS_MAP_KEY_DOWN
1554      case OSM_GPS_MAP_KEY_DOWN:
1555          priv->map_y += step;
1556          priv->center_coord_set = FALSE;
1557          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1558          handled = TRUE;
1559          break;
1560    #endif
1561    
1562    #ifdef OSM_GPS_MAP_KEY_LEFT
1563      case OSM_GPS_MAP_KEY_LEFT:
1564          priv->map_x -= step;
1565          priv->center_coord_set = FALSE;
1566          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1567          handled = TRUE;
1568          break;
1569    #endif
1570    
1571    #ifdef OSM_GPS_MAP_KEY_RIGHT
1572      case OSM_GPS_MAP_KEY_RIGHT:
1573          priv->map_x += step;
1574          priv->center_coord_set = FALSE;
1575          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1576          handled = TRUE;
1577          break;
1578    #endif
1579    
1580      default:
1581          break;
1582      }
1583    
1584      return handled;
1585    }
1586    #endif
1587    
1588  static void  static void
1589  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1590  {  {
# Line 1224  osm_gps_map_init (OsmGpsMap *object) Line 1599  osm_gps_map_init (OsmGpsMap *object)
1599      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1600      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1601    
1602    #ifdef ENABLE_BALLOON
1603        priv->balloon.coo = g_new0(coord_t, 1);
1604        priv->balloon.valid = FALSE;
1605        priv->balloon.cb = NULL;
1606    #endif
1607    
1608    #ifdef ENABLE_OSD
1609        priv->osd = NULL;
1610    #endif
1611    
1612    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1613        priv->fullscreen = FALSE;
1614    #endif
1615    
1616      priv->tracks = NULL;      priv->tracks = NULL;
1617      priv->images = NULL;      priv->images = NULL;
1618    
# Line 1236  osm_gps_map_init (OsmGpsMap *object) Line 1625  osm_gps_map_init (OsmGpsMap *object)
1625      priv->uri_format = 0;      priv->uri_format = 0;
1626      priv->the_google = FALSE;      priv->the_google = FALSE;
1627    
1628        priv->map_source = -1;
1629    
1630  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1631      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1632      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session =
1633                                                               SOUP_SESSION_USER_AGENT,          soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
1634                                                               "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11",                                              USER_AGENT, NULL);
                                                              NULL);  
1635  #else  #else
1636      /* libsoup-2.2 seems not to be able to set the user agent */      /* libsoup-2.2 has no special way to set the user agent, so we */
1637        /* set it seperately as an extra header field for each reuest */
1638      priv->soup_session = soup_session_async_new();      priv->soup_session = soup_session_async_new();
1639  #endif  #endif
1640    
# Line 1266  osm_gps_map_init (OsmGpsMap *object) Line 1657  osm_gps_map_init (OsmGpsMap *object)
1657      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1658    
1659      g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, my_log_handler, NULL);      g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, my_log_handler, NULL);
1660    
1661    #ifdef OSM_GPS_MAP_KEYS
1662        g_signal_connect(G_OBJECT(object), "key_press_event",
1663                         G_CALLBACK(on_window_key_press), priv);
1664    #endif
1665  }  }
1666    
1667  #ifndef G_CHECKSUM_MD5  static void
1668  /* simple hash algorithm hack if md5 is not present */  osm_gps_map_setup(OsmGpsMapPrivate *priv) {
1669  static char *simple_hash(char *str) {      const char *uri;
1670      union {  
1671          char str[4];      //user can specify a map source ID, or a repo URI as the map source
1672          gulong val;      uri = osm_gps_map_source_get_repo_uri(OSM_GPS_MAP_SOURCE_NULL);
1673      } hash = { .val = 0x55555555 };      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
1674            g_debug("Using null source");
1675      while(*str) {          priv->map_source = OSM_GPS_MAP_SOURCE_NULL;
1676          hash.str[(int)str & 3] ^= *str;  
1677          str++;          priv->null_tile = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, 256, 256);
1678            gdk_pixbuf_fill(priv->null_tile, 0xcccccc00);
1679        }
1680        else if (priv->map_source >= 0) {
1681            //check if the source given is valid
1682            uri = osm_gps_map_source_get_repo_uri(priv->map_source);
1683            if (uri) {
1684                g_debug("Setting map source from ID");
1685                g_free(priv->repo_uri);
1686    
1687                priv->repo_uri = g_strdup(uri);
1688                priv->image_format = g_strdup(
1689                    osm_gps_map_source_get_image_format(priv->map_source));
1690                priv->max_zoom = osm_gps_map_source_get_max_zoom(priv->map_source);
1691                priv->min_zoom = osm_gps_map_source_get_min_zoom(priv->map_source);
1692            }
1693        }
1694    
1695        const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1696        if(!fname) fname = "_unknown_";
1697    
1698        if (priv->tile_dir) {
1699            //the new cachedir is the given cache dir + the friendly name of the repo_uri
1700            priv->cache_dir = g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);
1701            g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);
1702      }      }
     return g_strdup_printf("%08lX", hash.val);  
1703  }  }
 #endif  
1704    
1705  static GObject *  static GObject *
1706  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
1707  {  {
     GObject *object;  
     OsmGpsMapPrivate *priv;  
   
1708      //Always chain up to the parent constructor      //Always chain up to the parent constructor
1709      object = G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);      GObject *object =
1710      priv = OSM_GPS_MAP_PRIVATE(object);          G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1711    
1712      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  
   
         if (priv->cache_dir) {  
             char *old = priv->cache_dir;  
             //the new cachedir is the given cache dir + the md5 of the repo_uri  
             priv->cache_dir = g_strdup_printf("%s/%s", old, md5);  
             g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);  
             g_free(old);  
         }  
1713    
1714          g_free(md5);      inspect_map_uri(OSM_GPS_MAP(object));
     }  
1715    
1716      return object;      return object;
1717  }  }
# Line 1338  osm_gps_map_dispose (GObject *object) Line 1739  osm_gps_map_dispose (GObject *object)
1739      if(priv->pixmap)      if(priv->pixmap)
1740          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
1741    
1742        if (priv->null_tile)
1743            g_object_unref (priv->null_tile);
1744    
1745      if(priv->gc_map)      if(priv->gc_map)
1746          g_object_unref(priv->gc_map);          g_object_unref(priv->gc_map);
1747    
1748      if (priv->idle_map_redraw != 0)      if (priv->idle_map_redraw != 0)
1749          g_source_remove (priv->idle_map_redraw);          g_source_remove (priv->idle_map_redraw);
1750    
1751        g_free(priv->gps);
1752    
1753    #ifdef ENABLE_BALLOON
1754        g_free(priv->balloon.coo);
1755    #endif
1756    
1757    #ifdef ENABLE_OSD
1758        if(priv->osd)
1759            priv->osd->free(priv->osd);
1760    
1761    #ifdef OSD_DOUBLE_BUFFER
1762        if(priv->dbuf_pixmap)
1763            g_object_unref (priv->dbuf_pixmap);
1764    #endif
1765    #endif
1766    
1767      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
1768  }  }
1769    
# Line 1353  osm_gps_map_finalize (GObject *object) Line 1773  osm_gps_map_finalize (GObject *object)
1773      OsmGpsMap *map = OSM_GPS_MAP(object);      OsmGpsMap *map = OSM_GPS_MAP(object);
1774      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1775    
1776      g_free(priv->cache_dir);      if(priv->tile_dir)
1777            g_free(priv->tile_dir);
1778    
1779        if(priv->cache_dir)
1780            g_free(priv->cache_dir);
1781    
1782      g_free(priv->repo_uri);      g_free(priv->repo_uri);
1783        g_free(priv->image_format);
1784    
1785      osm_gps_map_free_trip(map);      osm_gps_map_free_trip(map);
1786      osm_gps_map_free_tracks(map);      osm_gps_map_free_tracks(map);
# Line 1385  osm_gps_map_set_property (GObject *objec Line 1811  osm_gps_map_set_property (GObject *objec
1811              break;              break;
1812          case PROP_REPO_URI:          case PROP_REPO_URI:
1813              priv->repo_uri = g_value_dup_string (value);              priv->repo_uri = g_value_dup_string (value);
             inspect_map_uri(map);  
1814              break;              break;
1815          case PROP_PROXY_URI:          case PROP_PROXY_URI:
1816              if ( g_value_get_string(value) ) {              if ( g_value_get_string(value) ) {
   
1817                  priv->proxy_uri = g_value_dup_string (value);                  priv->proxy_uri = g_value_dup_string (value);
1818                  g_debug("Setting proxy server: %s", priv->proxy_uri);                  g_debug("Setting proxy server: %s", priv->proxy_uri);
1819    
1820  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1821                  GValue val = {0};                  GValue val = {0};
1822    
1823                  SoupURI* uri = soup_uri_new(priv->proxy_uri);                  SoupURI* uri = soup_uri_new(priv->proxy_uri);
1824                  g_value_init(&val, SOUP_TYPE_URI);                  g_value_init(&val, SOUP_TYPE_URI);
1825                  g_value_take_boxed(&val, uri);                  g_value_take_boxed(&val, uri);
# Line 1403  osm_gps_map_set_property (GObject *objec Line 1829  osm_gps_map_set_property (GObject *objec
1829                  SoupUri* uri = soup_uri_new(priv->proxy_uri);                  SoupUri* uri = soup_uri_new(priv->proxy_uri);
1830                  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);
1831  #endif  #endif
                 soup_uri_free(uri);  
1832              } else              } else
1833                  priv->proxy_uri = NULL;                  priv->proxy_uri = NULL;
1834    
1835              break;              break;
1836          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1837              priv->cache_dir = g_value_dup_string (value);              if ( g_value_get_string(value) )
1838              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);  
1839              break;              break;
1840          case PROP_ZOOM:          case PROP_ZOOM:
1841              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 1863  osm_gps_map_set_property (GObject *objec
1863          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1864              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
1865              break;              break;
1866            case PROP_MAP_SOURCE: {
1867                gint old = priv->map_source;
1868                priv->map_source = g_value_get_int (value);
1869                if(old >= OSM_GPS_MAP_SOURCE_NULL &&
1870                   priv->map_source != old &&
1871                   priv->map_source >= OSM_GPS_MAP_SOURCE_NULL &&
1872                   priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) {
1873    
1874                    /* we now have to switch the entire map */
1875    
1876                    /* flush the ram cache */
1877                    g_hash_table_remove_all(priv->tile_cache);
1878    
1879                    osm_gps_map_setup(priv);
1880    
1881                    inspect_map_uri(map);
1882    
1883                    /* adjust zoom if necessary */
1884                    if(priv->map_zoom > priv->max_zoom)
1885                        osm_gps_map_set_zoom(map, priv->max_zoom);
1886    
1887                    if(priv->map_zoom < priv->min_zoom)
1888                        osm_gps_map_set_zoom(map, priv->min_zoom);
1889    
1890                } } break;
1891            case PROP_IMAGE_FORMAT:
1892                priv->image_format = g_value_dup_string (value);
1893                break;
1894          default:          default:
1895              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
1896              break;              break;
# Line 1477  osm_gps_map_get_property (GObject *objec Line 1928  osm_gps_map_get_property (GObject *objec
1928          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1929              g_value_set_string(value, priv->cache_dir);              g_value_set_string(value, priv->cache_dir);
1930              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             g_value_set_boolean(value, priv->cache_dir_is_full_path);  
             break;  
1931          case PROP_ZOOM:          case PROP_ZOOM:
1932              g_value_set_int(value, priv->map_zoom);              g_value_set_int(value, priv->map_zoom);
1933              break;              break;
# Line 1517  osm_gps_map_get_property (GObject *objec Line 1965  osm_gps_map_get_property (GObject *objec
1965          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1966              g_value_set_int(value, priv->ui_gps_point_outer_radius);              g_value_set_int(value, priv->ui_gps_point_outer_radius);
1967              break;              break;
1968            case PROP_MAP_SOURCE:
1969                g_value_set_int(value, priv->map_source);
1970                break;
1971            case PROP_IMAGE_FORMAT:
1972                g_value_set_string(value, priv->image_format);
1973                break;
1974          default:          default:
1975              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
1976              break;              break;
# Line 1524  osm_gps_map_get_property (GObject *objec Line 1978  osm_gps_map_get_property (GObject *objec
1978  }  }
1979    
1980  static gboolean  static gboolean
1981  _osm_gps_map_scroll (GtkWidget *widget, GdkEventScroll  *event)  osm_gps_map_scroll_event (GtkWidget *widget, GdkEventScroll  *event)
1982  {  {
1983      OsmGpsMap *map = OSM_GPS_MAP(widget);      OsmGpsMap *map = OSM_GPS_MAP(widget);
1984      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
# Line 1546  osm_gps_map_button_press (GtkWidget *wid Line 2000  osm_gps_map_button_press (GtkWidget *wid
2000  {  {
2001      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2002    
2003    #ifdef ENABLE_BALLOON
2004        /* don't drag if the user clicked within the balloon */
2005        if (osm_gps_map_in_balloon(priv,
2006                       event->x + EXTRA_BORDER,
2007                       event->y + EXTRA_BORDER))
2008        {
2009            priv->drag_counter = -1;
2010            return FALSE;
2011        }
2012    #endif
2013    
2014    #ifdef ENABLE_OSD
2015        /* pressed inside OSD control? */
2016        if(priv->osd) {
2017            osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);
2018            if(but != OSD_NONE)
2019            {
2020                int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
2021                priv->drag_counter = -1;
2022    
2023                switch(but) {
2024                case OSD_UP:
2025                    priv->map_y -= step;
2026                    priv->center_coord_set = FALSE;
2027                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2028                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2029                    break;
2030    
2031                case OSD_DOWN:
2032                    priv->map_y += step;
2033                    priv->center_coord_set = FALSE;
2034                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2035                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2036                    break;
2037    
2038                case OSD_LEFT:
2039                    priv->map_x -= step;
2040                    priv->center_coord_set = FALSE;
2041                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2042                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2043                    break;
2044    
2045                case OSD_RIGHT:
2046                    priv->map_x += step;
2047                    priv->center_coord_set = FALSE;
2048                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2049                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2050                    break;
2051    
2052                case OSD_IN:
2053                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
2054                    break;
2055    
2056                case OSD_OUT:
2057                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
2058                    break;
2059    
2060                default:
2061                    /* all custom buttons are forwarded to the application */
2062                    if(priv->osd->cb)
2063                        priv->osd->cb(but, priv->osd->data);
2064                    break;
2065                }
2066    
2067                return FALSE;
2068            }
2069        }
2070    #endif
2071    
2072      priv->drag_counter = 0;      priv->drag_counter = 0;
2073      priv->drag_start_mouse_x = (int) event->x;      priv->drag_start_mouse_x = (int) event->x;
2074      priv->drag_start_mouse_y = (int) event->y;      priv->drag_start_mouse_y = (int) event->y;
# Line 1560  osm_gps_map_button_release (GtkWidget *w Line 2083  osm_gps_map_button_release (GtkWidget *w
2083  {  {
2084      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2085    
2086    #ifdef ENABLE_BALLOON
2087        /* released inside the balloon? */
2088        if (osm_gps_map_in_balloon(priv,
2089                       event->x + EXTRA_BORDER,
2090                       event->y + EXTRA_BORDER))
2091        {
2092            osm_gps_map_handle_balloon_click(OSM_GPS_MAP(widget),
2093                 event->x - priv->balloon.rect.x + EXTRA_BORDER,
2094                 event->y - priv->balloon.rect.y + EXTRA_BORDER);
2095        }
2096    #endif
2097    
2098      if (priv->dragging)      if (priv->dragging)
2099      {      {
2100          priv->dragging = FALSE;          priv->dragging = FALSE;
# Line 1577  osm_gps_map_button_release (GtkWidget *w Line 2112  osm_gps_map_button_release (GtkWidget *w
2112    
2113      priv->drag_mouse_dx = 0;      priv->drag_mouse_dx = 0;
2114      priv->drag_mouse_dy = 0;      priv->drag_mouse_dy = 0;
2115      priv->drag_counter = 0;      priv->drag_counter = -1;
2116    
2117      return FALSE;      return FALSE;
2118  }  }
2119    
2120  static gboolean  static gboolean
2121    osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);
2122    
2123    static gboolean
2124  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)
2125  {  {
2126      int x, y;      int x, y;
# Line 1602  osm_gps_map_motion_notify (GtkWidget *wi Line 2140  osm_gps_map_motion_notify (GtkWidget *wi
2140      if (!(state & GDK_BUTTON1_MASK))      if (!(state & GDK_BUTTON1_MASK))
2141          return FALSE;          return FALSE;
2142    
2143        if (priv->drag_counter < 0)
2144            return FALSE;
2145    
2146      priv->drag_counter++;      priv->drag_counter++;
2147    
2148      // we havent dragged more than 6 pixels      // we havent dragged more than 6 pixels
2149      if (priv->drag_counter < 6)      if (priv->drag_counter < 6)
2150          return FALSE;          return FALSE;
2151    
2152    #ifdef OSM_GPS_MAP_REFRESH
2153        /* reduce update frequency on maemo to keep screen update fluid */
2154        static guint32 last_time = 0;
2155    
2156        if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE;
2157        last_time = event->time;
2158    #endif
2159    
2160      priv->dragging = TRUE;      priv->dragging = TRUE;
2161    
2162      if (priv->map_auto_center)      if (priv->map_auto_center)
# Line 1616  osm_gps_map_motion_notify (GtkWidget *wi Line 2165  osm_gps_map_motion_notify (GtkWidget *wi
2165      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
2166      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
2167    
2168      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);  
     }  
2169    
2170      return FALSE;      return FALSE;
2171  }  }
# Line 1679  osm_gps_map_configure (GtkWidget *widget Line 2180  osm_gps_map_configure (GtkWidget *widget
2180          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
2181    
2182      priv->pixmap = gdk_pixmap_new (      priv->pixmap = gdk_pixmap_new (
2183                                     widget->window,                          widget->window,
2184                                     widget->allocation.width + EXTRA_BORDER * 2,                          widget->allocation.width + EXTRA_BORDER * 2,
2185                                     widget->allocation.height + EXTRA_BORDER * 2,                          widget->allocation.height + EXTRA_BORDER * 2,
2186                                     -1);                          -1);
2187    
2188    #ifdef ENABLE_OSD
2189    
2190    #ifdef OSD_DOUBLE_BUFFER
2191        if (priv->dbuf_pixmap)
2192            g_object_unref (priv->dbuf_pixmap);
2193    
2194        priv->dbuf_pixmap = gdk_pixmap_new (
2195                            widget->window,
2196                            widget->allocation.width,
2197                            widget->allocation.height,
2198                            -1);
2199    #endif
2200    
2201        /* the osd needs some references to map internal objects */
2202        if(priv->osd)
2203            priv->osd->widget = widget;
2204    #endif
2205    
2206      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
2207      if(priv->gc_map)      if(priv->gc_map)
# Line 1700  osm_gps_map_expose (GtkWidget *widget, G Line 2219  osm_gps_map_expose (GtkWidget *widget, G
2219  {  {
2220      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2221    
2222      gdk_draw_drawable (  #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2223                         widget->window,      GdkDrawable *drawable = priv->dbuf_pixmap;
2224    #else
2225        GdkDrawable *drawable = widget->window;
2226    #endif
2227    
2228        if (!priv->dragging && event)
2229        {
2230            gdk_draw_drawable (drawable,
2231                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2232                               priv->pixmap,
2233                               event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
2234                               event->area.x, event->area.y,
2235                               event->area.width, event->area.height);
2236        }
2237        else
2238        {
2239            gdk_draw_drawable (drawable,
2240                               widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2241                               priv->pixmap,
2242                               0,0,
2243                               priv->drag_mouse_dx - EXTRA_BORDER,
2244                               priv->drag_mouse_dy - EXTRA_BORDER,
2245                               -1,-1);
2246    
2247            //Paint white outside of the map if dragging. Its less
2248            //ugly than painting the corrupted map
2249            if(priv->drag_mouse_dx>EXTRA_BORDER) {
2250                gdk_draw_rectangle (drawable,
2251                                    widget->style->white_gc,
2252                                    TRUE,
2253                                    0, 0,
2254                                    priv->drag_mouse_dx - EXTRA_BORDER,
2255                                    widget->allocation.height);
2256            }
2257            else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2258            {
2259                gdk_draw_rectangle (drawable,
2260                                    widget->style->white_gc,
2261                                    TRUE,
2262                                    priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
2263                                    -priv->drag_mouse_dx - EXTRA_BORDER,
2264                                    widget->allocation.height);
2265            }
2266    
2267            if (priv->drag_mouse_dy>EXTRA_BORDER) {
2268                gdk_draw_rectangle (drawable,
2269                                    widget->style->white_gc,
2270                                    TRUE,
2271                                    0, 0,
2272                                    widget->allocation.width,
2273                                    priv->drag_mouse_dy - EXTRA_BORDER);
2274            }
2275            else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2276            {
2277                gdk_draw_rectangle (drawable,
2278                                    widget->style->white_gc,
2279                                    TRUE,
2280                                    0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
2281                                    widget->allocation.width,
2282                                    -priv->drag_mouse_dy - EXTRA_BORDER);
2283            }
2284        }
2285    
2286    #ifdef ENABLE_OSD
2287        /* draw new OSD */
2288        if(priv->osd)
2289            priv->osd->draw (priv->osd, drawable);
2290    
2291    #ifdef OSD_DOUBLE_BUFFER
2292        gdk_draw_drawable (widget->window,
2293                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2294                         priv->pixmap,                         priv->dbuf_pixmap,
2295                         event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,                         0,0,0,0,-1,-1);
2296                         event->area.x, event->area.y,  #endif
                        event->area.width, event->area.height);  
2297    
2298    #endif
2299    
2300      return FALSE;      return FALSE;
2301  }  }
2302    
# Line 1730  osm_gps_map_class_init (OsmGpsMapClass * Line 2319  osm_gps_map_class_init (OsmGpsMapClass *
2319      widget_class->button_press_event = osm_gps_map_button_press;      widget_class->button_press_event = osm_gps_map_button_press;
2320      widget_class->button_release_event = osm_gps_map_button_release;      widget_class->button_release_event = osm_gps_map_button_release;
2321      widget_class->motion_notify_event = osm_gps_map_motion_notify;      widget_class->motion_notify_event = osm_gps_map_motion_notify;
2322      widget_class->scroll_event = _osm_gps_map_scroll;      widget_class->scroll_event = osm_gps_map_scroll_event;
2323    
2324      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2325                                       PROP_AUTO_CENTER,                                       PROP_AUTO_CENTER,
# Line 1768  osm_gps_map_class_init (OsmGpsMapClass * Line 2357  osm_gps_map_class_init (OsmGpsMapClass *
2357                                       PROP_REPO_URI,                                       PROP_REPO_URI,
2358                                       g_param_spec_string ("repo-uri",                                       g_param_spec_string ("repo-uri",
2359                                                            "repo uri",                                                            "repo uri",
2360                                                            "osm repo uri",                                                            "map source tile repository uri",
2361                                                            "http://tile.openstreetmap.org/#Z/#X/#Y.png",                                                            OSM_REPO_URI,
2362                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2363    
2364      g_object_class_install_property (object_class,       g_object_class_install_property (object_class,
2365                                       PROP_PROXY_URI,                                       PROP_PROXY_URI,
2366                                       g_param_spec_string ("proxy-uri",                                       g_param_spec_string ("proxy-uri",
2367                                                            "proxy uri",                                                            "proxy uri",
# Line 1785  osm_gps_map_class_init (OsmGpsMapClass * Line 2374  osm_gps_map_class_init (OsmGpsMapClass *
2374                                       g_param_spec_string ("tile-cache",                                       g_param_spec_string ("tile-cache",
2375                                                            "tile cache",                                                            "tile cache",
2376                                                            "osm local tile cache dir",                                                            "osm local tile cache dir",
2377                                                            "/tmp/Maps",                                                            NULL,
2378                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2379    
2380      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,  
2381                                       PROP_ZOOM,                                       PROP_ZOOM,
2382                                       g_param_spec_int ("zoom",                                       g_param_spec_int ("zoom",
2383                                                         "zoom",                                                         "zoom",
# Line 1813  osm_gps_map_class_init (OsmGpsMapClass * Line 2394  osm_gps_map_class_init (OsmGpsMapClass *
2394                                                         "maximum zoom level",                                                         "maximum zoom level",
2395                                                         MIN_ZOOM, /* minimum property value */                                                         MIN_ZOOM, /* minimum property value */
2396                                                         MAX_ZOOM, /* maximum property value */                                                         MAX_ZOOM, /* maximum property value */
2397                                                         17,                                                         OSM_MAX_ZOOM,
2398                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2399    
2400      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1823  osm_gps_map_class_init (OsmGpsMapClass * Line 2404  osm_gps_map_class_init (OsmGpsMapClass *
2404                                                         "minimum zoom level",                                                         "minimum zoom level",
2405                                                         MIN_ZOOM, /* minimum property value */                                                         MIN_ZOOM, /* minimum property value */
2406                                                         MAX_ZOOM, /* maximum property value */                                                         MAX_ZOOM, /* maximum property value */
2407                                                         1,                                                         OSM_MIN_ZOOM,
2408                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2409    
2410      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1893  osm_gps_map_class_init (OsmGpsMapClass * Line 2474  osm_gps_map_class_init (OsmGpsMapClass *
2474                                                         "radius of the gps point inner circle",                                                         "radius of the gps point inner circle",
2475                                                         0,           /* minimum property value */                                                         0,           /* minimum property value */
2476                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2477                                                         5,                                                         10,
2478                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2479    
2480      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1906  osm_gps_map_class_init (OsmGpsMapClass * Line 2487  osm_gps_map_class_init (OsmGpsMapClass *
2487                                                         20,                                                         20,
2488                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2489    
2490        g_object_class_install_property (object_class,
2491                                         PROP_MAP_SOURCE,
2492                                         g_param_spec_int ("map-source",
2493                                                           "map source",
2494                                                           "map source ID",
2495                                                           -1,           /* minimum property value */
2496                                                           G_MAXINT,    /* maximum property value */
2497                                                           -1,
2498                                                           G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2499    
2500        g_object_class_install_property (object_class,
2501                                         PROP_IMAGE_FORMAT,
2502                                         g_param_spec_string ("image-format",
2503                                                              "image format",
2504                                                              "map source tile repository image format (jpg, png)",
2505                                                              OSM_IMAGE_FORMAT,
2506                                                              G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2507    }
2508    
2509    const char*
2510    osm_gps_map_source_get_friendly_name(OsmGpsMapSource_t source)
2511    {
2512        switch(source)
2513        {
2514            case OSM_GPS_MAP_SOURCE_NULL:
2515                return "None";
2516            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2517                return "OpenStreetMap I";
2518            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2519                return "OpenStreetMap II";
2520            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2521                return "OpenCycleMap";
2522            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2523                return "OSMC Trails";
2524            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2525                return "Maps-For-Free";
2526            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2527                return "Google Maps";
2528            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2529                return "Google Satellite";
2530            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2531                return "Google Hybrid";
2532            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2533                return "Virtual Earth";
2534            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2535                return "Virtual Earth Satellite";
2536            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2537                return "Virtual Earth Hybrid";
2538            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2539                return "Yahoo Maps";
2540            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2541                return "Yahoo Satellite";
2542            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2543                return "Yahoo Hybrid";
2544            default:
2545                return NULL;
2546        }
2547        return NULL;
2548    }
2549    
2550    //http://www.internettablettalk.com/forums/showthread.php?t=5209
2551    //https://garage.maemo.org/plugins/scmsvn/viewcvs.php/trunk/src/maps.c?root=maemo-mapper&view=markup
2552    //http://www.ponies.me.uk/maps/GoogleTileUtils.java
2553    //http://www.mgmaps.com/cache/MapTileCacher.perl
2554    const char*
2555    osm_gps_map_source_get_repo_uri(OsmGpsMapSource_t source)
2556    {
2557        switch(source)
2558        {
2559            case OSM_GPS_MAP_SOURCE_NULL:
2560                return "none://";
2561            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2562                return OSM_REPO_URI;
2563            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2564                return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2565            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2566                return "http://c.andy.sandbox.cloudmade.com/tiles/cycle/#Z/#X/#Y.png";
2567            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2568                return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
2569            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2570                return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";
2571            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2572                return "http://mt#R.google.com/vt/v=w2.97&x=#X&y=#Y&z=#Z";
2573            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2574                return "http://khm#R.google.com/kh?n=404&v=3&t=#Q";
2575            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2576                return NULL; /* No longer working  "http://mt#R.google.com/mt?n=404&v=w2t.99&x=#X&y=#Y&zoom=#S" */
2577            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2578                return "http://a#R.ortho.tiles.virtualearth.net/tiles/r#W.jpeg?g=50";
2579            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2580                return "http://a#R.ortho.tiles.virtualearth.net/tiles/a#W.jpeg?g=50";
2581            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2582                return "http://a#R.ortho.tiles.virtualearth.net/tiles/h#W.jpeg?g=50";
2583            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2584            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2585            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2586                /* TODO: Implement signed Y, aka U
2587                 * http://us.maps3.yimg.com/aerial.maps.yimg.com/ximg?v=1.7&t=a&s=256&x=%d&y=%-d&z=%d
2588                 *  x = tilex,
2589                 *  y = (1 << (MAX_ZOOM - zoom)) - tiley - 1,
2590                 *  z = zoom - (MAX_ZOOM - 17));
2591                 */
2592                return NULL;
2593            default:
2594                return NULL;
2595        }
2596        return NULL;
2597    }
2598    
2599    const char *
2600    osm_gps_map_source_get_image_format(OsmGpsMapSource_t source)
2601    {
2602        switch(source) {
2603            case OSM_GPS_MAP_SOURCE_NULL:
2604            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2605            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2606            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2607            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2608                return "png";
2609            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2610            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2611            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2612            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2613            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2614            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2615            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2616            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2617            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2618            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2619                return "jpg";
2620            default:
2621                return "bin";
2622        }
2623        return "bin";
2624    }
2625    
2626    
2627    int
2628    osm_gps_map_source_get_min_zoom(OsmGpsMapSource_t source)
2629    {
2630        return 1;
2631    }
2632    
2633    int
2634    osm_gps_map_source_get_max_zoom(OsmGpsMapSource_t source)
2635    {
2636        switch(source) {
2637            case OSM_GPS_MAP_SOURCE_NULL:
2638                return 18;
2639            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2640                return OSM_MAX_ZOOM;
2641            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2642            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2643            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2644            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2645            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2646            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2647            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2648            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2649            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2650            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2651                return 17;
2652            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2653                return 15;
2654            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2655                return 11;
2656            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2657                return 18;
2658            default:
2659                return 17;
2660        }
2661        return 17;
2662  }  }
2663    
2664  void  void
# Line 1938  osm_gps_map_download_maps (OsmGpsMap *ma Line 2691  osm_gps_map_download_maps (OsmGpsMap *ma
2691                  for(j=y1; j<=y2; j++)                  for(j=y1; j<=y2; j++)
2692                  {                  {
2693                      // x = i, y = j                      // x = i, y = j
2694                      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",
2695                      if (!priv->cache_dir || !g_file_test(filename, G_FILE_TEST_EXISTS))                                      priv->cache_dir, G_DIR_SEPARATOR,
2696                                        zoom, G_DIR_SEPARATOR,
2697                                        i, G_DIR_SEPARATOR,
2698                                        j,
2699                                        priv->image_format);
2700                        if (!g_file_test(filename, G_FILE_TEST_EXISTS))
2701                      {                      {
2702                          osm_gps_map_download_tile(map, zoom, i, j, FALSE);                          osm_gps_map_download_tile(map, zoom, i, j, FALSE);
2703                          num_tiles++;                          num_tiles++;
# Line 2001  int Line 2759  int
2759  osm_gps_map_set_zoom (OsmGpsMap *map, int zoom)  osm_gps_map_set_zoom (OsmGpsMap *map, int zoom)
2760  {  {
2761      int zoom_old;      int zoom_old;
2762      double factor = 1.0;      double factor = 0.0;
2763      int width_center, height_center;      int width_center, height_center;
2764      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
2765    
# Line 2072  osm_gps_map_add_image (OsmGpsMap *map, f Line 2830  osm_gps_map_add_image (OsmGpsMap *map, f
2830          //cache w/h for speed, and add image to list          //cache w/h for speed, and add image to list
2831          im = g_new0(image_t,1);          im = g_new0(image_t,1);
2832          im->w = gdk_pixbuf_get_width(image);          im->w = gdk_pixbuf_get_width(image);
2833          im->h = gdk_pixbuf_get_width(image);          im->h = gdk_pixbuf_get_height(image);
2834          im->pt.rlat = deg2rad(latitude);          im->pt.rlat = deg2rad(latitude);
2835          im->pt.rlon = deg2rad(longitude);          im->pt.rlon = deg2rad(longitude);
2836    
# Line 2085  osm_gps_map_add_image (OsmGpsMap *map, f Line 2843  osm_gps_map_add_image (OsmGpsMap *map, f
2843      }      }
2844  }  }
2845    
2846  void  gboolean
2847  osm_gps_map_clear_images (OsmGpsMap *map)  osm_gps_map_remove_image (OsmGpsMap *map, GdkPixbuf *image)
2848  {  {
2849      g_return_if_fail (OSM_IS_GPS_MAP (map));      OsmGpsMapPrivate *priv = map->priv;
2850        if (priv->images) {
2851      osm_gps_map_free_images(map);          GSList *list;
2852      osm_gps_map_map_redraw_idle(map);          for(list = priv->images; list != NULL; list = list->next)
2853            {
2854                image_t *im = list->data;
2855                    if (im->image == image)
2856                    {
2857                            priv->images = g_slist_remove_link(priv->images, list);
2858                            g_object_unref(im->image);
2859                            g_free(im);
2860                            osm_gps_map_map_redraw_idle(map);
2861                            return TRUE;
2862                    }
2863            }
2864        }
2865        return FALSE;
2866  }  }
2867    
2868  void  void
2869  osm_gps_map_osd_speed (OsmGpsMap *map, float speed)  osm_gps_map_clear_images (OsmGpsMap *map)
2870  {  {
     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;  
   
2871      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);  
2872    
2873      /* pango initialisation */      osm_gps_map_free_images(map);
2874      context = gtk_widget_get_pango_context (GTK_WIDGET(map));      osm_gps_map_map_redraw_idle(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);  
2875  }  }
2876    
2877  void  void
# Line 2276  osm_gps_map_scroll (OsmGpsMap *map, gint Line 2995  osm_gps_map_scroll (OsmGpsMap *map, gint
2995      osm_gps_map_map_redraw_idle (map);      osm_gps_map_map_redraw_idle (map);
2996  }  }
2997    
2998    float
2999    osm_gps_map_get_scale(OsmGpsMap *map)
3000    {
3001        OsmGpsMapPrivate *priv;
3002    
3003        g_return_val_if_fail (OSM_IS_GPS_MAP (map), OSM_NAN);
3004        priv = map->priv;
3005    
3006        return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);
3007    }
3008    
3009    #ifdef ENABLE_BALLOON
3010    void
3011    osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
3012                              OsmGpsMapBalloonCallback cb, gpointer data)
3013    {
3014        OsmGpsMapPrivate *priv;
3015    
3016        /* remove and previously installed balloon */
3017        osm_gps_map_clear_balloon (map);
3018    
3019        g_return_if_fail (OSM_IS_GPS_MAP (map));
3020        priv = map->priv;
3021    
3022        priv->balloon.coo->rlat = deg2rad(latitude);
3023        priv->balloon.coo->rlon = deg2rad(longitude);
3024        priv->balloon.valid = TRUE;
3025    
3026        priv->balloon.cb = cb;
3027        priv->balloon.data = data;
3028    
3029        // this redraws the map
3030        osm_gps_map_map_redraw_idle(map);
3031    }
3032    
3033    void
3034    osm_gps_map_clear_balloon (OsmGpsMap *map)
3035    {
3036        OsmGpsMapPrivate *priv;
3037    
3038        g_return_if_fail (OSM_IS_GPS_MAP (map));
3039        priv = map->priv;
3040    
3041        priv->balloon.valid = FALSE;
3042    
3043        osm_gps_map_map_redraw_idle(map);
3044    }
3045    #endif
3046    
3047    #ifdef ENABLE_OSD
3048    
3049    void
3050    osm_gps_map_redraw (OsmGpsMap *map)
3051    {
3052        osm_gps_map_map_redraw_idle(map);
3053    }
3054    
3055    osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {
3056        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
3057        return map->priv->osd;
3058    }
3059    
3060    void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {
3061        OsmGpsMapPrivate *priv;
3062    
3063        g_return_if_fail (OSM_IS_GPS_MAP (map));
3064    
3065        priv = map->priv;
3066        g_return_if_fail (!priv->osd);
3067    
3068        priv->osd = osd;
3069    }
3070    
3071    void
3072    osm_gps_map_repaint (OsmGpsMap *map) {
3073        osm_gps_map_expose (GTK_WIDGET(map), NULL);
3074    }
3075    
3076    #endif
Legend:
Removed from v.32  
changed lines
  Added in v.95