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

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

revision 89 by harbaum, Tue Sep 1 11:16:30 2009 UTC revision 105 by harbaum, Wed Sep 9 19:57:45 2009 UTC
# Line 115  struct _OsmGpsMapPrivate Line 115  struct _OsmGpsMapPrivate
115      gboolean show_trip_history;      gboolean show_trip_history;
116      GSList *trip_history;      GSList *trip_history;
117      coord_t *gps;      coord_t *gps;
118        float gps_heading;
119      gboolean gps_valid;      gboolean gps_valid;
120    
121  #ifdef ENABLE_BALLOON  #ifdef ENABLE_BALLOON
# Line 589  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 590  osm_gps_map_draw_gps_point (OsmGpsMap *m
590          int x, y;          int x, y;
591          int r = priv->ui_gps_point_inner_radius;          int r = priv->ui_gps_point_inner_radius;
592          int r2 = priv->ui_gps_point_outer_radius;          int r2 = priv->ui_gps_point_outer_radius;
593          // int lw = priv->ui_gps_track_width;          int mr = MAX(3*r,r2);
         int mr = MAX(r,r2);  
594    
595          map_x0 = priv->map_x - EXTRA_BORDER;          map_x0 = priv->map_x - EXTRA_BORDER;
596          map_y0 = priv->map_y - EXTRA_BORDER;          map_y0 = priv->map_y - EXTRA_BORDER;
# Line 621  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 621  osm_gps_map_draw_gps_point (OsmGpsMap *m
621    
622          // draw ball gradient          // draw ball gradient
623          if (r > 0) {          if (r > 0) {
624                // draw direction arrow
625                if(!isnan(priv->gps_heading))
626                {
627                    cairo_move_to (cr, x-r*cos(priv->gps_heading), y-r*sin(priv->gps_heading));
628                    cairo_line_to (cr, x+3*r*sin(priv->gps_heading), y-3*r*cos(priv->gps_heading));
629                    cairo_line_to (cr, x+r*cos(priv->gps_heading), y+r*sin(priv->gps_heading));
630                    cairo_close_path (cr);
631    
632                    cairo_set_source_rgba (cr, 0.3, 0.3, 1.0, 0.5);
633                    cairo_fill_preserve (cr);
634    
635                    cairo_set_line_width (cr, 1.0);
636                    cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5);
637                    cairo_stroke(cr);
638                }
639    
640              pat = cairo_pattern_create_radial (x-(r/5), y-(r/5), (r/5), x,  y, r);              pat = cairo_pattern_create_radial (x-(r/5), y-(r/5), (r/5), x,  y, r);
641              cairo_pattern_add_color_stop_rgba (pat, 0, 1, 1, 1, 1.0);              cairo_pattern_add_color_stop_rgba (pat, 0, 1, 1, 1, 1.0);
642              cairo_pattern_add_color_stop_rgba (pat, 1, 0, 0, 1, 1.0);              cairo_pattern_add_color_stop_rgba (pat, 1, 0, 0, 1, 1.0);
# Line 634  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 650  osm_gps_map_draw_gps_point (OsmGpsMap *m
650              cairo_arc (cr, x, y, r, 0, 2 * M_PI);              cairo_arc (cr, x, y, r, 0, 2 * M_PI);
651              cairo_stroke(cr);              cairo_stroke(cr);
652          }          }
653    
654          cairo_destroy(cr);          cairo_destroy(cr);
655          gtk_widget_queue_draw_area (GTK_WIDGET(map),          gtk_widget_queue_draw_area (GTK_WIDGET(map),
656                                      x-mr,                                      x-mr,
# Line 1598  osm_gps_map_init (OsmGpsMap *object) Line 1614  osm_gps_map_init (OsmGpsMap *object)
1614      priv->trip_history = NULL;      priv->trip_history = NULL;
1615      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1616      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1617        priv->gps_heading = OSM_GPS_MAP_INVALID;
1618    
1619  #ifdef ENABLE_BALLOON  #ifdef ENABLE_BALLOON
1620      priv->balloon.coo = g_new0(coord_t, 1);      priv->balloon.coo = g_new0(coord_t, 1);
# Line 1664  osm_gps_map_init (OsmGpsMap *object) Line 1681  osm_gps_map_init (OsmGpsMap *object)
1681  #endif  #endif
1682  }  }
1683    
1684  static GObject *  static void
1685  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_setup(OsmGpsMapPrivate *priv) {
 {  
     GObject *object;  
     OsmGpsMapPrivate *priv;  
     OsmGpsMap *map;  
1686      const char *uri;      const char *uri;
1687    
     //Always chain up to the parent constructor  
     object = G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);  
     map = OSM_GPS_MAP(object);  
     priv = OSM_GPS_MAP_PRIVATE(object);  
   
1688      //user can specify a map source ID, or a repo URI as the map source      //user can specify a map source ID, or a repo URI as the map source
1689      uri = osm_gps_map_source_get_repo_uri(OSM_GPS_MAP_SOURCE_NULL);      uri = osm_gps_map_source_get_repo_uri(OSM_GPS_MAP_SOURCE_NULL);
1690      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
# Line 1709  osm_gps_map_constructor (GType gtype, gu Line 1717  osm_gps_map_constructor (GType gtype, gu
1717          priv->cache_dir = g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);          priv->cache_dir = g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);
1718          g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);          g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);
1719      }      }
1720    }
1721    
1722      inspect_map_uri(map);  static GObject *
1723    osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
1724    {
1725        //Always chain up to the parent constructor
1726        GObject *object =
1727            G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1728    
1729        osm_gps_map_setup(OSM_GPS_MAP_PRIVATE(object));
1730    
1731        inspect_map_uri(OSM_GPS_MAP(object));
1732    
1733      return object;      return object;
1734  }  }
# Line 1875  osm_gps_map_set_property (GObject *objec Line 1893  osm_gps_map_set_property (GObject *objec
1893                  /* flush the ram cache */                  /* flush the ram cache */
1894                  g_hash_table_remove_all(priv->tile_cache);                  g_hash_table_remove_all(priv->tile_cache);
1895    
1896                  //check if the source given is valid                  osm_gps_map_setup(priv);
1897                  const char *uri = osm_gps_map_source_get_repo_uri(priv->map_source);  
1898                  if (uri) {                  inspect_map_uri(map);
                     g_debug("Setting map source from ID");  
                     g_free(priv->repo_uri);  
   
                     priv->repo_uri = g_strdup(uri);  
                     priv->image_format = g_strdup(  
                            osm_gps_map_source_get_image_format(priv->map_source));  
                     priv->max_zoom = osm_gps_map_source_get_max_zoom(priv->map_source);  
                     priv->min_zoom = osm_gps_map_source_get_min_zoom(priv->map_source);  
                 }  
   
                 /* create a new disk cache path */  
                 const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);  
                 if(!fname) fname = "_unknown_";  
   
                 if (priv->tile_dir) {  
                     //the new cachedir is the given cache dir + the friendly name of the repo_uri  
                     priv->cache_dir =  
                         g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);  
                     g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);  
                 }  
1899    
1900                  /* adjust zoom if necessary */                  /* adjust zoom if necessary */
1901                  if(priv->map_zoom > priv->max_zoom)                  if(priv->map_zoom > priv->max_zoom)
# Line 1906  osm_gps_map_set_property (GObject *objec Line 1904  osm_gps_map_set_property (GObject *objec
1904                  if(priv->map_zoom < priv->min_zoom)                  if(priv->map_zoom < priv->min_zoom)
1905                      osm_gps_map_set_zoom(map, priv->min_zoom);                      osm_gps_map_set_zoom(map, priv->min_zoom);
1906    
                 inspect_map_uri(map);  
   
1907              } } break;              } } break;
1908          case PROP_IMAGE_FORMAT:          case PROP_IMAGE_FORMAT:
1909              priv->image_format = g_value_dup_string (value);              priv->image_format = g_value_dup_string (value);
# Line 2045  osm_gps_map_button_press (GtkWidget *wid Line 2041  osm_gps_map_button_press (GtkWidget *wid
2041              case OSD_UP:              case OSD_UP:
2042                  priv->map_y -= step;                  priv->map_y -= step;
2043                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2044                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2045                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2046                  break;                  break;
2047    
2048              case OSD_DOWN:              case OSD_DOWN:
2049                  priv->map_y += step;                  priv->map_y += step;
2050                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2051                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2052                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2053                  break;                  break;
2054    
2055              case OSD_LEFT:              case OSD_LEFT:
2056                  priv->map_x -= step;                  priv->map_x -= step;
2057                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2058                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2059                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2060                  break;                  break;
2061    
2062              case OSD_RIGHT:              case OSD_RIGHT:
2063                  priv->map_x += step;                  priv->map_x += step;
2064                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2065                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
2066                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2067                  break;                  break;
2068    
# Line 2531  osm_gps_map_source_get_friendly_name(Osm Line 2531  osm_gps_map_source_get_friendly_name(Osm
2531          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2532              return "None";              return "None";
2533          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2534              return "OpenStreetMap";              return "OpenStreetMap I";
2535          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2536              return "OpenStreetMap Tiles@Home";              return "OpenStreetMap II";
2537          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2538              return "OpenCycleMap";              return "OpenCycleMap";
2539            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2540                return "OSMC Trails";
2541          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2542              return "Maps-For-Free";              return "Maps-For-Free";
2543          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2579  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2581  osm_gps_map_source_get_repo_uri(OsmGpsMa
2581              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2582          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2583              return "http://c.andy.sandbox.cloudmade.com/tiles/cycle/#Z/#X/#Y.png";              return "http://c.andy.sandbox.cloudmade.com/tiles/cycle/#Z/#X/#Y.png";
2584            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2585                return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
2586          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2587              return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";              return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";
2588          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2617  osm_gps_map_source_get_image_format(OsmG Line 2621  osm_gps_map_source_get_image_format(OsmG
2621          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2622          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2623          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2624            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2625              return "png";              return "png";
2626          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2627          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2649  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2654  osm_gps_map_source_get_max_zoom(OsmGpsMa
2654          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2655              return 18;              return 18;
2656          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2657            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2658              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2659          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
         case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:  
2660          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2661          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2662          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2661  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2666  osm_gps_map_source_get_max_zoom(OsmGpsMa
2666          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2667          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2668              return 17;              return 17;
2669            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2670                return 15;
2671          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2672              return 11;              return 11;
2673          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
# Line 2800  osm_gps_map_set_zoom (OsmGpsMap *map, in Line 2807  osm_gps_map_set_zoom (OsmGpsMap *map, in
2807          g_debug("Zoom changed from %d to %d factor:%f x:%d",          g_debug("Zoom changed from %d to %d factor:%f x:%d",
2808                  zoom_old, priv->map_zoom, factor, priv->map_x);                  zoom_old, priv->map_zoom, factor, priv->map_x);
2809    
2810    #ifdef ENABLE_OSD
2811            /* OSD may contain a scale, so we may have to re-render it */
2812            if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2813                priv->osd->render (priv->osd);
2814    #endif
2815    
2816          osm_gps_map_map_redraw_idle(map);          osm_gps_map_map_redraw_idle(map);
2817      }      }
2818      return priv->map_zoom;      return priv->map_zoom;
# Line 2896  osm_gps_map_draw_gps (OsmGpsMap *map, fl Line 2909  osm_gps_map_draw_gps (OsmGpsMap *map, fl
2909      priv->gps->rlat = deg2rad(latitude);      priv->gps->rlat = deg2rad(latitude);
2910      priv->gps->rlon = deg2rad(longitude);      priv->gps->rlon = deg2rad(longitude);
2911      priv->gps_valid = TRUE;      priv->gps_valid = TRUE;
2912        priv->gps_heading = deg2rad(heading);
2913    
2914      // pixel_x,y, offsets      // pixel_x,y, offsets
2915      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);
# Line 3010  osm_gps_map_get_scale(OsmGpsMap *map) Line 3024  osm_gps_map_get_scale(OsmGpsMap *map)
3024  {  {
3025      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
3026    
3027      g_return_val_if_fail (OSM_IS_GPS_MAP (map), OSM_NAN);      g_return_val_if_fail (OSM_IS_GPS_MAP (map), OSM_GPS_MAP_INVALID);
3028      priv = map->priv;      priv = map->priv;
3029    
3030      return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);      return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);
Legend:
Removed from v.89  
changed lines
  Added in v.105