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 66 by harbaum, Wed Aug 19 20:03:28 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 83  struct _OsmGpsMapPrivate Line 84  struct _OsmGpsMapPrivate
84      //contains flags indicating the various special characters      //contains flags indicating the various special characters
85      //the uri string contains, that will be replaced when calculating      //the uri string contains, that will be replaced when calculating
86      //the uri to download.      //the uri to download.
87        OsmGpsMapSource_t map_source;
88      char *repo_uri;      char *repo_uri;
89        char *image_format;
90      int uri_format;      int uri_format;
91      //flag indicating if the map source is located on the google      //flag indicating if the map source is located on the google
92      gboolean the_google;      gboolean the_google;
# Line 95  struct _OsmGpsMapPrivate Line 98  struct _OsmGpsMapPrivate
98      coord_t *gps;      coord_t *gps;
99      gboolean gps_valid;      gboolean gps_valid;
100    
101    #ifdef ENABLE_BALLOON
102        //a balloon with additional info
103        struct {
104            coord_t *coo;
105            gboolean valid;
106            OsmGpsMapRect_t rect;
107            OsmGpsMapBalloonCallback cb;
108            gpointer data;
109        } balloon;
110    #endif
111    
112    #ifdef ENABLE_OSD
113        //the osd controls
114        struct {
115            GdkPixmap *backup;
116            gint backup_x, backup_y;
117            OsmGpsMapOsdGpsCallback cb;
118            gpointer data;
119        } osd;
120    #endif
121    
122      //additional images or tracks added to the map      //additional images or tracks added to the map
123      GSList *tracks;      GSList *tracks;
124      GSList *images;      GSList *images;
# Line 104  struct _OsmGpsMapPrivate Line 128  struct _OsmGpsMapPrivate
128      GdkGC *gc_map;      GdkGC *gc_map;
129    
130      //The tile painted when one cannot be found      //The tile painted when one cannot be found
131      //GdkPixbuf *missing_tile;      GdkPixbuf *null_tile;
132    
133      //For tracking click and drag      //For tracking click and drag
134      int drag_counter;      int drag_counter;
# Line 157  enum Line 181  enum
181      PROP_TILES_QUEUED,      PROP_TILES_QUEUED,
182      PROP_GPS_TRACK_WIDTH,      PROP_GPS_TRACK_WIDTH,
183      PROP_GPS_POINT_R1,      PROP_GPS_POINT_R1,
184      PROP_GPS_POINT_R2      PROP_GPS_POINT_R2,
185        PROP_MAP_SOURCE,
186        PROP_IMAGE_FORMAT
187  };  };
188    
189  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 197  static gchar    *replace_map_uri(OsmGpsM
197  static void     osm_gps_map_print_images (OsmGpsMap *map);  static void     osm_gps_map_print_images (OsmGpsMap *map);
198  static void     osm_gps_map_draw_gps_point (OsmGpsMap *map);  static void     osm_gps_map_draw_gps_point (OsmGpsMap *map);
199  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);
200    #ifdef LIBSOUP22
201    static void     osm_gps_map_tile_download_complete (SoupMessage *msg, gpointer user_data);
202    #else
203    static void     osm_gps_map_tile_download_complete (SoupSession *session, SoupMessage *msg, gpointer user_data);
204    #endif
205  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);
206  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);
207  static void     osm_gps_map_fill_tiles_pixel (OsmGpsMap *map);  static void     osm_gps_map_fill_tiles_pixel (OsmGpsMap *map);
# Line 420  my_log_handler (const gchar * log_domain Line 451  my_log_handler (const gchar * log_domain
451          g_log_default_handler (log_domain, log_level, message, user_data);          g_log_default_handler (log_domain, log_level, message, user_data);
452  }  }
453    
454    static float
455    osm_gps_map_get_scale_at_point(int zoom, float rlat, float rlon)
456    {
457        /* world at zoom 1 == 512 pixels */
458        return cos(rlat) * M_PI * OSM_EQ_RADIUS / (1<<(7+zoom));
459    }
460    
461  /* clears the trip list and all resources */  /* clears the trip list and all resources */
462  static void  static void
463  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 567  osm_gps_map_draw_gps_point (OsmGpsMap *m
567          int x, y;          int x, y;
568          int r = priv->ui_gps_point_inner_radius;          int r = priv->ui_gps_point_inner_radius;
569          int r2 = priv->ui_gps_point_outer_radius;          int r2 = priv->ui_gps_point_outer_radius;
570            // int lw = priv->ui_gps_track_width;
571          int mr = MAX(r,r2);          int mr = MAX(r,r2);
572    
573          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 578  osm_gps_map_draw_gps_point (OsmGpsMap *m
578          cairo_t *cr;          cairo_t *cr;
579          cairo_pattern_t *pat;          cairo_pattern_t *pat;
580  #else  #else
         int lw = priv->ui_gps_track_width;  
581          GdkColor color;          GdkColor color;
582          GdkGC *marker;          GdkGC *marker;
583  #endif  #endif
# Line 614  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 652  osm_gps_map_draw_gps_point (OsmGpsMap *m
652                                      (mr*2)+lw+lw);                                      (mr*2)+lw+lw);
653  #endif  #endif
654      }      }
655    }
656    
657    #ifdef ENABLE_BALLOON
658    /* most visual effects are hardcoded by now, but may be made */
659    /* available via properties later */
660    #ifndef BALLOON_AREA_WIDTH
661    #define BALLOON_AREA_WIDTH           290
662    #endif
663    #ifndef BALLOON_AREA_HEIGHT
664    #define BALLOON_AREA_HEIGHT           75
665    #endif
666    #ifndef BALLOON_CORNER_RADIUS
667    #define BALLOON_CORNER_RADIUS         10
668    #endif
669    
670    #define BALLOON_BORDER               (BALLOON_CORNER_RADIUS/2)
671    #define BALLOON_WIDTH                (BALLOON_AREA_WIDTH + 2 * BALLOON_BORDER)
672    #define BALLOON_HEIGHT               (BALLOON_AREA_HEIGHT + 2 * BALLOON_BORDER)
673    #define BALLOON_TRANSPARENCY         0.8
674    #define POINTER_HEIGHT                20
675    #define POINTER_FOOT_WIDTH            20
676    #define POINTER_OFFSET               (BALLOON_CORNER_RADIUS*3/4)
677    #define BALLOON_SHADOW               (BALLOON_CORNER_RADIUS/2)
678    #define BALLOON_SHADOW_TRANSPARENCY  0.2
679    
680    #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
681    
682    
683    /* draw the bubble shape. this is used twice, once for the shape and once */
684    /* for the shadow */
685    static void
686    osm_gps_map_draw_balloon_shape (cairo_t *cr, int x0, int y0, int x1, int y1,
687           gboolean bottom, int px, int py, int px0, int px1) {
688    
689        cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);
690        cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
691                   BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);
692        if(!bottom) {
693            /* insert top pointer */
694            cairo_line_to (cr, px1, y0);
695            cairo_line_to (cr, px, py);
696            cairo_line_to (cr, px0, y0);
697        }
698    
699        cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0);
700        cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
701                   BALLOON_CORNER_RADIUS, -M_PI/2, 0);
702        cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS);
703        cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
704                   BALLOON_CORNER_RADIUS, 0, M_PI/2);
705        if(bottom) {
706            /* insert bottom pointer */
707            cairo_line_to (cr, px0, y1);
708            cairo_line_to (cr, px, py);
709            cairo_line_to (cr, px1, y1);
710        }
711    
712        cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1);
713        cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
714                   BALLOON_CORNER_RADIUS, M_PI/2, M_PI);
715    
716        cairo_close_path (cr);
717    }
718    
719    static void
720    osm_gps_map_draw_balloon_int (OsmGpsMap *map)
721    {
722        OsmGpsMapPrivate *priv = map->priv;
723    
724        if (priv->balloon.valid) {
725    
726            /* ------- convert given coordinate into screen position --------- */
727            int x0 = lon2pixel(priv->map_zoom, priv->balloon.coo->rlon) -
728                priv->map_x + EXTRA_BORDER;
729            int y0 = lat2pixel(priv->map_zoom, priv->balloon.coo->rlat) -
730                priv->map_y + EXTRA_BORDER;
731    
732            /* check position of this relative to screen center to determine */
733            /* pointer direction ... */
734            int pointer_x = x0, pointer_x0, pointer_x1;
735            int pointer_y = y0;
736    
737            /* ... and calculate position */
738            if((x0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.width/2) {
739                x0 -= BALLOON_WIDTH - POINTER_OFFSET;
740                pointer_x0 = pointer_x - (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
741                pointer_x1 = pointer_x0 - POINTER_FOOT_WIDTH;
742            } else {
743                x0 -= POINTER_OFFSET;
744                pointer_x1 = pointer_x + (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
745                pointer_x0 = pointer_x1 + POINTER_FOOT_WIDTH;
746            }
747    
748            gboolean bottom = FALSE;
749            if((y0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.height/2) {
750                bottom = TRUE;
751                y0 -= BALLOON_HEIGHT + POINTER_HEIGHT;
752            } else
753                y0 += POINTER_HEIGHT;
754    
755            /* calculate bottom/right of box */
756            int x1 = x0 + BALLOON_WIDTH, y1 = y0 + BALLOON_HEIGHT;
757    
758            /* save balloon screen coordinates for later use */
759            priv->balloon.rect.x = x0 + BALLOON_BORDER;
760            priv->balloon.rect.y = y0 + BALLOON_BORDER;
761            priv->balloon.rect.w = x1 - x0 - 2*BALLOON_BORDER;
762            priv->balloon.rect.h = y1 - y0 - 2*BALLOON_BORDER;
763    
764    #ifdef USE_CAIRO
765            cairo_t *cr = gdk_cairo_create(priv->pixmap);
766    
767            /* --------- draw shadow --------------- */
768            osm_gps_map_draw_balloon_shape (cr,
769                        x0 + BALLOON_SHADOW, y0 + BALLOON_SHADOW,
770                        x1 + BALLOON_SHADOW, y1 + BALLOON_SHADOW,
771                        bottom, pointer_x, pointer_y,
772                        pointer_x0 + BALLOON_SHADOW, pointer_x1 + BALLOON_SHADOW);
773    
774            cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_SHADOW_TRANSPARENCY);
775            cairo_fill_preserve (cr);
776            cairo_set_source_rgba (cr, 1, 0, 0, 1.0);
777            cairo_set_line_width (cr, 0);
778            cairo_stroke (cr);
779    
780            /* --------- draw main shape ----------- */
781            osm_gps_map_draw_balloon_shape (cr, x0, y0, x1, y1,
782                        bottom, pointer_x, pointer_y, pointer_x0, pointer_x1);
783    
784            cairo_set_source_rgba (cr, 1, 1, 1, BALLOON_TRANSPARENCY);
785            cairo_fill_preserve (cr);
786            cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_TRANSPARENCY);
787            cairo_set_line_width (cr, 1);
788            cairo_stroke (cr);
789    
790    
791            /* ---------- draw close button --------- */
792    
793            int cx = x1 - BALLOON_BORDER - CLOSE_BUTTON_RADIUS;
794            int cy = y0 + BALLOON_BORDER + CLOSE_BUTTON_RADIUS;
795            int crad = CLOSE_BUTTON_RADIUS;
796    
797            cairo_arc (cr, cx, cy, crad, 0, 2 * M_PI);
798            cairo_set_source_rgba (cr, 0.8, 0, 0, 1.0);
799            cairo_fill_preserve (cr);
800            cairo_set_source_rgba (cr, 0.3, 0, 0, 1.0);
801            cairo_set_line_width (cr, 2);
802            cairo_stroke(cr);
803    
804            cairo_set_source_rgba (cr, 1, 1, 1, 1.0);
805            cairo_set_line_width (cr, BALLOON_CORNER_RADIUS/3.3);
806            cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
807            cairo_move_to (cr, cx - crad/2, cy - crad/2);
808            cairo_line_to (cr, cx + crad/2, cy + crad/2);
809            cairo_stroke (cr);
810            cairo_move_to (cr, cx + crad/2, cy - crad/2);
811            cairo_line_to (cr, cx - crad/2, cy + crad/2);
812            cairo_stroke (cr);
813    
814            if (priv->balloon.cb) {
815                /* clip in case application tries to draw in */
816                /* exceed of the balloon */
817                cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,
818                                 priv->balloon.rect.w, priv->balloon.rect.h);
819                cairo_clip (cr);
820                cairo_new_path (cr);  /* current path is not
821                                         consumed by cairo_clip() */
822    
823                priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);
824            }
825    
826            cairo_destroy(cr);
827    
828            gtk_widget_queue_draw_area (GTK_WIDGET(map),
829                                        x0, y0, BALLOON_WIDTH,
830                                        BALLOON_HEIGHT + POINTER_HEIGHT);
831    #else
832    #warning "Balloon display lacks a non-cairo implementation!"
833    #endif
834        }
835  }  }
836    
837    /* the user clicked into the balloons main area. handle this */
838    static void
839    osm_gps_map_handle_balloon_click(OsmGpsMap *map, gint x, gint y)
840    {
841        OsmGpsMapPrivate *priv = map->priv;
842    
843        if (!priv->balloon.valid)
844            return;
845    
846        /* check if the close button was clicked */
847        if ((x > priv->balloon.rect.w - 2*CLOSE_BUTTON_RADIUS) &&
848            (x < priv->balloon.rect.w) &&
849            (y > 0) && (y < 2*CLOSE_BUTTON_RADIUS)) {
850    
851            priv->balloon.valid = FALSE;
852            osm_gps_map_map_redraw_idle(map);
853        }
854    }
855    
856    /* return true if balloon is being displayed and if */
857    /* the given coordinate is within this balloon */
858    static gboolean
859    osm_gps_map_in_balloon(OsmGpsMapPrivate *priv, gint x, gint y)
860    {
861        return (priv->balloon.valid &&
862                (x > priv->balloon.rect.x) &&
863                (x < priv->balloon.rect.x + priv->balloon.rect.w) &&
864                (y > priv->balloon.rect.y) &&
865                (y < priv->balloon.rect.y + priv->balloon.rect.h));
866    }
867    #endif // ENABLE_BALLOON
868    
869  static void  static void
870  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)
871  {  {
872      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
873    
874      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);  
875    
876      /* draw pixbuf onto pixmap */      /* draw pixbuf onto pixmap */
877      gdk_draw_pixbuf (priv->pixmap,      gdk_draw_pixbuf (priv->pixmap,
# Line 654  static void Line 903  static void
903  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)
904  #endif  #endif
905  {  {
906      int fd;      FILE *file;
907      tile_download_t *dl = (tile_download_t *)user_data;      tile_download_t *dl = (tile_download_t *)user_data;
908      OsmGpsMap *map = OSM_GPS_MAP(dl->map);      OsmGpsMap *map = OSM_GPS_MAP(dl->map);
909      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
# Line 667  osm_gps_map_tile_download_complete (Soup Line 916  osm_gps_map_tile_download_complete (Soup
916          {          {
917              if (g_mkdir_with_parents(dl->folder,0700) == 0)              if (g_mkdir_with_parents(dl->folder,0700) == 0)
918              {              {
919                  fd = open(dl->filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);                  file = g_fopen(dl->filename, "wb");
920                  if (fd != -1)                  if (file != NULL)
921                  {                  {
922                      write (fd, MSG_RESPONSE_BODY(msg), MSG_RESPONSE_LEN(msg));                      fwrite (MSG_RESPONSE_BODY(msg), 1, MSG_RESPONSE_LEN(msg), file);
923                      file_saved = TRUE;                      file_saved = TRUE;
924                        g_debug("Wrote "MSG_RESPONSE_LEN_FORMAT" bytes to %s", MSG_RESPONSE_LEN(msg), dl->filename);
925                        fclose (file);
926    
                     g_debug("Wrote " MSG_RESPONSE_LEN_FORMAT " bytes to %s", MSG_RESPONSE_LEN(msg), dl->filename);  
                     close (fd);  
927                  }                  }
928              }              }
929              else              else
930              {              {
931                  g_warning("Error creating tile download directory: %s", dl->folder);                  g_warning("Error creating tile download directory: %s",
932                              dl->folder);
933                    perror("perror:");
934              }              }
935          }          }
936    
# Line 687  osm_gps_map_tile_download_complete (Soup Line 938  osm_gps_map_tile_download_complete (Soup
938          {          {
939              GdkPixbuf *pixbuf = NULL;              GdkPixbuf *pixbuf = NULL;
940    
941                /* if the file was actually stored on disk, we can simply */
942                /* load and decode it from that file */
943              if (priv->cache_dir)              if (priv->cache_dir)
944              {              {
945                  if (file_saved)                  if (file_saved)
# Line 720  osm_gps_map_tile_download_complete (Soup Line 973  osm_gps_map_tile_download_complete (Soup
973                      g_warning("Error: Unable to determine image file format");                      g_warning("Error: Unable to determine image file format");
974                  }                  }
975              }              }
976    
977              /* Store the tile into the cache */              /* Store the tile into the cache */
978              if (G_LIKELY (pixbuf))              if (G_LIKELY (pixbuf))
979              {              {
# Line 735  osm_gps_map_tile_download_complete (Soup Line 988  osm_gps_map_tile_download_complete (Soup
988                   * we are using it as a key in the hash table */                   * we are using it as a key in the hash table */
989                  dl->filename = NULL;                  dl->filename = NULL;
990              }              }
   
991              osm_gps_map_map_redraw_idle (map);              osm_gps_map_map_redraw_idle (map);
992          }          }
993          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 1046  osm_gps_map_download_tile (OsmGpsMap *ma
1046          g_free(dl->uri);          g_free(dl->uri);
1047          g_free(dl);          g_free(dl);
1048      } else {      } else {
1049          dl->folder = g_strdup_printf("%s/%d/%d/",priv->cache_dir, zoom, x);          dl->folder = g_strdup_printf("%s%c%d%c%d%c",
1050          dl->filename = g_strdup_printf("%s/%d/%d/%d.png",priv->cache_dir, zoom, x, y);                              priv->cache_dir, G_DIR_SEPARATOR,
1051                                zoom, G_DIR_SEPARATOR,
1052                                x, G_DIR_SEPARATOR);
1053            dl->filename = g_strdup_printf("%s%c%d%c%d%c%d.%s",
1054                                priv->cache_dir, G_DIR_SEPARATOR,
1055                                zoom, G_DIR_SEPARATOR,
1056                                x, G_DIR_SEPARATOR,
1057                                y,
1058                                priv->image_format);
1059          dl->map = map;          dl->map = map;
1060          dl->redraw = redraw;          dl->redraw = redraw;
1061    
# Line 813  osm_gps_map_download_tile (OsmGpsMap *ma Line 1073  osm_gps_map_download_tile (OsmGpsMap *ma
1073                      if (cookie) {                      if (cookie) {
1074                          g_debug("Adding Google Cookie");                          g_debug("Adding Google Cookie");
1075                          soup_message_headers_append(msg->request_headers, "Cookie", cookie);                          soup_message_headers_append(msg->request_headers, "Cookie", cookie);
   
1076                      }                      }
1077                  }                  }
1078              }              }
# Line 835  osm_gps_map_load_cached_tile (OsmGpsMap Line 1094  osm_gps_map_load_cached_tile (OsmGpsMap
1094  {  {
1095      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1096      gchar *filename;      gchar *filename;
1097      GdkPixbuf *pixbuf;      GdkPixbuf *pixbuf = NULL;
1098      OsmCachedTile *tile;      OsmCachedTile *tile;
1099    
1100      filename = g_strdup_printf("%s/%u/%u/%u.png",      filename = g_strdup_printf("%s%c%d%c%d%c%d.%s",
1101                                 priv->cache_dir,                  priv->cache_dir, G_DIR_SEPARATOR,
1102                                 zoom, x, y);                  zoom, G_DIR_SEPARATOR,
1103                    x, G_DIR_SEPARATOR,
1104                    y,
1105                    priv->image_format);
1106    
1107      tile = g_hash_table_lookup (priv->tile_cache, filename);      tile = g_hash_table_lookup (priv->tile_cache, filename);
1108      if (tile)      if (tile)
1109      {      {
1110          g_free (filename);          g_free (filename);
1111      }      }
1112      else if (priv->cache_dir)      else
1113      {      {
1114          pixbuf = gdk_pixbuf_new_from_file (filename, NULL);          pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
1115          if (pixbuf)          if (pixbuf)
# Line 863  osm_gps_map_load_cached_tile (OsmGpsMap Line 1125  osm_gps_map_load_cached_tile (OsmGpsMap
1125      {      {
1126          tile->redraw_cycle = priv->redraw_cycle;          tile->redraw_cycle = priv->redraw_cycle;
1127          pixbuf = g_object_ref (tile->pixbuf);          pixbuf = g_object_ref (tile->pixbuf);
1128      } else      }
         pixbuf = NULL;  
1129    
1130      return pixbuf;      return pixbuf;
1131  }  }
# Line 928  static void Line 1189  static void
1189  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)
1190  {  {
1191      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1192        gchar *filename;
1193      GdkPixbuf *pixbuf;      GdkPixbuf *pixbuf;
1194    
1195      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);
1196    
1197      /* try to get file from internal cache */      if (priv->map_source == OSM_GPS_MAP_SOURCE_NULL) {
1198      pixbuf = osm_gps_map_load_cached_tile(map, zoom, x, y);          osm_gps_map_blit_tile(map, priv->null_tile, offset_x,offset_y);
1199            return;
1200        }
1201    
1202      /* 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",
1203      if (priv->cache_dir && !pixbuf)                  priv->cache_dir, G_DIR_SEPARATOR,
1204      {                  zoom, G_DIR_SEPARATOR,
1205          gchar *filename;                  x, G_DIR_SEPARATOR,
1206          filename = g_strdup_printf("%s/%u/%u/%u.png",                  y,
1207                                     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);  
         }  
1208    
1209          g_free(filename);      /* try to get file from internal cache first */
1210      }      if(!(pixbuf = osm_gps_map_load_cached_tile(map, zoom, x, y)))
1211            pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
1212    
1213      if (G_LIKELY(pixbuf))      if(pixbuf)
1214      {      {
1215            g_debug("Found tile %s", filename);
1216          osm_gps_map_blit_tile(map, pixbuf, offset_x,offset_y);          osm_gps_map_blit_tile(map, pixbuf, offset_x,offset_y);
1217          g_object_unref (pixbuf);          g_object_unref (pixbuf);
1218      }      }
# Line 984  osm_gps_map_load_tile (OsmGpsMap *map, i Line 1243  osm_gps_map_load_tile (OsmGpsMap *map, i
1243                                  TRUE, offset_x, offset_y, TILESIZE, TILESIZE);                                  TRUE, offset_x, offset_y, TILESIZE, TILESIZE);
1244          }          }
1245      }      }
1246        g_free(filename);
1247  }  }
1248    
1249  static void  static void
# Line 1077  osm_gps_map_print_track (OsmGpsMap *map, Line 1337  osm_gps_map_print_track (OsmGpsMap *map,
1337    
1338      map_x0 = priv->map_x - EXTRA_BORDER;      map_x0 = priv->map_x - EXTRA_BORDER;
1339      map_y0 = priv->map_y - EXTRA_BORDER;      map_y0 = priv->map_y - EXTRA_BORDER;
   
1340      for(list = trackpoint_list; list != NULL; list = list->next)      for(list = trackpoint_list; list != NULL; list = list->next)
1341      {      {
1342          coord_t *tp = list->data;          coord_t *tp = list->data;
# Line 1132  osm_gps_map_print_tracks (OsmGpsMap *map Line 1391  osm_gps_map_print_tracks (OsmGpsMap *map
1391    
1392      if (priv->show_trip_history)      if (priv->show_trip_history)
1393          osm_gps_map_print_track (map, priv->trip_history);          osm_gps_map_print_track (map, priv->trip_history);
1394    
1395      if (priv->tracks)      if (priv->tracks)
1396      {      {
         g_debug("TRACK");  
1397          GSList* tmp = priv->tracks;          GSList* tmp = priv->tracks;
1398          while (tmp != NULL)          while (tmp != NULL)
1399          {          {
# Line 1144  osm_gps_map_print_tracks (OsmGpsMap *map Line 1403  osm_gps_map_print_tracks (OsmGpsMap *map
1403      }      }
1404  }  }
1405    
1406  static gboolean  static gboolean
1407  osm_gps_map_purge_cache_check(gpointer key, gpointer value, gpointer user)  osm_gps_map_purge_cache_check(gpointer key, gpointer value, gpointer user)
1408  {  {
1409      return(((OsmCachedTile*)value)->redraw_cycle != ((OsmGpsMapPrivate*)user)->redraw_cycle);     return (((OsmCachedTile*)value)->redraw_cycle != ((OsmGpsMapPrivate*)user)->redraw_cycle);
1410  }  }
1411    
1412  static void  static void
1413  osm_gps_map_purge_cache (OsmGpsMap *map)  osm_gps_map_purge_cache (OsmGpsMap *map)
1414  {  {
1415       OsmGpsMapPrivate *priv = map->priv;
1416    
1417       if (g_hash_table_size (priv->tile_cache) < priv->max_tile_cache_size)
1418           return;
1419    
1420       /* run through the cache, and remove the tiles which have not been used
1421        * during the last redraw operation */
1422       g_hash_table_foreach_remove(priv->tile_cache, osm_gps_map_purge_cache_check, priv);
1423    }
1424    
1425    #ifdef ENABLE_OSD
1426    /* position and extent of bounding box */
1427    #define OSD_X      (10)
1428    #define OSD_Y      (10)
1429    
1430    #define OSD_COLOR            0.5, 0.5, 1
1431    #define OSD_COLOR_DISABLED   0.8, 0.8, 0.8
1432    
1433    /* parameters of the direction shape */
1434    #ifndef OSM_GPS_MAP_OSD_DIAMETER
1435    #define D_RAD  (30)         // diameter of dpad
1436    #else
1437    #define D_RAD  (OSM_GPS_MAP_OSD_DIAMETER)
1438    #endif
1439    #define D_TIP  (4*D_RAD/5)  // distance of arrow tip from dpad center
1440    #define D_LEN  (D_RAD/4)    // length of arrow
1441    #define D_WID  (D_LEN)      // width of arrow
1442    
1443    /* parameters of the "zoom" pad */
1444    #define Z_STEP   (D_RAD/4)  // distance between dpad and zoom
1445    #define Z_RAD    (D_RAD/2)  // radius of "caps" of zoom bar
1446    
1447    /* shadow also depends on control size */
1448    #define OSD_SHADOW (D_RAD/6)
1449    
1450    /* total width and height of controls incl. shadow */
1451    #define OSD_W    (2*D_RAD + OSD_SHADOW)
1452    #define OSD_H    (2*D_RAD + Z_STEP + 2*Z_RAD + OSD_SHADOW)
1453    
1454    #define OSD_LBL_SHADOW (OSD_SHADOW/2)
1455    
1456    #define Z_TOP    (2 * D_RAD + Z_STEP)
1457    #define Z_MID    (Z_TOP + Z_RAD)
1458    #define Z_BOT    (Z_MID + Z_RAD)
1459    #define Z_LEFT   (Z_RAD)
1460    #define Z_RIGHT  (2 * D_RAD - Z_RAD)
1461    
1462    /* create the cairo shape used for the zoom buttons */
1463    static void
1464    osm_gps_map_osd_zoom_shape(cairo_t *cr, gint x, gint y) {
1465        cairo_move_to (cr, x+Z_LEFT,    y+Z_TOP);
1466        cairo_line_to (cr, x+Z_RIGHT,   y+Z_TOP);
1467        cairo_arc     (cr, x+Z_RIGHT,   y+Z_MID, Z_RAD, -M_PI/2,  M_PI/2);
1468        cairo_line_to (cr, x+Z_LEFT,    y+Z_BOT);
1469        cairo_arc     (cr, x+Z_LEFT,    y+Z_MID, Z_RAD,  M_PI/2, -M_PI/2);
1470    }
1471    
1472    /* create the cairo shape used for the dpad */
1473    static void
1474    osm_gps_map_osd_dpad_shape(cairo_t *cr, gint x, gint y) {
1475        cairo_arc (cr, x+D_RAD, y+D_RAD, D_RAD, 0, 2 * M_PI);
1476    }
1477    
1478    typedef enum {
1479        OSD_NONE = 0,
1480        OSD_BG,
1481        OSD_UP,
1482        OSD_DOWN,
1483        OSD_LEFT,
1484        OSD_RIGHT,
1485        OSD_IN,
1486        OSD_OUT,
1487        OSD_GPS
1488    } osd_button_t;
1489    
1490    static gboolean
1491    osm_gps_map_in_circle(gint x, gint y, gint cx, gint cy, gint rad)
1492    {
1493        return( pow(cx - x, 2) + pow(cy - y, 2) < rad * rad);
1494    }
1495    
1496    /* check whether x/y is within the dpad */
1497    static osd_button_t
1498    osm_gps_map_osd_check_dpad(gint x, gint y)
1499    {
1500        /* within entire dpad circle */
1501        if( osm_gps_map_in_circle(x, y, OSD_X + D_RAD, OSD_Y + D_RAD, D_RAD))
1502        {
1503            /* convert into position relative to dpads centre */
1504            x -= (OSD_X + D_RAD);
1505            y -= (OSD_Y + D_RAD);
1506    
1507            /* check for dpad center goes here! */
1508            if( osm_gps_map_in_circle(x, y, 0, 0, D_RAD/3))
1509                return OSD_GPS;
1510    
1511            if( y < 0 && abs(x) < abs(y))
1512                return OSD_UP;
1513    
1514            if( y > 0 && abs(x) < abs(y))
1515                return OSD_DOWN;
1516    
1517            if( x < 0 && abs(y) < abs(x))
1518                return OSD_LEFT;
1519    
1520            if( x > 0 && abs(y) < abs(x))
1521                return OSD_RIGHT;
1522    
1523            return OSD_BG;
1524        }
1525        return OSD_NONE;
1526    }
1527    
1528    /* check whether x/y is within the zoom pads */
1529    static osd_button_t
1530    osm_gps_map_osd_check_zoom(gint x, gint y) {
1531        if( x > OSD_X && x < (OSD_X + OSD_W) && y > Z_TOP && y < (OSD_Y+Z_BOT)) {
1532    
1533            /* within circle around (-) label */
1534            if( osm_gps_map_in_circle(x, y, OSD_X + Z_LEFT, OSD_Y + Z_MID, Z_RAD))
1535                return OSD_OUT;
1536    
1537            /* between center of (-) button and center of entire zoom control area */
1538            if(x > OSD_LEFT && x < OSD_X + D_RAD)
1539                return OSD_OUT;
1540    
1541            /* within circle around (+) label */
1542            if( osm_gps_map_in_circle(x, y, OSD_X + Z_RIGHT, OSD_Y + Z_MID, Z_RAD))
1543                return OSD_IN;
1544    
1545            /* between center of (+) button and center of entire zoom control area */
1546            if(x < OSD_RIGHT && x > OSD_X + D_RAD)
1547                return OSD_IN;
1548        }
1549    
1550        return OSD_NONE;
1551    }
1552    
1553    static osd_button_t
1554    osm_gps_map_osd_check(gint x, gint y) {
1555        osd_button_t but = OSD_NONE;
1556    
1557        /* first do a rough test for the OSD area. */
1558        /* this is just to avoid an unnecessary detailed test */
1559        if(x > OSD_X && x < OSD_X + OSD_W &&
1560           y > OSD_Y && y < OSD_Y + OSD_H) {
1561            but = osm_gps_map_osd_check_dpad(x, y);
1562    
1563            if(but == OSD_NONE)
1564                but = osm_gps_map_osd_check_zoom(x, y);
1565        }
1566    
1567        return but;
1568    }
1569    
1570    static void
1571    osm_gps_map_osd_shape_shadow(cairo_t *cr) {
1572        cairo_set_source_rgba (cr, 0, 0, 0, 0.2);
1573        cairo_fill (cr);
1574        cairo_stroke (cr);
1575    }
1576    
1577    static void
1578    osm_gps_map_osd_shape(cairo_t *cr) {
1579        cairo_set_source_rgb (cr, 1, 1, 1);
1580        cairo_fill_preserve (cr);
1581        cairo_set_source_rgb (cr, OSD_COLOR);
1582        cairo_set_line_width (cr, 1);
1583        cairo_stroke (cr);
1584    }
1585    
1586    static void
1587    osm_gps_map_osd_dpad_labels(cairo_t *cr, gint x, gint y) {
1588        /* move reference to dpad center */
1589        x += D_RAD;
1590        y += D_RAD;
1591    
1592        const static gint offset[][3][2] = {
1593            /* left arrow/triangle */
1594            { { -D_TIP+D_LEN, -D_WID }, { -D_LEN, D_WID }, { +D_LEN, D_WID } },
1595            /* right arrow/triangle */
1596            { { +D_TIP-D_LEN, -D_WID }, { +D_LEN, D_WID }, { -D_LEN, D_WID } },
1597            /* top arrow/triangle */
1598            { { -D_WID, -D_TIP+D_LEN }, { D_WID, -D_LEN }, { D_WID, +D_LEN } },
1599            /* bottom arrow/triangle */
1600            { { -D_WID, +D_TIP-D_LEN }, { D_WID, +D_LEN }, { D_WID, -D_LEN } }
1601        };
1602    
1603        int i;
1604        for(i=0;i<4;i++) {
1605            cairo_move_to (cr, x + offset[i][0][0], y + offset[i][0][1]);
1606            cairo_rel_line_to (cr, offset[i][1][0], offset[i][1][1]);
1607            cairo_rel_line_to (cr, offset[i][2][0], offset[i][2][1]);
1608        }
1609    }
1610    
1611    /* draw the sattelite dish icon in the center of the dpad */
1612    #define GPS_V0  (D_RAD/8)
1613    #define GPS_V1  (D_RAD/10)
1614    #define GPS_V2  (D_RAD/5)
1615    
1616    /* draw a satellite receiver dish */
1617    static void
1618    osm_gps_map_osd_dpad_gps(cairo_t *cr, gint x, gint y) {
1619        /* move reference to dpad center */
1620        x += D_RAD;
1621        y += D_RAD + GPS_V0;
1622    
1623        cairo_move_to (cr, x-GPS_V0, y+GPS_V0);
1624        cairo_rel_line_to (cr, +GPS_V0, -GPS_V0);
1625        cairo_rel_line_to (cr, +GPS_V0, +GPS_V0);
1626        cairo_close_path (cr);
1627    
1628        cairo_move_to (cr, x+GPS_V1-GPS_V2, y-2*GPS_V2);
1629        cairo_curve_to (cr, x-GPS_V2, y, x+GPS_V1, y+GPS_V1, x+GPS_V1+GPS_V2, y);
1630        cairo_close_path (cr);
1631    
1632        x += GPS_V1;
1633        cairo_move_to (cr, x, y-GPS_V2);
1634        cairo_rel_line_to (cr, +GPS_V1, -GPS_V1);
1635    }
1636    
1637    #define Z_LEN  (2*Z_RAD/3)
1638    
1639    static void
1640    osm_gps_map_osd_zoom_labels(cairo_t *cr, gint x, gint y) {
1641        cairo_move_to (cr, x + Z_LEFT  - Z_LEN, y + Z_MID);
1642        cairo_line_to (cr, x + Z_LEFT  + Z_LEN, y + Z_MID);
1643    
1644        cairo_move_to (cr, x + Z_RIGHT,         y + Z_MID - Z_LEN);
1645        cairo_line_to (cr, x + Z_RIGHT,         y + Z_MID + Z_LEN);
1646        cairo_move_to (cr, x + Z_RIGHT - Z_LEN, y + Z_MID);
1647        cairo_line_to (cr, x + Z_RIGHT + Z_LEN, y + Z_MID);
1648    }
1649    
1650    static void
1651    osm_gps_map_osd_labels(cairo_t *cr, gint width, gboolean enabled) {
1652        if(enabled)  cairo_set_source_rgb (cr, OSD_COLOR);
1653        else         cairo_set_source_rgb (cr, OSD_COLOR_DISABLED);
1654        cairo_set_line_width (cr, width);
1655        cairo_stroke (cr);
1656    }
1657    
1658    static void
1659    osm_gps_map_osd_labels_shadow(cairo_t *cr, gint width, gboolean enabled) {
1660        cairo_set_source_rgba (cr, 0, 0, 0, enabled?0.3:0.15);
1661        cairo_set_line_width (cr, width);
1662        cairo_stroke (cr);
1663    }
1664    
1665    static void
1666    osm_gps_map_osd_draw_controls (OsmGpsMap *map, gint xoffset, gint yoffset)
1667    {
1668      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1669    
1670      if (g_hash_table_size (priv->tile_cache) < priv->max_tile_cache_size)      /* backup previous contents */
1671          return;      if(!priv->osd.backup)
1672            priv->osd.backup = gdk_pixmap_new(priv->pixmap, OSD_W+2, OSD_H+2, -1);
1673    
1674        gint x = OSD_X + EXTRA_BORDER + xoffset;
1675        gint y = OSD_Y + EXTRA_BORDER + yoffset;
1676    
1677        /* create backup of background */
1678        gdk_draw_drawable(priv->osd.backup,
1679            GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(GTK_WIDGET(map))],
1680                          priv->pixmap, x-1, y-1, 0, 0, OSD_W+2, OSD_H+2);
1681        priv->osd.backup_x = x-1;
1682        priv->osd.backup_y = y-1;
1683    
1684    #if 0
1685        /* create pixbuf for osd */
1686        if(!priv->osd.pixbuf)
1687            priv->osd.pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
1688                                              TRUE, 8, OSD_W, OSD_H);
1689        cairo_surface_t *surface =
1690            cairo_image_surface_create(CAIRO_FORMAT_ARGB32, OSD_W, OSD_H);
1691    
1692        /* fill with transparency */
1693        {
1694        cairo_t *cr = cairo_create(surface);
1695        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1696        cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
1697        cairo_paint(cr);
1698        cairo_destroy(cr);
1699        }
1700    #endif
1701    
1702    
1703    #ifdef USE_CAIRO
1704        //    cairo_t *cr = cairo_create(surface);
1705        cairo_t *cr = gdk_cairo_create(priv->pixmap);
1706    
1707        /* --------- draw zoom and dpad shape shadow ----------- */
1708    
1709        osm_gps_map_osd_zoom_shape(cr, x + OSD_SHADOW, y + OSD_SHADOW);
1710        osm_gps_map_osd_shape_shadow(cr);
1711        osm_gps_map_osd_dpad_shape(cr, x + OSD_SHADOW, y + OSD_SHADOW);
1712        osm_gps_map_osd_shape_shadow(cr);
1713    
1714        /* --------- draw zoom and dpad shape ----------- */
1715    
1716        osm_gps_map_osd_zoom_shape(cr, x, y);
1717        osm_gps_map_osd_shape(cr);
1718        osm_gps_map_osd_dpad_shape(cr, x, y);
1719        osm_gps_map_osd_shape(cr);
1720    
1721        /* --------- draw zoom and dpad labels --------- */
1722    
1723        osm_gps_map_osd_zoom_labels(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW);
1724        osm_gps_map_osd_dpad_labels(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW);
1725        osm_gps_map_osd_labels_shadow(cr, Z_RAD/3, TRUE);
1726        osm_gps_map_osd_dpad_gps(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW);
1727        osm_gps_map_osd_labels_shadow(cr, Z_RAD/6, priv->osd.cb != NULL);
1728    
1729        osm_gps_map_osd_zoom_labels(cr, x, y);
1730        osm_gps_map_osd_dpad_labels(cr, x, y);
1731        osm_gps_map_osd_labels(cr, Z_RAD/3, TRUE);
1732        osm_gps_map_osd_dpad_gps(cr, x, y);
1733        osm_gps_map_osd_labels(cr, Z_RAD/6, priv->osd.cb != NULL);
1734    
1735        cairo_destroy(cr);
1736    
1737    #else
1738    #warning "OSD control display lacks a non-cairo implementation!"
1739    #endif
1740    }
1741    
1742    static void
1743    osm_gps_map_osd_restore (OsmGpsMap *map)
1744    {
1745        OsmGpsMapPrivate *priv = map->priv;
1746    
1747      /* run through the cache, and remove the tiles which have not been used      /* restore backup of previous contents */
1748       * during the last redraw operation */      if(priv->osd.backup) {
1749      g_hash_table_foreach_remove(priv->tile_cache, osm_gps_map_purge_cache_check, priv);          /* create backup of background */
1750            gdk_draw_drawable(priv->pixmap,
1751                GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(GTK_WIDGET(map))],
1752                          priv->osd.backup, 0, 0,
1753                          priv->osd.backup_x, priv->osd.backup_y, OSD_W+2, OSD_H+2);
1754        }
1755  }  }
1756    
1757    #endif
1758    
1759  static gboolean  static gboolean
1760  osm_gps_map_map_redraw (OsmGpsMap *map)  osm_gps_map_map_redraw (OsmGpsMap *map)
1761  {  {
# Line 1193  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1786  osm_gps_map_map_redraw (OsmGpsMap *map)
1786      osm_gps_map_print_tracks(map);      osm_gps_map_print_tracks(map);
1787      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1788      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1789    #ifdef ENABLE_BALLOON
1790        osm_gps_map_draw_balloon_int(map);
1791    #endif
1792    #ifdef ENABLE_OSD
1793        osm_gps_map_osd_draw_controls(map, 0, 0);
1794    #endif
1795    
1796      //osm_gps_map_osd_speed(map, 1.5);      //osm_gps_map_osd_speed(map, 1.5);
1797      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
# Line 1224  osm_gps_map_init (OsmGpsMap *object) Line 1823  osm_gps_map_init (OsmGpsMap *object)
1823      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1824      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1825    
1826    #ifdef ENABLE_BALLOON
1827        priv->balloon.coo = g_new0(coord_t, 1);
1828        priv->balloon.valid = FALSE;
1829        priv->balloon.cb = NULL;
1830    #endif
1831    
1832    #ifdef ENABLE_OSD
1833        priv->osd.backup = NULL;
1834        priv->osd.cb = NULL;
1835    #endif
1836    
1837      priv->tracks = NULL;      priv->tracks = NULL;
1838      priv->images = NULL;      priv->images = NULL;
1839    
# Line 1236  osm_gps_map_init (OsmGpsMap *object) Line 1846  osm_gps_map_init (OsmGpsMap *object)
1846      priv->uri_format = 0;      priv->uri_format = 0;
1847      priv->the_google = FALSE;      priv->the_google = FALSE;
1848    
1849        priv->map_source = -1;
1850    
1851  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1852      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1853      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session = soup_session_async_new_with_options(
# Line 1289  osm_gps_map_constructor (GType gtype, gu Line 1901  osm_gps_map_constructor (GType gtype, gu
1901  {  {
1902      GObject *object;      GObject *object;
1903      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
1904        OsmGpsMap *map;
1905        const char *uri;
1906    
1907      //Always chain up to the parent constructor      //Always chain up to the parent constructor
1908      object = G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);      object = G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1909        map = OSM_GPS_MAP(object);
1910      priv = OSM_GPS_MAP_PRIVATE(object);      priv = OSM_GPS_MAP_PRIVATE(object);
1911    
1912        //user can specify a map source ID, or a repo URI as the map source
1913        uri = osm_gps_map_source_get_repo_uri(OSM_GPS_MAP_SOURCE_NULL);
1914        if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
1915            g_debug("Using null source");
1916            priv->map_source = OSM_GPS_MAP_SOURCE_NULL;
1917    
1918            priv->null_tile = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, 256, 256);
1919            gdk_pixbuf_fill(priv->null_tile, 0xcccccc00);
1920        }
1921        else if (priv->map_source >= 0) {
1922            //check if the source given is valid
1923            uri = osm_gps_map_source_get_repo_uri(priv->map_source);
1924            if (uri) {
1925                g_debug("Setting map source from ID");
1926                g_free(priv->repo_uri);
1927    
1928                priv->repo_uri = g_strdup(uri);
1929                priv->image_format = g_strdup(
1930                    osm_gps_map_source_get_image_format(priv->map_source));
1931                priv->max_zoom = osm_gps_map_source_get_max_zoom(priv->map_source);
1932                priv->min_zoom = osm_gps_map_source_get_min_zoom(priv->map_source);
1933            }
1934        }
1935    
1936      if (!priv->cache_dir_is_full_path) {      if (!priv->cache_dir_is_full_path) {
1937  #ifdef G_CHECKSUM_MD5  #ifdef G_CHECKSUM_MD5
1938          char *md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, priv->repo_uri, -1);          char *md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, priv->repo_uri, -1);
# Line 1304  osm_gps_map_constructor (GType gtype, gu Line 1943  osm_gps_map_constructor (GType gtype, gu
1943          if (priv->cache_dir) {          if (priv->cache_dir) {
1944              char *old = priv->cache_dir;              char *old = priv->cache_dir;
1945              //the new cachedir is the given cache dir + the md5 of the repo_uri              //the new cachedir is the given cache dir + the md5 of the repo_uri
1946              priv->cache_dir = g_strdup_printf("%s/%s", old, md5);              priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, md5);
1947              g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);              g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);
1948              g_free(old);              g_free(old);
1949            } else {
1950                //the new cachedir is the current dir + the md5 of the repo_uri
1951                priv->cache_dir = g_strdup(md5);
1952          }          }
1953    
1954          g_free(md5);          g_free(md5);
1955      }      }
1956    
1957        inspect_map_uri(map);
1958    
1959      return object;      return object;
1960  }  }
1961    
# Line 1338  osm_gps_map_dispose (GObject *object) Line 1982  osm_gps_map_dispose (GObject *object)
1982      if(priv->pixmap)      if(priv->pixmap)
1983          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
1984    
1985        if (priv->null_tile)
1986            g_object_unref (priv->null_tile);
1987    
1988      if(priv->gc_map)      if(priv->gc_map)
1989          g_object_unref(priv->gc_map);          g_object_unref(priv->gc_map);
1990    
1991      if (priv->idle_map_redraw != 0)      if (priv->idle_map_redraw != 0)
1992          g_source_remove (priv->idle_map_redraw);          g_source_remove (priv->idle_map_redraw);
1993    
1994        g_free(priv->gps);
1995    
1996    #ifdef ENABLE_BALLOON
1997        g_free(priv->balloon.coo);
1998    #endif
1999    
2000    #ifdef ENABLE_OSD
2001        if (priv->osd.backup)
2002            g_object_unref(priv->osd.backup);
2003    #endif
2004    
2005      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
2006  }  }
2007    
# Line 1355  osm_gps_map_finalize (GObject *object) Line 2013  osm_gps_map_finalize (GObject *object)
2013    
2014      g_free(priv->cache_dir);      g_free(priv->cache_dir);
2015      g_free(priv->repo_uri);      g_free(priv->repo_uri);
2016        g_free(priv->image_format);
2017    
2018      osm_gps_map_free_trip(map);      osm_gps_map_free_trip(map);
2019      osm_gps_map_free_tracks(map);      osm_gps_map_free_tracks(map);
# Line 1385  osm_gps_map_set_property (GObject *objec Line 2044  osm_gps_map_set_property (GObject *objec
2044              break;              break;
2045          case PROP_REPO_URI:          case PROP_REPO_URI:
2046              priv->repo_uri = g_value_dup_string (value);              priv->repo_uri = g_value_dup_string (value);
             inspect_map_uri(map);  
2047              break;              break;
2048          case PROP_PROXY_URI:          case PROP_PROXY_URI:
2049              if ( g_value_get_string(value) ) {              if ( g_value_get_string(value) ) {
   
2050                  priv->proxy_uri = g_value_dup_string (value);                  priv->proxy_uri = g_value_dup_string (value);
2051                  g_debug("Setting proxy server: %s", priv->proxy_uri);                  g_debug("Setting proxy server: %s", priv->proxy_uri);
2052    
2053  #ifndef LIBSOUP22  #ifndef LIBSOUP22
2054                  GValue val = {0};                  GValue val = {0};
2055    
2056                  SoupURI* uri = soup_uri_new(priv->proxy_uri);                  SoupURI* uri = soup_uri_new(priv->proxy_uri);
2057                  g_value_init(&val, SOUP_TYPE_URI);                  g_value_init(&val, SOUP_TYPE_URI);
2058                  g_value_take_boxed(&val, uri);                  g_value_take_boxed(&val, uri);
# Line 1403  osm_gps_map_set_property (GObject *objec Line 2062  osm_gps_map_set_property (GObject *objec
2062                  SoupUri* uri = soup_uri_new(priv->proxy_uri);                  SoupUri* uri = soup_uri_new(priv->proxy_uri);
2063                  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);
2064  #endif  #endif
                 soup_uri_free(uri);  
2065              } else              } else
2066                  priv->proxy_uri = NULL;                  priv->proxy_uri = NULL;
2067    
2068              break;              break;
2069          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
2070              priv->cache_dir = g_value_dup_string (value);              if ( g_value_get_string(value) )
2071                    priv->cache_dir = g_value_dup_string (value);
2072              break;              break;
2073          case PROP_TILE_CACHE_DIR_IS_FULL_PATH:          case PROP_TILE_CACHE_DIR_IS_FULL_PATH:
2074              priv->cache_dir_is_full_path = g_value_get_boolean (value);              priv->cache_dir_is_full_path = g_value_get_boolean (value);
# Line 1440  osm_gps_map_set_property (GObject *objec Line 2099  osm_gps_map_set_property (GObject *objec
2099          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
2100              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
2101              break;              break;
2102            case PROP_MAP_SOURCE:
2103                priv->map_source = g_value_get_int (value);
2104                break;
2105            case PROP_IMAGE_FORMAT:
2106                priv->image_format = g_value_dup_string (value);
2107                break;
2108          default:          default:
2109              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
2110              break;              break;
# Line 1517  osm_gps_map_get_property (GObject *objec Line 2182  osm_gps_map_get_property (GObject *objec
2182          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
2183              g_value_set_int(value, priv->ui_gps_point_outer_radius);              g_value_set_int(value, priv->ui_gps_point_outer_radius);
2184              break;              break;
2185            case PROP_MAP_SOURCE:
2186                g_value_set_int(value, priv->map_source);
2187                break;
2188            case PROP_IMAGE_FORMAT:
2189                g_value_set_string(value, priv->image_format);
2190                break;
2191          default:          default:
2192              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
2193              break;              break;
# Line 1524  osm_gps_map_get_property (GObject *objec Line 2195  osm_gps_map_get_property (GObject *objec
2195  }  }
2196    
2197  static gboolean  static gboolean
2198  _osm_gps_map_scroll (GtkWidget *widget, GdkEventScroll  *event)  osm_gps_map_scroll_event (GtkWidget *widget, GdkEventScroll  *event)
2199  {  {
2200      OsmGpsMap *map = OSM_GPS_MAP(widget);      OsmGpsMap *map = OSM_GPS_MAP(widget);
2201      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
# Line 1546  osm_gps_map_button_press (GtkWidget *wid Line 2217  osm_gps_map_button_press (GtkWidget *wid
2217  {  {
2218      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2219    
2220    #ifdef ENABLE_BALLOON
2221        /* don't drag if the user clicked within the balloon */
2222        if (osm_gps_map_in_balloon(priv,
2223                       event->x + EXTRA_BORDER,
2224                       event->y + EXTRA_BORDER))
2225        {
2226            priv->drag_counter = -1;
2227            return FALSE;
2228        }
2229    #endif
2230    
2231    #ifdef ENABLE_OSD
2232        #define SCROLL_STEP 10
2233    
2234        /* pressed inside OSD control? */
2235        osd_button_t but = osm_gps_map_osd_check(event->x, event->y);
2236        if(but != OSD_NONE)
2237        {
2238            priv->drag_counter = -1;
2239    
2240            switch(but) {
2241            case OSD_GPS:
2242                priv->osd.cb(priv->osd.data);
2243                break;
2244    
2245            case OSD_UP:
2246                priv->map_y -= GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;
2247                priv->center_coord_set = FALSE;
2248                break;
2249    
2250            case OSD_DOWN:
2251                priv->map_y += GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;
2252                priv->center_coord_set = FALSE;
2253                break;
2254    
2255            case OSD_LEFT:
2256                priv->map_x -= GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;
2257                priv->center_coord_set = FALSE;
2258                break;
2259    
2260            case OSD_RIGHT:
2261                priv->map_x += GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;
2262                priv->center_coord_set = FALSE;
2263                break;
2264    
2265            case OSD_IN:
2266                osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
2267                break;
2268    
2269            case OSD_OUT:
2270                osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
2271                break;
2272    
2273            default:
2274                break;
2275            }
2276    
2277            osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2278    
2279            return FALSE;
2280        }
2281    #endif
2282    
2283      priv->drag_counter = 0;      priv->drag_counter = 0;
2284      priv->drag_start_mouse_x = (int) event->x;      priv->drag_start_mouse_x = (int) event->x;
2285      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 2294  osm_gps_map_button_release (GtkWidget *w
2294  {  {
2295      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2296    
2297    #ifdef ENABLE_BALLOON
2298        /* released inside the balloon? */
2299        if (osm_gps_map_in_balloon(priv,
2300                       event->x + EXTRA_BORDER,
2301                       event->y + EXTRA_BORDER))
2302        {
2303            osm_gps_map_handle_balloon_click(OSM_GPS_MAP(widget),
2304                 event->x - priv->balloon.rect.x + EXTRA_BORDER,
2305                 event->y - priv->balloon.rect.y + EXTRA_BORDER);
2306        }
2307    #endif
2308    
2309      if (priv->dragging)      if (priv->dragging)
2310      {      {
2311          priv->dragging = FALSE;          priv->dragging = FALSE;
# Line 1577  osm_gps_map_button_release (GtkWidget *w Line 2323  osm_gps_map_button_release (GtkWidget *w
2323    
2324      priv->drag_mouse_dx = 0;      priv->drag_mouse_dx = 0;
2325      priv->drag_mouse_dy = 0;      priv->drag_mouse_dy = 0;
2326      priv->drag_counter = 0;      priv->drag_counter = -1;
2327    
2328      return FALSE;      return FALSE;
2329  }  }
# Line 1602  osm_gps_map_motion_notify (GtkWidget *wi Line 2348  osm_gps_map_motion_notify (GtkWidget *wi
2348      if (!(state & GDK_BUTTON1_MASK))      if (!(state & GDK_BUTTON1_MASK))
2349          return FALSE;          return FALSE;
2350    
2351        if (priv->drag_counter < 0)
2352            return FALSE;
2353    
2354      priv->drag_counter++;      priv->drag_counter++;
2355    
2356      // we havent dragged more than 6 pixels      // we havent dragged more than 6 pixels
# Line 1616  osm_gps_map_motion_notify (GtkWidget *wi Line 2365  osm_gps_map_motion_notify (GtkWidget *wi
2365      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
2366      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
2367    
2368    #ifdef ENABLE_OSD
2369        /* undo OSD */
2370        osm_gps_map_osd_restore (OSM_GPS_MAP(widget));
2371    
2372        /* draw new OSD */
2373        osm_gps_map_osd_draw_controls (OSM_GPS_MAP(widget),
2374                                       -priv->drag_mouse_dx,
2375                                       -priv->drag_mouse_dy);
2376    #endif
2377    
2378      gdk_draw_drawable (      gdk_draw_drawable (
2379                         widget->window,                         widget->window,
2380                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
# Line 1704  osm_gps_map_expose (GtkWidget *widget, G Line 2463  osm_gps_map_expose (GtkWidget *widget, G
2463                         widget->window,                         widget->window,
2464                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2465                         priv->pixmap,                         priv->pixmap,
2466                         event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,                         event->area.x + EXTRA_BORDER,
2467                           event->area.y + EXTRA_BORDER,
2468                         event->area.x, event->area.y,                         event->area.x, event->area.y,
2469                         event->area.width, event->area.height);                         event->area.width, event->area.height);
2470    
2471    #ifdef ENABLE_OSD_OVL
2472        /* TODO: intersect with area */
2473        if (priv->osd.pixbuf)
2474        {
2475            //        gdk_draw_drawable (widget->window,
2476            //            widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2477            //            priv->osd.pixbuf, 0, 0,
2478            //            OSD_X, OSD_Y, OSD_W, OSD_H);
2479        }
2480    #endif
2481    
2482      return FALSE;      return FALSE;
2483  }  }
2484    
# Line 1730  osm_gps_map_class_init (OsmGpsMapClass * Line 2501  osm_gps_map_class_init (OsmGpsMapClass *
2501      widget_class->button_press_event = osm_gps_map_button_press;      widget_class->button_press_event = osm_gps_map_button_press;
2502      widget_class->button_release_event = osm_gps_map_button_release;      widget_class->button_release_event = osm_gps_map_button_release;
2503      widget_class->motion_notify_event = osm_gps_map_motion_notify;      widget_class->motion_notify_event = osm_gps_map_motion_notify;
2504      widget_class->scroll_event = _osm_gps_map_scroll;      widget_class->scroll_event = osm_gps_map_scroll_event;
2505    
2506      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2507                                       PROP_AUTO_CENTER,                                       PROP_AUTO_CENTER,
# Line 1768  osm_gps_map_class_init (OsmGpsMapClass * Line 2539  osm_gps_map_class_init (OsmGpsMapClass *
2539                                       PROP_REPO_URI,                                       PROP_REPO_URI,
2540                                       g_param_spec_string ("repo-uri",                                       g_param_spec_string ("repo-uri",
2541                                                            "repo uri",                                                            "repo uri",
2542                                                            "osm repo uri",                                                            "map source tile repository uri",
2543                                                            "http://tile.openstreetmap.org/#Z/#X/#Y.png",                                                            OSM_REPO_URI,
2544                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2545    
2546      g_object_class_install_property (object_class,       g_object_class_install_property (object_class,
2547                                       PROP_PROXY_URI,                                       PROP_PROXY_URI,
2548                                       g_param_spec_string ("proxy-uri",                                       g_param_spec_string ("proxy-uri",
2549                                                            "proxy uri",                                                            "proxy uri",
# Line 1785  osm_gps_map_class_init (OsmGpsMapClass * Line 2556  osm_gps_map_class_init (OsmGpsMapClass *
2556                                       g_param_spec_string ("tile-cache",                                       g_param_spec_string ("tile-cache",
2557                                                            "tile cache",                                                            "tile cache",
2558                                                            "osm local tile cache dir",                                                            "osm local tile cache dir",
2559                                                            "/tmp/Maps",                                                            NULL,
2560                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2561    
2562      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1813  osm_gps_map_class_init (OsmGpsMapClass * Line 2584  osm_gps_map_class_init (OsmGpsMapClass *
2584                                                         "maximum zoom level",                                                         "maximum zoom level",
2585                                                         MIN_ZOOM, /* minimum property value */                                                         MIN_ZOOM, /* minimum property value */
2586                                                         MAX_ZOOM, /* maximum property value */                                                         MAX_ZOOM, /* maximum property value */
2587                                                         17,                                                         OSM_MAX_ZOOM,
2588                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2589    
2590      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1823  osm_gps_map_class_init (OsmGpsMapClass * Line 2594  osm_gps_map_class_init (OsmGpsMapClass *
2594                                                         "minimum zoom level",                                                         "minimum zoom level",
2595                                                         MIN_ZOOM, /* minimum property value */                                                         MIN_ZOOM, /* minimum property value */
2596                                                         MAX_ZOOM, /* maximum property value */                                                         MAX_ZOOM, /* maximum property value */
2597                                                         1,                                                         OSM_MIN_ZOOM,
2598                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2599    
2600      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1893  osm_gps_map_class_init (OsmGpsMapClass * Line 2664  osm_gps_map_class_init (OsmGpsMapClass *
2664                                                         "radius of the gps point inner circle",                                                         "radius of the gps point inner circle",
2665                                                         0,           /* minimum property value */                                                         0,           /* minimum property value */
2666                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2667                                                         5,                                                         10,
2668                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2669    
2670      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
# Line 1906  osm_gps_map_class_init (OsmGpsMapClass * Line 2677  osm_gps_map_class_init (OsmGpsMapClass *
2677                                                         20,                                                         20,
2678                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2679    
2680        g_object_class_install_property (object_class,
2681                                         PROP_MAP_SOURCE,
2682                                         g_param_spec_int ("map-source",
2683                                                           "map source",
2684                                                           "map source ID",
2685                                                           -1,           /* minimum property value */
2686                                                           G_MAXINT,    /* maximum property value */
2687                                                           -1,
2688                                                           G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2689    
2690        g_object_class_install_property (object_class,
2691                                         PROP_IMAGE_FORMAT,
2692                                         g_param_spec_string ("image-format",
2693                                                              "image format",
2694                                                              "map source tile repository image format (jpg, png)",
2695                                                              OSM_IMAGE_FORMAT,
2696                                                              G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2697    }
2698    
2699    const char*
2700    osm_gps_map_source_get_friendly_name(OsmGpsMapSource_t source)
2701    {
2702        switch(source)
2703        {
2704            case OSM_GPS_MAP_SOURCE_NULL:
2705                return "None";
2706            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2707                return "OpenStreetMap";
2708            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2709                return "OpenStreetMap Renderer";
2710            case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:
2711                return "OpenAerialMap";
2712            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2713                return "Maps-For-Free";
2714            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2715                return "Google Maps";
2716            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2717                return "Google Satellite";
2718            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2719                return "Google Hybrid";
2720            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2721                return "Virtual Earth";
2722            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2723                return "Virtual Earth Satellite";
2724            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2725                return "Virtual Earth Hybrid";
2726            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2727                return "Yahoo Maps";
2728            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2729                return "Yahoo Satellite";
2730            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2731                return "Yahoo Hybrid";
2732            default:
2733                return NULL;
2734        }
2735        return NULL;
2736    }
2737    
2738    //http://www.internettablettalk.com/forums/showthread.php?t=5209
2739    //https://garage.maemo.org/plugins/scmsvn/viewcvs.php/trunk/src/maps.c?root=maemo-mapper&view=markup
2740    //http://www.ponies.me.uk/maps/GoogleTileUtils.java
2741    //http://www.mgmaps.com/cache/MapTileCacher.perl
2742    const char*
2743    osm_gps_map_source_get_repo_uri(OsmGpsMapSource_t source)
2744    {
2745        switch(source)
2746        {
2747            case OSM_GPS_MAP_SOURCE_NULL:
2748                return "none://";
2749            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2750                return OSM_REPO_URI;
2751            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2752                return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2753            case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:
2754                return "http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/#Z/#X/#Y.jpg";
2755            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2756                return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";
2757            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2758                return "http://mt#R.google.com/vt/v=w2.97&x=#X&y=#Y&z=#Z";
2759            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2760                return "http://khm#R.google.com/kh?n=404&v=3&t=#Q";
2761            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2762                return NULL; /* No longer working  "http://mt#R.google.com/mt?n=404&v=w2t.99&x=#X&y=#Y&zoom=#S" */
2763            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2764                return "http://a#R.ortho.tiles.virtualearth.net/tiles/r#W.jpeg?g=50";
2765            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2766                return "http://a#R.ortho.tiles.virtualearth.net/tiles/a#W.jpeg?g=50";
2767            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2768                return "http://a#R.ortho.tiles.virtualearth.net/tiles/h#W.jpeg?g=50";
2769            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2770            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2771            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2772                /* TODO: Implement signed Y, aka U
2773                 * http://us.maps3.yimg.com/aerial.maps.yimg.com/ximg?v=1.7&t=a&s=256&x=%d&y=%-d&z=%d
2774                 *  x = tilex,
2775                 *  y = (1 << (MAX_ZOOM - zoom)) - tiley - 1,
2776                 *  z = zoom - (MAX_ZOOM - 17));
2777                 */
2778                return NULL;
2779            default:
2780                return NULL;
2781        }
2782        return NULL;
2783    }
2784    
2785    const char *
2786    osm_gps_map_source_get_image_format(OsmGpsMapSource_t source)
2787    {
2788        switch(source) {
2789            case OSM_GPS_MAP_SOURCE_NULL:
2790            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2791            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2792                return "png";
2793            case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:
2794            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2795            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2796            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2797            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2798            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2799            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2800            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2801            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2802            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2803            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2804                return "jpg";
2805            default:
2806                return "bin";
2807        }
2808        return "bin";
2809    }
2810    
2811    
2812    int
2813    osm_gps_map_source_get_min_zoom(OsmGpsMapSource_t source)
2814    {
2815        return 1;
2816    }
2817    
2818    int
2819    osm_gps_map_source_get_max_zoom(OsmGpsMapSource_t source)
2820    {
2821        switch(source) {
2822            case OSM_GPS_MAP_SOURCE_NULL:
2823                return 18;
2824            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2825                return OSM_MAX_ZOOM;
2826            case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2827            case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:
2828            case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2829            case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2830            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2831            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
2832            case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID:
2833            case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2834            case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2835            case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2836                return 17;
2837            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2838                return 11;
2839            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2840                return 18;
2841            default:
2842                return 17;
2843        }
2844        return 17;
2845  }  }
2846    
2847  void  void
# Line 1938  osm_gps_map_download_maps (OsmGpsMap *ma Line 2874  osm_gps_map_download_maps (OsmGpsMap *ma
2874                  for(j=y1; j<=y2; j++)                  for(j=y1; j<=y2; j++)
2875                  {                  {
2876                      // x = i, y = j                      // x = i, y = j
2877                      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",
2878                      if (!priv->cache_dir || !g_file_test(filename, G_FILE_TEST_EXISTS))                                      priv->cache_dir, G_DIR_SEPARATOR,
2879                                        zoom, G_DIR_SEPARATOR,
2880                                        i, G_DIR_SEPARATOR,
2881                                        j,
2882                                        priv->image_format);
2883                        if (!g_file_test(filename, G_FILE_TEST_EXISTS))
2884                      {                      {
2885                          osm_gps_map_download_tile(map, zoom, i, j, FALSE);                          osm_gps_map_download_tile(map, zoom, i, j, FALSE);
2886                          num_tiles++;                          num_tiles++;
# Line 2001  int Line 2942  int
2942  osm_gps_map_set_zoom (OsmGpsMap *map, int zoom)  osm_gps_map_set_zoom (OsmGpsMap *map, int zoom)
2943  {  {
2944      int zoom_old;      int zoom_old;
2945      double factor = 1.0;      double factor = 0.0;
2946      int width_center, height_center;      int width_center, height_center;
2947      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
2948    
# Line 2072  osm_gps_map_add_image (OsmGpsMap *map, f Line 3013  osm_gps_map_add_image (OsmGpsMap *map, f
3013          //cache w/h for speed, and add image to list          //cache w/h for speed, and add image to list
3014          im = g_new0(image_t,1);          im = g_new0(image_t,1);
3015          im->w = gdk_pixbuf_get_width(image);          im->w = gdk_pixbuf_get_width(image);
3016          im->h = gdk_pixbuf_get_width(image);          im->h = gdk_pixbuf_get_height(image);
3017          im->pt.rlat = deg2rad(latitude);          im->pt.rlat = deg2rad(latitude);
3018          im->pt.rlon = deg2rad(longitude);          im->pt.rlon = deg2rad(longitude);
3019    
# Line 2085  osm_gps_map_add_image (OsmGpsMap *map, f Line 3026  osm_gps_map_add_image (OsmGpsMap *map, f
3026      }      }
3027  }  }
3028    
3029    gboolean
3030    osm_gps_map_remove_image (OsmGpsMap *map, GdkPixbuf *image)
3031    {
3032        OsmGpsMapPrivate *priv = map->priv;
3033        if (priv->images) {
3034            GSList *list;
3035            for(list = priv->images; list != NULL; list = list->next)
3036            {
3037                image_t *im = list->data;
3038                    if (im->image == image)
3039                    {
3040                            priv->images = g_slist_remove_link(priv->images, list);
3041                            g_object_unref(im->image);
3042                            g_free(im);
3043                            osm_gps_map_map_redraw_idle(map);
3044                            return TRUE;
3045                    }
3046            }
3047        }
3048        return FALSE;
3049    }
3050    
3051  void  void
3052  osm_gps_map_clear_images (OsmGpsMap *map)  osm_gps_map_clear_images (OsmGpsMap *map)
3053  {  {
# Line 2276  osm_gps_map_scroll (OsmGpsMap *map, gint Line 3239  osm_gps_map_scroll (OsmGpsMap *map, gint
3239      osm_gps_map_map_redraw_idle (map);      osm_gps_map_map_redraw_idle (map);
3240  }  }
3241    
3242    float
3243    osm_gps_map_get_scale(OsmGpsMap *map)
3244    {
3245        OsmGpsMapPrivate *priv;
3246    
3247        g_return_val_if_fail (OSM_IS_GPS_MAP (map), OSM_NAN);
3248        priv = map->priv;
3249    
3250        return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);
3251    }
3252    
3253    #ifdef ENABLE_BALLOON
3254    void
3255    osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
3256                              OsmGpsMapBalloonCallback cb, gpointer data)
3257    {
3258        OsmGpsMapPrivate *priv;
3259    
3260        /* remove and previously installed balloon */
3261        osm_gps_map_clear_balloon (map);
3262    
3263        g_return_if_fail (OSM_IS_GPS_MAP (map));
3264        priv = map->priv;
3265    
3266        priv->balloon.coo->rlat = deg2rad(latitude);
3267        priv->balloon.coo->rlon = deg2rad(longitude);
3268        priv->balloon.valid = TRUE;
3269    
3270        priv->balloon.cb = cb;
3271        priv->balloon.data = data;
3272    
3273        // this redraws the map
3274        osm_gps_map_map_redraw_idle(map);
3275    }
3276    
3277    void
3278    osm_gps_map_clear_balloon (OsmGpsMap *map)
3279    {
3280        OsmGpsMapPrivate *priv;
3281    
3282        g_return_if_fail (OSM_IS_GPS_MAP (map));
3283        priv = map->priv;
3284    
3285        priv->balloon.valid = FALSE;
3286    
3287        osm_gps_map_map_redraw_idle(map);
3288    }
3289    #endif
3290    
3291    #ifdef ENABLE_OSD
3292    void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdGpsCallback cb, gpointer data) {
3293        OsmGpsMapPrivate *priv;
3294    
3295        g_return_if_fail (OSM_IS_GPS_MAP (map));
3296        priv = map->priv;
3297    
3298        priv->osd.cb = cb;
3299        priv->osd.data = data;
3300    
3301        osm_gps_map_map_redraw_idle(map);
3302    }
3303    #endif
Legend:
Removed from v.32  
changed lines
  Added in v.66