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

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

revision 83 by harbaum, Thu Aug 27 20:24:31 2009 UTC revision 87 by harbaum, Mon Aug 31 12:01:28 2009 UTC
# Line 1446  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1446  osm_gps_map_map_redraw (OsmGpsMap *map)
1446    
1447      priv->idle_map_redraw = 0;      priv->idle_map_redraw = 0;
1448    
1449        /* don't redraw the entire map while the OSD is doing */
1450        /* some animation or the like. This is to keep the animation */
1451        /* fluid */
1452        if (priv->osd->busy(priv->osd))
1453            return FALSE;
1454    
1455      /* the motion_notify handler uses priv->pixmap to redraw the area; if we      /* the motion_notify handler uses priv->pixmap to redraw the area; if we
1456       * change it while we are dragging, we will end up showing it in the wrong       * change it while we are dragging, we will end up showing it in the wrong
1457       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1496  on_window_key_press(GtkWidget *widget, Line 1502  on_window_key_press(GtkWidget *widget,
1502    gboolean handled = FALSE;    gboolean handled = FALSE;
1503    int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;    int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1504    
1505    printf("key event with keyval %x\n", event->keyval);    //  printf("key event with keyval %x\n", event->keyval);
1506    
1507    // the map handles some keys on its own ...    // the map handles some keys on its own ...
1508    switch(event->keyval) {    switch(event->keyval) {
# Line 1564  on_window_key_press(GtkWidget *widget, Line 1570  on_window_key_press(GtkWidget *widget,
1570  #endif  #endif
1571    
1572    default:    default:
1573        printf("unhandled key event with keyval %x\n", event->keyval);        //      printf("unhandled key event with keyval %x\n", event->keyval);
1574        break;        break;
1575    }    }
1576    
# Line 2183  osm_gps_map_expose (GtkWidget *widget, G Line 2189  osm_gps_map_expose (GtkWidget *widget, G
2189      GdkDrawable *drawable = widget->window;      GdkDrawable *drawable = widget->window;
2190  #endif  #endif
2191    
2192      if (!priv->dragging)      if (!priv->dragging && event)
2193      {      {
2194          gdk_draw_drawable (drawable,          gdk_draw_drawable (drawable,
2195                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
# Line 2475  osm_gps_map_source_get_friendly_name(Osm Line 2481  osm_gps_map_source_get_friendly_name(Osm
2481              return "OpenStreetMap";              return "OpenStreetMap";
2482          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2483              return "OpenStreetMap Renderer";              return "OpenStreetMap Renderer";
2484          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2485              return "OpenAerialMap";              return "OpenCycleMap";
2486          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2487              return "Maps-For-Free";              return "Maps-For-Free";
2488          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2518  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2524  osm_gps_map_source_get_repo_uri(OsmGpsMa
2524              return OSM_REPO_URI;              return OSM_REPO_URI;
2525          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2526              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2527          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2528              return "http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/#Z/#X/#Y.jpg";              return "http://c.andy.sandbox.cloudmade.com/tiles/cycle/#Z/#X/#Y.png";
2529          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2530              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";
2531          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2557  osm_gps_map_source_get_image_format(OsmG Line 2563  osm_gps_map_source_get_image_format(OsmG
2563          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2564          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2565          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2566            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2567              return "png";              return "png";
         case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:  
2568          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2569          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2570          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2592  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2598  osm_gps_map_source_get_max_zoom(OsmGpsMa
2598          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2599              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2600          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2601          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2602          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2603          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2604          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 3019  void osm_gps_map_register_osd(OsmGpsMap Line 3025  void osm_gps_map_register_osd(OsmGpsMap
3025      priv->osd = osd;      priv->osd = osd;
3026  }  }
3027    
3028    void
3029    osm_gps_map_repaint (OsmGpsMap *map) {
3030        osm_gps_map_expose (GTK_WIDGET(map), NULL);
3031    }
3032    
3033  #endif  #endif
Legend:
Removed from v.83  
changed lines
  Added in v.87