Diff of /trunk/src/map.c

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

revision 78 by harbaum, Sun Feb 15 12:07:04 2009 UTC revision 163 by harbaum, Tue Apr 14 19:26:18 2009 UTC
# Line 30  static void map_statusbar(map_t *map, ma Line 30  static void map_statusbar(map_t *map, ma
30    tag_t *tag = NULL;    tag_t *tag = NULL;
31    char *str = NULL;    char *str = NULL;
32    
33    switch(map_item->type) {    switch(map_item->object.type) {
34    case MAP_TYPE_NODE:    case NODE:
35      item_str = "Node";      item_str = "Node";
36      id = map_item->node->id;      id = map_item->object.node->id;
37      tag = map_item->node->tag;      tag = map_item->object.node->tag;
38      break;      break;
39    
40    case MAP_TYPE_WAY:    case WAY:
41      item_str = "Way";      item_str = "Way";
42      id = map_item->way->id;      id = map_item->object.way->id;
43      tag = map_item->way->tag;      tag = map_item->object.way->tag;
44        break;
45    
46      case RELATION:
47        item_str = "Relation";
48        id = map_item->object.relation->id;
49        tag = map_item->object.relation->tag;
50      break;      break;
51    
52    default:    default:
# Line 53  static void map_statusbar(map_t *map, ma Line 59  static void map_statusbar(map_t *map, ma
59    if(id == ID_ILLEGAL)    if(id == ID_ILLEGAL)
60      str = g_strdup_printf(_("Unknown item"));      str = g_strdup_printf(_("Unknown item"));
61    else {    else {
62      str = g_strdup_printf("%s #%ld", item_str, id);      str = g_strdup_printf("%s #" ITEM_ID_FORMAT, item_str, id);
63    
64      /* add some tags ... */      /* add some tags ... */
65      /*      /*
# Line 132  static void map_node_select(appdata_t *a Line 138  static void map_node_select(appdata_t *a
138    
139    g_assert(!map->highlight);    g_assert(!map->highlight);
140    
141    map_item->type      = MAP_TYPE_NODE;    map_item->object.type      = NODE;
142    map_item->node      = node;    map_item->object.node      = node;
143    map_item->highlight = FALSE;    map_item->highlight = FALSE;
144    
145    /* node may not have any visible representation at all */    /* node may not have any visible representation at all */
# Line 146  static void map_node_select(appdata_t *a Line 152  static void map_node_select(appdata_t *a
152    icon_bar_map_item_selected(appdata, map_item, TRUE);    icon_bar_map_item_selected(appdata, map_item, TRUE);
153    
154    /* highlight node */    /* highlight node */
155    gint x = map_item->node->lpos.x, y = map_item->node->lpos.y;    gint x = map_item->object.node->lpos.x, y = map_item->object.node->lpos.y;
156    
157    /* create a copy of this map item and mark it as being a highlight */    /* create a copy of this map item and mark it as being a highlight */
158    map_item_t *new_map_item = g_new0(map_item_t, 1);    map_item_t *new_map_item = g_new0(map_item_t, 1);
# Line 157  static void map_node_select(appdata_t *a Line 163  static void map_node_select(appdata_t *a
163    if(!node->ways) radius += map->style->node.border_radius;    if(!node->ways) radius += map->style->node.border_radius;
164    if(node->icon_buf && map->style->icon.enable &&    if(node->icon_buf && map->style->icon.enable &&
165       !appdata->settings->no_icons) {       !appdata->settings->no_icons) {
166      gint w = gdk_pixbuf_get_width(map_item->node->icon_buf);      gint w = gdk_pixbuf_get_width(map_item->object.node->icon_buf);
167      gint h = gdk_pixbuf_get_height(map_item->node->icon_buf);      gint h = gdk_pixbuf_get_height(map_item->object.node->icon_buf);
168      /* icons are technically square, so a radius slightly bigger */      /* icons are technically square, so a radius slightly bigger */
169      /* than sqrt(2)*MAX(w,h) should fit nicely */      /* than sqrt(2)*MAX(w,h) should fit nicely */
170      radius =  0.75 * map->style->icon.scale * ((w>h)?w:h);      radius = 0.75 * map->style->icon.scale * ((w>h)?w:h);
171    }    }
172    
173      radius *= map->state->detail;
174    map_hl_circle_new(map, CANVAS_GROUP_NODES_HL, new_map_item,    map_hl_circle_new(map, CANVAS_GROUP_NODES_HL, new_map_item,
175                      x, y, radius, map->style->highlight.color);                      x, y, radius, map->style->highlight.color);
176    
177    if(!map_item->item) {    if(!map_item->item) {
178      /* and draw a fake node */      /* and draw a fake node */
179      new_map_item = g_new0(map_item_t, 1);      new_map_item = g_new0(map_item_t, 1);
180      memcpy(new_map_item, map_item, sizeof(map_item_t));      memcpy(new_map_item, map_item, sizeof(map_item_t));
181      new_map_item->highlight = TRUE;      new_map_item->highlight = TRUE;
182      map_hl_circle_new(map, CANVAS_GROUP_NODES_HL, new_map_item,      map_hl_circle_new(map, CANVAS_GROUP_NODES_IHL, new_map_item,
183                        x, y, map->style->node.radius,                        x, y, map->style->node.radius,
184                        map->style->highlight.node_color);                        map->style->highlight.node_color);
185    }    }
# Line 184  void map_way_select(appdata_t *appdata, Line 191  void map_way_select(appdata_t *appdata,
191    
192    g_assert(!map->highlight);    g_assert(!map->highlight);
193    
194    map_item->type      = MAP_TYPE_WAY;    map_item->object.type      = WAY;
195    map_item->way       = way;    map_item->object.way       = way;
196    map_item->highlight = FALSE;    map_item->highlight = FALSE;
197    map_item->item      = way->map_item_chain->map_item->item;    map_item->item      = way->map_item_chain->map_item->item;
198    
199    map_statusbar(map, map_item);    map_statusbar(map, map_item);
200    icon_bar_map_item_selected(appdata, map_item, TRUE);    icon_bar_map_item_selected(appdata, map_item, TRUE);
201    gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, TRUE);    gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, TRUE);
   
   gint arrow_width = (map_item->way->draw.flags & OSM_DRAW_FLAG_BG)?  
     map->style->highlight.width + map_item->way->draw.bg.width/2:  
     map->style->highlight.width + map_item->way->draw.width/2;  
202    
203    node_chain_t *node_chain = map_item->way->node_chain;    gint arrow_width = ((map_item->object.way->draw.flags & OSM_DRAW_FLAG_BG)?
204                          map->style->highlight.width + map_item->object.way->draw.bg.width/2:
205                          map->style->highlight.width + map_item->object.way->draw.width/2)
206        * map->state->detail;
207    
208      node_chain_t *node_chain = map_item->object.way->node_chain;
209    node_t *last = NULL;    node_t *last = NULL;
210    while(node_chain) {    while(node_chain) {
211      map_item_t item;      map_item_t item;
212      item.type = MAP_TYPE_NODE;      item.object.type = NODE;
213      item.node = node_chain->node;      item.object.node = node_chain->node;
214    
215      /* draw an arrow between every two nodes */      /* draw an arrow between every two nodes */
216      if(last) {      if(last) {
217        /* create a new map item for every arrow */        /* create a new map item for every arrow */
218        map_item_t *new_map_item = g_new0(map_item_t, 1);        map_item_t *new_map_item = g_new0(map_item_t, 1);
219        new_map_item->type = MAP_TYPE_WAY;        new_map_item->object.type = WAY;
220        new_map_item->way = way;        new_map_item->object.way = way;
221        new_map_item->highlight = TRUE;        new_map_item->highlight = TRUE;
222    
223        struct { float x, y;} center, diff;        struct { float x, y;} center, diff;
# Line 234  void map_way_select(appdata_t *appdata, Line 242  void map_way_select(appdata_t *appdata,
242          points->coords[2*2+0] = center.x - diff.y - diff.x;          points->coords[2*2+0] = center.x - diff.y - diff.x;
243          points->coords[2*2+1] = center.y + diff.x - diff.y;          points->coords[2*2+1] = center.y + diff.x - diff.y;
244    
245          map_hl_polygon_new(map, CANVAS_GROUP_NODES_HL, new_map_item,          map_hl_polygon_new(map, CANVAS_GROUP_WAYS_DIR, new_map_item,
246                             points, map->style->highlight.arrow_color);                             points, map->style->highlight.arrow_color);
247    
248          canvas_points_free(points);          canvas_points_free(points);
# Line 245  void map_way_select(appdata_t *appdata, Line 253  void map_way_select(appdata_t *appdata,
253    
254        /* create a new map item for every node */        /* create a new map item for every node */
255        map_item_t *new_map_item = g_new0(map_item_t, 1);        map_item_t *new_map_item = g_new0(map_item_t, 1);
256        new_map_item->type = MAP_TYPE_NODE;        new_map_item->object.type = NODE;
257        new_map_item->node = node_chain->node;        new_map_item->object.node = node_chain->node;
258        new_map_item->highlight = TRUE;        new_map_item->highlight = TRUE;
259    
260        gint x = node_chain->node->lpos.x;        gint x = node_chain->node->lpos.x;
261        gint y = node_chain->node->lpos.y;        gint y = node_chain->node->lpos.y;
262    
263        map_hl_circle_new(map, CANVAS_GROUP_NODES_HL, new_map_item,        map_hl_circle_new(map, CANVAS_GROUP_NODES_IHL, new_map_item,
264                          x, y, map->style->node.radius,                          x, y, map->style->node.radius * map->state->detail,
265                          map->style->highlight.node_color);                          map->style->highlight.node_color);
266      }      }
267    
# Line 269  void map_way_select(appdata_t *appdata, Line 277  void map_way_select(appdata_t *appdata,
277      canvas_points_t *points = canvas_points_new(nodes);      canvas_points_t *points = canvas_points_new(nodes);
278    
279      int node = 0;      int node = 0;
280      node_chain = map_item->way->node_chain;      node_chain = map_item->object.way->node_chain;
281      while(node_chain) {      while(node_chain) {
282        canvas_point_set_pos(points, node++, &node_chain->node->lpos);        canvas_point_set_pos(points, node++, &node_chain->node->lpos);
283        node_chain = node_chain->next;        node_chain = node_chain->next;
# Line 281  void map_way_select(appdata_t *appdata, Line 289  void map_way_select(appdata_t *appdata,
289      new_map_item->highlight = TRUE;      new_map_item->highlight = TRUE;
290    
291      map_hl_polyline_new(map, CANVAS_GROUP_WAYS_HL, new_map_item, points,      map_hl_polyline_new(map, CANVAS_GROUP_WAYS_HL, new_map_item, points,
292                  (map_item->way->draw.flags & OSM_DRAW_FLAG_BG)?                   ((map_item->object.way->draw.flags & OSM_DRAW_FLAG_BG)?
293                  2*map->style->highlight.width + map_item->way->draw.bg.width:                   2*map->style->highlight.width + map_item->object.way->draw.bg.width:
294                  2*map->style->highlight.width + map_item->way->draw.width,                   2*map->style->highlight.width + map_item->object.way->draw.width)
295                  map->style->highlight.color);                  * map->state->detail, map->style->highlight.color);
296    
297      canvas_points_free(points);      canvas_points_free(points);
298    }    }
299  }  }
300    
301  static void map_item_select(appdata_t *appdata, map_item_t *map_item) {  void map_relation_select(appdata_t *appdata, relation_t *relation) {
302    switch(map_item->type) {    map_t *map = appdata->map;
303    case MAP_TYPE_NODE:  
304      map_node_select(appdata, map_item->node);    printf("highlighting relation "ITEM_ID_FORMAT"\n", relation->id);
305    
306      g_assert(!map->highlight);
307      map_highlight_t **hl = &map->highlight;
308    
309      map_item_t *map_item = &map->selected;
310      map_item->object.type      = RELATION;
311      map_item->object.relation  = relation;
312      map_item->highlight = FALSE;
313      map_item->item      = NULL;
314    
315      map_statusbar(map, map_item);
316      icon_bar_map_item_selected(appdata, map_item, TRUE);
317    
318      /* process all members */
319      member_t *member = relation->member;
320      while(member) {
321        canvas_item_t *item = NULL;
322    
323        switch(member->object.type) {
324    
325        case NODE: {
326          node_t *node = member->object.node;
327          printf("  -> node "ITEM_ID_FORMAT"\n", node->id);
328    
329          item = canvas_circle_new(map->canvas, CANVAS_GROUP_NODES_HL,
330                            node->lpos.x, node->lpos.y,
331                            map->style->highlight.width + map->style->node.radius,
332                            0, map->style->highlight.color, NO_COLOR);
333          } break;
334    
335        case WAY: {
336          way_t *way = member->object.way;
337          /* a way needs at least 2 points to be drawn */
338          guint nodes = osm_way_number_of_nodes(way);
339          if(nodes > 1) {
340    
341            /* allocate space for nodes */
342            canvas_points_t *points = canvas_points_new(nodes);
343    
344            int node = 0;
345            node_chain_t *node_chain = way->node_chain;
346            while(node_chain) {
347              canvas_point_set_pos(points, node++, &node_chain->node->lpos);
348              node_chain = node_chain->next;
349            }
350    
351            if(way->draw.flags & OSM_DRAW_FLAG_AREA)
352              item = canvas_polygon_new(map->canvas, CANVAS_GROUP_WAYS_HL, points, 0, 0,
353                                        map->style->highlight.color);
354            else
355              item = canvas_polyline_new(map->canvas, CANVAS_GROUP_WAYS_HL, points,
356                                  (way->draw.flags & OSM_DRAW_FLAG_BG)?
357                                  2*map->style->highlight.width + way->draw.bg.width:
358                                  2*map->style->highlight.width + way->draw.width,
359                                  map->style->highlight.color);
360    
361            canvas_points_free(points);
362          } } break;
363    
364        default:
365          break;
366        }
367    
368        /* attach item to item chain */
369        if(item) {
370          *hl = g_new0(map_highlight_t, 1);
371          (*hl)->item = item;
372          hl = &(*hl)->next;
373        }
374    
375        member = member->next;
376      }
377    }
378    
379    static void map_object_select(appdata_t *appdata, object_t *object) {
380      switch(object->type) {
381      case NODE:
382        map_node_select(appdata, object->node);
383      break;      break;
384    case MAP_TYPE_WAY:    case WAY:
385      map_way_select(appdata, map_item->way);      map_way_select(appdata, object->way);
386        break;
387      case RELATION:
388        map_relation_select(appdata, object->relation);
389      break;      break;
390    default:    default:
391      g_assert((map_item->type == MAP_TYPE_NODE)||      g_assert((object->type == NODE)||(object->type == RELATION)||
392               (map_item->type == MAP_TYPE_WAY));               (object->type == WAY));
393      break;      break;
394    }    }
395  }  }
# Line 308  static void map_item_select(appdata_t *a Line 397  static void map_item_select(appdata_t *a
397  void map_item_deselect(appdata_t *appdata) {  void map_item_deselect(appdata_t *appdata) {
398    
399    /* save tags for "last" function in info dialog */    /* save tags for "last" function in info dialog */
400    if(appdata->map->selected.type == MAP_TYPE_NODE) {    if(appdata->map->selected.object.type == NODE) {
401      if(appdata->map->last_node_tags)      if(appdata->map->last_node_tags)
402        osm_tags_free(appdata->map->last_node_tags);        osm_tags_free(appdata->map->last_node_tags);
403    
404      appdata->map->last_node_tags =      appdata->map->last_node_tags =
405        osm_tags_copy(appdata->map->selected.node->tag, FALSE);        osm_tags_copy(appdata->map->selected.object.node->tag, FALSE);
406    } else if(appdata->map->selected.type == MAP_TYPE_WAY) {    } else if(appdata->map->selected.object.type == WAY) {
407      if(appdata->map->last_way_tags)      if(appdata->map->last_way_tags)
408        osm_tags_free(appdata->map->last_way_tags);        osm_tags_free(appdata->map->last_way_tags);
409    
410      appdata->map->last_way_tags =      appdata->map->last_way_tags =
411        osm_tags_copy(appdata->map->selected.way->tag, FALSE);        osm_tags_copy(appdata->map->selected.object.way->tag, FALSE);
412    }    }
413    
414    /* remove statusbar message */    /* remove statusbar message */
# Line 333  void map_item_deselect(appdata_t *appdat Line 422  void map_item_deselect(appdata_t *appdat
422    map_hl_remove(appdata);    map_hl_remove(appdata);
423    
424    /* forget about selection */    /* forget about selection */
425    appdata->map->selected.type = MAP_TYPE_ILLEGAL;    appdata->map->selected.object.type = ILLEGAL;
426  }  }
427    
428  /* called whenever a map item is to be destroyed */  /* called whenever a map item is to be destroyed */
# Line 345  static gint map_item_destroy_event(GtkWi Line 434  static gint map_item_destroy_event(GtkWi
434  #ifdef DESTROY_WAIT_FOR_GTK  #ifdef DESTROY_WAIT_FOR_GTK
435    /* remove item from nodes/ways map_item_chain */    /* remove item from nodes/ways map_item_chain */
436    map_item_chain_t **chain = NULL;    map_item_chain_t **chain = NULL;
437    if(map_item->type == MAP_TYPE_NODE)    if(map_item->object.type == NODE)
438      chain = &map_item->node->map_item_chain;      chain = &map_item->object.node->map_item_chain;
439    else if(map_item->type == MAP_TYPE_WAY)    else if(map_item->object.type == WAY)
440      chain = &map_item->way->map_item_chain;      chain = &map_item->object.way->map_item_chain;
441    
442    /* there must be a chain with content, otherwise things are broken */    /* there must be a chain with content, otherwise things are broken */
443    g_assert(chain);    g_assert(chain);
# Line 375  static canvas_item_t *map_node_new(map_t Line 464  static canvas_item_t *map_node_new(map_t
464                     gint width, canvas_color_t fill, canvas_color_t border) {                     gint width, canvas_color_t fill, canvas_color_t border) {
465    
466    map_item_t *map_item = g_new0(map_item_t, 1);    map_item_t *map_item = g_new0(map_item_t, 1);
467    map_item->type = MAP_TYPE_NODE;    map_item->object.type = NODE;
468    map_item->node = node;    map_item->object.node = node;
469    
470    if(!node->icon_buf || !map->style->icon.enable ||    if(!node->icon_buf || !map->style->icon.enable ||
471       map->appdata->settings->no_icons)       map->appdata->settings->no_icons)
472      map_item->item = canvas_circle_new(map, CANVAS_GROUP_NODES,      map_item->item = canvas_circle_new(map->canvas, CANVAS_GROUP_NODES,
473         node->lpos.x, node->lpos.y, radius, width, fill, border);         node->lpos.x, node->lpos.y, radius, width, fill, border);
474    else    else
475      map_item->item = canvas_image_new(map, CANVAS_GROUP_NODES,      map_item->item = canvas_image_new(map->canvas, CANVAS_GROUP_NODES,
476        node->icon_buf,        node->icon_buf,
477        node->lpos.x - map->style->icon.scale/2 *        node->lpos.x - map->style->icon.scale/2 * map->state->detail *
478                        gdk_pixbuf_get_width(node->icon_buf),                        gdk_pixbuf_get_width(node->icon_buf),
479        node->lpos.y - map->style->icon.scale/2 *        node->lpos.y - map->style->icon.scale/2 * map->state->detail *
480                        gdk_pixbuf_get_height(node->icon_buf),                        gdk_pixbuf_get_height(node->icon_buf),
481                map->style->icon.scale,map->style->icon.scale);                        map->state->detail * map->style->icon.scale,
482                          map->state->detail * map->style->icon.scale);
483    
484    canvas_item_set_zoom_max(map_item->item, node->zoom_max);    canvas_item_set_zoom_max(map_item->item,
485                               node->zoom_max / (2 * map->state->detail));
486    
487    /* attach map_item to nodes map_item_chain */    /* attach map_item to nodes map_item_chain */
488    map_item_chain_t **chain = &node->map_item_chain;    map_item_chain_t **chain = &node->map_item_chain;
# Line 413  static canvas_item_t *map_way_single_new Line 504  static canvas_item_t *map_way_single_new
504                     gint width, canvas_color_t fill, canvas_color_t border) {                     gint width, canvas_color_t fill, canvas_color_t border) {
505    
506    map_item_t *map_item = g_new0(map_item_t, 1);    map_item_t *map_item = g_new0(map_item_t, 1);
507    map_item->type = MAP_TYPE_WAY;    map_item->object.type = WAY;
508    map_item->way = way;    map_item->object.way = way;
509    map_item->item = canvas_circle_new(map, CANVAS_GROUP_WAYS,    map_item->item = canvas_circle_new(map->canvas, CANVAS_GROUP_WAYS,
510            way->node_chain->node->lpos.x, way->node_chain->node->lpos.y,            way->node_chain->node->lpos.x, way->node_chain->node->lpos.y,
511                                       radius, width, fill, border);                                       radius, width, fill, border);
512    
# Line 439  static canvas_item_t *map_way_new(map_t Line 530  static canvas_item_t *map_way_new(map_t
530            way_t *way, canvas_points_t *points, gint width,            way_t *way, canvas_points_t *points, gint width,
531            canvas_color_t color, canvas_color_t fill_color) {            canvas_color_t color, canvas_color_t fill_color) {
532    map_item_t *map_item = g_new0(map_item_t, 1);    map_item_t *map_item = g_new0(map_item_t, 1);
533    map_item->type = MAP_TYPE_WAY;    map_item->object.type = WAY;
534    map_item->way = way;    map_item->object.way = way;
535    
536    if(way->draw.flags & OSM_DRAW_FLAG_AREA) {    if(way->draw.flags & OSM_DRAW_FLAG_AREA) {
537      if(map->style->area.color & 0xff)      if(map->style->area.color & 0xff)
538        map_item->item = canvas_polygon_new(map, group, points,        map_item->item = canvas_polygon_new(map->canvas, group, points,
539                                            width, color, fill_color);                                            width, color, fill_color);
540      else      else
541        map_item->item = canvas_polyline_new(map, group, points,        map_item->item = canvas_polyline_new(map->canvas, group, points,
542                                             width, color);                                             width, color);
543    } else {    } else {
544      map_item->item = canvas_polyline_new(map, group, points, width, color);      map_item->item = canvas_polyline_new(map->canvas, group, points, width, color);
545    }    }
546    
547    canvas_item_set_zoom_max(map_item->item, way->draw.zoom_max);    canvas_item_set_zoom_max(map_item->item,
548                               way->draw.zoom_max / (2 * map->state->detail));
549    
550      /* a ways outline itself is never dashed */
551    if (group != CANVAS_GROUP_WAYS_OL)    if (group != CANVAS_GROUP_WAYS_OL)
552      if (way->draw.dashed)      if (way->draw.dashed)
553        canvas_item_set_dashed(map_item->item, width, way->draw.dash_length);        canvas_item_set_dashed(map_item->item, width, way->draw.dash_length);
# Line 502  void map_way_draw(map_t *map, way_t *way Line 595  void map_way_draw(map_t *map, way_t *way
595      }      }
596    
597      /* draw way */      /* draw way */
598        float width = way->draw.width * map->state->detail;
599    
600      if(way->draw.flags & OSM_DRAW_FLAG_AREA) {      if(way->draw.flags & OSM_DRAW_FLAG_AREA) {
601        map_way_new(map, CANVAS_GROUP_POLYGONS, way, points,        map_way_new(map, CANVAS_GROUP_POLYGONS, way, points,
602                    way->draw.width, way->draw.color, way->draw.area.color);                    width, way->draw.color, way->draw.area.color);
603      } else {      } else {
604        map_way_new(map, CANVAS_GROUP_WAYS, way, points,  
605                    way->draw.width, way->draw.color, NO_COLOR);        if(way->draw.flags & OSM_DRAW_FLAG_BG) {
606            map_way_new(map, CANVAS_GROUP_WAYS_INT, way, points,
607        if(way->draw.flags & OSM_DRAW_FLAG_BG)                      width, way->draw.color, NO_COLOR);
608    
609          map_way_new(map, CANVAS_GROUP_WAYS_OL, way, points,          map_way_new(map, CANVAS_GROUP_WAYS_OL, way, points,
610                      way->draw.bg.width, way->draw.bg.color, NO_COLOR);                      way->draw.bg.width * map->state->detail,
611                        way->draw.bg.color, NO_COLOR);
612    
613          } else
614            map_way_new(map, CANVAS_GROUP_WAYS, way, points,
615                        width, way->draw.color, NO_COLOR);
616      }      }
617      canvas_points_free(points);      canvas_points_free(points);
618    }    }
# Line 524  void map_node_draw(map_t *map, node_t *n Line 625  void map_node_draw(map_t *map, node_t *n
625    
626    if(!node->ways)    if(!node->ways)
627      map_node_new(map, node,      map_node_new(map, node,
628                   map->style->node.radius,                   map->style->node.radius * map->state->detail,
629                   map->style->node.border_radius,                   map->style->node.border_radius * map->state->detail,
630                   map->style->node.fill_color,                   map->style->node.fill_color,
631                   map->style->node.color);                   map->style->node.color);
632    
633    else if(map->style->node.show_untagged || osm_node_has_tag(node))    else if(map->style->node.show_untagged || osm_node_has_tag(node))
634      map_node_new(map, node,      map_node_new(map, node,
635                   map->style->node.radius, 0,                   map->style->node.radius * map->state->detail, 0,
636                   map->style->node.color, 0);                   map->style->node.color, 0);
637  }  }
638    
639  static void map_item_draw(map_t *map, map_item_t *map_item) {  static void map_item_draw(map_t *map, map_item_t *map_item) {
640    switch(map_item->type) {    switch(map_item->object.type) {
641    case MAP_TYPE_NODE:    case NODE:
642      map_node_draw(map, map_item->node);      map_node_draw(map, map_item->object.node);
643      break;      break;
644    case MAP_TYPE_WAY:    case WAY:
645      map_way_draw(map, map_item->way);      map_way_draw(map, map_item->object.way);
646      break;      break;
647    default:    default:
648      g_assert((map_item->type == MAP_TYPE_NODE) ||      g_assert((map_item->object.type == NODE) ||
649               (map_item->type == MAP_TYPE_WAY));               (map_item->object.type == WAY));
650    }    }
651  }  }
652    
653  static void map_item_remove(map_t *map, map_item_t *map_item) {  static void map_item_remove(map_t *map, map_item_t *map_item) {
654    map_item_chain_t **chainP = NULL;    map_item_chain_t **chainP = NULL;
655    
656    switch(map_item->type) {    switch(map_item->object.type) {
657    case MAP_TYPE_NODE:    case NODE:
658      chainP = &map_item->node->map_item_chain;      chainP = &map_item->object.node->map_item_chain;
659      break;      break;
660    case MAP_TYPE_WAY:    case WAY:
661      chainP = &map_item->way->map_item_chain;      chainP = &map_item->object.way->map_item_chain;
662      break;      break;
663    default:    default:
664      g_assert((map_item->type == MAP_TYPE_NODE) ||      g_assert((map_item->object.type == NODE) ||
665               (map_item->type == MAP_TYPE_WAY));               (map_item->object.type == WAY));
666    }    }
667    
668    map_item_chain_destroy(chainP);    map_item_chain_destroy(chainP);
669  }  }
670    
671  static void map_item_init(style_t *style, map_item_t *map_item) {  static void map_item_init(style_t *style, map_item_t *map_item) {
672    switch (map_item->type){    switch (map_item->object.type){
673      case MAP_TYPE_WAY:      case WAY:
674        josm_elemstyles_colorize_way(style, map_item->way);        josm_elemstyles_colorize_way(style, map_item->object.way);
675        break;        break;
676      case MAP_TYPE_NODE:      case NODE:
677        josm_elemstyles_colorize_node(style, map_item->node);        josm_elemstyles_colorize_node(style, map_item->object.node);
678        break;        break;
679      default:      default:
680        g_assert((map_item->type == MAP_TYPE_NODE) ||        g_assert((map_item->object.type == NODE) ||
681                     (map_item->type == MAP_TYPE_WAY));                     (map_item->object.type == WAY));
682    }    }
683  }  }
684    
# Line 586  void map_item_redraw(appdata_t *appdata, Line 687  void map_item_redraw(appdata_t *appdata,
687    
688    /* check if the item to be redrawn is the selected one */    /* check if the item to be redrawn is the selected one */
689    gboolean is_selected = FALSE;    gboolean is_selected = FALSE;
690    if(map_item->ptr == appdata->map->selected.ptr) {    if(map_item->object.ptr == appdata->map->selected.object.ptr) {
691      map_item_deselect(appdata);      map_item_deselect(appdata);
692      is_selected = TRUE;      is_selected = TRUE;
693    }    }
# Line 597  void map_item_redraw(appdata_t *appdata, Line 698  void map_item_redraw(appdata_t *appdata,
698    
699    /* restore selection if there was one */    /* restore selection if there was one */
700    if(is_selected)    if(is_selected)
701      map_item_select(appdata, &item);      map_object_select(appdata, &item.object);
702  }  }
703    
704  static void map_frisket_rectangle(canvas_points_t *points,  static void map_frisket_rectangle(canvas_points_t *points,
# Line 622  void map_frisket_draw(map_t *map, bounds Line 723  void map_frisket_draw(map_t *map, bounds
723      /* top rectangle */      /* top rectangle */
724      map_frisket_rectangle(points, mult*bounds->min.x, mult*bounds->max.x,      map_frisket_rectangle(points, mult*bounds->min.x, mult*bounds->max.x,
725                            mult*bounds->min.y, bounds->min.y);                            mult*bounds->min.y, bounds->min.y);
726      canvas_polygon_new(map, CANVAS_GROUP_NODES, points, 1, NO_COLOR, color);      canvas_polygon_new(map->canvas, CANVAS_GROUP_FRISKET, points,
727                           1, NO_COLOR, color);
728    
729      /* bottom rectangle */      /* bottom rectangle */
730      map_frisket_rectangle(points, mult*bounds->min.x, mult*bounds->max.x,      map_frisket_rectangle(points, mult*bounds->min.x, mult*bounds->max.x,
731                            bounds->max.y, mult*bounds->max.y);                            bounds->max.y, mult*bounds->max.y);
732      canvas_polygon_new(map, CANVAS_GROUP_NODES, points, 1, NO_COLOR, color);      canvas_polygon_new(map->canvas, CANVAS_GROUP_FRISKET, points,
733                           1, NO_COLOR, color);
734    
735      /* left rectangle */      /* left rectangle */
736      map_frisket_rectangle(points, mult*bounds->min.x, bounds->min.x,      map_frisket_rectangle(points, mult*bounds->min.x, bounds->min.x,
737                            mult*bounds->min.y, mult*bounds->max.y);                            mult*bounds->min.y, mult*bounds->max.y);
738      canvas_polygon_new(map, CANVAS_GROUP_NODES, points, 1, NO_COLOR, color);      canvas_polygon_new(map->canvas, CANVAS_GROUP_FRISKET, points,
739                           1, NO_COLOR, color);
740    
741      /* right rectangle */      /* right rectangle */
742      map_frisket_rectangle(points, bounds->max.x, mult*bounds->max.x,      map_frisket_rectangle(points, bounds->max.x, mult*bounds->max.x,
743                            mult*bounds->min.y, mult*bounds->max.y);                            mult*bounds->min.y, mult*bounds->max.y);
744      canvas_polygon_new(map, CANVAS_GROUP_NODES, points, 1, NO_COLOR, color);      canvas_polygon_new(map->canvas, CANVAS_GROUP_FRISKET, points,
745                           1, NO_COLOR, color);
746    
747    }    }
748    
# Line 648  void map_frisket_draw(map_t *map, bounds Line 753  void map_frisket_draw(map_t *map, bounds
753                            bounds->min.x-ew2, bounds->max.x+ew2,                            bounds->min.x-ew2, bounds->max.x+ew2,
754                            bounds->min.y-ew2, bounds->max.y+ew2);                            bounds->min.y-ew2, bounds->max.y+ew2);
755    
756      canvas_polyline_new(map, CANVAS_GROUP_NODES, points,      canvas_polyline_new(map->canvas, CANVAS_GROUP_FRISKET, points,
757                          map->style->frisket.border.width,                          map->style->frisket.border.width,
758                          map->style->frisket.border.color);                          map->style->frisket.border.color);
759    
# Line 783  map_item_t *map_item_at(map_t *map, gint Line 888  map_item_t *map_item_at(map_t *map, gint
888    if(map_item->highlight)    if(map_item->highlight)
889      printf("  item is highlight\n");      printf("  item is highlight\n");
890    
891    switch(map_item->type) {    switch(map_item->object.type) {
892    case MAP_TYPE_NODE:    case NODE:
893      printf("  item is node #%ld\n", map_item->node->id);      printf("  item is node #"ITEM_ID_FORMAT"\n", map_item->object.node->id);
894      break;      break;
895    case MAP_TYPE_WAY:    case WAY:
896      printf("  item is way #%ld\n", map_item->way->id);      printf("  item is way #"ITEM_ID_FORMAT"\n", map_item->object.way->id);
897      break;      break;
898    default:    default:
899      printf("  unknown item\n");      printf("  unknown item\n");
# Line 807  map_item_t *map_real_item_at(map_t *map, Line 912  map_item_t *map_real_item_at(map_t *map,
912    
913    /* get the item (parent) this item is the highlight of */    /* get the item (parent) this item is the highlight of */
914    map_item_t *parent = NULL;    map_item_t *parent = NULL;
915    switch(map_item->type) {    switch(map_item->object.type) {
916    
917    case MAP_TYPE_NODE:    case NODE:
918      if(map_item->node->map_item_chain)      if(map_item->object.node->map_item_chain)
919        parent = map_item->node->map_item_chain->map_item;        parent = map_item->object.node->map_item_chain->map_item;
920    
921      if(parent)      if(parent)
922        printf("  using parent item node #%ld\n", parent->node->id);        printf("  using parent item node #" ITEM_ID_FORMAT "\n",
923                 parent->object.node->id);
924      break;      break;
925    
926    case MAP_TYPE_WAY:    case WAY:
927      if(map_item->way->map_item_chain)      if(map_item->object.way->map_item_chain)
928        parent = map_item->way->map_item_chain->map_item;        parent = map_item->object.way->map_item_chain->map_item;
929    
930      if(parent)      if(parent)
931        printf("  using parent item way #%ld\n", parent->way->id);        printf("  using parent item way #" ITEM_ID_FORMAT "\n",
932                 parent->object.way->id);
933      break;      break;
934    
935    default:    default:
936      g_assert((map_item->type == MAP_TYPE_NODE) ||      g_assert((map_item->object.type == NODE) ||
937               (map_item->type == MAP_TYPE_WAY));               (map_item->object.type == WAY));
938      break;      break;
939    }    }
940    
# Line 841  map_item_t *map_real_item_at(map_t *map, Line 948  map_item_t *map_real_item_at(map_t *map,
948    
949  /* Limitations on the amount by which we can scroll. Keeps part of the  /* Limitations on the amount by which we can scroll. Keeps part of the
950   * map visible at all times */   * map visible at all times */
951  static void map_limit_scroll(map_t *map, gint *sx, gint *sy) {  static void map_limit_scroll(map_t *map, canvas_unit_t unit,
952      gdouble zoom = goo_canvas_get_scale(GOO_CANVAS(map->canvas));                               gint *sx, gint *sy) {
   
     gint sx_cu = *sx / zoom;  
     gint sy_cu = *sy / zoom;  
   
     // Canvas viewport dimensions  
     GtkAllocation *a = &GTK_WIDGET(map->canvas)->allocation;  
     gint aw_cu = a->width / zoom;  
     gint ah_cu = a->height / zoom;  
   
     // Data rect minimum and maximum  
     gint min_x, min_y, max_x, max_y;  
     min_x = map->appdata->osm->bounds->min.x;  
     min_y = map->appdata->osm->bounds->min.y;  
     max_x = map->appdata->osm->bounds->max.x;  
     max_y = map->appdata->osm->bounds->max.y;  
953    
954      // limit stops - prevent scrolling beyond these    /* get scale factor for pixel->meter conversion. set to 1 if */
955      gint min_sy_cu = 0.95*(min_y - ah_cu);    /* given coordinates are already in meters */
956      gint min_sx_cu = 0.95*(min_x - aw_cu);    gdouble scale = (unit == CANVAS_UNIT_METER)?1.0:canvas_get_zoom(map->canvas);
957      gint max_sy_cu = 0.95*(max_y);  
958      gint max_sx_cu = 0.95*(max_x);    /* convert pixels to meters if necessary */
959      if (sy_cu < min_sy_cu) { *sy = min_sy_cu*zoom; }    gdouble sx_cu = *sx / scale;
960      if (sx_cu < min_sx_cu) { *sx = min_sx_cu*zoom; }    gdouble sy_cu = *sy / scale;
961      if (sy_cu > max_sy_cu) { *sy = max_sy_cu*zoom; }  
962      if (sx_cu > max_sx_cu) { *sx = max_sx_cu*zoom; }    /* get size of visible area in canvas units (meters) */
963      gint aw_cu = canvas_get_viewport_width(map->canvas, CANVAS_UNIT_METER);
964      gint ah_cu = canvas_get_viewport_height(map->canvas, CANVAS_UNIT_METER);
965    
966      // Data rect minimum and maximum
967      gint min_x, min_y, max_x, max_y;
968      min_x = map->appdata->osm->bounds->min.x;
969      min_y = map->appdata->osm->bounds->min.y;
970      max_x = map->appdata->osm->bounds->max.x;
971      max_y = map->appdata->osm->bounds->max.y;
972    
973      // limit stops - prevent scrolling beyond these
974      gint min_sy_cu = 0.95*(min_y - ah_cu);
975      gint min_sx_cu = 0.95*(min_x - aw_cu);
976      gint max_sy_cu = 0.95*(max_y);
977      gint max_sx_cu = 0.95*(max_x);
978      if (sy_cu < min_sy_cu) { *sy = min_sy_cu * scale; }
979      if (sx_cu < min_sx_cu) { *sx = min_sx_cu * scale; }
980      if (sy_cu > max_sy_cu) { *sy = max_sy_cu * scale; }
981      if (sx_cu > max_sx_cu) { *sx = max_sx_cu * scale; }
982  }  }
983    
984    
# Line 881  static gboolean map_limit_zoom(map_t *ma Line 992  static gboolean map_limit_zoom(map_t *ma
992      max_x = map->appdata->osm->bounds->max.x;      max_x = map->appdata->osm->bounds->max.x;
993      max_y = map->appdata->osm->bounds->max.y;      max_y = map->appdata->osm->bounds->max.y;
994    
995      // Canvas viewport dimensions      /* get size of visible area in pixels and convert to meters of intended */
996      GtkAllocation *a = &GTK_WIDGET(map->canvas)->allocation;      /* zoom by deviding by zoom (which is basically pix/m) */
997      gint ah_cu = a->height / *zoom;      gint aw_cu =
998      gint aw_cu = a->width / *zoom;        canvas_get_viewport_width(map->canvas, CANVAS_UNIT_PIXEL) / *zoom;
999        gint ah_cu =
1000          canvas_get_viewport_height(map->canvas, CANVAS_UNIT_PIXEL) / *zoom;
1001    
1002      gdouble oldzoom = *zoom;      gdouble oldzoom = *zoom;
1003      if (ah_cu < aw_cu) {      if (ah_cu < aw_cu) {
# Line 931  void map_scroll_to_if_offscreen(map_t *m Line 1044  void map_scroll_to_if_offscreen(map_t *m
1044    }    }
1045    
1046    // Viewport dimensions in canvas space    // Viewport dimensions in canvas space
1047    gdouble zoom = goo_canvas_get_scale(GOO_CANVAS(map->canvas));  
1048    GtkAllocation *a = &GTK_WIDGET(map->canvas)->allocation;    /* get size of visible area in canvas units (meters) */
1049    gdouble aw = a->width / zoom;    gdouble pix_per_meter = canvas_get_zoom(map->canvas);
1050    gdouble ah = a->height / zoom;    gdouble aw = canvas_get_viewport_width(map->canvas, CANVAS_UNIT_METER);
1051      gdouble ah = canvas_get_viewport_height(map->canvas, CANVAS_UNIT_METER);
1052    
1053    // Is the point still onscreen?    // Is the point still onscreen?
1054    gboolean vert_recentre_needed = FALSE;    gboolean vert_recentre_needed = FALSE;
1055    gboolean horiz_recentre_needed = FALSE;    gboolean horiz_recentre_needed = FALSE;
1056    gint sx, sy;    gint sx, sy;
1057    canvas_get_scroll_offsets(map->canvas, &sx, &sy);    canvas_scroll_get(map->canvas, CANVAS_UNIT_PIXEL, &sx, &sy);
1058    gint viewport_left   = (sx/zoom);    gint viewport_left   = (sx/pix_per_meter);
1059    gint viewport_right  = (sx/zoom)+aw;    gint viewport_right  = (sx/pix_per_meter)+aw;
1060    gint viewport_top    = (sy/zoom);    gint viewport_top    = (sy/pix_per_meter);
1061    gint viewport_bottom = (sy/zoom)+ah;    gint viewport_bottom = (sy/pix_per_meter)+ah;
1062    if (lpos->x > viewport_right) {    if (lpos->x > viewport_right) {
1063      printf("** off right edge (%d > %d)\n", lpos->x, viewport_right);      printf("** off right edge (%d > %d)\n", lpos->x, viewport_right);
1064      horiz_recentre_needed = TRUE;      horiz_recentre_needed = TRUE;
# Line 966  void map_scroll_to_if_offscreen(map_t *m Line 1080  void map_scroll_to_if_offscreen(map_t *m
1080      gint new_sx, new_sy;      gint new_sx, new_sy;
1081    
1082      // Just centre both at once      // Just centre both at once
1083      new_sx = zoom * (lpos->x - (aw/2));      new_sx = pix_per_meter * (lpos->x - (aw/2));
1084      new_sy = zoom * (lpos->y - (ah/2));      new_sy = pix_per_meter * (lpos->y - (ah/2));
1085    
1086      map_limit_scroll(map, &new_sx, &new_sy);      map_limit_scroll(map, CANVAS_UNIT_PIXEL, &new_sx, &new_sy);
1087      canvas_scroll_to(map->canvas, new_sx, new_sy);      canvas_scroll_to(map->canvas, CANVAS_UNIT_PIXEL, new_sx, new_sy);
1088    }    }
1089  }  }
1090    
1091  /* Deselects the current way or node if its zoom_max  /* Deselects the current way or node if its zoom_max
1092   * means that it's not going to render at the current map zoom. */   * means that it's not going to render at the current map zoom. */
1093  void map_deselect_if_zoom_below_zoom_max(map_t *map) {  void map_deselect_if_zoom_below_zoom_max(map_t *map) {
1094      if (map->selected.type == MAP_TYPE_WAY) {      if (map->selected.object.type == WAY) {
1095          printf("will deselect way if zoomed below %f\n",          printf("will deselect way if zoomed below %f\n",
1096                 map->selected.way->draw.zoom_max);                 map->selected.object.way->draw.zoom_max);
1097          if (map->state->zoom < map->selected.way->draw.zoom_max) {          if (map->state->zoom < map->selected.object.way->draw.zoom_max) {
1098              printf("  deselecting way!\n");              printf("  deselecting way!\n");
1099              map_item_deselect(map->appdata);              map_item_deselect(map->appdata);
1100          }          }
1101      }      }
1102      else if (map->selected.type == MAP_TYPE_NODE) {      else if (map->selected.object.type == NODE) {
1103          printf("will deselect node if zoomed below %f\n",          printf("will deselect node if zoomed below %f\n",
1104                 map->selected.node->zoom_max);                 map->selected.object.node->zoom_max);
1105          if (map->state->zoom < map->selected.node->zoom_max) {          if (map->state->zoom < map->selected.object.node->zoom_max) {
1106              printf("  deselecting node!\n");              printf("  deselecting node!\n");
1107              map_item_deselect(map->appdata);              map_item_deselect(map->appdata);
1108          }          }
# Line 1005  void map_set_zoom(map_t *map, double zoo Line 1119  void map_set_zoom(map_t *map, double zoo
1119    
1120    map_deselect_if_zoom_below_zoom_max(map);    map_deselect_if_zoom_below_zoom_max(map);
1121    
1122    if (update_scroll_offsets) {    if(update_scroll_offsets) {
1123      if (!at_zoom_limit) {      if (!at_zoom_limit) {
1124        /* zooming affects the scroll offsets */        /* zooming affects the scroll offsets */
1125        gint sx, sy;        gint sx, sy;
1126        canvas_get_scroll_offsets(map->canvas, &sx, &sy);        canvas_scroll_get(map->canvas, CANVAS_UNIT_PIXEL, &sx, &sy);
1127        map_limit_scroll(map, &sx, &sy);        map_limit_scroll(map, CANVAS_UNIT_PIXEL, &sx, &sy);
1128        canvas_scroll_to(map->canvas, sx, sy);  // keep the map visible  
1129        map->state->scroll_offset.x = sx;        // keep the map visible
1130        map->state->scroll_offset.y = sy;        canvas_scroll_to(map->canvas, CANVAS_UNIT_PIXEL, sx, sy);
1131      }      }
1132    
1133        canvas_scroll_get(map->canvas, CANVAS_UNIT_METER,
1134                          &map->state->scroll_offset.x,
1135                          &map->state->scroll_offset.y);
1136    }    }
1137  }  }
1138    
# Line 1039  static gboolean map_scroll_event(GtkWidg Line 1157  static gboolean map_scroll_event(GtkWidg
1157  static gboolean distance_above(map_t *map, gint x, gint y, gint limit) {  static gboolean distance_above(map_t *map, gint x, gint y, gint limit) {
1158    gint sx, sy;    gint sx, sy;
1159    
 #ifdef USE_GNOMECANVAS  
   gnome_canvas_get_scroll_offsets(GNOME_CANVAS(map->canvas), &sx, &sy);  
   
   /* add offsets generated by mouse within map and map scrolling */  
   sx = (x-map->pen_down.at.x) + (map->pen_down.so.x-sx);  
   sy = (y-map->pen_down.at.y) + (map->pen_down.so.y-sy);  
 #else  
1160    /* add offsets generated by mouse within map and map scrolling */    /* add offsets generated by mouse within map and map scrolling */
1161    sx = (x-map->pen_down.at.x);    sx = (x-map->pen_down.at.x);
1162    sy = (y-map->pen_down.at.y);    sy = (y-map->pen_down.at.y);
 #endif  
1163    
1164    return(sx*sx + sy*sy > limit*limit);    return(sx*sx + sy*sy > limit*limit);
1165  }  }
# Line 1058  static gboolean distance_above(map_t *ma Line 1168  static gboolean distance_above(map_t *ma
1168  static void map_do_scroll(map_t *map, gint x, gint y) {  static void map_do_scroll(map_t *map, gint x, gint y) {
1169    gint sx, sy;    gint sx, sy;
1170    
1171    canvas_get_scroll_offsets(map->canvas, &sx, &sy);    canvas_scroll_get(map->canvas, CANVAS_UNIT_PIXEL, &sx, &sy);
1172    sx -= x-map->pen_down.at.x;    sx -= x-map->pen_down.at.x;
1173    sy -= y-map->pen_down.at.y;    sy -= y-map->pen_down.at.y;
1174    map_limit_scroll(map, &sx, &sy);    map_limit_scroll(map, CANVAS_UNIT_PIXEL, &sx, &sy);
1175    canvas_scroll_to(map->canvas, sx, sy);    canvas_scroll_to(map->canvas, CANVAS_UNIT_PIXEL, sx, sy);
1176    map->state->scroll_offset.x = sx;  
1177    map->state->scroll_offset.y = sy;    canvas_scroll_get(map->canvas, CANVAS_UNIT_METER,
1178                        &map->state->scroll_offset.x,
1179                        &map->state->scroll_offset.y);
1180  }  }
1181    
1182    
1183  /* scroll a certain step */  /* scroll a certain step */
1184  static void map_do_scroll_step(map_t *map, gint x, gint y) {  static void map_do_scroll_step(map_t *map, gint x, gint y) {
1185    gint sx, sy;    gint sx, sy;
1186    canvas_get_scroll_offsets(map->canvas, &sx, &sy);    canvas_scroll_get(map->canvas, CANVAS_UNIT_PIXEL, &sx, &sy);
1187    sx += x;    sx += x;
1188    sy += y;    sy += y;
1189    map_limit_scroll(map, &sx, &sy);    map_limit_scroll(map, CANVAS_UNIT_PIXEL, &sx, &sy);
1190    canvas_scroll_to(map->canvas, sx, sy);    canvas_scroll_to(map->canvas, CANVAS_UNIT_PIXEL, sx, sy);
   map->state->scroll_offset.x = sx;  
   map->state->scroll_offset.y = sy;  
 }  
1191    
1192      canvas_scroll_get(map->canvas, CANVAS_UNIT_METER,
1193                        &map->state->scroll_offset.x,
1194                        &map->state->scroll_offset.y);
1195    }
1196    
1197  gboolean map_item_is_selected_node(map_t *map, map_item_t *map_item) {  gboolean map_item_is_selected_node(map_t *map, map_item_t *map_item) {
1198    printf("check if item is a selected node\n");    printf("check if item is a selected node\n");
# Line 1089  gboolean map_item_is_selected_node(map_t Line 1202  gboolean map_item_is_selected_node(map_t
1202      return FALSE;      return FALSE;
1203    }    }
1204    
1205    if(map->selected.type == MAP_TYPE_ILLEGAL) {    if(map->selected.object.type == ILLEGAL) {
1206      printf("  nothing is selected\n");      printf("  nothing is selected\n");
1207      return FALSE;      return FALSE;
1208    }    }
1209    
1210    /* clicked the highlight directly */    /* clicked the highlight directly */
1211    if(map_item->type != MAP_TYPE_NODE) {    if(map_item->object.type != NODE) {
1212      printf("  didn't click node\n");      printf("  didn't click node\n");
1213      return FALSE;      return FALSE;
1214    }    }
1215    
1216    if(map->selected.type == MAP_TYPE_NODE) {    if(map->selected.object.type == NODE) {
1217      printf("  selected item is a node\n");      printf("  selected item is a node\n");
1218    
1219      if(map_item->node == map->selected.node) {      if(map_item->object.node == map->selected.object.node) {
1220        printf("  requested item is a selected node\n");        printf("  requested item is a selected node\n");
1221        return TRUE;        return TRUE;
1222      }      }
1223      printf("  but it's not the requested one\n");      printf("  but it's not the requested one\n");
1224      return FALSE;      return FALSE;
1225    
1226    } else if(map->selected.type == MAP_TYPE_WAY) {    } else if(map->selected.object.type == WAY) {
1227      printf("  selected item is a way\n");      printf("  selected item is a way\n");
1228    
1229      node_chain_t *node_chain = map->selected.way->node_chain;      node_chain_t *node_chain = map->selected.object.way->node_chain;
1230      while(node_chain) {      while(node_chain) {
1231        if(node_chain->node == map_item->node) {        if(node_chain->node == map_item->object.node) {
1232          printf("  requested item is part of selected way\n");          printf("  requested item is part of selected way\n");
1233          return TRUE;          return TRUE;
1234        }        }
# Line 1143  gboolean map_item_is_selected_way(map_t Line 1256  gboolean map_item_is_selected_way(map_t
1256      return FALSE;      return FALSE;
1257    }    }
1258    
1259    if(map->selected.type == MAP_TYPE_ILLEGAL) {    if(map->selected.object.type == ILLEGAL) {
1260      printf("  nothing is selected\n");      printf("  nothing is selected\n");
1261      return FALSE;      return FALSE;
1262    }    }
1263    
1264    /* clicked the highlight directly */    /* clicked the highlight directly */
1265    if(map_item->type != MAP_TYPE_WAY) {    if(map_item->object.type != WAY) {
1266      printf("  didn't click way\n");      printf("  didn't click way\n");
1267      return FALSE;      return FALSE;
1268    }    }
1269    
1270    if(map->selected.type == MAP_TYPE_WAY) {    if(map->selected.object.type == WAY) {
1271      printf("  selected item is a way\n");      printf("  selected item is a way\n");
1272    
1273      if(map_item->way == map->selected.way) {      if(map_item->object.way == map->selected.object.way) {
1274        printf("  requested item is a selected way\n");        printf("  requested item is a selected way\n");
1275        return TRUE;        return TRUE;
1276      }      }
# Line 1172  gboolean map_item_is_selected_way(map_t Line 1285  gboolean map_item_is_selected_way(map_t
1285    
1286  void map_highlight_refresh(appdata_t *appdata) {  void map_highlight_refresh(appdata_t *appdata) {
1287    map_t *map = appdata->map;    map_t *map = appdata->map;
1288    map_item_t old = map->selected;    object_t old = map->selected.object;
1289    
1290    printf("type to refresh is %d\n", old.type);    printf("type to refresh is %d\n", old.type);
1291    if(old.type == MAP_TYPE_ILLEGAL)    if(old.type == ILLEGAL)
1292      return;      return;
1293    
1294    map_item_deselect(appdata);    map_item_deselect(appdata);
1295    map_item_select(appdata, &old);    map_object_select(appdata, &old);
1296  }  }
1297    
1298  void map_way_delete(appdata_t *appdata, way_t *way) {  void map_way_delete(appdata_t *appdata, way_t *way) {
1299    printf("deleting way #%ld from map and osm\n", way->id);    printf("deleting way #" ITEM_ID_FORMAT " from map and osm\n", way->id);
1300    
1301    /* remove it visually from the screen */    /* remove it visually from the screen */
1302    map_item_chain_destroy(&way->map_item_chain);    map_item_chain_destroy(&way->map_item_chain);
# Line 1207  static void map_handle_click(appdata_t * Line 1320  static void map_handle_click(appdata_t *
1320    /* problem: on_item may be the highlight itself! So store it! */    /* problem: on_item may be the highlight itself! So store it! */
1321    map_item_t map_item;    map_item_t map_item;
1322    if(map->pen_down.on_item) map_item = *map->pen_down.on_item;    if(map->pen_down.on_item) map_item = *map->pen_down.on_item;
1323    else                      map_item.type = MAP_TYPE_ILLEGAL;    else                      map_item.object.type = ILLEGAL;
1324    
1325    /* if we aready have something selected, then de-select it */    /* if we aready have something selected, then de-select it */
1326    map_item_deselect(appdata);    map_item_deselect(appdata);
1327    
1328    /* select the clicked item (if there was one) */    /* select the clicked item (if there was one) */
1329    if(map_item.type != MAP_TYPE_ILLEGAL) {    if(map_item.object.type != ILLEGAL) {
1330      switch(map_item.type) {      switch(map_item.object.type) {
1331      case MAP_TYPE_NODE:      case NODE:
1332        map_node_select(appdata, map_item.node);        map_node_select(appdata, map_item.object.node);
1333        break;        break;
1334    
1335      case MAP_TYPE_WAY:      case WAY:
1336        map_way_select(appdata, map_item.way);        map_way_select(appdata, map_item.object.way);
1337        break;        break;
1338    
1339      default:      default:
1340        g_assert((map_item.type == MAP_TYPE_NODE) ||        g_assert((map_item.object.type == NODE) ||
1341                 (map_item.type == MAP_TYPE_WAY));                 (map_item.object.type == WAY));
1342        break;        break;
1343      }      }
1344    }    }
# Line 1245  static void map_touchnode_update(appdata Line 1358  static void map_touchnode_update(appdata
1358      /* in idle mode the dragged node is not highlighted */      /* in idle mode the dragged node is not highlighted */
1359    case MAP_ACTION_IDLE:    case MAP_ACTION_IDLE:
1360      g_assert(map->pen_down.on_item);      g_assert(map->pen_down.on_item);
1361      g_assert(map->pen_down.on_item->type == MAP_TYPE_NODE);      g_assert(map->pen_down.on_item->object.type == NODE);
1362      cur_node = map->pen_down.on_item->node;      cur_node = map->pen_down.on_item->object.node;
1363      break;      break;
1364    
1365    default:    default:
# Line 1298  static void map_button_press(map_t *map, Line 1411  static void map_button_press(map_t *map,
1411    map->pen_down.at.y = y;    map->pen_down.at.y = y;
1412    map->pen_down.drag = FALSE;     // don't assume drag yet    map->pen_down.drag = FALSE;     // don't assume drag yet
1413    
 #ifdef USE_GNOMECANVAS  
   /* save initial scroll offset */  
   gnome_canvas_get_scroll_offsets(GNOME_CANVAS(map->canvas),  
                   &map->pen_down.so.x, &map->pen_down.so.y);  
 #endif  
   
1414    /* determine wether this press was on an item */    /* determine wether this press was on an item */
1415    map->pen_down.on_item = map_real_item_at(map, x, y);    map->pen_down.on_item = map_real_item_at(map, x, y);
1416    
# Line 1375  static void map_button_release(map_t *ma Line 1482  static void map_button_release(map_t *ma
1482        map_item_t old_sel = map->selected;        map_item_t old_sel = map->selected;
1483        map_handle_click(map->appdata, map);        map_handle_click(map->appdata, map);
1484    
1485        if((old_sel.type != MAP_TYPE_ILLEGAL) &&        if((old_sel.object.type != ILLEGAL) &&
1486           (old_sel.type == map->selected.type) &&           (old_sel.object.type == map->selected.object.type) &&
1487           (old_sel.ptr == map->selected.ptr)) {           (old_sel.object.ptr == map->selected.object.ptr)) {
1488          printf("re-selected same item of type %d, "          printf("re-selected same item of type %d, "
1489                 "pushing it to the bottom\n", old_sel.type);                 "pushing it to the bottom\n", old_sel.object.type);
1490    
1491          if(!map->selected.item) {          if(!map->selected.item) {
1492            printf("  item has no visible representation to push\n");            printf("  item has no visible representation to push\n");
# Line 1548  static gboolean map_motion_notify_event( Line 1655  static gboolean map_motion_notify_event(
1655    
1656    case MAP_ACTION_WAY_NODE_ADD:    case MAP_ACTION_WAY_NODE_ADD:
1657      map_hl_cursor_clear(map);      map_hl_cursor_clear(map);
1658      map_item_t *item = map_real_item_at(map, x, y);      map_item_t *item = map_item_at(map, x, y);
1659      if(item) map_edit_way_node_add_highlight(map, item, x, y);      if(item) map_edit_way_node_add_highlight(map, item, x, y);
1660      break;      break;
1661    
1662    case MAP_ACTION_WAY_CUT:    case MAP_ACTION_WAY_CUT:
1663      map_hl_cursor_clear(map);      map_hl_cursor_clear(map);
1664      item = map_real_item_at(map, x, y);      item = map_item_at(map, x, y);
1665      if(item) map_edit_way_cut_highlight(map, item, x, y);      if(item) map_edit_way_cut_highlight(map, item, x, y);
1666      break;      break;
1667    
# Line 1658  GtkWidget *map_new(appdata_t *appdata) { Line 1765  GtkWidget *map_new(appdata_t *appdata) {
1765      printf("Creating new map state\n");      printf("Creating new map state\n");
1766      map->state = g_new0(map_state_t, 1);      map->state = g_new0(map_state_t, 1);
1767      map->state->zoom = 0.25;      map->state->zoom = 0.25;
1768        map->state->detail = 1.0;
1769    }    }
1770    
1771    map->state->refcount++;    map->state->refcount++;
# Line 1667  GtkWidget *map_new(appdata_t *appdata) { Line 1775  GtkWidget *map_new(appdata_t *appdata) {
1775    map->appdata = appdata;    map->appdata = appdata;
1776    map->action.type = MAP_ACTION_IDLE;    map->action.type = MAP_ACTION_IDLE;
1777    
1778  #ifdef USE_GNOMECANVAS    map->canvas = canvas_new(map->style->background.color);
1779    map->canvas = gnome_canvas_new_aa();  // _aa    canvas_set_antialias(map->canvas, !appdata->settings->no_antialias);
1780    
1781    /* create the groups */    GtkWidget *canvas_widget = canvas_get_widget(map->canvas);
   canvas_group_t group;  
   for(group = 0; group < CANVAS_GROUPS; group++)  
     map->group[group] = gnome_canvas_item_new(  
                 gnome_canvas_root(GNOME_CANVAS(map->canvas)),  
                 GNOME_TYPE_CANVAS_GROUP,  
                 NULL);  
1782    
1783    gtk_widget_modify_bg(map->canvas, GTK_STATE_NORMAL,    gtk_widget_set_events(canvas_widget,
                        &map->canvas->style->white);  
   
 #else  
   map->canvas = goo_canvas_new();  
   
   g_object_set(G_OBJECT(map->canvas), "anchor", GTK_ANCHOR_CENTER, NULL);  
   g_object_set(G_OBJECT(map->canvas), "background-color-rgb",  
                map->style->background.color >> 8, NULL);  
   
   GooCanvasItem *root = goo_canvas_get_root_item(GOO_CANVAS(map->canvas));  
   g_object_set(G_OBJECT(root), "antialias",  
                appdata->settings->no_antialias?CAIRO_ANTIALIAS_NONE:  
                CAIRO_ANTIALIAS_DEFAULT, NULL);  
   
   /* create the groups */  
   canvas_group_t group;  
   for(group = 0; group < CANVAS_GROUPS; group++)  
     map->group[group] = goo_canvas_group_new(root, NULL);  
   
 #endif  
   
   gtk_widget_set_events(map->canvas,  
1784                            GDK_BUTTON_PRESS_MASK                            GDK_BUTTON_PRESS_MASK
1785                          | GDK_BUTTON_RELEASE_MASK                          | GDK_BUTTON_RELEASE_MASK
1786                          | GDK_SCROLL_MASK                          | GDK_SCROLL_MASK
1787                          | GDK_POINTER_MOTION_MASK                          | GDK_POINTER_MOTION_MASK
1788                          | GDK_POINTER_MOTION_HINT_MASK);                          | GDK_POINTER_MOTION_HINT_MASK);
1789    
1790    gtk_signal_connect(GTK_OBJECT(map->canvas),    gtk_signal_connect(GTK_OBJECT(canvas_widget),
1791       "button_press_event", G_CALLBACK(map_button_event), appdata);       "button_press_event", G_CALLBACK(map_button_event), appdata);
1792    gtk_signal_connect(GTK_OBJECT(map->canvas),    gtk_signal_connect(GTK_OBJECT(canvas_widget),
1793       "button_release_event", G_CALLBACK(map_button_event), appdata);       "button_release_event", G_CALLBACK(map_button_event), appdata);
1794    gtk_signal_connect(GTK_OBJECT(map->canvas),    gtk_signal_connect(GTK_OBJECT(canvas_widget),
1795       "motion_notify_event", G_CALLBACK(map_motion_notify_event), appdata);       "motion_notify_event", G_CALLBACK(map_motion_notify_event), appdata);
1796    gtk_signal_connect(GTK_OBJECT(map->canvas),    gtk_signal_connect(GTK_OBJECT(canvas_widget),
1797       "scroll_event", G_CALLBACK(map_scroll_event), appdata);       "scroll_event", G_CALLBACK(map_scroll_event), appdata);
1798    
1799    gtk_signal_connect(GTK_OBJECT(map->canvas),    gtk_signal_connect(GTK_OBJECT(canvas_widget),
1800       "destroy", G_CALLBACK(map_destroy_event), appdata);       "destroy", G_CALLBACK(map_destroy_event), appdata);
1801    
1802    return map->canvas;    return canvas_widget;
1803  }  }
1804    
1805  void map_init(appdata_t *appdata) {  void map_init(appdata_t *appdata) {
# Line 1738  void map_init(appdata_t *appdata) { Line 1818  void map_init(appdata_t *appdata) {
1818                      mult*appdata->osm->bounds->max.x,                      mult*appdata->osm->bounds->max.x,
1819                      mult*appdata->osm->bounds->max.y);                      mult*appdata->osm->bounds->max.y);
1820    
1821    printf("restore scroll offsets %d/%d\n",    printf("restore scroll position %d/%d\n",
1822           map->state->scroll_offset.x, map->state->scroll_offset.y);           map->state->scroll_offset.x, map->state->scroll_offset.y);
1823    
1824    canvas_scroll_to(map->canvas,    map_limit_scroll(map, CANVAS_UNIT_METER,
1825                     map->state->scroll_offset.x, map->state->scroll_offset.y);             &map->state->scroll_offset.x, &map->state->scroll_offset.y);
1826      canvas_scroll_to(map->canvas, CANVAS_UNIT_METER,
1827               map->state->scroll_offset.x, map->state->scroll_offset.y);
1828  }  }
1829    
1830    
1831  void map_item_set_flags(map_item_t *map_item, int set, int clr) {  void map_clear(appdata_t *appdata, gint group_mask) {
   
   switch(map_item->type) {  
   case MAP_TYPE_NODE:  
     map_item->node->flags |=  set;  
     map_item->node->flags &= ~clr;  
     break;  
   
   case MAP_TYPE_WAY:  
     map_item->way->flags |=  set;  
     map_item->way->flags &= ~clr;  
     break;  
   
   default:  
     g_assert(0);  
     break;  
   }  
 }  
   
 void map_clear(appdata_t *appdata, gint layer_mask) {  
1832    map_t *map = appdata->map;    map_t *map = appdata->map;
1833    
1834    printf("freeing map contents\n");    printf("freeing map contents\n");
# Line 1775  void map_clear(appdata_t *appdata, gint Line 1838  void map_clear(appdata_t *appdata, gint
1838    /* remove a possibly existing highlight */    /* remove a possibly existing highlight */
1839    map_item_deselect(appdata);    map_item_deselect(appdata);
1840    
1841    canvas_group_t group;    canvas_erase(map->canvas, group_mask);
   for(group=0;group<CANVAS_GROUPS;group++) {  
   
 #ifdef USE_GNOMECANVAS  
     /* destroy the entire group */  
     canvas_item_destroy(map->group[group]);  
   
     /* and create an empty new one */  
     map->group[group] = gnome_canvas_item_new(  
                       gnome_canvas_root(GNOME_CANVAS(map->canvas)),  
                       GNOME_TYPE_CANVAS_GROUP,  
                       NULL);  
 #else  
     if(layer_mask & (1<<group)) {  
       gint children = goo_canvas_item_get_n_children(map->group[group]);  
       printf("Removing %d children from layer %d\n", children, group);  
       while(children--)  
         goo_canvas_item_remove_child(map->group[group], children);  
     }  
 #endif  
   }  
1842  }  }
1843    
1844  void map_paint(appdata_t *appdata) {  void map_paint(appdata_t *appdata) {
1845    map_t *map = appdata->map;    map_t *map = appdata->map;
1846    
1847    /* user may have changed antialias settings */    /* user may have changed antialias settings */
1848    GooCanvasItem *root = goo_canvas_get_root_item(GOO_CANVAS(map->canvas));    canvas_set_antialias(map->canvas, !appdata->settings->no_antialias);
   g_object_set(G_OBJECT(root), "antialias",  
                appdata->settings->no_antialias?CAIRO_ANTIALIAS_NONE:  
                CAIRO_ANTIALIAS_DEFAULT, NULL);  
1849    
1850    josm_elemstyles_colorize_world(map->style, appdata->osm);    josm_elemstyles_colorize_world(map->style, appdata->osm);
1851    map_draw(map, appdata->osm);    map_draw(map, appdata->osm);
# Line 1838  void map_action_set(appdata_t *appdata, Line 1878  void map_action_set(appdata_t *appdata,
1878    
1879      /* remember if there was a way selected */      /* remember if there was a way selected */
1880      way_t *way_sel = NULL;      way_t *way_sel = NULL;
1881      if(appdata->map->selected.type == MAP_TYPE_WAY)      if(appdata->map->selected.object.type == WAY)
1882        way_sel = appdata->map->selected.way;        way_sel = appdata->map->selected.object.way;
1883    
1884      map_item_deselect(appdata);      map_item_deselect(appdata);
1885      map_edit_way_add_begin(appdata->map, way_sel);      map_edit_way_add_begin(appdata->map, way_sel);
# Line 1938  void map_delete_selected(appdata_t *appd Line 1978  void map_delete_selected(appdata_t *appd
1978    /* deleting the selected item de-selects it ... */    /* deleting the selected item de-selects it ... */
1979    map_item_deselect(appdata);    map_item_deselect(appdata);
1980    
1981    undo_remember_delete(appdata, item.type, item.ptr);    undo_remember_delete(appdata, &item.object);
1982    
1983    switch(item.type) {    switch(item.object.type) {
1984    case MAP_TYPE_NODE:    case NODE:
1985      printf("request to delete node #%ld\n", item.node->id);      printf("request to delete node #" ITEM_ID_FORMAT "\n",
1986               item.object.node->id);
1987    
1988      /* check if this node is part of a way with two nodes only. */      /* check if this node is part of a way with two nodes only. */
1989      /* we cannot delete this as this would also delete the way */      /* we cannot delete this as this would also delete the way */
1990      way_chain_t *way_chain = osm_node_to_way(appdata->osm, item.node);      way_chain_t *way_chain = osm_node_to_way(appdata->osm, item.object.node);
1991      if(way_chain) {      if(way_chain) {
1992        gboolean short_way = FALSE;        gboolean short_way = FALSE;
1993    
# Line 1972  void map_delete_selected(appdata_t *appd Line 2013  void map_delete_selected(appdata_t *appd
2013      }      }
2014    
2015      /* remove it visually from the screen */      /* remove it visually from the screen */
2016      map_item_chain_destroy(&item.node->map_item_chain);      map_item_chain_destroy(&item.object.node->map_item_chain);
2017    
2018      /* and mark it "deleted" in the database */      /* and mark it "deleted" in the database */
2019      osm_node_remove_from_relation(appdata->osm, item.node);      osm_node_remove_from_relation(appdata->osm, item.object.node);
2020      way_chain_t *chain = osm_node_delete(appdata->osm,      way_chain_t *chain = osm_node_delete(appdata->osm,
2021                           &appdata->icon, item.node, FALSE, TRUE);                           &appdata->icon, item.object.node, FALSE, TRUE);
2022    
2023      /* redraw all affected ways */      /* redraw all affected ways */
2024      while(chain) {      while(chain) {
# Line 1990  void map_delete_selected(appdata_t *appd Line 2031  void map_delete_selected(appdata_t *appd
2031          map_way_delete(appdata, chain->way);          map_way_delete(appdata, chain->way);
2032        } else {        } else {
2033          map_item_t item;          map_item_t item;
2034          item.type = MAP_TYPE_WAY;          item.object.type = WAY;
2035          item.way = chain->way;          item.object.way = chain->way;
2036          map_item_redraw(appdata, &item);          map_item_redraw(appdata, &item);
2037        }        }
2038    
# Line 2002  void map_delete_selected(appdata_t *appd Line 2043  void map_delete_selected(appdata_t *appd
2043    
2044      break;      break;
2045    
2046    case MAP_TYPE_WAY:    case WAY:
2047      printf("request to delete way #%ld\n", item.way->id);      printf("request to delete way #" ITEM_ID_FORMAT "\n", item.object.way->id);
2048      map_way_delete(appdata, item.way);      map_way_delete(appdata, item.object.way);
2049      break;      break;
2050    
2051    default:    default:
2052      g_assert((item.type == MAP_TYPE_NODE) ||      g_assert((item.object.type == NODE) ||
2053               (item.type == MAP_TYPE_WAY));               (item.object.type == WAY));
2054      break;      break;
2055    }    }
2056  }  }
2057    
2058  /* ----------------------- track related stuff ----------------------- */  /* ----------------------- track related stuff ----------------------- */
2059    
2060    static gboolean track_pos2lpos(bounds_t *bounds, pos_t *pos, lpos_t *lpos) {
2061      pos2lpos(bounds, pos, lpos);
2062    
2063      /* check if point is within bounds */
2064      return ((lpos->x >= bounds->min.x) && (lpos->x <= bounds->max.x) &&
2065              (lpos->y >= bounds->min.y) && (lpos->y <= bounds->max.y));
2066    }
2067    
2068  void map_track_draw_seg(map_t *map, track_seg_t *seg) {  void map_track_draw_seg(map_t *map, track_seg_t *seg) {
2069      bounds_t *bounds = map->appdata->osm->bounds;
2070    
2071    /* a track_seg needs at least 2 points to be drawn */    /* a track_seg needs at least 2 points to be drawn */
2072    guint pnum = track_seg_points(seg);    guint pnum = track_seg_points(seg);
2073    printf("seg of length %d\n", pnum);    printf("seg of length %d\n", pnum);
2074    
2075    if(pnum == 1) {    if(!pnum)
2076      g_assert(!seg->item);      return;
2077    
2078      seg->item = canvas_circle_new(map, CANVAS_GROUP_TRACK,    /* nothing should have been drawn by now ... */
2079            seg->track_point->lpos.x, seg->track_point->lpos.y,    g_assert(!seg->item_chain);
2080            map->style->track.width/2.0, 0, map->style->track.color, NO_COLOR);  
2081    }    track_item_chain_t **itemP = &seg->item_chain;
2082      track_point_t *track_point = seg->track_point;
2083      while(track_point) {
2084        lpos_t lpos;
2085    
2086        /* skip all points not on screen */
2087        track_point_t *last = NULL;
2088        while(track_point && !track_pos2lpos(bounds, &track_point->pos, &lpos)) {
2089          last = track_point;
2090          track_point = track_point->next;
2091        }
2092    
2093        int visible = 0;
2094    
2095        /* count nodes that _are_ on screen */
2096        track_point_t *tmp = track_point;
2097        while(tmp && track_pos2lpos(bounds, &tmp->pos, &lpos)) {
2098          tmp = tmp->next;
2099          visible++;
2100        }
2101    
2102        /* actually start drawing with the last position that was offscreen */
2103        /* so the track nicely enters the viewing area */
2104        if(last) {
2105          track_point = last;
2106          visible++;
2107        }
2108    
2109        /* also use last one that's offscreen to nicely leave the visible area */
2110        if(tmp && tmp->next)
2111          visible++;
2112    
   if(pnum > 1) {  
   
2113      /* allocate space for nodes */      /* allocate space for nodes */
2114      canvas_points_t *points = canvas_points_new(pnum);      canvas_points_t *points = canvas_points_new(visible);
2115    
2116      int point = 0;      printf("visible are %d\n", visible);
2117      track_point_t *track_point = seg->track_point;      int point;
2118      while(track_point) {      for(point=0;point<visible;point++) {
2119        points->coords[point++] = track_point->lpos.x;        track_pos2lpos(bounds, &track_point->pos, &lpos);
2120        points->coords[point++] = track_point->lpos.y;  
2121          points->coords[2*point+0] = lpos.x;
2122          points->coords[2*point+1] = lpos.y;
2123        track_point = track_point->next;        track_point = track_point->next;
2124      }      }
   
     /* there may be a circle (one point line) */  
     if(seg->item)  
       canvas_item_destroy(seg->item);  
2125    
2126      seg->item = canvas_polyline_new(map, CANVAS_GROUP_TRACK,      *itemP = g_new0(track_item_chain_t, 1);
2127            points, map->style->track.width, map->style->track.color);      (*itemP)->item = canvas_polyline_new(map->canvas, CANVAS_GROUP_TRACK,
2128                     points, map->style->track.width, map->style->track.color);
2129        itemP = &(*itemP)->next;
2130    
2131      canvas_points_free(points);      canvas_points_free(points);
2132    }    }
2133  }  }
2134    
2135    /* update the last visible fragment of this segment since a */
2136    /* gps position may have been added */
2137  void map_track_update_seg(map_t *map, track_seg_t *seg) {  void map_track_update_seg(map_t *map, track_seg_t *seg) {
2138      bounds_t *bounds = map->appdata->osm->bounds;
2139    
2140      printf("-- APPENDING TO TRACK --\n");
2141    
2142    /* a track_seg needs at least 2 points to be drawn */    /* a track_seg needs at least 2 points to be drawn */
2143    guint pnum = track_seg_points(seg);    guint pnum = track_seg_points(seg);
2144    printf("seg of length %d\n", pnum);    printf("seg of length %d\n", pnum);
2145    
2146    if(pnum > 1) {    /* there are two cases: either the second last point was on screen */
2147      /* or it wasn't. We'll have to start a new screen item if the latter */
2148      /* is the case */
2149    
2150      /* search last point */
2151      track_point_t *begin = seg->track_point, *second_last = seg->track_point;
2152      lpos_t lpos;
2153      while(second_last && second_last->next && second_last->next->next) {
2154        if(!track_pos2lpos(bounds, &second_last->pos, &lpos))
2155          begin = second_last;
2156    
2157        second_last = second_last->next;
2158      }
2159      track_point_t *last = second_last->next;
2160    
2161      /* since we are updating an existing track, it sure has at least two */
2162      /* points, second_last must be valid and its "next" (last) also */
2163      g_assert(second_last);
2164      g_assert(last);
2165    
2166      /* check if the last and second_last points are visible */
2167      gboolean last_is_visible =
2168        track_pos2lpos(bounds, &last->pos, &lpos);
2169      gboolean second_last_is_visible =
2170        track_pos2lpos(bounds, &second_last->pos, &lpos);
2171    
2172      /* if both are invisible, then nothing has changed on screen */
2173      if(!last_is_visible && !second_last_is_visible) {
2174        printf("second_last and last entry are invisible -> doing nothing\n");
2175        return;
2176      }
2177    
2178      /* search last element in item chain */
2179      track_item_chain_t *item = seg->item_chain;
2180      while(item && item->next)
2181        item = item->next;
2182    
2183      if(second_last_is_visible) {
2184        /* there must be something already on the screen and there must */
2185        /* be visible nodes in the chain */
2186        g_assert(item);
2187        g_assert(begin);
2188    
2189        printf("second_last is visible -> append\n");
2190    
2191      /* allocate space for nodes */      /* count points to be placed */
2192      canvas_points_t *points = canvas_points_new(pnum);      int npoints = 0;
2193        track_point_t *tmp = begin;
2194        while(tmp) {
2195          tmp = tmp->next;
2196          npoints++;
2197        }
2198    
2199        printf("updating last segment to %d points\n", npoints);
2200    
2201        canvas_points_t *points = canvas_points_new(npoints);
2202    
2203        gint point = 0;
2204        while(begin) {
2205          track_pos2lpos(bounds, &begin->pos, &lpos);
2206          canvas_point_set_pos(points, point++, &lpos);
2207          begin = begin->next;
2208        }
2209    
2210      int point = 0;      canvas_item_set_points(item->item, points);
2211      track_point_t *track_point = seg->track_point;      canvas_points_free(points);
2212      while(track_point) {  
2213        canvas_point_set_pos(points, point++, &track_point->lpos);    } else {
2214        track_point = track_point->next;      printf("second last is invisible -> start new screen segment\n");
2215    
2216        /* the search for the "begin" ends with the second_last item */
2217        /* verify the last one also */
2218        if(begin->next && !track_pos2lpos(bounds, &begin->next->pos, &lpos))
2219          begin = begin->next;
2220    
2221        item->next = g_new0(track_item_chain_t, 1);
2222        item = item->next;
2223    
2224        /* count points to be placed */
2225        int npoints = 0;
2226        track_point_t *tmp = begin;
2227        while(tmp) {
2228          tmp = tmp->next;
2229          npoints++;
2230      }      }
2231    
2232        printf("attaching new segment with %d points\n", npoints);
2233    
2234        canvas_points_t *points = canvas_points_new(npoints);
2235    
2236        gint point = 0;
2237        while(begin) {
2238          track_pos2lpos(bounds, &begin->pos, &lpos);
2239          canvas_point_set_pos(points, point++, &lpos);
2240          begin = begin->next;
2241        }
2242    
2243        item->item = canvas_polyline_new(map->canvas, CANVAS_GROUP_TRACK,
2244                     points, map->style->track.width, map->style->track.color);
2245    
     g_assert(seg->item);  
     canvas_item_set_points(seg->item, points);  
2246      canvas_points_free(points);      canvas_points_free(points);
2247    }    }
2248    
2249  }  }
2250    
2251  void map_track_draw(map_t *map, track_t *track) {  void map_track_draw(map_t *map, track_t *track) {
# Line 2096  void map_track_remove(appdata_t *appdata Line 2268  void map_track_remove(appdata_t *appdata
2268    /* remove all segments */    /* remove all segments */
2269    track_seg_t *seg = track->track_seg;    track_seg_t *seg = track->track_seg;
2270    while(seg) {    while(seg) {
2271      if(seg->item) {      track_item_chain_t *item = seg->item_chain;
2272        canvas_item_destroy(seg->item);      while(item) {
2273        seg->item = NULL;        track_item_chain_t *next = item->next;
2274          canvas_item_destroy(item->item);
2275          item = next;
2276      }      }
2277    
2278        seg->item_chain = NULL;
2279      seg = seg->next;      seg = seg->next;
2280    }    }
2281  }  }
2282    
2283  void map_track_pos(appdata_t *appdata, lpos_t *lpos) {  void map_track_pos(appdata_t *appdata, pos_t *pos) {
2284    if(appdata->track.gps_item) {    if(appdata->track.gps_item) {
2285      canvas_item_destroy(appdata->track.gps_item);      canvas_item_destroy(appdata->track.gps_item);
2286      appdata->track.gps_item = NULL;      appdata->track.gps_item = NULL;
2287    }    }
2288    
2289    if(lpos)    if(pos) {
2290      appdata->track.gps_item = canvas_circle_new(appdata->map, CANVAS_GROUP_GPS,      lpos_t lpos;
2291          lpos->x, lpos->y, appdata->map->style->track.width/2.0, 0,      pos2lpos(appdata->osm->bounds, pos, &lpos);
2292    
2293        appdata->track.gps_item =
2294          canvas_circle_new(appdata->map->canvas, CANVAS_GROUP_GPS,
2295            lpos.x, lpos.y, appdata->map->style->track.width/2.0, 0,
2296                          appdata->map->style->track.gps_color, NO_COLOR);                          appdata->map->style->track.gps_color, NO_COLOR);
2297      }
2298  }  }
2299    
2300  /* ------------------- map background ------------------ */  /* ------------------- map background ------------------ */
# Line 2155  void map_set_bg_image(map_t *map, char * Line 2335  void map_set_bg_image(map_t *map, char *
2335    map->bg.scale.y = (float)(bounds->max.y - bounds->min.y)/    map->bg.scale.y = (float)(bounds->max.y - bounds->min.y)/
2336      (float)gdk_pixbuf_get_height(map->bg.pix);      (float)gdk_pixbuf_get_height(map->bg.pix);
2337    
2338    map->bg.item = canvas_image_new(map, CANVAS_GROUP_BG, map->bg.pix,    map->bg.item = canvas_image_new(map->canvas, CANVAS_GROUP_BG, map->bg.pix,
2339            bounds->min.x, bounds->min.y, map->bg.scale.x, map->bg.scale.y);            bounds->min.x, bounds->min.y, map->bg.scale.x, map->bg.scale.y);
2340    
2341    canvas_item_destroy_connect(map->bg.item,    canvas_item_destroy_connect(map->bg.item,
# Line 2169  void map_hide_selected(appdata_t *appdat Line 2349  void map_hide_selected(appdata_t *appdat
2349    map_t *map = appdata->map;    map_t *map = appdata->map;
2350    if(!map) return;    if(!map) return;
2351    
2352    if(map->selected.type != MAP_TYPE_WAY) {    if(map->selected.object.type != WAY) {
2353      printf("selected item is not a way\n");      printf("selected item is not a way\n");
2354      return;      return;
2355    }    }
2356    
2357    way_t *way = map->selected.way;    way_t *way = map->selected.object.way;
2358    printf("hiding way #%ld\n", way->id);    printf("hiding way #" ITEM_ID_FORMAT "\n", way->id);
2359    
2360    map_item_deselect(appdata);    map_item_deselect(appdata);
2361    way->flags |= OSM_FLAG_HIDDEN;    way->flags |= OSM_FLAG_HIDDEN;
# Line 2200  void map_show_all(appdata_t *appdata) { Line 2380  void map_show_all(appdata_t *appdata) {
2380    
2381    gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
2382  }  }
2383    
2384    static void map_detail_change(map_t *map, float detail) {
2385      appdata_t *appdata = map->appdata;
2386    
2387      /* deselecting anything allows us not to care about automatic deselection */
2388      /* as well as items becoming invisible by the detail change */
2389      map_item_deselect(appdata);
2390    
2391      map->state->detail = detail;
2392      printf("changing detail factor to %f\n", map->state->detail);
2393    
2394      banner_busy_start(appdata, 1, "Redrawing...");
2395      map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
2396      map_paint(appdata);
2397      banner_busy_stop(appdata);
2398    }
2399    
2400    #define DETAIL_STEP 1.5
2401    
2402    void map_detail_increase(map_t *map) {
2403      if(!map) return;
2404      map_detail_change(map, map->state->detail * DETAIL_STEP);
2405    }
2406    
2407    void map_detail_decrease(map_t *map) {
2408      if(!map) return;
2409      map_detail_change(map, map->state->detail / DETAIL_STEP);
2410    }
2411    
2412    void map_detail_normal(map_t *map) {
2413      if(!map) return;
2414      map_detail_change(map, 1.0);
2415    }
2416    
2417  // vim:et:ts=8:sw=2:sts=2:ai  // vim:et:ts=8:sw=2:sts=2:ai
Legend:
Removed from v.78  
changed lines
  Added in v.163