Merge branch 'trunk' of https://github.com/navit-gps/navit into trunk

2 files changed, 49 insertions, 88 deletions

diff --git a/navit/android/AndroidManifest.xml.in b/navit/android/AndroidManifest.xml.in
deleted file mode 100644
index 085276623..000000000
--- a/navit/android/AndroidManifest.xml.in
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.navitproject.navit"
-      android:sharedUserId="org.navitproject.navit"
-      android:versionCode="@ANDROID_VERSION_INT@"
-      android:versionName="@ANDROID_VERSION_NAME@"
-      android:installLocation="auto">
-    <application android:label="@string/app_name"
-                 android:icon="@drawable/icon"
-                 android:name=".NavitAppConfig"
-                 android:theme="@style/NavitTheme">
-        <activity android:name="Navit"
-                  android:label="@string/app_name"
-		  android:configChanges="locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale|screenSize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-				<action android:name="android.intent.action.VIEW" /> 
-				<category android:name="android.intent.category.DEFAULT" /> 
-				<data android:scheme="google.navigation" /> 
-            </intent-filter>
-        </activity>
-		<activity android:name=".NavitAddressSearchActivity"></activity>
-        <activity android:name=".NavitDownloadSelectMapActivity"></activity>
-		<activity android:name=".NavitAddressResultListActivity"></activity>
-        <activity android:name=".FileBrowserActivity"></activity>
-    </application>
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19"/>
-    <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:resizeable="true" android:anyDensity="true"/>
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-</manifest> 
diff --git a/navit/navit.c b/navit/navit.c
index 9e4ea421b..3f4678032 100644
--- a/navit/navit.c
+++ b/navit/navit.c
@@ -3403,61 +3403,59 @@ navit_layout_switch(struct navit *n)
 	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);
-		dbg(lvl_debug,"currTs: %u:%u\n",currTs%86400/3600,((currTs%86400)%3600)/60);
-	}
-	dbg(lvl_debug,"prevTs: %u:%u\n",n->prevTs%86400/3600,((n->prevTs%86400)%3600)/60);
-	if (currTs-(n->prevTs)<60) {
-		//We've have to wait a little
-		return;
-	}
-	if (n->auto_switch == FALSE)
-		return;
-	if (sscanf(iso8601_attr.u.str,"%d-%02d-%02dT",&year,&month,&day) != 3)
-		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
-	}
-	if (vehicle_get_attr(n->vehicle->vehicle, attr_position_coord_geo,&geo_attr,NULL)!=1) {
+		//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);
+			dbg(lvl_debug,"currTs: %u:%u\n",currTs%86400/3600,((currTs%86400)%3600)/60);
+		}
+		dbg(lvl_debug,"prevTs: %u:%u\n",n->prevTs%86400/3600,((n->prevTs%86400)%3600)/60);
+
+		if (n->auto_switch == FALSE)
+			return;
+
+		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_valid, &valid_attr,NULL) && valid_attr.u.num==attr_position_valid_invalid) {
+			return; //No valid fix yet
+		}
+		if (vehicle_get_attr(n->vehicle->vehicle, attr_position_coord_geo,&geo_attr,NULL)!=1) {
 		//No position - no sun
 		return;
-	}
-	//We calculate sunrise anyway, cause it is needed both for day and for night
-	if (__sunriset__(year,month,day,geo_attr.u.coord_geo->lng,geo_attr.u.coord_geo->lat,-5,1,&trise,&tset)!=0) {
-		//near the pole sun never rises/sets, so we should never switch profiles
-		dbg(lvl_debug,"trise: %u:%u, sun never visible, never switch profile\n",HOURS(trise),MINUTES(trise));
-		n->prevTs=currTs;
-		return;
 		}
-	trise_actual=trise;
-	dbg(lvl_debug,"trise: %u:%u\n",HOURS(trise),MINUTES(trise));
-	dbg(lvl_debug,"dayname = %s, name =%s \n",l->dayname, l->name);
-	if (HOURS(trise)*60+MINUTES(trise)<(currTs%86400)/60) {
-		after_sunrise = TRUE;
-	}
-	dbg(lvl_debug,"nightname = %s, name = %s \n",l->nightname, l->name);
-	if (__sunriset__(year,month,day,geo_attr.u.coord_geo->lng,geo_attr.u.coord_geo->lat,-5,1,&trise,&tset)!=0) {
-		//near the pole sun never rises/sets, so we should never switch profiles
-		dbg(lvl_debug,"tset: %u:%u, sun always visible, never switch profile\n",HOURS(tset),MINUTES(tset));
-		n->prevTs=currTs;
-		return;
-	}
-	dbg(lvl_debug,"tset: %u:%u\n",HOURS(tset),MINUTES(tset));
-	if (((HOURS(tset)*60+MINUTES(tset)<(currTs%86400)/60)) ||
-			((HOURS(trise_actual)*60+MINUTES(trise_actual)>(currTs%86400)/60))) {
-		after_sunset = TRUE;
-	}	
-	if (after_sunrise && !after_sunset && l->dayname) {
-		navit_set_layout_by_name(n,l->dayname);
+		//We calculate sunrise anyway, cause it is needed both for day and for night
+		if (__sunriset__(year,month,day,geo_attr.u.coord_geo->lng,geo_attr.u.coord_geo->lat,-5,1,&trise,&tset)!=0) {
+			dbg(lvl_debug,"near the pole sun never rises/sets, so we should never switch profiles\n");
+			dbg(lvl_debug,"trise: %u:%u\n",HOURS(trise),MINUTES(trise));
+			dbg(lvl_debug,"tset: %u:%u\n",HOURS(tset),MINUTES(tset));
+			n->prevTs=currTs;
+			return;
+		}
+		trise_actual=trise;
+		dbg(lvl_debug,"trise: %u:%u\n",HOURS(trise),MINUTES(trise));
+		dbg(lvl_debug,"tset: %u:%u\n",HOURS(tset),MINUTES(tset));
+		dbg(lvl_debug,"dayname = %s, name =%s \n",l->dayname, l->name);
+		dbg(lvl_debug,"nightname = %s, name = %s \n",l->nightname, l->name);
+		if (HOURS(trise)*60+MINUTES(trise)<(currTs%86400)/60) {
+			after_sunrise = TRUE;
+		}
+	
+		if (((HOURS(tset)*60+MINUTES(tset)<(currTs%86400)/60)) ||
+				((HOURS(trise_actual)*60+MINUTES(trise_actual)>(currTs%86400)/60))) {
+			after_sunset = TRUE;
+		}
+		if (after_sunrise && !after_sunset && l->dayname) {
+			navit_set_layout_by_name(n,l->dayname);
 			dbg(lvl_debug,"layout set to day\n");
-	}
-	else if (after_sunset && l->nightname) {
-		navit_set_layout_by_name(n,l->nightname);
-		dbg(lvl_debug,"layout set to night\n");
-	}
-	n->prevTs=currTs;
+		}else if (after_sunset && l->nightname) {
+			navit_set_layout_by_name(n,l->nightname);
+			dbg(lvl_debug,"layout set to night\n");
+			}
+		n->prevTs=currTs;
 	}
 }