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 86 by harbaum, Sun Aug 30 19:05:44 2009 UTC
# Line 1496  on_window_key_press(GtkWidget *widget, Line 1496  on_window_key_press(GtkWidget *widget,
1496    gboolean handled = FALSE;    gboolean handled = FALSE;
1497    int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;    int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1498    
1499    printf("key event with keyval %x\n", event->keyval);    //  printf("key event with keyval %x\n", event->keyval);
1500    
1501    // the map handles some keys on its own ...    // the map handles some keys on its own ...
1502    switch(event->keyval) {    switch(event->keyval) {
# Line 1564  on_window_key_press(GtkWidget *widget, Line 1564  on_window_key_press(GtkWidget *widget,
1564  #endif  #endif
1565    
1566    default:    default:
1567        printf("unhandled key event with keyval %x\n", event->keyval);        //      printf("unhandled key event with keyval %x\n", event->keyval);
1568        break;        break;
1569    }    }
1570    
# Line 2183  osm_gps_map_expose (GtkWidget *widget, G Line 2183  osm_gps_map_expose (GtkWidget *widget, G
2183      GdkDrawable *drawable = widget->window;      GdkDrawable *drawable = widget->window;
2184  #endif  #endif
2185    
2186      if (!priv->dragging)      if (!priv->dragging && event)
2187      {      {
2188          gdk_draw_drawable (drawable,          gdk_draw_drawable (drawable,
2189                             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 2475  osm_gps_map_source_get_friendly_name(Osm
2475              return "OpenStreetMap";              return "OpenStreetMap";
2476          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2477              return "OpenStreetMap Renderer";              return "OpenStreetMap Renderer";
2478          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2479              return "OpenAerialMap";              return "OpenCycleMap";
2480          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2481              return "Maps-For-Free";              return "Maps-For-Free";
2482          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 2518  osm_gps_map_source_get_repo_uri(OsmGpsMa
2518              return OSM_REPO_URI;              return OSM_REPO_URI;
2519          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2520              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2521          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2522              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";
2523          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2524              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";
2525          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 2557  osm_gps_map_source_get_image_format(OsmG
2557          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2558          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2559          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2560            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2561              return "png";              return "png";
         case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:  
2562          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2563          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2564          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 2592  osm_gps_map_source_get_max_zoom(OsmGpsMa
2592          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2593              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2594          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2595          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2596          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2597          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2598          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 3019  void osm_gps_map_register_osd(OsmGpsMap
3019      priv->osd = osd;      priv->osd = osd;
3020  }  }
3021    
3022    void
3023    osm_gps_map_repaint (OsmGpsMap *map) {
3024        osm_gps_map_expose (GTK_WIDGET(map), NULL);
3025    }
3026    
3027  #endif  #endif
Legend:
Removed from v.83  
changed lines
  Added in v.86