Diff of /trunk/src/map-tool.c

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

revision 33 by harbaum, Tue Jul 28 13:21:40 2009 UTC revision 65 by harbaum, Wed Aug 19 14:21:14 2009 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2008 Till Harbaum <till@harbaum.org>.   * Copyright (C) 2008-2009 Till Harbaum <till@harbaum.org>.
3   *   *
4   * This file is part of GPXView.   * This file is part of GPXView.
5   *   *
# Line 18  Line 18 
18   */   */
19    
20  #include "gpxview.h"  #include "gpxview.h"
21    #include "converter.h"
22    #include <math.h>    // for isnan
23    
24  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
25  #include "osm-gps-map.h"  #include "osm-gps-map.h"
26  #endif  #endif
27    
28  typedef struct {  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP
29    GtkWidget *widget;  #define GPS_DEFAULT_ZOOM 13
   GtkWidget *zoomin, *zoomout, *gps;  
   gint handler_id;  
 } map_context_t;  
30    
31  static const char *get_proxy_uri(void) {  #define PROXY_KEY  "/system/http_proxy/"
32    static char proxy_buffer[64];  
33    static const char *get_proxy_uri(appdata_t *appdata) {
34      static char proxy_buffer[64] = "";
35    
36    /* use environment settings if preset */    /* use environment settings if preset */
37    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
# Line 39  static const char *get_proxy_uri(void) { Line 40  static const char *get_proxy_uri(void) {
40      return proxy;      return proxy;
41    }    }
42    
43  #if 0    /* ------------- get proxy settings -------------------- */
44    /* otherwise try settings */    if(gconf_client_get_bool(appdata->gconf_client,
45    if(!settings || !settings->proxy ||                             PROXY_KEY "use_http_proxy", NULL)) {
46       !settings->proxy->host) return NULL;  
47        /* we can savely ignore things like "ignore_hosts" since we */
48        /* are pretty sure not inside the net of one of our map renderers */
49        /* (unless the user works at google :-) */
50    
51        /* get basic settings */
52        char *host =
53          gconf_client_get_string(appdata->gconf_client, PROXY_KEY "host", NULL);
54        if(host) {
55          int port =
56            gconf_client_get_int(appdata->gconf_client, PROXY_KEY "port", NULL);
57    
58          snprintf(proxy_buffer, sizeof(proxy_buffer),
59                   "http://%s:%u", host, port);
60    
61          g_free(host);
62        }
63        return proxy_buffer;
64      }
65    
66    snprintf(proxy_buffer, sizeof(proxy_buffer), "%s%s:%u",    return NULL;
67             strncmp(settings->proxy->host, "http://", 7)?"http://":"",  }
            settings->proxy->host, settings->proxy->port);  
68    
69    proxy_buffer[sizeof(proxy_buffer)-1] = 0;  /* TODO: This needs to be wired to the GPS button in osm_gps_map */
70    printf("gconf_proxy: %s\n", proxy_buffer);  #if 0
71    static gboolean
72    cb_map_gps(GtkButton *button, map_context_t *context) {
73      pos_t *refpos = get_pos(context->appdata);
74      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
75        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
76                          refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
77      } else {
78        /* no coordinates given: display the entire world */
79        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
80                                  0.0, 0.0, 1);
81      }
82    
83      return FALSE;
84    }
85  #endif  #endif
86    
87    return proxy_buffer;  static int dist2pixel(map_context_t *context, float km, float lat) {
88      return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));
89  }  }
90    
91  static void map_zoom(map_context_t *context, int step) {  static gboolean map_gps_update(gpointer data) {
92    int zoom;    map_context_t *context = (map_context_t*)data;
   OsmGpsMap *map = OSM_GPS_MAP(context->widget);  
   g_object_get(map, "zoom", &zoom, NULL);  
   zoom = osm_gps_map_set_zoom(map, zoom+step);  
93    
94    /* enable/disable zoom buttons as required */    /* get reference position ... */
95    gtk_widget_set_sensitive(context->zoomin, zoom<17);    pos_t *refpos = get_pos(context->appdata);
96    gtk_widget_set_sensitive(context->zoomout, zoom>1);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
97    
98      /* ... and enable "goto" button if it's valid */
99      /* TODO: gtk_widget_set_sensitive(context->gps, ok); */
100    
101      if(ok) {
102        float heading = NAN;
103        int radius = 0;
104    
105        if(context->appdata->use_gps) {
106          heading = gps_get_heading(context->appdata);
107    
108          /* get error */
109          float eph = gps_get_eph(context->appdata);
110          if(!isnan(eph))
111            radius = dist2pixel(context, eph/1000, refpos->lat);
112        }
113    
114        g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
115        osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
116                             refpos->lat, refpos->lon, heading);
117      } else
118        osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
119    
120      return TRUE;
121  }  }
122    
123  static gboolean  static gboolean on_map_configure(GtkWidget *widget,
124  cb_map_zoomin(GtkButton *button, map_context_t *context) {                                   GdkEventConfigure *event,
125    map_zoom(context, +1);                                   map_context_t *context) {
126    
127      /* set default values if they are invalid */
128      if(!context->appdata->map.zoom ||
129         isnan(context->appdata->map.pos.lat) ||
130         isnan(context->appdata->map.pos.lon)) {
131        printf("no valid map position found\n");
132    
133        pos_t *refpos = get_pos(context->appdata);
134        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
135          /* use gps position if present */
136          context->appdata->map.pos = *refpos;
137          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
138        } else {
139          /* use world map otherwise */
140          context->appdata->map.pos.lat = 0.0;
141          context->appdata->map.pos.lon = 0.0;
142          context->appdata->map.zoom = 1;
143        }
144      }
145    
146      /* jump to initial position */
147      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
148                                context->appdata->map.pos.lat,
149                                context->appdata->map.pos.lon,
150                                context->appdata->map.zoom);
151    
152    return FALSE;    return FALSE;
153  }  }
154    
155  static gboolean  static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {
156  cb_map_zoomout(GtkButton *button, map_context_t *context) {    while(cache) {
157    map_zoom(context, -1);      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
158    return FALSE;  
159        osm_gps_map_add_image(OSM_GPS_MAP(map),
160                              cache->pos.lat, cache->pos.lon, icon);
161    
162        cache = cache->next;
163      }
164    }
165    
166    static void
167    map_cachelist_nearest(cache_t *cache, pos_t *pos,
168                          cache_t **result, float *distance) {
169      while(cache) {
170        float dist =
171          pow(cache->pos.lat - pos->lat, 2) +
172          pow(cache->pos.lon - pos->lon, 2);
173    
174        if(!(dist > *distance)) {
175          *result = cache;
176          *distance = dist;
177        }
178    
179        cache = cache->next;
180      }
181  }  }
182    
183    static cache_t *map_closest(map_context_t *context, pos_t *pos) {
184      cache_t *result = NULL;
185      float distance = NAN;
186    
187    #ifdef USE_MAEMO
188      if(!context->appdata->cur_gpx) {
189    #endif
190        /* search all geocaches */
191        gpx_t *gpx = context->appdata->gpx;
192        while(gpx) {
193          map_cachelist_nearest(gpx->cache, pos, &result, &distance);
194          gpx = gpx->next;
195        }
196    #ifdef USE_MAEMO
197      } else {
198        map_cachelist_nearest(context->appdata->cur_gpx->cache,
199                              pos, &result, &distance);
200      }
201    #endif
202    
203      return result;
204    }
205    
206    /* translate between osm-gps-map positions and gpxview ones */
207    pos_t coord2pos(coord_t coo) {
208      pos_t pos;
209      pos.lat = rad2deg(coo.rlat);
210      pos.lon = rad2deg(coo.rlon);
211      return pos;
212    }
213    
214    #define CLICK_FUZZ (24)
215    
216  static gboolean  static gboolean
217  cb_map_gps(GtkButton *button, map_context_t *context) {  on_map_button_press_event(GtkWidget *widget,
218                                GdkEventButton *event, map_context_t *context) {
219      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
220    
221    //  osm_gps_map_set_center(OSM_GPS_MAP(context->widget),    /* got a press event without release event? eat it! */
222    //                     DEG2RAD(pos.lat), DEG2RAD(pos.lon));    if(context->press_on != NULL) {
223        printf("PRESS: already\n");
224        return TRUE;
225      }
226    
227      pos_t pos =
228        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
229    
230      cache_t *nearest = map_closest(context, &pos);
231      if(nearest) {
232        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
233        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)
234          context->press_on = nearest;
235      }
236    
237    return FALSE;    return FALSE;
238  }  }
239    
240  static GtkWidget  static void
241  *map_add_button(const gchar *icon, GCallback cb, gpointer data,  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
242                  char *tooltip) {    /* convert the pixbuf into something cairo can handle */
243    GtkWidget *button = gtk_button_new();  
244    gtk_button_set_image(GTK_BUTTON(button),    // Create a new ImageSurface
245                         gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU));    cairo_surface_t *image_surface =
246    g_signal_connect(button, "clicked", cb, data);      cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
247  #ifndef USE_MAEMO                                 gdk_pixbuf_get_width(buf),
248    gtk_widget_set_tooltip_text(button, tooltip);                                 gdk_pixbuf_get_height(buf));
249  #endif  
250    return button;    // Create the new Context for the ImageSurface
251      cairo_t *context = cairo_create(image_surface);
252    
253      // Draw the image on the new Context
254      gdk_cairo_set_source_pixbuf(context, buf, 0.0, 0.0);
255      cairo_paint(context);
256    
257      // now draw this onto the original context
258      cairo_set_source_surface(cr, image_surface, x, y);
259    
260      cairo_paint(cr);
261  }  }
262    
263  static gboolean map_gps_update(gpointer data) {  #ifndef BIG_BALLOONS
264    map_context_t *context = (map_context_t*)data;  #define LINE_SKIP  7
265    #else
266    #define LINE_SKIP  12
267    #endif
268    
269    //  gtk_widget_set_sensitive(context->map.gps, gps_fix);  static void
270    balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
271      cache_t *cache = (cache_t*)data;
272    
273    return TRUE;    //  printf("draw cb for \"%s\"\n", cache->name);
 }  
274    
275    #if 0
276      /* draw pink background to check clipping */
277      cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
278      cairo_set_source_rgba (cr, 1, 0, 0, 0.3);
279      cairo_fill_preserve (cr);
280      cairo_set_line_width (cr, 0);
281      cairo_stroke (cr);
282    #endif
283    
284  void map(appdata_t *appdata) {    /* leave a little border top and left */
285    map_context_t context;    gint x = rect->x, y = rect->y;
286    
287    GtkWidget *dialog = gtk_dialog_new_with_buttons(_("Map"),    /* draw the cache type icon ... */
288                            GTK_WINDOW(appdata->window),    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
289                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,    cairo_draw_pixbuf(cr, icon, x, y);
290                            GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,  
291                            NULL);    /* ... and right of it the waypoint id */
292      cairo_text_extents_t extents;
293    
294      if(cache->id) {
295        cairo_select_font_face (cr, "Sans",
296                                CAIRO_FONT_SLANT_NORMAL,
297                                CAIRO_FONT_WEIGHT_BOLD);
298    
299    #ifndef BIG_BALLOONS
300        cairo_set_font_size (cr, 20.0);
301    #else
302        cairo_set_font_size (cr, 36.0);
303    #endif
304    
305  #ifndef USE_MAEMO      cairo_text_extents (cr, cache->id, &extents);
306    gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 350);  
307        /* display id right of icon vertically centered */
308        x += gdk_pixbuf_get_width(icon) + 5;
309        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
310        cairo_move_to (cr, x, y);
311        cairo_set_source_rgba (cr, 0, 0, 0, 1);
312        cairo_show_text (cr, cache->id);
313        cairo_stroke (cr);
314    
315        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
316      } else
317        y += gdk_pixbuf_get_height(icon);
318    
319      /* return to the left border and below icon/text */
320      x = rect->x;
321    
322      /* everything from here uses the same font */
323      cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
324                              CAIRO_FONT_WEIGHT_NORMAL);
325    #ifndef BIG_BALLOONS
326      cairo_set_font_size (cr, 14.0);
327  #else  #else
328    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);    cairo_set_font_size (cr, 24.0);
329    #endif
330    
331      if(cache->name) {
332        /* draw cache name */
333        cairo_text_extents (cr, cache->name, &extents);
334        y += extents.height;
335        cairo_move_to (cr, x, y);
336        cairo_set_source_rgba (cr, 0, 0, 0, 1);
337        cairo_show_text (cr, cache->name);
338        cairo_stroke (cr);
339    
340        /* return to the left border and below text */
341        y += LINE_SKIP;
342        x = rect->x;
343      }
344    
345      if(cache->terrain) {
346        /* draw cache rating */
347        const char *terrain = "Terrain:";
348        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
349        cairo_text_extents (cr, _(terrain), &extents);
350        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
351    
352        /* draw "Terrain:" string */
353        cairo_move_to (cr, x, y);
354        cairo_set_source_rgba (cr, 0, 0, 0, 1);
355        cairo_show_text (cr, _(terrain));
356        cairo_stroke (cr);
357        x += extents.width + 2;
358    
359        /* draw terrain stars */
360        cairo_draw_pixbuf(cr, icon, x, y -
361                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
362    
363        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
364        y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
365      }
366    
367      if(cache->difficulty) {
368        const char *difficulty = "Difficulty:";
369        cairo_text_extents (cr, _(difficulty), &extents);
370        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
371    
372        /* draw "Difficulty:" string */
373        cairo_move_to (cr, x, y);
374        cairo_set_source_rgba (cr, 0, 0, 0, 1);
375        cairo_show_text (cr, _(difficulty));
376        cairo_stroke (cr);
377        x += extents.width + 2;
378    
379        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
380        cairo_draw_pixbuf(cr, icon, x, y -
381                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
382      }
383    }
384    
385    static gboolean
386    on_map_button_release_event(GtkWidget *widget,
387                                GdkEventButton *event, map_context_t *context) {
388      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
389    
390      if(context->press_on) {
391        coord_t coo;
392        coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
393    
394        pos_t pos =
395          coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
396    
397        cache_t *nearest = map_closest(context, &pos);
398        if(nearest && nearest == context->press_on) {
399          float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
400          if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {
401    
402            osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,
403                                     balloon_draw_cb, nearest);
404          }
405        }
406        context->press_on = NULL;
407      } else {
408        /* save new map position */
409        gfloat lat, lon;
410        g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
411        context->appdata->map.pos.lat = lat;
412        context->appdata->map.pos.lon = lon;
413      }
414    
415      return FALSE;
416    }
417    
418    static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
419      appdata_t *appdata = context->appdata;
420    
421      printf("destroy map window\n");
422    
423      /* save map parameters */
424      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
425      gint zoom;
426      g_object_get(map, "zoom", &zoom, NULL);
427      context->appdata->map.zoom = zoom;
428    
429      gfloat lat, lon;
430      g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
431      context->appdata->map.pos.lat = lat;
432      context->appdata->map.pos.lon = lon;
433    
434    #if MAEMO_VERSION_MAJOR == 5
435      /* restore cur_view */
436      context->appdata->cur_view = context->old_view;
437  #endif  #endif
438    
439    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    gtk_timeout_remove(context->handler_id);
440    
441      g_free(context);
442      appdata->map.context = NULL;
443    }
444    
445    void map(appdata_t *appdata) {
446      map_context_t *context = NULL;
447    
448      /* if the map window already exists, just raise it */
449      if(appdata->map.context) {
450        gtk_window_present(GTK_WINDOW(appdata->map.context->window));
451        return;
452      }
453    
454      context = appdata->map.context = g_new0(map_context_t, 1);
455      context->appdata = appdata;
456    
457    char *path = g_strdup_printf("%s/map/", appdata->image_path);    char *path = g_strdup_printf("%s/map/", appdata->image_path);
458      const char *proxy = get_proxy_uri(appdata);
459    
460    context.widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
461                  "repo-uri", MAP_SOURCE_OPENSTREETMAP,                   "map-source",               MAP_SOURCE,
462                  "proxy-uri", get_proxy_uri(),                   "tile-cache",               path,
463                  "tile-cache", path,                   "auto-center",              FALSE,
464                     "record-trip-history",      FALSE,
465                     "show-trip-history",        FALSE,
466                     proxy?"proxy-uri":NULL,     proxy,
467                   NULL);                   NULL);
468    
469    g_free(path);    g_free(path);
470    
471  #if 0    char *name = NULL;
472    g_signal_connect(G_OBJECT(context.widget), "button-release-event",  #ifdef USE_MAEMO
473                     G_CALLBACK(on_map_button_release_event), &context);    if(!appdata->cur_gpx) {
474    #endif
475        /* draw all geocaches */
476        gpx_t *gpx = appdata->gpx;
477        while(gpx) {
478          map_draw_cachelist(context->widget, gpx->cache);
479          gpx = gpx->next;
480        }
481        name = g_strdup(_("all geocaches"));
482    #ifdef USE_MAEMO
483      } else {
484        map_draw_cachelist(context->widget, appdata->cur_gpx->cache);
485        name = g_strdup(appdata->cur_gpx->name);
486      }
487  #endif  #endif
488    
489    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.widget);    char *title = g_strdup_printf(_("Map - %s"), name);
490    /* zoom button box */    g_free(name);
   GtkWidget *vbox = gtk_vbox_new(FALSE,0);  
   
   context.zoomin =  
     map_add_button(GTK_STOCK_ZOOM_IN, G_CALLBACK(cb_map_zoomin),  
                    &context, _("Zoom in"));  
   gtk_box_pack_start(GTK_BOX(vbox), context.zoomin, FALSE, FALSE, 0);  
   
   context.zoomout =  
     map_add_button(GTK_STOCK_ZOOM_OUT, G_CALLBACK(cb_map_zoomout),  
                    &context, _("Zoom out"));  
   gtk_box_pack_start(GTK_BOX(vbox), context.zoomout, FALSE, FALSE, 0);  
   
   context.gps =  
     map_add_button(GTK_STOCK_HOME, G_CALLBACK(cb_map_gps),  
                    &context, _("Jump to GPS position"));  
   gtk_widget_set_sensitive(context.gps, FALSE);  
   /* install handler for timed updates of the gps button */  
   context.handler_id = gtk_timeout_add(1000, map_gps_update, &context);  
   gtk_box_pack_start(GTK_BOX(vbox), context.gps, FALSE, FALSE, 0);  
491    
492    gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);  #ifdef USE_MAEMO
493    #ifdef USE_STACKABLE_WINDOW
494      context->window = hildon_stackable_window_new();
495    #else
496      context->window = hildon_window_new();
497    #endif
498    #else
499      context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
500    #endif
501    
502    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);    gtk_window_set_title(GTK_WINDOW(context->window), title);
503    
504    gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);  #ifndef USE_MAEMO
505      gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
506    #endif
507    
508    gtk_widget_show_all(dialog);    g_free(title);
509    
510    gtk_dialog_run(GTK_DIALOG(dialog));    g_signal_connect(G_OBJECT(context->widget), "configure-event",
511                       G_CALLBACK(on_map_configure), context);
512    gtk_widget_destroy(dialog);  
513      g_signal_connect(G_OBJECT(context->widget), "button-press-event",
514                       G_CALLBACK(on_map_button_press_event), context);
515    
516      g_signal_connect(G_OBJECT(context->widget), "button-release-event",
517                       G_CALLBACK(on_map_button_release_event), context);
518    
519      /* TODO: gtk_widget_set_sensitive(context->gps, FALSE); */
520    
521      /* install handler for timed updates of the gps button */
522      context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
523    
524    #if MAEMO_VERSION_MAJOR == 5
525      /* prevent some of the main screen things */
526      context->old_view = appdata->cur_view;
527      appdata->cur_view = NULL;
528    #endif
529    
530      g_signal_connect(G_OBJECT(context->window), "destroy",
531                       G_CALLBACK(on_window_destroy), context);
532    
533      gtk_container_add(GTK_CONTAINER(context->window), context->widget);
534      gtk_widget_show_all(GTK_WIDGET(context->window));
535  }  }
Legend:
Removed from v.33  
changed lines
  Added in v.65