Add:Core:Support for FRA FRA NLS Setting
[navit-package] / navit / navit.c
index bd0a7e0..eb92e8b 100644 (file)
@@ -1,6 +1,6 @@
 /**
  * Navit, a modular navigation system.
- * Copyright (C) 2005-2008 Navit Team
+ * Copyright (C) 2005-2009 Navit Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -42,7 +42,6 @@
 #include "param.h"
 #include "menu.h"
 #include "graphics.h"
-#include "cursor.h"
 #include "popup.h"
 #include "data_window.h"
 #include "route.h"
@@ -50,7 +49,6 @@
 #include "speech.h"
 #include "track.h"
 #include "vehicle.h"
-#include "color.h"
 #include "layout.h"
 #include "log.h"
 #include "attr.h"
@@ -62,6 +60,7 @@
 #include "util.h"
 #include "messages.h"
 #include "vehicleprofile.h"
+#include "sunriset.h"
 
 /**
  * @defgroup navit the navit core instance. navit is the object containing nearly everything: A set of maps, one or more vehicle, a graphics object for rendering the map, a gui object for displaying the user interface, a route object, a navigation object and so on. Be warned that it is theoretically possible to have more than one navit object
@@ -78,9 +77,6 @@ struct navit_vehicle {
        int dir;
        int speed;
        struct coord last; /*< Position of the last update of this vehicle */
-       struct color c;
-       struct color *c2;
-       struct cursor *cursor;
        struct vehicle *vehicle;
        struct attr callback;
        int animate_cursor;
@@ -139,6 +135,9 @@ struct navit {
        GList *vehicleprofiles;
        int pitch;
        int follow_cursor;
+       int prevTs;
+       int graphics_flags;
+       int zoom_min, zoom_max;
 };
 
 struct gui *main_loop_gui;
@@ -155,8 +154,10 @@ static void navit_vehicle_draw(struct navit *this_, struct navit_vehicle *nv, st
 static int navit_add_vehicle(struct navit *this_, struct vehicle *v);
 static int navit_set_attr_do(struct navit *this_, struct attr *attr, int init);
 static int navit_get_cursor_pnt(struct navit *this_, struct point *p, int *dir);
+static void navit_set_cursors(struct navit *this_);
 static void navit_cmd_zoom_to_route(struct navit *this);
 static void navit_cmd_set_center_cursor(struct navit *this_);
+static void navit_cmd_announcer_toggle(struct navit *this_);
 static void navit_set_vehicle(struct navit *this_, struct navit_vehicle *nv);
 
 void
@@ -199,7 +200,7 @@ navit_draw_async(struct navit *this_, int async)
                navit_vehicle_draw(this_, nv, NULL);
                l=g_list_next(l);
        }
-       graphics_draw(this_->gra, this_->displaylist, this_->mapsets->data, this_->trans, this_->layout_current, async, NULL);
+       graphics_draw(this_->gra, this_->displaylist, this_->mapsets->data, this_->trans, this_->layout_current, async, NULL, this_->graphics_flags|1);
 }
 
 void
@@ -208,12 +209,19 @@ navit_draw(struct navit *this_)
        navit_draw_async(this_, 0);
 }
 
+int
+navit_get_ready(struct navit *this_)
+{
+       return this_->ready;
+}
+
+
 
 void
 navit_draw_displaylist(struct navit *this_)
 {
        if (this_->ready == 3)
-               graphics_displaylist_draw(this_->gra, this_->displaylist, this_->trans, this_->layout_current, 1);
+               graphics_displaylist_draw(this_->gra, this_->displaylist, this_->trans, this_->layout_current, this_->graphics_flags|1);
 }
 
 static void
@@ -240,16 +248,22 @@ void
 navit_handle_resize(struct navit *this_, int w, int h)
 {
        struct map_selection sel;
-       memset(&sel, 0, sizeof(sel));
-       this_->w=w;
-       this_->h=h;
-       sel.u.p_rect.rl.x=w;
-       sel.u.p_rect.rl.y=h;
-       transform_set_screen_selection(this_->trans, &sel);
+       int callback=(this_->ready == 1);
        this_->ready |= 2;
-       graphics_set_rect(this_->gra, &sel.u.p_rect);
+       if (this_->w != w || this_->h != h) {
+               memset(&sel, 0, sizeof(sel));
+               this_->w=w;
+               this_->h=h;
+               sel.u.p_rect.rl.x=w;
+               sel.u.p_rect.rl.y=h;
+               transform_set_screen_selection(this_->trans, &sel);
+               graphics_init(this_->gra);
+               graphics_set_rect(this_->gra, &sel.u.p_rect);
+       }
        if (this_->ready == 3)
                navit_draw(this_);
+       if (callback)
+               callback_list_call_attr_1(this_->attr_cbl, attr_graphics_ready, this_);
 }
 
 static void
@@ -306,14 +320,16 @@ update_transformation(struct transformation *tr, struct point *old, struct point
        int yaw;
        double angleo,anglen;
 
-       transform_reverse(tr, old, &co);
+       if (!transform_reverse(tr, old, &co))
+               return;
        if (rot) {
                angleo=atan2(old->y-rot->y, old->x-rot->x)*180/M_PI;
                anglen=atan2(new->y-rot->y, new->x-rot->x)*180/M_PI;
                yaw=transform_get_yaw(tr)+angleo-anglen;
                transform_set_yaw(tr, yaw % 360);
        }
-       transform_reverse(tr, new, &cn);
+       if (!transform_reverse(tr, new, &cn))
+               return;
        cp=transform_get_center(tr);
        c.x=cp->x+co.x-cn.x;
        c.y=cp->y+co.y-cn.y;
@@ -335,7 +351,8 @@ navit_handle_button(struct navit *this_, int pressed, int button, struct point *
 {
        int border=16;
 
-       callback_list_call_attr_4(this_->attr_cbl, attr_button, this_, (void *)pressed, (void *)button, p);
+       dbg(1,"enter %d %d (ignore %d)\n",pressed,button,this_->ignore_button);
+       callback_list_call_attr_4(this_->attr_cbl, attr_button, this_, GINT_TO_POINTER(pressed), GINT_TO_POINTER(button), p);
        if (this_->ignore_button) {
                this_->ignore_button=0;
                return 0;
@@ -401,6 +418,7 @@ static void
 navit_button(void *data, int pressed, int button, struct point *p)
 {
        struct navit *this=data;
+       dbg(1,"enter %d %d ignore %d\n",pressed,button,this->ignore_graphics_events);
        if (!this->ignore_graphics_events) {
                if (! this->popup_callback)
                        this->popup_callback=callback_new_1(callback_cast(navit_popup), this);
@@ -445,7 +463,7 @@ navit_motion_timeout(struct navit *this_)
                graphics_displaylist_move(this_->displaylist, dx, dy);
 #endif
                graphics_draw_cancel(this_->gra, this_->displaylist);
-               graphics_displaylist_draw(this_->gra, this_->displaylist, tr, this_->layout_current, 0);
+               graphics_displaylist_draw(this_->gra, this_->displaylist, tr, this_->layout_current, this_->graphics_flags);
                transform_destroy(tr);
                this_->moved=1;
        }
@@ -462,6 +480,7 @@ navit_handle_motion(struct navit *this_, struct point *p)
                dx=(p->x-this_->pressed.x);
                dy=(p->y-this_->pressed.y);
                if (dx < -8 || dx > 8 || dy < -8 || dy > 8) {
+                       this_->moved=1;
                        if (this_->button_timeout) {
                                event_remove_timeout(this_->button_timeout);
                                this_->button_timeout=NULL;
@@ -487,6 +506,10 @@ static void
 navit_scale(struct navit *this_, long scale, struct point *p, int draw)
 {
        struct coord c1, c2, *center;
+       if (scale < this_->zoom_min)
+               scale=this_->zoom_min;
+       if (scale > this_->zoom_max)
+               scale=this_->zoom_max;
        if (p)
                transform_reverse(this_->trans, p, &c1);
        transform_set_scale(this_->trans, scale);
@@ -529,7 +552,7 @@ navit_autozoom(struct navit *this_, struct coord *center, int speed, int draw)
        transform(this_->trans, transform_get_projection(this_->trans), center, &pc, 1, 0, 0, NULL);
        scale = transform_get_scale(this_->trans);
 
-       /* We make shure that the point we want to see is within a certain range
+       /* We make sure that the point we want to see is within a certain range
         * around the vehicle. The radius of this circle is the size of the
         * screen. This doesn't necessarily mean the point is visible because of
         * perspective etc. Quite rough, but should be enough. */
@@ -614,6 +637,7 @@ static struct command_table commands[] = {
        {"zoom_out",command_cast(navit_cmd_zoom_out)},
        {"zoom_to_route",command_cast(navit_cmd_zoom_to_route)},
        {"set_center_cursor",command_cast(navit_cmd_set_center_cursor)},
+       {"announcer_toggle",command_cast(navit_cmd_announcer_toggle)},
 };
        
 
@@ -632,7 +656,6 @@ navit_new(struct attr *parent, struct attr **attrs)
        this_->self.type=attr_navit;
        this_->self.u.navit=this_;
        this_->attr_cbl=callback_list_new();
-       main_add_navit(this_);
 
        this_->bookmarks_hash=g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
 
@@ -646,6 +669,8 @@ navit_new(struct attr *parent, struct attr **attrs)
        this_->autozoom_secs = 10;
        this_->autozoom_min = 7;
        this_->autozoom_active = 0;
+       this_->zoom_min = 1;
+       this_->zoom_max = 2097152;
        this_->follow_cursor = 1;
 
        this_->trans = transform_new();
@@ -653,6 +678,8 @@ navit_new(struct attr *parent, struct attr **attrs)
        center.x=co.x;
        center.y=co.y;
        center.pro = pro;
+       
+       this_->prevTs=0;
 
        transform_setup(this_->trans, &center, zoom, (this_->orientation != -1) ? this_->orientation : 0);
        for (;*attrs; attrs++) {
@@ -897,6 +924,7 @@ navit_get_center_file(gboolean create)
 static void
 navit_set_center_from_file(struct navit *this_, char *file)
 {
+#ifndef HAVE_API_ANDROID
        FILE *f;
        char *line = NULL;
 
@@ -916,6 +944,7 @@ navit_set_center_from_file(struct navit *this_, char *file)
                free(line);
        }
        return;
+#endif
 }
  
 static void
@@ -1076,7 +1105,7 @@ navit_textfile_debug_log(struct navit *this_, const char *fmt, ...)
        if (this_->textfile_debug_log && this_->vehicle) {
                str1=g_strdup_vprintf(fmt, ap);
                str2=g_strdup_printf("0x%x 0x%x%s%s\n", this_->vehicle->coord.x, this_->vehicle->coord.y, strlen(str1) ? " " : "", str1);
-               log_write(this_->textfile_debug_log, str2, strlen(str2));
+               log_write(this_->textfile_debug_log, str2, strlen(str2), 0);
                g_free(str2);
                g_free(str1);
        }
@@ -1099,8 +1128,8 @@ navit_say(struct navit *this_, char *text)
  * @brief Toggles the navigation announcer for navit
  * @param this_ The navit object
  */
-void
-navit_announcer_toggle(struct navit *this_)
+static void
+navit_cmd_announcer_toggle(struct navit *this_)
 {
     struct attr attr, speechattr;
 
@@ -1272,6 +1301,7 @@ navit_init(struct navit *this_)
 {
        struct mapset *ms;
        struct map *map;
+       int callback;
 
        dbg(2,"enter gui %p graphics %p\n",this_->gui,this_->gra);
        if (!this_->gui) {
@@ -1297,7 +1327,6 @@ navit_init(struct navit *this_)
                return;
        }
        dbg(2,"Initializing graphics\n");
-       graphics_init(this_->gra);
        dbg(2,"Setting Vehicle\n");
        navit_set_vehicle(this_, this_->vehicle);
        dbg(2,"Adding dynamic maps to mapset %p\n",this_->mapsets);
@@ -1365,14 +1394,22 @@ navit_init(struct navit *this_)
        navit_window_roadbook_new(this_);
        navit_window_items_new(this_);
 #endif
-       callback_list_call_attr_1(this_->attr_cbl, attr_navit, this_);
-       this_->ready|=1;
 
        messagelist_init(this_->messages);
 
+       navit_set_cursors(this_);
+
+       callback_list_call_attr_1(this_->attr_cbl, attr_navit, this_);
+       callback=(this_->ready == 2);
+       this_->ready|=1;
        dbg(2,"ready=%d\n",this_->ready);
        if (this_->ready == 3)
                navit_draw(this_);
+       if (callback)
+               callback_list_call_attr_1(this_->attr_cbl, attr_graphics_ready, this_);
+#if 0
+       routech_test(this_);
+#endif
 }
 
 void
@@ -1481,15 +1518,59 @@ navit_set_center_coord_screen(struct navit *this_, struct coord *c, struct point
                navit_set_timeout(this_);
 }
 
+/**
+ * Links all vehicles to a cursor depending on the current profile.
+ *
+ * @param this_ A navit instance
+ * @author Ralph Sennhauser (10/2009)
+ */
+static void
+navit_set_cursors(struct navit *this_)
+{
+       struct attr name;
+       struct navit_vehicle *nv;
+       struct cursor *c;
+       GList *v;
+
+       v=g_list_first(this_->vehicles); // GList of navit_vehicles
+       while (v) {
+               nv=v->data;
+               if (vehicle_get_attr(nv->vehicle, attr_cursorname, &name, NULL))
+                       c=layout_get_cursor(this_->layout_current, name.u.str);
+               else
+                       c=layout_get_cursor(this_->layout_current, "default");
+               vehicle_set_cursor(nv->vehicle, c);
+               v=g_list_next(v);
+       }
+       return;
+}
+
 static int
 navit_get_cursor_pnt(struct navit *this_, struct point *p, int *dir)
 {
        int width, height;
        struct navit_vehicle *nv=this_->vehicle;
+
+        float offset=30;            // Cursor offset from the center of the screen (percent).
+#if 0 /* Better improve track.c to get that issue resolved or make it configurable with being off the default, the jumping back to the center is a bit annoying */
+        float min_offset = 0.;      // Percent offset at min_offset_speed.
+        float max_offset = 30.;     // Percent offset at max_offset_speed.
+        int min_offset_speed = 2;   // Speed in km/h
+        int max_offset_speed = 50;  // Speed ini km/h
+        // Calculate cursor offset from the center of the screen, upon speed.
+        if (nv->speed <= min_offset_speed) {
+            offset = min_offset;
+        } else if (nv->speed > max_offset_speed) {
+            offset = max_offset;
+        } else {
+            offset = (max_offset - min_offset) / (max_offset_speed - min_offset_speed) * (nv->speed - min_offset_speed);
+        }
+#endif
+
        transform_get_size(this_->trans, &width, &height);
        if (this_->orientation == -1) {
                p->x=50*width/100;
-               p->y=80*height/100;
+               p->y=(50 + offset)*height/100;
                if (dir)
                        *dir=nv->dir;
        } else {
@@ -1500,8 +1581,8 @@ navit_get_cursor_pnt(struct navit *this_, struct point *p, int *dir)
                        mdir=nv->dir-this_->orientation;
                }
 
-               p->x=(50 - 30.*sin(M_PI*mdir/180.))*width/100;
-               p->y=(50 + 30.*cos(M_PI*mdir/180.))*height/100;
+               p->x=(50 - offset*sin(M_PI*mdir/180.))*width/100;
+               p->y=(50 + offset*cos(M_PI*mdir/180.))*height/100;
                if (dir)
                        *dir=this_->orientation;
        }
@@ -1559,6 +1640,7 @@ navit_set_attr_do(struct navit *this_, struct attr *attr, int init)
        GList *l;
        struct navit_vehicle *nv;
        struct attr active=(struct attr){attr_active,{(void *)0}};
+       struct layout *lay;
 
        switch (attr->type) {
        case attr_autozoom:
@@ -1578,6 +1660,10 @@ navit_set_attr_do(struct navit *this_, struct attr *attr, int init)
                attr_updated=(this_->drag_bitmap != !!attr->u.num);
                this_->drag_bitmap=!!attr->u.num;
                break;
+       case attr_flags_graphics:
+               attr_updated=(this_->graphics_flags != attr->u.num);
+               this_->graphics_flags=attr->u.num;
+               break;
        case attr_follow:
                if (!this_->vehicle)
                        return 0;
@@ -1588,10 +1674,25 @@ navit_set_attr_do(struct navit *this_, struct attr *attr, int init)
                if(this_->layout_current!=attr->u.layout) {
                        this_->layout_current=attr->u.layout;
                        graphics_font_destroy_all(this_->gra);
-                       navit_draw(this_);
+                       navit_set_cursors(this_);
+                       if (this_->ready == 3)
+                               navit_draw(this_);
                        attr_updated=1;
                }
                break;
+       case attr_layout_name:
+               l=this_->layouts;
+               while (l) {
+                       lay=l->data;
+                       if (!strcmp(lay->name,attr->u.str)) {
+                               struct attr attr;
+                               attr.type=attr_layout;
+                               attr.u.layout=lay;
+                               return navit_set_attr_do(this_, &attr, init);
+                       }
+                       l=g_list_next(l);
+               }               
+               return 0;
        case attr_orientation:
                orient_old=this_->orientation;
                this_->orientation=attr->u.num;
@@ -1605,8 +1706,10 @@ navit_set_attr_do(struct navit *this_, struct attr *attr, int init)
                        }
                        transform_set_yaw(this_->trans, dir);
                        if (orient_old != this_->orientation) {
+#if 0
                                if (this_->ready == 3)
                                        navit_draw(this_);
+#endif
                                attr_updated=1;
                        }
                }
@@ -1658,9 +1761,9 @@ navit_set_attr_do(struct navit *this_, struct attr *attr, int init)
                        if (nv->vehicle == attr->u.vehicle) {
                                if (!this_->vehicle || this_->vehicle->vehicle != attr->u.vehicle) {
                                        if (this_->vehicle)
-                                               vehicle_set_attr(this_->vehicle->vehicle, &active, NULL);
+                                               vehicle_set_attr(this_->vehicle->vehicle, &active);
                                        active.u.num=1;
-                                       vehicle_set_attr(nv->vehicle, &active, NULL);
+                                       vehicle_set_attr(nv->vehicle, &active);
                                        attr_updated=1;
                                }
                                navit_set_vehicle(this_, nv);
@@ -1675,6 +1778,14 @@ navit_set_attr_do(struct navit *this_, struct attr *attr, int init)
                if (attr_updated && !init) 
                        navit_draw(this_);
                break;
+       case attr_zoom_min:
+               attr_updated=(attr->u.num != this_->zoom_min);
+               this_->zoom_min=attr->u.num;
+               break;
+       case attr_zoom_max:
+               attr_updated=(attr->u.num != this_->zoom_max);
+               this_->zoom_max=attr->u.num;
+               break;
        case attr_message:
                navit_add_message(this_, attr->u.str);
                break;
@@ -1748,6 +1859,11 @@ navit_get_attr(struct navit *this_, enum attr_type type, struct attr *attr, stru
        case attr_displaylist:
                attr->u.displaylist=this_->displaylist;
                return (attr->u.displaylist != NULL);
+       case attr_follow:
+               if (!this_->vehicle)
+                       return 0;
+               attr->u.num=this_->vehicle->follow_curr;
+               break;
        case attr_former_destination_map:
                attr->u.map=this_->former_destination;
                break;
@@ -1799,6 +1915,9 @@ navit_get_attr(struct navit *this_, enum attr_type type, struct attr *attr, stru
        case attr_osd_configuration:
                attr->u.num=this_->osd_configuration;
                break;
+       case attr_pitch:
+               attr->u.num=transform_get_pitch(this_->trans);
+               break;
        case attr_projection:
                if(this_->trans) {
                        attr->u.num=transform_get_projection(this_->trans);
@@ -1842,6 +1961,9 @@ navit_get_attr(struct navit *this_, enum attr_type type, struct attr *attr, stru
        case attr_autozoom_active:
                attr->u.num=this_->autozoom_active;
                break;
+       case attr_follow_cursor:
+               attr->u.num=this_->follow_cursor;
+               break;
        default:
                return 0;
        }
@@ -1937,7 +2059,7 @@ navit_remove_attr(struct navit *this_, struct attr *attr)
 }
 
 struct attr_iter *
-navit_attr_iter_new()
+navit_attr_iter_new(void)
 {
        return g_new0(struct attr_iter, 1);
 }
@@ -1972,21 +2094,16 @@ navit_vehicle_draw(struct navit *this_, struct navit_vehicle *nv, struct point *
 {
        struct point cursor_pnt;
        enum projection pro;
-       struct attr cursor;
 
        if (this_->blocked)
                return;
-       if (! vehicle_get_attr(nv->vehicle, attr_cursor, &cursor, NULL))
-               return;
-       if (! cursor.u.cursor)
-               return;
        if (pnt)
                cursor_pnt=*pnt;
        else {
                pro=transform_get_projection(this_->trans);
                transform(this_->trans, pro, &nv->coord, &cursor_pnt, 1, 0, 0, NULL);
        }
-       cursor_draw(cursor.u.cursor, this_->gra, &cursor_pnt, pnt ? 0:1, nv->dir-transform_get_yaw(this_->trans), nv->speed);
+       vehicle_draw(nv->vehicle, this_->gra, &cursor_pnt, pnt ? 0:1, nv->dir-transform_get_yaw(this_->trans), nv->speed);
 #if 0  
        if (pnt)
                pnt2=*pnt;
@@ -2019,6 +2136,7 @@ navit_vehicle_update(struct navit *this_, struct navit_vehicle *nv)
                profile(0,"return 1\n");
                return;
        }
+       navit_layout_switch(this_);
        if (this_->vehicle == nv && this_->tracking_flag)
                tracking=this_->tracking;
        if (tracking) {
@@ -2142,7 +2260,7 @@ static int
 navit_add_vehicle(struct navit *this_, struct vehicle *v)
 {
        struct navit_vehicle *nv=g_new0(struct navit_vehicle, 1);
-       struct attr follow,color,active, color2, animate;
+       struct attr follow, active, animate;
        nv->vehicle=v;
        nv->follow=0;
        nv->last.x = 0;
@@ -2150,12 +2268,6 @@ navit_add_vehicle(struct navit *this_, struct vehicle *v)
        nv->animate_cursor=0;
        if ((vehicle_get_attr(v, attr_follow, &follow, NULL)))
                nv->follow=nv->follow=follow.u.num;
-       if ((vehicle_get_attr(v, attr_color, &color, NULL)))
-               nv->c=*(color.u.color);
-       if ((vehicle_get_attr(v, attr_color2, &color2, NULL)))
-               nv->c2=color2.u.color;
-       else
-               nv->c2=NULL;
        nv->follow_curr=nv->follow;
        this_->vehicles=g_list_append(this_->vehicles, nv);
        if ((vehicle_get_attr(v, attr_active, &active, NULL)) && active.u.num)
@@ -2163,9 +2275,9 @@ navit_add_vehicle(struct navit *this_, struct vehicle *v)
        if ((vehicle_get_attr(v, attr_animate, &animate, NULL)))
                nv->animate_cursor=animate.u.num;
        nv->callback.type=attr_callback;
-       nv->callback.u.callback=callback_new_2(callback_cast(navit_vehicle_update), this_, nv);
+       nv->callback.u.callback=callback_new_attr_2(callback_cast(navit_vehicle_update), attr_position_coord_geo, this_, nv);
        vehicle_add_attr(nv->vehicle, &nv->callback);
-       vehicle_set_attr(nv->vehicle, &this_->self, NULL);
+       vehicle_set_attr(nv->vehicle, &this_->self);
        return 1;
 }
 
@@ -2202,6 +2314,118 @@ navit_get_displaylist(struct navit *this_)
        return this_->displaylist;
 }
 
+void
+navit_layout_switch(struct navit *n) 
+{
+
+    int currTs=0;
+    struct attr iso8601_attr,geo_attr,valid_attr,layout_attr;
+    double trise,tset,trise_actual;
+    struct layout *l;
+    int year, month, day;
+    
+    if (navit_get_attr(n,attr_layout,&layout_attr,NULL)!=1) {
+       return; //No layout - nothing to switch
+    }
+    if (!n->vehicle)
+       return;
+    l=layout_attr.u.layout;
+    
+    if (l->dayname || l->nightname) {
+       //Ok, we know that we have profile to switch
+       
+       //Check that we aren't calculating too fast
+       if (vehicle_get_attr(n->vehicle->vehicle, attr_position_time_iso8601,&iso8601_attr,NULL)==1) {
+               currTs=iso8601_to_secs(iso8601_attr.u.str);
+       }
+       if (currTs-(n->prevTs)<60) {
+           //We've have to wait a little
+           return;
+       }
+       if (sscanf(iso8601_attr.u.str,"%d-%02d-%02dT",&year,&month,&day) != 3)
+               return;
+       if (vehicle_get_attr(n->vehicle->vehicle, attr_position_coord_geo,&geo_attr,NULL)!=1) {
+               //No position - no sun
+               return;
+       }
+       if (vehicle_get_attr(n->vehicle->vehicle, attr_position_valid, &valid_attr,NULL) && valid_attr.u.num==attr_position_valid_invalid) {
+               return; //No valid fix yet
+       }
+       
+       //We calculate sunrise anyway, cause it is need both for day and for night
+        if (__sunriset__(year,month,day,geo_attr.u.coord_geo->lat,geo_attr.u.coord_geo->lng,35,1,&trise,&tset)!=0) {
+               //near the pole sun never rises/sets, so we should never switch profiles
+               n->prevTs=currTs;
+               return;
+           }
+       
+        trise_actual=trise;
+       
+       if (l->dayname) {
+       
+           if ((HOURS(trise)*60+MINUTES(trise)==(currTs%86400)/60) || 
+                   (n->prevTs==0 && ((HOURS(trise)*60+MINUTES(trise)<(currTs%86400)/60)))) {
+               //The sun is rising now!
+               if (strcmp(l->name,l->dayname)) {
+                   navit_set_layout_by_name(n,l->dayname);
+               }
+           }
+       }
+       if (l->nightname) {
+           if (__sunriset__(year,month,day,geo_attr.u.coord_geo->lat,geo_attr.u.coord_geo->lng,-12,0,&trise,&tset)!=0) {
+               //near the pole sun never rises/sets, so we should never switch profiles
+               n->prevTs=currTs;
+               return;
+           }
+           
+           if (HOURS(tset)*60+MINUTES(tset)==((currTs%86400)/60)
+               || (n->prevTs==0 && (((HOURS(tset)*60+MINUTES(tset)<(currTs%86400)/60)) || 
+                       ((HOURS(trise_actual)*60+MINUTES(trise_actual)>(currTs%86400)/60))))) {
+               //Time to sleep
+               if (strcmp(l->name,l->nightname)) {
+                   navit_set_layout_by_name(n,l->nightname);
+               }
+           }   
+       }
+       
+       n->prevTs=currTs;
+    }
+}
+
+int 
+navit_set_layout_by_name(struct navit *n,char *name) 
+{
+    struct layout *l;
+    struct attr_iter iter;
+    struct attr layout_attr;
+
+    iter.u.list=0x00;
+
+    if (navit_get_attr(n,attr_layout,&layout_attr,&iter)!=1) {
+       return 0; //No layouts - nothing to do
+    }
+    if (iter.u.list==NULL) {
+       return 0;
+    }
+    
+    iter.u.list=g_list_first(iter.u.list);
+    
+    while(iter.u.list) {
+       l=(struct layout*)iter.u.list->data;
+       if (!strcmp(name,l->name)) {
+           layout_attr.u.layout=l;
+           layout_attr.type=attr_layout;
+           navit_set_attr(n,&layout_attr);
+           iter.u.list=g_list_first(iter.u.list);
+           return 1;
+       }
+       iter.u.list=g_list_next(iter.u.list);
+    }
+
+    iter.u.list=g_list_first(iter.u.list);
+    return 0;
+}
+
 int
 navit_block(struct navit *this_, int block)
 {
@@ -2226,7 +2450,6 @@ navit_destroy(struct navit *this_)
        /* TODO: destroy objects contained in this_ */
        if (this_->vehicle)
                vehicle_destroy(this_->vehicle->vehicle);
-       main_remove_navit(this_);
        char *center_file = navit_get_center_file(TRUE);
        navit_write_center_to_file(this_, center_file);
        g_free(center_file);