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

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

revision 91 by harbaum, Tue Sep 1 19:55:49 2009 UTC revision 97 by harbaum, Mon Sep 7 06:16:06 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 2024  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 2515  osm_gps_map_source_get_friendly_name(Osm Line 2536  osm_gps_map_source_get_friendly_name(Osm
2536              return "OpenStreetMap II";              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 2558  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 2596  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 2640  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 2875  osm_gps_map_draw_gps (OsmGpsMap *map, fl Line 2903  osm_gps_map_draw_gps (OsmGpsMap *map, fl
2903      priv->gps->rlat = deg2rad(latitude);      priv->gps->rlat = deg2rad(latitude);
2904      priv->gps->rlon = deg2rad(longitude);      priv->gps->rlon = deg2rad(longitude);
2905      priv->gps_valid = TRUE;      priv->gps_valid = TRUE;
2906        priv->gps_heading = deg2rad(heading);
2907    
2908      // pixel_x,y, offsets      // pixel_x,y, offsets
2909      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);
# Line 2989  osm_gps_map_get_scale(OsmGpsMap *map) Line 3018  osm_gps_map_get_scale(OsmGpsMap *map)
3018  {  {
3019      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
3020    
3021      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);
3022      priv = map->priv;      priv = map->priv;
3023    
3024      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.91  
changed lines
  Added in v.97