Diff of /trunk/src/map.c

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

revision 13 by achadwick, Mon Dec 15 14:17:29 2008 UTC revision 14 by harbaum, Mon Dec 15 19:45:38 2008 UTC
# Line 146  static void map_node_select(appdata_t *a Line 146  static void map_node_select(appdata_t *a
146    
147    float radius = map->style->highlight.width + map->style->node.radius;    float radius = map->style->highlight.width + map->style->node.radius;
148    if(!node->ways) radius += map->style->node.border_radius;    if(!node->ways) radius += map->style->node.border_radius;
149    if(node->icon_buf && map->style->icon.enable) {    if(node->icon_buf && map->style->icon.enable &&
150         !appdata->settings->no_icons) {
151      gint w = gdk_pixbuf_get_width(map_item->node->icon_buf);      gint w = gdk_pixbuf_get_width(map_item->node->icon_buf);
152      gint h = gdk_pixbuf_get_height(map_item->node->icon_buf);      gint h = gdk_pixbuf_get_height(map_item->node->icon_buf);
153      /* icons are technically square, so a radius slightly bigger */      /* icons are technically square, so a radius slightly bigger */
# Line 366  static canvas_item_t *map_node_new(map_t Line 367  static canvas_item_t *map_node_new(map_t
367    map_item->type = MAP_TYPE_NODE;    map_item->type = MAP_TYPE_NODE;
368    map_item->node = node;    map_item->node = node;
369    
370    if(!node->icon_buf || !map->style->icon.enable)    if(!node->icon_buf || !map->style->icon.enable ||
371         map->appdata->settings->no_icons)
372      map_item->item = canvas_circle_new(map, CANVAS_GROUP_NODES,      map_item->item = canvas_circle_new(map, CANVAS_GROUP_NODES,
373         node->lpos.x, node->lpos.y, radius, width, fill, border);         node->lpos.x, node->lpos.y, radius, width, fill, border);
374    else    else
# Line 990  void map_scroll_to_if_offscreen(map_t *m Line 992  void map_scroll_to_if_offscreen(map_t *m
992    max_y = map->appdata->osm->bounds->max.y;    max_y = map->appdata->osm->bounds->max.y;
993    if (   (lpos->x > max_x) || (lpos->x < min_x)    if (   (lpos->x > max_x) || (lpos->x < min_x)
994        || (lpos->y > max_y) || (lpos->y < min_y)) {        || (lpos->y > max_y) || (lpos->y < min_y)) {
995      printf("cannot scroll to (%d, %d): outside the working area\n");      printf("cannot scroll to (%d, %d): outside the working area\n",
996               lpos->x, lpos->y);
997      return;      return;
998    }    }
999    
Legend:
Removed from v.13  
changed lines
  Added in v.14