cleanup:general:Declaring war to control-M

54 files changed, 4228 insertions, 4228 deletions

diff --git a/navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml b/navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml
index 28bedf592..d45485f49 100644
--- a/navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml
+++ b/navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="utf-8"?>

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

-    android:layout_width="fill_parent"

-    android:layout_height="fill_parent"

-    android:orientation="vertical"

-    android:padding="3dp" >

-

-    <!--

-    android:layout_weight="1"

-    android:layout_weight="1"

-    android:layout_height="wrap_content"

-    android:layout_width="fill_parent"

-    android:layout_width="fill_parent"

-    android:layout_gravity="top"

-    android:background = "#f00"

-    android:background = "#0f0"

-    

-    -->

-

-    <LinearLayout

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:layout_margin="0dp"

-        android:gravity="top"

-        android:orientation="horizontal"

-        android:padding="0dp" >

-

-        <LinearLayout

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:layout_margin="0dp"

-            android:layout_weight="1"

-            android:gravity="top"

-            android:orientation="horizontal"

-            android:padding="0dp" >

-

-            <Button

-                android:id="@+id/upDirectoryButton"

-                android:layout_width="fill_parent"

-                android:layout_height="wrap_content"

-                android:layout_gravity="top"

-                android:layout_margin="0dp"

-                android:layout_weight="1"

-                android:padding="0dp"

-                android:drawableLeft="@drawable/dir_up"

-                android:text="Up" />

-        </LinearLayout>

-

-        <LinearLayout

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:layout_margin="0dp"

-            android:layout_weight="1"

-            android:gravity="top"

-            android:orientation="horizontal"

-            android:padding="0dp" >

-

-            <Button

-                android:id="@+id/selectCurrentDirectoryButton"

-                android:layout_width="fill_parent"

-                android:layout_height="wrap_content"

-                android:layout_gravity="top"

-                android:gravity = "center|center_vertical"

-                android:layout_margin="0dp"

-                android:layout_weight="1"

-                android:padding="0dp"

-                android:text="Select" />

-        </LinearLayout>

-    </LinearLayout>

-

-    <TextView

-        android:id="@+id/currentDirectoryTextView"

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:text="Current folder: \n/THis/is/a/long/path/to/test/if/this/will/span/multiple/lines" />

-

-    <ListView

-        android:id="@+id/fileListView"

-        android:layout_width="fill_parent"

-        android:layout_height="fill_parent"

-        android:layout_marginTop="5dp"

-        android:layout_weight="1" />

-

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:padding="3dp" >
+
+    <!--
+    android:layout_weight="1"
+    android:layout_weight="1"
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:layout_width="fill_parent"
+    android:layout_gravity="top"
+    android:background = "#f00"
+    android:background = "#0f0"
+    
+    -->
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="0dp"
+        android:gravity="top"
+        android:orientation="horizontal"
+        android:padding="0dp" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="0dp"
+            android:layout_weight="1"
+            android:gravity="top"
+            android:orientation="horizontal"
+            android:padding="0dp" >
+
+            <Button
+                android:id="@+id/upDirectoryButton"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:layout_margin="0dp"
+                android:layout_weight="1"
+                android:padding="0dp"
+                android:drawableLeft="@drawable/dir_up"
+                android:text="Up" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="0dp"
+            android:layout_weight="1"
+            android:gravity="top"
+            android:orientation="horizontal"
+            android:padding="0dp" >
+
+            <Button
+                android:id="@+id/selectCurrentDirectoryButton"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:gravity = "center|center_vertical"
+                android:layout_margin="0dp"
+                android:layout_weight="1"
+                android:padding="0dp"
+                android:text="Select" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/currentDirectoryTextView"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="Current folder: \n/THis/is/a/long/path/to/test/if/this/will/span/multiple/lines" />
+
+    <ListView
+        android:id="@+id/fileListView"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginTop="5dp"
+        android:layout_weight="1" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/navit/android/src/org/navitproject/navit/FileBrowserActivity.java b/navit/android/src/org/navitproject/navit/FileBrowserActivity.java
index f3dac4894..d24be64e3 100644
--- a/navit/android/src/org/navitproject/navit/FileBrowserActivity.java
+++ b/navit/android/src/org/navitproject/navit/FileBrowserActivity.java
@@ -1,430 +1,430 @@
-package org.navitproject.navit;

-

-//Heavily based on code from

-//https://github.com/mburman/Android-File-Explore

-//	Version of Aug 13, 2011

-//Also contributed:

-//  Sugan Krishnan (https://github.com/rgksugan) - Jan 2013.

-//

-

-//Project type now is Android library: 

-//  http://developer.android.com/guide/developing/projects/projects-eclipse.html#ReferencingLibraryProject

-

-//General Java imports 

-import java.io.File;

-import java.io.FilenameFilter;

-import java.util.ArrayList;

-import java.util.Comparator;

-import java.util.List;

-import java.util.Collections;

-

-//Android imports 

-import android.app.Activity;

-import android.content.Intent;

-import android.content.res.Configuration;

-import android.graphics.Color;

-import android.os.Bundle;

-import android.os.Environment;

-import android.os.StatFs;

-import android.util.Log;

-import android.view.View.OnClickListener;

-import android.view.ViewGroup.LayoutParams;

-import android.view.*;

-import android.widget.*;

-

-//Import of resources file for file browser

-import org.navitproject.navit.R;

-

-public class FileBrowserActivity extends Activity {

-	// Intent Action Constants

-	public static final String INTENT_ACTION_SELECT_DIR = "ua.com.vassiliev.androidfilebrowser.SELECT_DIRECTORY_ACTION";

-	public static final String INTENT_ACTION_SELECT_FILE = "ua.com.vassiliev.androidfilebrowser.SELECT_FILE_ACTION";

-

-	// Intent parameters names constants

-	public static final String startDirectoryParameter = "ua.com.vassiliev.androidfilebrowser.directoryPath";

-	public static final String returnDirectoryParameter = "ua.com.vassiliev.androidfilebrowser.directoryPathRet";

-	public static final String returnFileParameter = "ua.com.vassiliev.androidfilebrowser.filePathRet";

-	public static final String showCannotReadParameter = "ua.com.vassiliev.androidfilebrowser.showCannotRead";

-	public static final String filterExtension = "ua.com.vassiliev.androidfilebrowser.filterExtension";

-

-	// Stores names of traversed directories

-	ArrayList<String> pathDirsList = new ArrayList<String>();

-

-	// Check if the first level of the directory structure is the one showing

-	// private Boolean firstLvl = true;

-

-	private static final String LOGTAG = "F_PATH";

-

-	private List<Item> fileList = new ArrayList<Item>();

-	private File path = null;

-	private String chosenFile;

-	// private static final int DIALOG_LOAD_FILE = 1000;

-

-	ArrayAdapter<Item> adapter;

-

-	private boolean showHiddenFilesAndDirs = true;

-

-	private boolean directoryShownIsEmpty = false;

-

-	private String filterFileExtension = null;

-

-	// Action constants

-	private static int currentAction = -1;

-	private static final int SELECT_DIRECTORY = 1;

-	private static final int SELECT_FILE = 2;

-

-	@Override

-	public void onCreate(Bundle savedInstanceState) {

-		super.onCreate(savedInstanceState);

-		// In case of

-		// ua.com.vassiliev.androidfilebrowser.SELECT_DIRECTORY_ACTION

-		// Expects com.mburman.fileexplore.directoryPath parameter to

-		// point to the start folder.

-		// If empty or null, will start from SDcard root.

-		setContentView(R.layout.ua_com_vassiliev_filebrowser_layout);

-

-		// Set action for this activity

-		Intent thisInt = this.getIntent();

-		currentAction = SELECT_DIRECTORY;// This would be a default action in

-											// case not set by intent

-		if (thisInt.getAction().equalsIgnoreCase(INTENT_ACTION_SELECT_FILE)) {

-			Log.d(LOGTAG, "SELECT ACTION - SELECT FILE");

-			currentAction = SELECT_FILE;

-		}

-

-		showHiddenFilesAndDirs = thisInt.getBooleanExtra(

-				showCannotReadParameter, true);

-

-		filterFileExtension = thisInt.getStringExtra(filterExtension);

-

-		setInitialDirectory();

-

-		parseDirectoryPath();

-		loadFileList();

-		this.createFileListAdapter();

-		this.initializeButtons();

-		this.initializeFileListView();

-		updateCurrentDirectoryTextView();

-		Log.d(LOGTAG, path.getAbsolutePath());

-	}

-

-	private void setInitialDirectory() {

-		Intent thisInt = this.getIntent();

-		String requestedStartDir = thisInt

-				.getStringExtra(startDirectoryParameter);

-

-		if (requestedStartDir != null && requestedStartDir.length() > 0) {// if(requestedStartDir!=null

-			File tempFile = new File(requestedStartDir);

-			if (tempFile.isDirectory())

-				this.path = tempFile;

-		}// if(requestedStartDir!=null

-

-		if (this.path == null) {// No or invalid directory supplied in intent

-								// parameter

-			if (Environment.getExternalStorageDirectory().isDirectory()

-					&& Environment.getExternalStorageDirectory().canRead())

-				path = Environment.getExternalStorageDirectory();

-			else

-				path = new File("/");

-		}// if(this.path==null) {//No or invalid directory supplied in intent

-			// parameter

-	}// private void setInitialDirectory() {

-

-	private void parseDirectoryPath() {

-		pathDirsList.clear();

-		String pathString = path.getAbsolutePath();

-		String[] parts = pathString.split("/");

-		int i = 0;

-		while (i < parts.length) {

-			pathDirsList.add(parts[i]);

-			i++;

-		}

-	}

-

-	private void initializeButtons() {

-		Button upDirButton = (Button) this.findViewById(R.id.upDirectoryButton);

-		upDirButton.setOnClickListener(new OnClickListener() {

-			public void onClick(View v) {

-				Log.d(LOGTAG, "onclick for upDirButton");

-				loadDirectoryUp();

-				loadFileList();

-				adapter.notifyDataSetChanged();

-				updateCurrentDirectoryTextView();

-			}

-		});// upDirButton.setOnClickListener(

-

-		Button selectFolderButton = (Button) this

-				.findViewById(R.id.selectCurrentDirectoryButton);

-		if (currentAction == SELECT_DIRECTORY) {

-			selectFolderButton.setOnClickListener(new OnClickListener() {

-				public void onClick(View v) {

-					Log.d(LOGTAG, "onclick for selectFolderButton");

-					returnDirectoryFinishActivity();

-				}

-			});

-		} else {// if(currentAction == this.SELECT_DIRECTORY) {

-			selectFolderButton.setVisibility(View.GONE);

-		}// } else {//if(currentAction == this.SELECT_DIRECTORY) {

-	}// private void initializeButtons() {

-

-	private void loadDirectoryUp() {

-		// present directory removed from list

-		String s = pathDirsList.remove(pathDirsList.size() - 1);

-		// path modified to exclude present directory

-		path = new File(path.toString().substring(0,

-				path.toString().lastIndexOf(s)));

-		fileList.clear();

-	}

-

-	private void updateCurrentDirectoryTextView() {

-		int i = 0;

-		String curDirString = "";

-		while (i < pathDirsList.size()) {

-			curDirString += pathDirsList.get(i) + "/";

-			i++;

-		}

-		if (pathDirsList.size() == 0) {

-			((Button) this.findViewById(R.id.upDirectoryButton))

-					.setEnabled(false);

-			curDirString = "/";

-		} else

-			((Button) this.findViewById(R.id.upDirectoryButton))

-					.setEnabled(true);

-		long freeSpace = getFreeSpace(curDirString);

-		String formattedSpaceString = formatBytes(freeSpace);

-		if (freeSpace == 0) {

-			Log.d(LOGTAG, "NO FREE SPACE");

-			File currentDir = new File(curDirString);

-			if(!currentDir.canWrite())

-				formattedSpaceString = "NON Writable";

-		}

-

-		((Button) this.findViewById(R.id.selectCurrentDirectoryButton))

-				.setText("Select\n[" + formattedSpaceString

-						+ "]");

-

-		((TextView) this.findViewById(R.id.currentDirectoryTextView))

-				.setText("Current directory: " + curDirString);

-	}// END private void updateCurrentDirectoryTextView() {

-

-	private void showToast(String message) {

-		Toast.makeText(this, message, Toast.LENGTH_LONG).show();

-	}

-

-	private void initializeFileListView() {

-		ListView lView = (ListView) this.findViewById(R.id.fileListView);

-		LinearLayout.LayoutParams lParam = new LinearLayout.LayoutParams(

-				LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);

-		lParam.setMargins(15, 5, 15, 5);

-		lView.setAdapter(this.adapter);

-		lView.setOnItemClickListener(new AdapterView.OnItemClickListener() {

-			public void onItemClick(AdapterView<?> parent, View view,

-					int position, long id) {

-				chosenFile = fileList.get(position).file;

-				File sel = new File(path + "/" + chosenFile);

-				Log.d(LOGTAG, "Clicked:" + chosenFile);

-				if (sel.isDirectory()) {

-					if (sel.canRead()) {

-						// Adds chosen directory to list

-						pathDirsList.add(chosenFile);

-						path = new File(sel + "");

-						Log.d(LOGTAG, "Just reloading the list");

-						loadFileList();

-						adapter.notifyDataSetChanged();

-						updateCurrentDirectoryTextView();

-						Log.d(LOGTAG, path.getAbsolutePath());

-					} else {// if(sel.canRead()) {

-						showToast("Path does not exist or cannot be read");

-					}// } else {//if(sel.canRead()) {

-				}// if (sel.isDirectory()) {

-					// File picked or an empty directory message clicked

-				else {// if (sel.isDirectory()) {

-					Log.d(LOGTAG, "item clicked");

-					if (!directoryShownIsEmpty) {

-						Log.d(LOGTAG, "File selected:" + chosenFile);

-						returnFileFinishActivity(sel.getAbsolutePath());

-					}

-				}// else {//if (sel.isDirectory()) {

-			}// public void onClick(DialogInterface dialog, int which) {

-		});// lView.setOnClickListener(

-	}// private void initializeFileListView() {

-

-	private void returnDirectoryFinishActivity() {

-		Intent retIntent = new Intent();

-		retIntent.putExtra(returnDirectoryParameter, path.getAbsolutePath());

-		this.setResult(RESULT_OK, retIntent);

-		this.finish();

-	}// END private void returnDirectoryFinishActivity() {

-

-	private void returnFileFinishActivity(String filePath) {

-		Intent retIntent = new Intent();

-		retIntent.putExtra(returnFileParameter, filePath);

-		this.setResult(RESULT_OK, retIntent);

-		this.finish();

-	}// END private void returnDirectoryFinishActivity() {

-

-	private void loadFileList() {

-		try {

-			path.mkdirs();

-		} catch (SecurityException e) {

-			Log.e(LOGTAG, "unable to write on the sd card ");

-		}

-		fileList.clear();

-

-		if (path.exists() && path.canRead()) {

-			FilenameFilter filter = new FilenameFilter() {

-				public boolean accept(File dir, String filename) {

-					File sel = new File(dir, filename);

-					boolean showReadableFile = showHiddenFilesAndDirs

-							|| sel.canRead();

-					// Filters based on whether the file is hidden or not

-					if (currentAction == SELECT_DIRECTORY) {

-						return (sel.isDirectory() && showReadableFile);

-					}

-					if (currentAction == SELECT_FILE) {

-

-						// If it is a file check the extension if provided

-						if (sel.isFile() && filterFileExtension != null) {

-							return (showReadableFile && sel.getName().endsWith(

-									filterFileExtension));

-						}

-						return (showReadableFile);

-					}

-					return true;

-				}// public boolean accept(File dir, String filename) {

-			};// FilenameFilter filter = new FilenameFilter() {

-

-			String[] fList = path.list(filter);

-			this.directoryShownIsEmpty = false;

-			for (int i = 0; i < fList.length; i++) {

-				// Convert into file path

-				File sel = new File(path, fList[i]);

-				Log.d(LOGTAG,

-						"File:" + fList[i] + " readable:"

-								+ (Boolean.valueOf(sel.canRead())).toString());

-				int drawableID = R.drawable.file_icon;

-				boolean canRead = sel.canRead();

-				// Set drawables

-				if (sel.isDirectory()) {

-					if (canRead) {

-						drawableID = R.drawable.folder_icon;

-					} else {

-						drawableID = R.drawable.folder_icon_light;

-					}

-				}

-				fileList.add(i, new Item(fList[i], drawableID, canRead));

-			}// for (int i = 0; i < fList.length; i++) {

-			if (fileList.size() == 0) {

-				// Log.d(LOGTAG, "This directory is empty");

-				this.directoryShownIsEmpty = true;

-				fileList.add(0, new Item("Directory is empty", -1, true));

-			} else {// sort non empty list

-				Collections.sort(fileList, new ItemFileNameComparator());

-			}

-		} else {

-			Log.e(LOGTAG, "path does not exist or cannot be read");

-		}

-		// Log.d(TAG, "loadFileList finished");

-	}// private void loadFileList() {

-

-	private void createFileListAdapter() {

-		adapter = new ArrayAdapter<Item>(this,

-				android.R.layout.select_dialog_item, android.R.id.text1,

-				fileList) {

-			@Override

-			public View getView(int position, View convertView, ViewGroup parent) {

-				// creates view

-				View view = super.getView(position, convertView, parent);

-				TextView textView = (TextView) view

-						.findViewById(android.R.id.text1);

-				// put the image on the text view

-				int drawableID = 0;

-				if (fileList.get(position).icon != -1) {

-					// If icon == -1, then directory is empty

-					drawableID = fileList.get(position).icon;

-				}

-				textView.setCompoundDrawablesWithIntrinsicBounds(drawableID, 0,

-						0, 0);

-

-				textView.setEllipsize(null);

-

-				// add margin between image and text (support various screen

-				// densities)

-				// int dp5 = (int) (5 *

-				// getResources().getDisplayMetrics().density + 0.5f);

-				int dp3 = (int) (3 * getResources().getDisplayMetrics().density + 0.5f);

-				// TODO: change next line for empty directory, so text will be

-				// centered

-				textView.setCompoundDrawablePadding(dp3);

-				return view;

-			}// public View getView(int position, View convertView, ViewGroup

-		};// adapter = new ArrayAdapter<Item>(this,

-	}// private createFileListAdapter(){

-

-	private class Item {

-		public String file;

-		public int icon;

-		public boolean canRead;

-

-		public Item(String file, Integer icon, boolean canRead) {

-			this.file = file;

-			this.icon = icon;

-		}

-

-		@Override

-		public String toString() {

-			return file;

-		}

-	}// END private class Item {

-

-	private class ItemFileNameComparator implements Comparator<Item> {

-		public int compare(Item lhs, Item rhs) {

-			return lhs.file.toLowerCase().compareTo(rhs.file.toLowerCase());

-		}

-	}

-

-	public void onConfigurationChanged(Configuration newConfig) {

-		super.onConfigurationChanged(newConfig);

-		if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {

-			Log.d(LOGTAG, "ORIENTATION_LANDSCAPE");

-		} else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {

-			Log.d(LOGTAG, "ORIENTATION_PORTRAIT");

-		}

-		// Layout apparently changes itself, only have to provide good onMeasure

-		// in custom components

-		// TODO: check with keyboard

-		// if(newConfig.keyboard == Configuration.KEYBOARDHIDDEN_YES)

-	}// END public void onConfigurationChanged(Configuration newConfig) {

-

-	public static long getFreeSpace(String path) {

-		StatFs stat = new StatFs(path);

-		long availSize = (long) stat.getAvailableBlocks()

-				* (long) stat.getBlockSize();

-		return availSize;

-	}// END public static long getFreeSpace(String path) {

-

-	public static String formatBytes(long bytes) {

-		// TODO: add flag to which part is needed (e.g. GB, MB, KB or bytes)

-		String retStr = "";

-		// One binary gigabyte equals 1,073,741,824 bytes.

-		if (bytes > 1073741824) {// Add GB

-			long gbs = bytes / 1073741824;

-			retStr += (new Long(gbs)).toString() + "GB ";

-			bytes = bytes - (gbs * 1073741824);

-		}

-		// One MB - 1048576 bytes

-		if (bytes > 1048576) {// Add GB

-			long mbs = bytes / 1048576;

-			retStr += (new Long(mbs)).toString() + "MB ";

-			bytes = bytes - (mbs * 1048576);

-		}

-		if (bytes > 1024) {

-			long kbs = bytes / 1024;

-			retStr += (new Long(kbs)).toString() + "KB";

-			bytes = bytes - (kbs * 1024);

-		} else

-			retStr += (new Long(bytes)).toString() + " bytes";

-		return retStr;

-	}// public static String formatBytes(long bytes){

-

-}// END public class FileBrowserActivity extends Activity {

+package org.navitproject.navit;
+
+//Heavily based on code from
+//https://github.com/mburman/Android-File-Explore
+//	Version of Aug 13, 2011
+//Also contributed:
+//  Sugan Krishnan (https://github.com/rgksugan) - Jan 2013.
+//
+
+//Project type now is Android library: 
+//  http://developer.android.com/guide/developing/projects/projects-eclipse.html#ReferencingLibraryProject
+
+//General Java imports 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Collections;
+
+//Android imports 
+import android.app.Activity;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.StatFs;
+import android.util.Log;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup.LayoutParams;
+import android.view.*;
+import android.widget.*;
+
+//Import of resources file for file browser
+import org.navitproject.navit.R;
+
+public class FileBrowserActivity extends Activity {
+	// Intent Action Constants
+	public static final String INTENT_ACTION_SELECT_DIR = "ua.com.vassiliev.androidfilebrowser.SELECT_DIRECTORY_ACTION";
+	public static final String INTENT_ACTION_SELECT_FILE = "ua.com.vassiliev.androidfilebrowser.SELECT_FILE_ACTION";
+
+	// Intent parameters names constants
+	public static final String startDirectoryParameter = "ua.com.vassiliev.androidfilebrowser.directoryPath";
+	public static final String returnDirectoryParameter = "ua.com.vassiliev.androidfilebrowser.directoryPathRet";
+	public static final String returnFileParameter = "ua.com.vassiliev.androidfilebrowser.filePathRet";
+	public static final String showCannotReadParameter = "ua.com.vassiliev.androidfilebrowser.showCannotRead";
+	public static final String filterExtension = "ua.com.vassiliev.androidfilebrowser.filterExtension";
+
+	// Stores names of traversed directories
+	ArrayList<String> pathDirsList = new ArrayList<String>();
+
+	// Check if the first level of the directory structure is the one showing
+	// private Boolean firstLvl = true;
+
+	private static final String LOGTAG = "F_PATH";
+
+	private List<Item> fileList = new ArrayList<Item>();
+	private File path = null;
+	private String chosenFile;
+	// private static final int DIALOG_LOAD_FILE = 1000;
+
+	ArrayAdapter<Item> adapter;
+
+	private boolean showHiddenFilesAndDirs = true;
+
+	private boolean directoryShownIsEmpty = false;
+
+	private String filterFileExtension = null;
+
+	// Action constants
+	private static int currentAction = -1;
+	private static final int SELECT_DIRECTORY = 1;
+	private static final int SELECT_FILE = 2;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		// In case of
+		// ua.com.vassiliev.androidfilebrowser.SELECT_DIRECTORY_ACTION
+		// Expects com.mburman.fileexplore.directoryPath parameter to
+		// point to the start folder.
+		// If empty or null, will start from SDcard root.
+		setContentView(R.layout.ua_com_vassiliev_filebrowser_layout);
+
+		// Set action for this activity
+		Intent thisInt = this.getIntent();
+		currentAction = SELECT_DIRECTORY;// This would be a default action in
+											// case not set by intent
+		if (thisInt.getAction().equalsIgnoreCase(INTENT_ACTION_SELECT_FILE)) {
+			Log.d(LOGTAG, "SELECT ACTION - SELECT FILE");
+			currentAction = SELECT_FILE;
+		}
+
+		showHiddenFilesAndDirs = thisInt.getBooleanExtra(
+				showCannotReadParameter, true);
+
+		filterFileExtension = thisInt.getStringExtra(filterExtension);
+
+		setInitialDirectory();
+
+		parseDirectoryPath();
+		loadFileList();
+		this.createFileListAdapter();
+		this.initializeButtons();
+		this.initializeFileListView();
+		updateCurrentDirectoryTextView();
+		Log.d(LOGTAG, path.getAbsolutePath());
+	}
+
+	private void setInitialDirectory() {
+		Intent thisInt = this.getIntent();
+		String requestedStartDir = thisInt
+				.getStringExtra(startDirectoryParameter);
+
+		if (requestedStartDir != null && requestedStartDir.length() > 0) {// if(requestedStartDir!=null
+			File tempFile = new File(requestedStartDir);
+			if (tempFile.isDirectory())
+				this.path = tempFile;
+		}// if(requestedStartDir!=null
+
+		if (this.path == null) {// No or invalid directory supplied in intent
+								// parameter
+			if (Environment.getExternalStorageDirectory().isDirectory()
+					&& Environment.getExternalStorageDirectory().canRead())
+				path = Environment.getExternalStorageDirectory();
+			else
+				path = new File("/");
+		}// if(this.path==null) {//No or invalid directory supplied in intent
+			// parameter
+	}// private void setInitialDirectory() {
+
+	private void parseDirectoryPath() {
+		pathDirsList.clear();
+		String pathString = path.getAbsolutePath();
+		String[] parts = pathString.split("/");
+		int i = 0;
+		while (i < parts.length) {
+			pathDirsList.add(parts[i]);
+			i++;
+		}
+	}
+
+	private void initializeButtons() {
+		Button upDirButton = (Button) this.findViewById(R.id.upDirectoryButton);
+		upDirButton.setOnClickListener(new OnClickListener() {
+			public void onClick(View v) {
+				Log.d(LOGTAG, "onclick for upDirButton");
+				loadDirectoryUp();
+				loadFileList();
+				adapter.notifyDataSetChanged();
+				updateCurrentDirectoryTextView();
+			}
+		});// upDirButton.setOnClickListener(
+
+		Button selectFolderButton = (Button) this
+				.findViewById(R.id.selectCurrentDirectoryButton);
+		if (currentAction == SELECT_DIRECTORY) {
+			selectFolderButton.setOnClickListener(new OnClickListener() {
+				public void onClick(View v) {
+					Log.d(LOGTAG, "onclick for selectFolderButton");
+					returnDirectoryFinishActivity();
+				}
+			});
+		} else {// if(currentAction == this.SELECT_DIRECTORY) {
+			selectFolderButton.setVisibility(View.GONE);
+		}// } else {//if(currentAction == this.SELECT_DIRECTORY) {
+	}// private void initializeButtons() {
+
+	private void loadDirectoryUp() {
+		// present directory removed from list
+		String s = pathDirsList.remove(pathDirsList.size() - 1);
+		// path modified to exclude present directory
+		path = new File(path.toString().substring(0,
+				path.toString().lastIndexOf(s)));
+		fileList.clear();
+	}
+
+	private void updateCurrentDirectoryTextView() {
+		int i = 0;
+		String curDirString = "";
+		while (i < pathDirsList.size()) {
+			curDirString += pathDirsList.get(i) + "/";
+			i++;
+		}
+		if (pathDirsList.size() == 0) {
+			((Button) this.findViewById(R.id.upDirectoryButton))
+					.setEnabled(false);
+			curDirString = "/";
+		} else
+			((Button) this.findViewById(R.id.upDirectoryButton))
+					.setEnabled(true);
+		long freeSpace = getFreeSpace(curDirString);
+		String formattedSpaceString = formatBytes(freeSpace);
+		if (freeSpace == 0) {
+			Log.d(LOGTAG, "NO FREE SPACE");
+			File currentDir = new File(curDirString);
+			if(!currentDir.canWrite())
+				formattedSpaceString = "NON Writable";
+		}
+
+		((Button) this.findViewById(R.id.selectCurrentDirectoryButton))
+				.setText("Select\n[" + formattedSpaceString
+						+ "]");
+
+		((TextView) this.findViewById(R.id.currentDirectoryTextView))
+				.setText("Current directory: " + curDirString);
+	}// END private void updateCurrentDirectoryTextView() {
+
+	private void showToast(String message) {
+		Toast.makeText(this, message, Toast.LENGTH_LONG).show();
+	}
+
+	private void initializeFileListView() {
+		ListView lView = (ListView) this.findViewById(R.id.fileListView);
+		LinearLayout.LayoutParams lParam = new LinearLayout.LayoutParams(
+				LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
+		lParam.setMargins(15, 5, 15, 5);
+		lView.setAdapter(this.adapter);
+		lView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+			public void onItemClick(AdapterView<?> parent, View view,
+					int position, long id) {
+				chosenFile = fileList.get(position).file;
+				File sel = new File(path + "/" + chosenFile);
+				Log.d(LOGTAG, "Clicked:" + chosenFile);
+				if (sel.isDirectory()) {
+					if (sel.canRead()) {
+						// Adds chosen directory to list
+						pathDirsList.add(chosenFile);
+						path = new File(sel + "");
+						Log.d(LOGTAG, "Just reloading the list");
+						loadFileList();
+						adapter.notifyDataSetChanged();
+						updateCurrentDirectoryTextView();
+						Log.d(LOGTAG, path.getAbsolutePath());
+					} else {// if(sel.canRead()) {
+						showToast("Path does not exist or cannot be read");
+					}// } else {//if(sel.canRead()) {
+				}// if (sel.isDirectory()) {
+					// File picked or an empty directory message clicked
+				else {// if (sel.isDirectory()) {
+					Log.d(LOGTAG, "item clicked");
+					if (!directoryShownIsEmpty) {
+						Log.d(LOGTAG, "File selected:" + chosenFile);
+						returnFileFinishActivity(sel.getAbsolutePath());
+					}
+				}// else {//if (sel.isDirectory()) {
+			}// public void onClick(DialogInterface dialog, int which) {
+		});// lView.setOnClickListener(
+	}// private void initializeFileListView() {
+
+	private void returnDirectoryFinishActivity() {
+		Intent retIntent = new Intent();
+		retIntent.putExtra(returnDirectoryParameter, path.getAbsolutePath());
+		this.setResult(RESULT_OK, retIntent);
+		this.finish();
+	}// END private void returnDirectoryFinishActivity() {
+
+	private void returnFileFinishActivity(String filePath) {
+		Intent retIntent = new Intent();
+		retIntent.putExtra(returnFileParameter, filePath);
+		this.setResult(RESULT_OK, retIntent);
+		this.finish();
+	}// END private void returnDirectoryFinishActivity() {
+
+	private void loadFileList() {
+		try {
+			path.mkdirs();
+		} catch (SecurityException e) {
+			Log.e(LOGTAG, "unable to write on the sd card ");
+		}
+		fileList.clear();
+
+		if (path.exists() && path.canRead()) {
+			FilenameFilter filter = new FilenameFilter() {
+				public boolean accept(File dir, String filename) {
+					File sel = new File(dir, filename);
+					boolean showReadableFile = showHiddenFilesAndDirs
+							|| sel.canRead();
+					// Filters based on whether the file is hidden or not
+					if (currentAction == SELECT_DIRECTORY) {
+						return (sel.isDirectory() && showReadableFile);
+					}
+					if (currentAction == SELECT_FILE) {
+
+						// If it is a file check the extension if provided
+						if (sel.isFile() && filterFileExtension != null) {
+							return (showReadableFile && sel.getName().endsWith(
+									filterFileExtension));
+						}
+						return (showReadableFile);
+					}
+					return true;
+				}// public boolean accept(File dir, String filename) {
+			};// FilenameFilter filter = new FilenameFilter() {
+
+			String[] fList = path.list(filter);
+			this.directoryShownIsEmpty = false;
+			for (int i = 0; i < fList.length; i++) {
+				// Convert into file path
+				File sel = new File(path, fList[i]);
+				Log.d(LOGTAG,
+						"File:" + fList[i] + " readable:"
+								+ (Boolean.valueOf(sel.canRead())).toString());
+				int drawableID = R.drawable.file_icon;
+				boolean canRead = sel.canRead();
+				// Set drawables
+				if (sel.isDirectory()) {
+					if (canRead) {
+						drawableID = R.drawable.folder_icon;
+					} else {
+						drawableID = R.drawable.folder_icon_light;
+					}
+				}
+				fileList.add(i, new Item(fList[i], drawableID, canRead));
+			}// for (int i = 0; i < fList.length; i++) {
+			if (fileList.size() == 0) {
+				// Log.d(LOGTAG, "This directory is empty");
+				this.directoryShownIsEmpty = true;
+				fileList.add(0, new Item("Directory is empty", -1, true));
+			} else {// sort non empty list
+				Collections.sort(fileList, new ItemFileNameComparator());
+			}
+		} else {
+			Log.e(LOGTAG, "path does not exist or cannot be read");
+		}
+		// Log.d(TAG, "loadFileList finished");
+	}// private void loadFileList() {
+
+	private void createFileListAdapter() {
+		adapter = new ArrayAdapter<Item>(this,
+				android.R.layout.select_dialog_item, android.R.id.text1,
+				fileList) {
+			@Override
+			public View getView(int position, View convertView, ViewGroup parent) {
+				// creates view
+				View view = super.getView(position, convertView, parent);
+				TextView textView = (TextView) view
+						.findViewById(android.R.id.text1);
+				// put the image on the text view
+				int drawableID = 0;
+				if (fileList.get(position).icon != -1) {
+					// If icon == -1, then directory is empty
+					drawableID = fileList.get(position).icon;
+				}
+				textView.setCompoundDrawablesWithIntrinsicBounds(drawableID, 0,
+						0, 0);
+
+				textView.setEllipsize(null);
+
+				// add margin between image and text (support various screen
+				// densities)
+				// int dp5 = (int) (5 *
+				// getResources().getDisplayMetrics().density + 0.5f);
+				int dp3 = (int) (3 * getResources().getDisplayMetrics().density + 0.5f);
+				// TODO: change next line for empty directory, so text will be
+				// centered
+				textView.setCompoundDrawablePadding(dp3);
+				return view;
+			}// public View getView(int position, View convertView, ViewGroup
+		};// adapter = new ArrayAdapter<Item>(this,
+	}// private createFileListAdapter(){
+
+	private class Item {
+		public String file;
+		public int icon;
+		public boolean canRead;
+
+		public Item(String file, Integer icon, boolean canRead) {
+			this.file = file;
+			this.icon = icon;
+		}
+
+		@Override
+		public String toString() {
+			return file;
+		}
+	}// END private class Item {
+
+	private class ItemFileNameComparator implements Comparator<Item> {
+		public int compare(Item lhs, Item rhs) {
+			return lhs.file.toLowerCase().compareTo(rhs.file.toLowerCase());
+		}
+	}
+
+	public void onConfigurationChanged(Configuration newConfig) {
+		super.onConfigurationChanged(newConfig);
+		if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+			Log.d(LOGTAG, "ORIENTATION_LANDSCAPE");
+		} else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
+			Log.d(LOGTAG, "ORIENTATION_PORTRAIT");
+		}
+		// Layout apparently changes itself, only have to provide good onMeasure
+		// in custom components
+		// TODO: check with keyboard
+		// if(newConfig.keyboard == Configuration.KEYBOARDHIDDEN_YES)
+	}// END public void onConfigurationChanged(Configuration newConfig) {
+
+	public static long getFreeSpace(String path) {
+		StatFs stat = new StatFs(path);
+		long availSize = (long) stat.getAvailableBlocks()
+				* (long) stat.getBlockSize();
+		return availSize;
+	}// END public static long getFreeSpace(String path) {
+
+	public static String formatBytes(long bytes) {
+		// TODO: add flag to which part is needed (e.g. GB, MB, KB or bytes)
+		String retStr = "";
+		// One binary gigabyte equals 1,073,741,824 bytes.
+		if (bytes > 1073741824) {// Add GB
+			long gbs = bytes / 1073741824;
+			retStr += (new Long(gbs)).toString() + "GB ";
+			bytes = bytes - (gbs * 1073741824);
+		}
+		// One MB - 1048576 bytes
+		if (bytes > 1048576) {// Add GB
+			long mbs = bytes / 1048576;
+			retStr += (new Long(mbs)).toString() + "MB ";
+			bytes = bytes - (mbs * 1048576);
+		}
+		if (bytes > 1024) {
+			long kbs = bytes / 1024;
+			retStr += (new Long(kbs)).toString() + "KB";
+			bytes = bytes - (kbs * 1024);
+		} else
+			retStr += (new Long(bytes)).toString() + " bytes";
+		return retStr;
+	}// public static String formatBytes(long bytes){
+
+}// END public class FileBrowserActivity extends Activity {
diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index 9a0df2fb4..e2d122de2 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -1,899 +1,899 @@
-/**

- * Navit, a modular navigation system.

- * Copyright (C) 2005-2008 Navit Team

- *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * version 2 as published by the Free Software Foundation.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the

- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

- * Boston, MA  02110-1301, USA.

- */

-

-package org.navitproject.navit;

-

-import java.io.File;

-import java.io.FileOutputStream;

-import java.io.InputStream;

-import java.io.FileInputStream;

-import java.io.IOException;

-import java.util.HashMap;

-import java.util.Locale;

-import java.util.Map;

-import java.util.regex.Matcher;

-import java.util.regex.Pattern;

-import android.app.Activity;

-import android.app.AlertDialog;

-import android.app.Dialog;

-import android.app.Notification;

-import android.app.NotificationManager;

-import android.app.PendingIntent;

-import android.content.Context;

-import android.content.DialogInterface;

-import android.content.Intent;

-import android.content.SharedPreferences;

-import android.content.pm.ApplicationInfo;

-import android.content.pm.PackageManager;

-import android.content.pm.PackageManager.NameNotFoundException;

-import android.content.res.Configuration;

-import android.content.res.Resources;

-import android.graphics.Point;

-import android.Manifest;

-import android.media.AudioManager;

-import android.net.Uri;

-import android.os.Build;

-import android.os.Bundle;

-import android.os.Environment;

-import android.os.Message;

-import android.os.PowerManager;

-import android.util.DisplayMetrics;

-import android.util.Log;

-import android.view.Display;

-import android.view.Menu;

-import android.view.MenuItem;

-import android.view.View;

-import android.view.Window;

-import android.view.WindowManager;

-import android.view.inputmethod.InputMethodManager;

-import android.widget.Toast;

-import android.support.v4.app.NotificationCompat;

-import android.support.v4.app.ActivityCompat;

-import android.support.v4.content.ContextCompat;

-

-public class Navit extends Activity

-{

-

-	public NavitDialogs              dialogs;

-	private PowerManager.WakeLock    wl;

-	private NavitActivityResult      ActivityResults[];

-	public static InputMethodManager mgr                            = null;

-	public static DisplayMetrics     metrics                        = null;

-	public static int                status_bar_height              = 0;

-	public static int                action_bar_default_height      = 0;

-	public static int                navigation_bar_height          = 0;

-	public static int                navigation_bar_height_landscape= 0;

-	public static int                navigation_bar_width           = 0;

-	public static Boolean            show_soft_keyboard             = false;

-	public static Boolean            show_soft_keyboard_now_showing = false;

-	public static long               last_pressed_menu_key          = 0L;

-	public static long               time_pressed_menu_key          = 0L;

-	private static Intent            startup_intent                 = null;

-	private static long              startup_intent_timestamp       = 0L;

-	public static String             my_display_density             = "mdpi";

-	public static final int          NavitDownloaderSelectMap_id    = 967;

-	public static final int          NavitAddressSearch_id          = 70;

-	public static final int          NavitSelectStorage_id          = 43;

-	public static String             NavitLanguage;

-	public static Resources          NavitResources                 = null;

-	static final String              NAVIT_PACKAGE_NAME             = "org.navitproject.navit";

-	static final String              TAG                            = "Navit";

-	static String                    map_filename_path              = null;

-	static final String              NAVIT_DATA_DIR                 = "/data/data/" + NAVIT_PACKAGE_NAME;

-	static final String              NAVIT_DATA_SHARE_DIR           = NAVIT_DATA_DIR + "/share";

-	public static final String       NAVIT_PREFS                    = "NavitPrefs";

-	Boolean                          isFullscreen                   = false;

-	private static final int         MY_PERMISSIONS_REQUEST_ALL     = 101;

-	public static NotificationManager       nm;

-	private static Navit navit;

-

-	public static Navit getInstance() {

-		return navit;

-	}

-

-

-	/**

-	 * @brief A Runnable to restore soft input when the user returns to the activity.

-	 * 

-	 * An instance of this class can be passed to the main message queue in the Activity's

-	 * {@code onRestore()} method.

-	 */

-	private class SoftInputRestorer implements Runnable {

-		public void run() {

-			Navit.this.showNativeKeyboard();

-		}

-	}

-	

-	

-	public void removeFileIfExists(String source) {

-		File file = new File(source);

-

-		if (!file.exists())

-			return;

-        

-		file.delete();

-    	}

-

-	public void copyFileIfExists(String source, String destination) throws IOException {

-		File file = new File(source);

-

-		if (!file.exists())

-			return;

-

-		FileInputStream is = null;

-		FileOutputStream os = null;

-

-		try {

-			is = new FileInputStream(source);

-			os = new FileOutputStream(destination);

-

-			int len;

-			byte buffer[] = new byte[1024];

-

-			while ((len = is.read(buffer)) != -1) {

-				os.write(buffer, 0, len);

-			}

-		} finally {

-			/* Close the FileStreams to prevent Resource leaks */

-			if (is != null)

-                		is.close();

-

-			if (os != null)

-                		os.close();

-		}

-	}

-

-

-	public static String T(String in)

-	{

-		return NavitTextTranslations.get_text(in);

-	}

-

-	private boolean extractRes(String resname, String result) {

-		boolean needs_update = false;

-		Log.e(TAG, "Res Name " + resname + ", result " + result);

-		int id = NavitResources.getIdentifier(resname, "raw", NAVIT_PACKAGE_NAME);

-		Log.e(TAG, "Res ID " + id);

-		if (id == 0)

-			return false;

-

-		File resultfile = new File(result);

-		if (!resultfile.exists()) {

-			needs_update = true;

-			File path = resultfile.getParentFile();

-			if ( !path.exists() && !resultfile.getParentFile().mkdirs())

-				return false;

-		} else {

-			PackageManager pm = getPackageManager();

-			ApplicationInfo appInfo;

-			long apkUpdateTime = 0;

-			try {

-				appInfo = pm.getApplicationInfo(NAVIT_PACKAGE_NAME, 0);

-				apkUpdateTime = new File(appInfo.sourceDir).lastModified();

-			} catch (NameNotFoundException e) {

-				Log.e(TAG, "Could not read package infos");

-				e.printStackTrace();

-			}

-			if (apkUpdateTime > resultfile.lastModified())

-				needs_update = true;

-		}

-

-		if (needs_update) {

-			Log.e(TAG, "Extracting resource");

-

-			try {

-				InputStream resourcestream = NavitResources.openRawResource(id);

-				FileOutputStream resultfilestream = new FileOutputStream(resultfile);

-				byte[] buf = new byte[1024];

-				int i = 0;

-				while ((i = resourcestream.read(buf)) != -1) {

-					resultfilestream.write(buf, 0, i);

-				}

-				 resultfilestream.close();

-			} catch (Exception e) {

-				Log.e(TAG, "Exception " + e.getMessage());

-				return false;

-			}

-		}

-		return true;

-	}

-

-	private void showInfos()

-	{

-		SharedPreferences settings = getSharedPreferences(NAVIT_PREFS, MODE_PRIVATE);

-		boolean firstStart = settings.getBoolean("firstStart", true);

-

-		if (firstStart)

-		{

-			AlertDialog.Builder infobox = new AlertDialog.Builder(this);

-			infobox.setTitle(getString(R.string.initial_info_box_title)); // TRANS

-			infobox.setCancelable(false);

-			

-			infobox.setMessage(R.string.initial_info_box_message);

-	

-			// TRANS

-			infobox.setPositiveButton(getString(R.string.initial_info_box_OK), new DialogInterface.OnClickListener() {

-				public void onClick(DialogInterface arg0, int arg1) {

-					Log.d(TAG, "Ok, user saw the infobox");

-				}

-			});

-

-			// TRANS

-			infobox.setNeutralButton(getString(R.string.initial_info_box_more_info), new DialogInterface.OnClickListener() {

-				public void onClick(DialogInterface arg0, int arg1) {

-					Log.d(TAG, "user wants more info, show the website");

-					String url = "http://wiki.navit-project.org/index.php/Navit_on_Android";

-					Intent i = new Intent(Intent.ACTION_VIEW);

-					i.setData(Uri.parse(url));

-					startActivity(i);

-				}

-			});

-			infobox.show();

-			SharedPreferences.Editor edit_settings = settings.edit();

-			edit_settings.putBoolean("firstStart", false);

-			edit_settings.apply();

-		}

-	}

-

-	/** Called when the activity is first created. */

-	@Override

-	public void onCreate(Bundle savedInstanceState)

-	{

-		super.onCreate(savedInstanceState);

-		if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB)

-			this.requestWindowFeature(Window.FEATURE_NO_TITLE);

-		else

-			this.getActionBar().hide();

-

-		navit = this;

-		dialogs = new NavitDialogs(this);

-

-		NavitResources = getResources();

-

-		// only take arguments here, onResume gets called all the time (e.g. when screenblanks, etc.)

-		Navit.startup_intent = this.getIntent();

-		// hack! Remember time stamps, and only allow 4 secs. later in onResume to set target!

-		Navit.startup_intent_timestamp = System.currentTimeMillis();

-		Log.d(TAG, "**1**A " + startup_intent.getAction());

-		Log.d(TAG, "**1**D " + startup_intent.getDataString());

-

-		// init translated text

-		NavitTextTranslations.init();

-		

-		// NOTIFICATION

-		// Setup the status bar notification		

-		// This notification is removed in the exit() function

-		nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);	// Grab a handle to the NotificationManager

-		PendingIntent appIntent = PendingIntent.getActivity(getApplicationContext(), 0, getIntent(), 0);

-		

-		NotificationCompat.Builder builder = new NotificationCompat.Builder(this);

-		builder.setContentIntent(appIntent);

-		builder.setAutoCancel(false).setOngoing(true);

-		builder.setContentTitle(getString(R.string.app_name));

-		builder.setContentText(getString(R.string.notification_event_default));

-		builder.setSmallIcon(R.drawable.ic_notify);

-		Notification NavitNotification = builder.build();

-		nm.notify(R.string.app_name, NavitNotification);// Show the notification

-		

-		// Status and navigation bar sizes

-		// These are platform defaults and do not change with rotation, but we have to figure out which ones apply

-		// (is the navigation bar visible? on the side or at the bottom?)

-		Resources resources = getResources();

-		int shid = resources.getIdentifier("status_bar_height", "dimen", "android");

-		int adhid = resources.getIdentifier("action_bar_default_height", "dimen", "android");

-		int nhid = resources.getIdentifier("navigation_bar_height", "dimen", "android");

-		int nhlid = resources.getIdentifier("navigation_bar_height_landscape", "dimen", "android");

-		int nwid = resources.getIdentifier("navigation_bar_width", "dimen", "android");

-		status_bar_height = (shid > 0) ? resources.getDimensionPixelSize(shid) : 0;

-		action_bar_default_height = (adhid > 0) ? resources.getDimensionPixelSize(adhid) : 0;

-		navigation_bar_height = (nhid > 0) ? resources.getDimensionPixelSize(nhid) : 0;

-		navigation_bar_height_landscape = (nhlid > 0) ? resources.getDimensionPixelSize(nhlid) : 0;

-		navigation_bar_width = (nwid > 0) ? resources.getDimensionPixelSize(nwid) : 0;

-		Log.d(TAG, String.format("status_bar_height=%d, action_bar_default_height=%d, navigation_bar_height=%d, navigation_bar_height_landscape=%d, navigation_bar_width=%d", 

-				status_bar_height, action_bar_default_height, navigation_bar_height, navigation_bar_height_landscape, navigation_bar_width));

-		if ((ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)||

-				(ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED)) {

-			Log.d (TAG,"ask for permission(s)");

-			ActivityCompat.requestPermissions(this,

-				new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.ACCESS_FINE_LOCATION},MY_PERMISSIONS_REQUEST_ALL);

-		}

-		// get the local language -------------

-		Locale locale = java.util.Locale.getDefault();

-		String lang = locale.getLanguage();

-		String langc = lang;

-		Log.d(TAG, "lang=" + lang);

-		int pos = lang.indexOf('_');

-		if (pos != -1)

-		{

-			langc = lang.substring(0, pos);

-			NavitLanguage = langc + lang.substring(pos).toUpperCase(locale);

-			Log.d(TAG, "substring lang " + NavitLanguage.substring(pos).toUpperCase(locale));

-			// set lang. for translation

-			NavitTextTranslations.main_language = langc;

-			NavitTextTranslations.sub_language = NavitLanguage.substring(pos).toUpperCase(locale);

-		}

-		else

-		{

-			String country = locale.getCountry();

-			Log.d(TAG, "Country1 " + country);

-			Log.d(TAG, "Country2 " + country.toUpperCase(locale));

-			NavitLanguage = langc + "_" + country.toUpperCase(locale);

-			// set lang. for translation

-			NavitTextTranslations.main_language = langc;

-			NavitTextTranslations.sub_language = country.toUpperCase(locale);

-		}

-		Log.d(TAG, "Language " + lang);

-

-		SharedPreferences prefs = getSharedPreferences(NAVIT_PREFS,MODE_PRIVATE);

-		map_filename_path  = prefs.getString("filenamePath", Environment.getExternalStorageDirectory().getPath() + "/navit/");

-

-		// make sure the new path for the navitmap.bin file(s) exist!!

-		File navit_maps_dir = new File(map_filename_path);

-		navit_maps_dir.mkdirs();

-

-		// make sure the share dir exists

-		File navit_data_share_dir = new File(NAVIT_DATA_SHARE_DIR);

-		navit_data_share_dir.mkdirs();

-

-		Display display_ = getWindowManager().getDefaultDisplay();

-		int width_ = display_.getWidth();

-		int height_ = display_.getHeight();

-		metrics = new DisplayMetrics();

-		display_.getMetrics(Navit.metrics);

-		int densityDpi = (int)(( Navit.metrics.density*160)-.5f);

-		Log.d(TAG, "Navit -> pixels x=" + width_ + " pixels y=" + height_);

-		Log.d(TAG, "Navit -> dpi=" + densityDpi);

-		Log.d(TAG, "Navit -> density=" + Navit.metrics.density);

-		Log.d(TAG, "Navit -> scaledDensity=" + Navit.metrics.scaledDensity);

-

-		ActivityResults = new NavitActivityResult[16];

-		setVolumeControlStream(AudioManager.STREAM_MUSIC);

-		PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);

-		wl = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ON_AFTER_RELEASE,"NavitDoNotDimScreen");

-

-		if (!extractRes(langc, NAVIT_DATA_DIR + "/locale/" + langc + "/LC_MESSAGES/navit.mo"))

-		{

-			Log.e(TAG, "Failed to extract language resource " + langc);

-		}

-

-		if (densityDpi <= 120)

-		{

-			my_display_density = "ldpi";

-		}

-		else if (densityDpi <= 160)

-		{

-			my_display_density = "mdpi";

-		}

-		else if (densityDpi < 240)

-		{

-			my_display_density = "hdpi";

-		}

-		else if (densityDpi < 320)

-		{

-			my_display_density = "xhdpi";

-		}

-		else if (densityDpi < 480)

-		{

-			my_display_density = "xxhdpi";

-		}

-		else if (densityDpi < 640)

-		{

-			my_display_density = "xxxhdpi";

-		}

-		else

-		{

-			Log.e(TAG, "found device of very high density ("+densityDpi+")");

-			Log.e(TAG, "using xxxhdpi values");

-			my_display_density = "xxxhdpi";

-		}

-

-		if (!extractRes("navit" + my_display_density, NAVIT_DATA_DIR + "/share/navit.xml"))

-		{

-			Log.e(TAG, "Failed to extract navit.xml for " + my_display_density);

-		}

-

-		Log.d(TAG, "android.os.Build.VERSION.SDK_INT=" + Integer.valueOf(android.os.Build.VERSION.SDK));

-		NavitMain(this, NavitLanguage, Integer.valueOf(android.os.Build.VERSION.SDK), my_display_density, NAVIT_DATA_DIR+"/bin/navit",map_filename_path);

-

-		showInfos();

-

-		Navit.mgr = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

-	}

-

-	@Override

-	public void onResume()

-	{

-		super.onResume();

-		Log.d(TAG, "OnResume");

-		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {

-			/* Required to make system bars fully transparent */

-			getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE

-                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN

-                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);

-		}

-		//InputMethodManager mgr = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

-		// DEBUG

-		// intent_data = "google.navigation:q=Wien Burggasse 27";

-		// intent_data = "google.navigation:q=48.25676,16.643";

-		// intent_data = "google.navigation:ll=48.25676,16.643&q=blabla-strasse";

-		// intent_data = "google.navigation:ll=48.25676,16.643";

-		if (startup_intent != null)

-		{

-			if (System.currentTimeMillis() <= Navit.startup_intent_timestamp + 4000L)

-			{

-				Log.d(TAG, "**2**A " + startup_intent.getAction());

-				Log.d(TAG, "**2**D " + startup_intent.getDataString());

-				String navi_scheme = startup_intent.getScheme();

-				if ( navi_scheme != null && navi_scheme.equals("google.navigation")) {

-					parseNavigationURI(startup_intent.getData().getSchemeSpecificPart());

-				}

-			}

-			else {

-				Log.e(TAG, "timestamp for navigate_to expired! not using data");

-			}

-		}

-		Log.d(TAG, "onResume");

-		if (show_soft_keyboard_now_showing) {

-			/* Calling showNativeKeyboard() directly won't work here, we need to use the message queue */

-			View cf = getCurrentFocus();

-			if (cf == null)

-				Log.e(TAG, "no view in focus, can't get a handler");

-			else

-				cf.getHandler().post(new SoftInputRestorer());

-		}

-	}

-	

-	@Override

-	public void onPause() {

-		super.onPause();

-		Log.d(TAG, "onPause");

-		if (show_soft_keyboard_now_showing) {

-			Log.d(TAG, "onPause:hiding soft input");

-			this.hideNativeKeyboard();

-			show_soft_keyboard_now_showing = true;

-		}

-	}

-	

-	@Override

-	public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {

-		switch (requestCode) {

-			case MY_PERMISSIONS_REQUEST_ALL: {

-				if (grantResults.length > 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED

-                                        && grantResults[1] == PackageManager.PERMISSION_GRANTED) {

-					return;

-				}

-				AlertDialog.Builder infobox = new AlertDialog.Builder(this);

-				infobox.setTitle(getString(R.string.permissions_info_box_title)); // TRANS

-				infobox.setCancelable(false);

-				infobox.setMessage(getString(R.string.permissions_not_granted));

-				// TRANS

-				infobox.setPositiveButton(getString(R.string.initial_info_box_OK), new DialogInterface.OnClickListener() {

-                    public void onClick(DialogInterface arg0, int arg1) {

-                        exit();

-                    }

-                });

-				infobox.show();

-			}

-		}

-	}

-	

-	private void parseNavigationURI(String schemeSpecificPart) {

-		String naviData[]= schemeSpecificPart.split("&");

-		Pattern p = Pattern.compile("(.*)=(.*)");

-		Map<String,String> params = new HashMap<String,String>();

-		for (int count=0; count < naviData.length; count++) {

-			Matcher m = p.matcher(naviData[count]);

-			

-			if (m.matches()) {

-				params.put(m.group(1), m.group(2));

-			}

-		}

-		

-		// d: google.navigation:q=blabla-strasse # (this happens when you are offline, or from contacts)

-		// a: google.navigation:ll=48.25676,16.643&q=blabla-strasse

-		// c: google.navigation:ll=48.25676,16.643

-		// b: google.navigation:q=48.25676,16.643

-		

-		Float lat;

-		Float lon;

-		Bundle b = new Bundle();

-		

-		String geoString = params.get("ll");

-		if (geoString != null) {

-			String address = params.get("q");

-			if (address != null) b.putString("q", address);

-		}

-		else {

-			geoString = params.get("q");

-		}

-		

-		if ( geoString != null) {

-			if (geoString.matches("^[+-]{0,1}\\d+(|\\.\\d*),[+-]{0,1}\\d+(|\\.\\d*)$")) {

-				String geo[] = geoString.split(",");

-				if (geo.length == 2) {

-					try {

-						lat = Float.valueOf(geo[0]);

-						lon = Float.valueOf(geo[1]);

-						b.putFloat("lat", lat);

-						b.putFloat("lon", lon);

-						Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());

-

-						msg.setData(b);

-						msg.sendToTarget();

-						Log.e(TAG, "target found (b): " + geoString);

-					} catch (NumberFormatException e) {

-						e.printStackTrace();

-					}

-				}

-			}

-			else {

-				start_targetsearch_from_intent(geoString);

-			}

-		}

-	}

-

-	public void setActivityResult(int requestCode, NavitActivityResult ActivityResult)

-	{

-		ActivityResults[requestCode] = ActivityResult;

-	}

-

-	/*

-	 * This is unused since we dont have the dropdown 

-	 * TODO: recheck if this is right and remove this!

-	 */

-	@Override

-	public boolean onPrepareOptionsMenu(Menu menu)

-	{

-		super.onPrepareOptionsMenu(menu);

-		//Log.e("Navit","onPrepareOptionsMenu");

-		// this gets called every time the menu is opened!!

-		// change menu items here!

-		menu.clear();

-

-		// group-id,item-id,sort order number

-		//menu.add(1, 1, 100, getString(R.string.optionsmenu_zoom_in)); //TRANS

-		//menu.add(1, 2, 200, getString(R.string.optionsmenu_zoom_out)); //TRANS

-

-		menu.add(1, 3, 300, getString(R.string.optionsmenu_download_maps)); //TRANS

-		menu.add(1, 5, 400, getString(R.string.optionsmenu_toggle_poi)); //TRANS

-

-		menu.add(1, 6, 500, getString(R.string.optionsmenu_address_search)); //TRANS

-		menu.add(1, 10, 600, getString(R.string.optionsmenu_set_map_location));

-

-		menu.add(1, 99, 900, getString(R.string.optionsmenu_exit_navit)); //TRANS

-		

-		/* Only show the Backup to SD-Card Option if we really have one */

-		if(Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED))

-		    menu.add(1, 7, 700, getString(R.string.optionsmenu_backup_restore)); //TRANS

-		

-		return true;

-	}

-

-	// define callback id here

-	private NavitGraphics N_NavitGraphics = null;

-

-	// callback id gets set here when called from NavitGraphics

-	public void setKeypressCallback(int kp_cb_id, NavitGraphics ng)

-	{

-		N_NavitGraphics = ng;

-	}

-

-	public void setMotionCallback(int mo_cb_id, NavitGraphics ng)

-	{

-		N_NavitGraphics = ng;

-	}

-

-	public NavitGraphics getNavitGraphics() {

-		return N_NavitGraphics;

-	}

-

-

-	public void start_targetsearch_from_intent(String target_address)

-	{

-		if (target_address == null || target_address.equals(""))

-		{

-			// empty search string entered

-			Toast.makeText(getApplicationContext(), getString(R.string.address_search_not_found), Toast.LENGTH_LONG).show(); //TRANS

-		}

-		else

-		{

-			Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);

-			search_intent.putExtra("search_string", target_address);

-			this.startActivityForResult(search_intent, NavitAddressSearch_id);

-		}

-	}

-

-	@Override

-	public boolean onOptionsItemSelected(MenuItem item)

-	{

-		runOptionsItem(item.getItemId());

-		return true;

-	}

-	

-	public void runOptionsItem(int id)

-	{

-		switch (id)

-		{

-			case 1 :

-				// zoom in

-				Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_ZOOM_IN.ordinal()).sendToTarget();

-				// if we zoom, hide the bubble

-				Log.d(TAG, "onOptionsItemSelected -> zoom in");

-				break;

-			case 2 :

-				// zoom out

-				Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_ZOOM_OUT.ordinal()).sendToTarget();

-				// if we zoom, hide the bubble

-				Log.d(TAG, "onOptionsItemSelected -> zoom out");

-				break;

-			case 3 :

-				// map download menu

-				Intent map_download_list_activity = new Intent(this, NavitDownloadSelectMapActivity.class);

-				startActivityForResult(map_download_list_activity, Navit.NavitDownloaderSelectMap_id);

-				break;

-			case 5 :

-				// toggle the normal POI layers and labels (to avoid double POIs)

-				Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_CALL_CMD.ordinal());

-				Bundle b = new Bundle();

-				b.putString("cmd", "toggle_layer(\"POI Symbols\");");

-				msg.setData(b);

-				msg.sendToTarget();

-

-				msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_CALL_CMD.ordinal());

-				b = new Bundle();

-				b.putString("cmd", "toggle_layer(\"POI Labels\");");

-				msg.setData(b);

-				msg.sendToTarget();

-

-				// toggle full POI icons on/off

-				msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_CALL_CMD.ordinal());

-				b = new Bundle();

-				b.putString("cmd", "toggle_layer(\"Android-POI-Icons-full\");");

-				msg.setData(b);

-				msg.sendToTarget();

-

-				break;

-			case 6 :

-				// ok startup address search activity

-				Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);

-				this.startActivityForResult(search_intent, NavitAddressSearch_id);

-				break;

-			case 7 :

-			    /* Backup / Restore */

-			    showDialog(NavitDialogs.DIALOG_BACKUP_RESTORE);

-			    break;

-			case 10:

-				setMapLocation();

-				break;

-			case 99 :

-				// exit

-				this.onStop();

-				this.exit();

-				break;

-		}

-	}

-	

-	

-	/**

-	 * @brief Shows the Options menu.

-	 * 

-	 * Calling this method has the same effect as pressing the hardware Menu button, where present, or touching

-	 * the overflow button in the Action bar.

-	 */

-	public void showMenu() {

-		openOptionsMenu();

-	}

-

-	

-	/**

-	 * @brief Shows the native keyboard or other input method.

-	 */

-	public int showNativeKeyboard() {

-		/*

-		 * Apologies for the huge mess that this function is, but Android's soft input API is a big

-		 * nightmare. Its devs have mercifully given us an option to show or hide the keyboard, but

-		 * there is no reliable way to figure out if it is actually showing, let alone how much of the

-		 * screen it occupies, so our best bet is guesswork.

-		 */

-		Configuration config = getResources().getConfiguration();

-		if ((config.keyboard == Configuration.KEYBOARD_QWERTY) && (config.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO))

-			/* physical keyboard present, exit */

-			return 0;

-		

-		/* Use SHOW_FORCED here, else keyboard won't show in landscape mode */

-		mgr.showSoftInput(getCurrentFocus(), InputMethodManager.SHOW_FORCED);

-		show_soft_keyboard_now_showing = true;

-

-		/* 

-		 * Crude way to estimate the height occupied by the keyboard: for AOSP on KitKat and Lollipop it

-		 * is about 62-63% of available screen width (in portrait mode) but no more than slightly above

-		 * 46% of height (in landscape mode).

-		 */

-		Display display_ = getWindowManager().getDefaultDisplay();

-		int width_ = display_.getWidth();

-		int height_ = display_.getHeight();

-		int maxHeight = height_ * 47 / 100;

-		int inputHeight = width_ * 63 / 100;

-		if (inputHeight > (maxHeight))

-			inputHeight = maxHeight;

-

-		/* the receiver isn't going to fire before the UI thread becomes idle, well after this method returns */

-		Log.d(TAG, "showNativeKeyboard:return (assuming true)");

-		return inputHeight;

-	}

-	

-	

-	/**

-	 * @brief Hides the native keyboard or other input method.

-	 */

-	public void hideNativeKeyboard() {

-		mgr.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);

-		show_soft_keyboard_now_showing = false;

-	}

-	

-	

-	void setDestination(float latitude, float longitude, String address) {

-		Toast.makeText( getApplicationContext(),getString(R.string.address_search_set_destination) + "\n" + address, Toast.LENGTH_LONG).show(); //TRANS

-

-		Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());

-		Bundle b = new Bundle();

-		b.putFloat("lat", latitude);

-		b.putFloat("lon", longitude);

-		b.putString("q", address);

-		msg.setData(b);

-		msg.sendToTarget();

-	}

-

-	protected void onActivityResult(int requestCode, int resultCode, Intent data)

-	{

-		switch (requestCode)

-		{

-		case Navit.NavitDownloaderSelectMap_id :

-			if (resultCode == Activity.RESULT_OK)

-			{

-				Message msg = dialogs.obtainMessage(NavitDialogs.MSG_START_MAP_DOWNLOAD

-						, data.getIntExtra("map_index", -1), 0);

-				msg.sendToTarget();

-			}

-			break;

-		case NavitAddressSearch_id :

-			if (resultCode == Activity.RESULT_OK) {

-				Bundle destination = data.getExtras();

-				Toast.makeText( getApplicationContext(),getString(R.string.address_search_set_destination) + "\n" + destination.getString(("q")), Toast.LENGTH_LONG).show(); //TRANS

-

-				Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());

-				msg.setData(destination);

-				msg.sendToTarget();

-			}

-			break;

-		case NavitSelectStorage_id : 

-			if(resultCode == RESULT_OK) {                        

-				String newDir = data.getStringExtra(FileBrowserActivity.returnDirectoryParameter); 

-				Log.d(TAG, "selected path= "+newDir);  

-				if(!newDir.contains("/navit")) 

-					newDir = newDir+"/navit/";

-				else

-					newDir = newDir+"/";

-				SharedPreferences prefs = this.getSharedPreferences(NAVIT_PREFS,MODE_PRIVATE); 

-				SharedPreferences.Editor  prefs_editor = prefs.edit(); 

-				prefs_editor.putString("filenamePath", newDir); 

-				prefs_editor.apply();

-				Toast.makeText(this, String.format(Navit.T("New location set to %s\nRestart Navit to apply the changes."),newDir),Toast.LENGTH_LONG).show();                 

-			} 

-				else Log.w(TAG, "select path failed"); 

-			break; 			

-		default :

-			ActivityResults[requestCode].onActivityResult(requestCode, resultCode, data);

-			break;

-		}

-	}

-

-	@Override

-    protected void onPrepareDialog(int id, Dialog dialog) {

-	    dialogs.prepareDialog(id, dialog);

-        super.onPrepareDialog(id, dialog);

-    }

-

-    protected Dialog onCreateDialog(int id)

-	{

-		return dialogs.createDialog(id);

-	}

-	

-	@Override

-	public boolean onSearchRequested() {

-		/* Launch the internal Search Activity */

-        Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);

-        this.startActivityForResult(search_intent, NavitAddressSearch_id);

-        

-		return true;

-	}

-

-	public void setMapLocation()

-	{ 

-		Intent fileExploreIntent = new Intent(this,FileBrowserActivity.class); 

-		fileExploreIntent

-			.putExtra(FileBrowserActivity.startDirectoryParameter, "/mnt")

-			.setAction(FileBrowserActivity.INTENT_ACTION_SELECT_DIR);

-		startActivityForResult(fileExploreIntent,NavitSelectStorage_id);

-	} 

-

-	@Override

-	public void onDestroy()

-	{

-		super.onDestroy();

-		Log.d(TAG, "OnDestroy");

-		// TODO next call will kill our app the hard way. This should not be necessary, but ensures navit is

-		// properly restarted and no resources are wasted with navit in background. Remove this call after 

-		// code review

-		NavitDestroy();

-	}

-	

-	public void fullscreen(int fullscreen) {

-		int w, h;

-		

-		isFullscreen = (fullscreen != 0);

-		if (isFullscreen) {

-			getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);

-			getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);

-		}

-		else {

-			getWindow().addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);

-			getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);

-		}

-		

-		Display display_ = getWindowManager().getDefaultDisplay();

-		if (Build.VERSION.SDK_INT < 17) {

-			w = display_.getWidth();

-			h = display_.getHeight();

-		} else {

-			Point size = new Point();

-			display_.getRealSize(size);

-			w = size.x;

-			h = size.y;

-		}

-		Log.d(TAG, String.format("Toggle fullscreen, w=%d, h=%d", w, h));

-		N_NavitGraphics.handleResize(w, h);

-	}

-

-	public void disableSuspend()

-	{

-		wl.acquire();

-		wl.release();

-	}

-

-	public void exit()

-	{

-		nm.cancelAll();

-		NavitVehicle.removeListener();

-		NavitDestroy();

-	}

-

-	public native void NavitMain(Navit x, String lang, int version, String display_density_string, String path, String path2);

-	public native void NavitDestroy();

-

-	/*

-	 * this is used to load the 'navit' native library on

-	 * application startup. The library has already been unpacked at

-	 * installation time by the package manager.

-	 */

-	static

-	{

-		System.loadLibrary("navit");

-	}

-}

+/**
+ * Navit, a modular navigation system.
+ * Copyright (C) 2005-2008 Navit Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ */
+
+package org.navitproject.navit;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.graphics.Point;
+import android.Manifest;
+import android.media.AudioManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Message;
+import android.os.PowerManager;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Display;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Toast;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+
+public class Navit extends Activity
+{
+
+	public NavitDialogs              dialogs;
+	private PowerManager.WakeLock    wl;
+	private NavitActivityResult      ActivityResults[];
+	public static InputMethodManager mgr                            = null;
+	public static DisplayMetrics     metrics                        = null;
+	public static int                status_bar_height              = 0;
+	public static int                action_bar_default_height      = 0;
+	public static int                navigation_bar_height          = 0;
+	public static int                navigation_bar_height_landscape= 0;
+	public static int                navigation_bar_width           = 0;
+	public static Boolean            show_soft_keyboard             = false;
+	public static Boolean            show_soft_keyboard_now_showing = false;
+	public static long               last_pressed_menu_key          = 0L;
+	public static long               time_pressed_menu_key          = 0L;
+	private static Intent            startup_intent                 = null;
+	private static long              startup_intent_timestamp       = 0L;
+	public static String             my_display_density             = "mdpi";
+	public static final int          NavitDownloaderSelectMap_id    = 967;
+	public static final int          NavitAddressSearch_id          = 70;
+	public static final int          NavitSelectStorage_id          = 43;
+	public static String             NavitLanguage;
+	public static Resources          NavitResources                 = null;
+	static final String              NAVIT_PACKAGE_NAME             = "org.navitproject.navit";
+	static final String              TAG                            = "Navit";
+	static String                    map_filename_path              = null;
+	static final String              NAVIT_DATA_DIR                 = "/data/data/" + NAVIT_PACKAGE_NAME;
+	static final String              NAVIT_DATA_SHARE_DIR           = NAVIT_DATA_DIR + "/share";
+	public static final String       NAVIT_PREFS                    = "NavitPrefs";
+	Boolean                          isFullscreen                   = false;
+	private static final int         MY_PERMISSIONS_REQUEST_ALL     = 101;
+	public static NotificationManager       nm;
+	private static Navit navit;
+
+	public static Navit getInstance() {
+		return navit;
+	}
+
+
+	/**
+	 * @brief A Runnable to restore soft input when the user returns to the activity.
+	 * 
+	 * An instance of this class can be passed to the main message queue in the Activity's
+	 * {@code onRestore()} method.
+	 */
+	private class SoftInputRestorer implements Runnable {
+		public void run() {
+			Navit.this.showNativeKeyboard();
+		}
+	}
+	
+	
+	public void removeFileIfExists(String source) {
+		File file = new File(source);
+
+		if (!file.exists())
+			return;
+        
+		file.delete();
+    	}
+
+	public void copyFileIfExists(String source, String destination) throws IOException {
+		File file = new File(source);
+
+		if (!file.exists())
+			return;
+
+		FileInputStream is = null;
+		FileOutputStream os = null;
+
+		try {
+			is = new FileInputStream(source);
+			os = new FileOutputStream(destination);
+
+			int len;
+			byte buffer[] = new byte[1024];
+
+			while ((len = is.read(buffer)) != -1) {
+				os.write(buffer, 0, len);
+			}
+		} finally {
+			/* Close the FileStreams to prevent Resource leaks */
+			if (is != null)
+                		is.close();
+
+			if (os != null)
+                		os.close();
+		}
+	}
+
+
+	public static String T(String in)
+	{
+		return NavitTextTranslations.get_text(in);
+	}
+
+	private boolean extractRes(String resname, String result) {
+		boolean needs_update = false;
+		Log.e(TAG, "Res Name " + resname + ", result " + result);
+		int id = NavitResources.getIdentifier(resname, "raw", NAVIT_PACKAGE_NAME);
+		Log.e(TAG, "Res ID " + id);
+		if (id == 0)
+			return false;
+
+		File resultfile = new File(result);
+		if (!resultfile.exists()) {
+			needs_update = true;
+			File path = resultfile.getParentFile();
+			if ( !path.exists() && !resultfile.getParentFile().mkdirs())
+				return false;
+		} else {
+			PackageManager pm = getPackageManager();
+			ApplicationInfo appInfo;
+			long apkUpdateTime = 0;
+			try {
+				appInfo = pm.getApplicationInfo(NAVIT_PACKAGE_NAME, 0);
+				apkUpdateTime = new File(appInfo.sourceDir).lastModified();
+			} catch (NameNotFoundException e) {
+				Log.e(TAG, "Could not read package infos");
+				e.printStackTrace();
+			}
+			if (apkUpdateTime > resultfile.lastModified())
+				needs_update = true;
+		}
+
+		if (needs_update) {
+			Log.e(TAG, "Extracting resource");
+
+			try {
+				InputStream resourcestream = NavitResources.openRawResource(id);
+				FileOutputStream resultfilestream = new FileOutputStream(resultfile);
+				byte[] buf = new byte[1024];
+				int i = 0;
+				while ((i = resourcestream.read(buf)) != -1) {
+					resultfilestream.write(buf, 0, i);
+				}
+				 resultfilestream.close();
+			} catch (Exception e) {
+				Log.e(TAG, "Exception " + e.getMessage());
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private void showInfos()
+	{
+		SharedPreferences settings = getSharedPreferences(NAVIT_PREFS, MODE_PRIVATE);
+		boolean firstStart = settings.getBoolean("firstStart", true);
+
+		if (firstStart)
+		{
+			AlertDialog.Builder infobox = new AlertDialog.Builder(this);
+			infobox.setTitle(getString(R.string.initial_info_box_title)); // TRANS
+			infobox.setCancelable(false);
+			
+			infobox.setMessage(R.string.initial_info_box_message);
+	
+			// TRANS
+			infobox.setPositiveButton(getString(R.string.initial_info_box_OK), new DialogInterface.OnClickListener() {
+				public void onClick(DialogInterface arg0, int arg1) {
+					Log.d(TAG, "Ok, user saw the infobox");
+				}
+			});
+
+			// TRANS
+			infobox.setNeutralButton(getString(R.string.initial_info_box_more_info), new DialogInterface.OnClickListener() {
+				public void onClick(DialogInterface arg0, int arg1) {
+					Log.d(TAG, "user wants more info, show the website");
+					String url = "http://wiki.navit-project.org/index.php/Navit_on_Android";
+					Intent i = new Intent(Intent.ACTION_VIEW);
+					i.setData(Uri.parse(url));
+					startActivity(i);
+				}
+			});
+			infobox.show();
+			SharedPreferences.Editor edit_settings = settings.edit();
+			edit_settings.putBoolean("firstStart", false);
+			edit_settings.apply();
+		}
+	}
+
+	/** Called when the activity is first created. */
+	@Override
+	public void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB)
+			this.requestWindowFeature(Window.FEATURE_NO_TITLE);
+		else
+			this.getActionBar().hide();
+
+		navit = this;
+		dialogs = new NavitDialogs(this);
+
+		NavitResources = getResources();
+
+		// only take arguments here, onResume gets called all the time (e.g. when screenblanks, etc.)
+		Navit.startup_intent = this.getIntent();
+		// hack! Remember time stamps, and only allow 4 secs. later in onResume to set target!
+		Navit.startup_intent_timestamp = System.currentTimeMillis();
+		Log.d(TAG, "**1**A " + startup_intent.getAction());
+		Log.d(TAG, "**1**D " + startup_intent.getDataString());
+
+		// init translated text
+		NavitTextTranslations.init();
+		
+		// NOTIFICATION
+		// Setup the status bar notification		
+		// This notification is removed in the exit() function
+		nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);	// Grab a handle to the NotificationManager
+		PendingIntent appIntent = PendingIntent.getActivity(getApplicationContext(), 0, getIntent(), 0);
+		
+		NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
+		builder.setContentIntent(appIntent);
+		builder.setAutoCancel(false).setOngoing(true);
+		builder.setContentTitle(getString(R.string.app_name));
+		builder.setContentText(getString(R.string.notification_event_default));
+		builder.setSmallIcon(R.drawable.ic_notify);
+		Notification NavitNotification = builder.build();
+		nm.notify(R.string.app_name, NavitNotification);// Show the notification
+		
+		// Status and navigation bar sizes
+		// These are platform defaults and do not change with rotation, but we have to figure out which ones apply
+		// (is the navigation bar visible? on the side or at the bottom?)
+		Resources resources = getResources();
+		int shid = resources.getIdentifier("status_bar_height", "dimen", "android");
+		int adhid = resources.getIdentifier("action_bar_default_height", "dimen", "android");
+		int nhid = resources.getIdentifier("navigation_bar_height", "dimen", "android");
+		int nhlid = resources.getIdentifier("navigation_bar_height_landscape", "dimen", "android");
+		int nwid = resources.getIdentifier("navigation_bar_width", "dimen", "android");
+		status_bar_height = (shid > 0) ? resources.getDimensionPixelSize(shid) : 0;
+		action_bar_default_height = (adhid > 0) ? resources.getDimensionPixelSize(adhid) : 0;
+		navigation_bar_height = (nhid > 0) ? resources.getDimensionPixelSize(nhid) : 0;
+		navigation_bar_height_landscape = (nhlid > 0) ? resources.getDimensionPixelSize(nhlid) : 0;
+		navigation_bar_width = (nwid > 0) ? resources.getDimensionPixelSize(nwid) : 0;
+		Log.d(TAG, String.format("status_bar_height=%d, action_bar_default_height=%d, navigation_bar_height=%d, navigation_bar_height_landscape=%d, navigation_bar_width=%d", 
+				status_bar_height, action_bar_default_height, navigation_bar_height, navigation_bar_height_landscape, navigation_bar_width));
+		if ((ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)||
+				(ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED)) {
+			Log.d (TAG,"ask for permission(s)");
+			ActivityCompat.requestPermissions(this,
+				new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.ACCESS_FINE_LOCATION},MY_PERMISSIONS_REQUEST_ALL);
+		}
+		// get the local language -------------
+		Locale locale = java.util.Locale.getDefault();
+		String lang = locale.getLanguage();
+		String langc = lang;
+		Log.d(TAG, "lang=" + lang);
+		int pos = lang.indexOf('_');
+		if (pos != -1)
+		{
+			langc = lang.substring(0, pos);
+			NavitLanguage = langc + lang.substring(pos).toUpperCase(locale);
+			Log.d(TAG, "substring lang " + NavitLanguage.substring(pos).toUpperCase(locale));
+			// set lang. for translation
+			NavitTextTranslations.main_language = langc;
+			NavitTextTranslations.sub_language = NavitLanguage.substring(pos).toUpperCase(locale);
+		}
+		else
+		{
+			String country = locale.getCountry();
+			Log.d(TAG, "Country1 " + country);
+			Log.d(TAG, "Country2 " + country.toUpperCase(locale));
+			NavitLanguage = langc + "_" + country.toUpperCase(locale);
+			// set lang. for translation
+			NavitTextTranslations.main_language = langc;
+			NavitTextTranslations.sub_language = country.toUpperCase(locale);
+		}
+		Log.d(TAG, "Language " + lang);
+
+		SharedPreferences prefs = getSharedPreferences(NAVIT_PREFS,MODE_PRIVATE);
+		map_filename_path  = prefs.getString("filenamePath", Environment.getExternalStorageDirectory().getPath() + "/navit/");
+
+		// make sure the new path for the navitmap.bin file(s) exist!!
+		File navit_maps_dir = new File(map_filename_path);
+		navit_maps_dir.mkdirs();
+
+		// make sure the share dir exists
+		File navit_data_share_dir = new File(NAVIT_DATA_SHARE_DIR);
+		navit_data_share_dir.mkdirs();
+
+		Display display_ = getWindowManager().getDefaultDisplay();
+		int width_ = display_.getWidth();
+		int height_ = display_.getHeight();
+		metrics = new DisplayMetrics();
+		display_.getMetrics(Navit.metrics);
+		int densityDpi = (int)(( Navit.metrics.density*160)-.5f);
+		Log.d(TAG, "Navit -> pixels x=" + width_ + " pixels y=" + height_);
+		Log.d(TAG, "Navit -> dpi=" + densityDpi);
+		Log.d(TAG, "Navit -> density=" + Navit.metrics.density);
+		Log.d(TAG, "Navit -> scaledDensity=" + Navit.metrics.scaledDensity);
+
+		ActivityResults = new NavitActivityResult[16];
+		setVolumeControlStream(AudioManager.STREAM_MUSIC);
+		PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+		wl = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ON_AFTER_RELEASE,"NavitDoNotDimScreen");
+
+		if (!extractRes(langc, NAVIT_DATA_DIR + "/locale/" + langc + "/LC_MESSAGES/navit.mo"))
+		{
+			Log.e(TAG, "Failed to extract language resource " + langc);
+		}
+
+		if (densityDpi <= 120)
+		{
+			my_display_density = "ldpi";
+		}
+		else if (densityDpi <= 160)
+		{
+			my_display_density = "mdpi";
+		}
+		else if (densityDpi < 240)
+		{
+			my_display_density = "hdpi";
+		}
+		else if (densityDpi < 320)
+		{
+			my_display_density = "xhdpi";
+		}
+		else if (densityDpi < 480)
+		{
+			my_display_density = "xxhdpi";
+		}
+		else if (densityDpi < 640)
+		{
+			my_display_density = "xxxhdpi";
+		}
+		else
+		{
+			Log.e(TAG, "found device of very high density ("+densityDpi+")");
+			Log.e(TAG, "using xxxhdpi values");
+			my_display_density = "xxxhdpi";
+		}
+
+		if (!extractRes("navit" + my_display_density, NAVIT_DATA_DIR + "/share/navit.xml"))
+		{
+			Log.e(TAG, "Failed to extract navit.xml for " + my_display_density);
+		}
+
+		Log.d(TAG, "android.os.Build.VERSION.SDK_INT=" + Integer.valueOf(android.os.Build.VERSION.SDK));
+		NavitMain(this, NavitLanguage, Integer.valueOf(android.os.Build.VERSION.SDK), my_display_density, NAVIT_DATA_DIR+"/bin/navit",map_filename_path);
+
+		showInfos();
+
+		Navit.mgr = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+	}
+
+	@Override
+	public void onResume()
+	{
+		super.onResume();
+		Log.d(TAG, "OnResume");
+		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+			/* Required to make system bars fully transparent */
+			getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
+		}
+		//InputMethodManager mgr = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		// DEBUG
+		// intent_data = "google.navigation:q=Wien Burggasse 27";
+		// intent_data = "google.navigation:q=48.25676,16.643";
+		// intent_data = "google.navigation:ll=48.25676,16.643&q=blabla-strasse";
+		// intent_data = "google.navigation:ll=48.25676,16.643";
+		if (startup_intent != null)
+		{
+			if (System.currentTimeMillis() <= Navit.startup_intent_timestamp + 4000L)
+			{
+				Log.d(TAG, "**2**A " + startup_intent.getAction());
+				Log.d(TAG, "**2**D " + startup_intent.getDataString());
+				String navi_scheme = startup_intent.getScheme();
+				if ( navi_scheme != null && navi_scheme.equals("google.navigation")) {
+					parseNavigationURI(startup_intent.getData().getSchemeSpecificPart());
+				}
+			}
+			else {
+				Log.e(TAG, "timestamp for navigate_to expired! not using data");
+			}
+		}
+		Log.d(TAG, "onResume");
+		if (show_soft_keyboard_now_showing) {
+			/* Calling showNativeKeyboard() directly won't work here, we need to use the message queue */
+			View cf = getCurrentFocus();
+			if (cf == null)
+				Log.e(TAG, "no view in focus, can't get a handler");
+			else
+				cf.getHandler().post(new SoftInputRestorer());
+		}
+	}
+	
+	@Override
+	public void onPause() {
+		super.onPause();
+		Log.d(TAG, "onPause");
+		if (show_soft_keyboard_now_showing) {
+			Log.d(TAG, "onPause:hiding soft input");
+			this.hideNativeKeyboard();
+			show_soft_keyboard_now_showing = true;
+		}
+	}
+	
+	@Override
+	public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+		switch (requestCode) {
+			case MY_PERMISSIONS_REQUEST_ALL: {
+				if (grantResults.length > 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED
+                                        && grantResults[1] == PackageManager.PERMISSION_GRANTED) {
+					return;
+				}
+				AlertDialog.Builder infobox = new AlertDialog.Builder(this);
+				infobox.setTitle(getString(R.string.permissions_info_box_title)); // TRANS
+				infobox.setCancelable(false);
+				infobox.setMessage(getString(R.string.permissions_not_granted));
+				// TRANS
+				infobox.setPositiveButton(getString(R.string.initial_info_box_OK), new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface arg0, int arg1) {
+                        exit();
+                    }
+                });
+				infobox.show();
+			}
+		}
+	}
+	
+	private void parseNavigationURI(String schemeSpecificPart) {
+		String naviData[]= schemeSpecificPart.split("&");
+		Pattern p = Pattern.compile("(.*)=(.*)");
+		Map<String,String> params = new HashMap<String,String>();
+		for (int count=0; count < naviData.length; count++) {
+			Matcher m = p.matcher(naviData[count]);
+			
+			if (m.matches()) {
+				params.put(m.group(1), m.group(2));
+			}
+		}
+		
+		// d: google.navigation:q=blabla-strasse # (this happens when you are offline, or from contacts)
+		// a: google.navigation:ll=48.25676,16.643&q=blabla-strasse
+		// c: google.navigation:ll=48.25676,16.643
+		// b: google.navigation:q=48.25676,16.643
+		
+		Float lat;
+		Float lon;
+		Bundle b = new Bundle();
+		
+		String geoString = params.get("ll");
+		if (geoString != null) {
+			String address = params.get("q");
+			if (address != null) b.putString("q", address);
+		}
+		else {
+			geoString = params.get("q");
+		}
+		
+		if ( geoString != null) {
+			if (geoString.matches("^[+-]{0,1}\\d+(|\\.\\d*),[+-]{0,1}\\d+(|\\.\\d*)$")) {
+				String geo[] = geoString.split(",");
+				if (geo.length == 2) {
+					try {
+						lat = Float.valueOf(geo[0]);
+						lon = Float.valueOf(geo[1]);
+						b.putFloat("lat", lat);
+						b.putFloat("lon", lon);
+						Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());
+
+						msg.setData(b);
+						msg.sendToTarget();
+						Log.e(TAG, "target found (b): " + geoString);
+					} catch (NumberFormatException e) {
+						e.printStackTrace();
+					}
+				}
+			}
+			else {
+				start_targetsearch_from_intent(geoString);
+			}
+		}
+	}
+
+	public void setActivityResult(int requestCode, NavitActivityResult ActivityResult)
+	{
+		ActivityResults[requestCode] = ActivityResult;
+	}
+
+	/*
+	 * This is unused since we dont have the dropdown 
+	 * TODO: recheck if this is right and remove this!
+	 */
+	@Override
+	public boolean onPrepareOptionsMenu(Menu menu)
+	{
+		super.onPrepareOptionsMenu(menu);
+		//Log.e("Navit","onPrepareOptionsMenu");
+		// this gets called every time the menu is opened!!
+		// change menu items here!
+		menu.clear();
+
+		// group-id,item-id,sort order number
+		//menu.add(1, 1, 100, getString(R.string.optionsmenu_zoom_in)); //TRANS
+		//menu.add(1, 2, 200, getString(R.string.optionsmenu_zoom_out)); //TRANS
+
+		menu.add(1, 3, 300, getString(R.string.optionsmenu_download_maps)); //TRANS
+		menu.add(1, 5, 400, getString(R.string.optionsmenu_toggle_poi)); //TRANS
+
+		menu.add(1, 6, 500, getString(R.string.optionsmenu_address_search)); //TRANS
+		menu.add(1, 10, 600, getString(R.string.optionsmenu_set_map_location));
+
+		menu.add(1, 99, 900, getString(R.string.optionsmenu_exit_navit)); //TRANS
+		
+		/* Only show the Backup to SD-Card Option if we really have one */
+		if(Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED))
+		    menu.add(1, 7, 700, getString(R.string.optionsmenu_backup_restore)); //TRANS
+		
+		return true;
+	}
+
+	// define callback id here
+	private NavitGraphics N_NavitGraphics = null;
+
+	// callback id gets set here when called from NavitGraphics
+	public void setKeypressCallback(int kp_cb_id, NavitGraphics ng)
+	{
+		N_NavitGraphics = ng;
+	}
+
+	public void setMotionCallback(int mo_cb_id, NavitGraphics ng)
+	{
+		N_NavitGraphics = ng;
+	}
+
+	public NavitGraphics getNavitGraphics() {
+		return N_NavitGraphics;
+	}
+
+
+	public void start_targetsearch_from_intent(String target_address)
+	{
+		if (target_address == null || target_address.equals(""))
+		{
+			// empty search string entered
+			Toast.makeText(getApplicationContext(), getString(R.string.address_search_not_found), Toast.LENGTH_LONG).show(); //TRANS
+		}
+		else
+		{
+			Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);
+			search_intent.putExtra("search_string", target_address);
+			this.startActivityForResult(search_intent, NavitAddressSearch_id);
+		}
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item)
+	{
+		runOptionsItem(item.getItemId());
+		return true;
+	}
+	
+	public void runOptionsItem(int id)
+	{
+		switch (id)
+		{
+			case 1 :
+				// zoom in
+				Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_ZOOM_IN.ordinal()).sendToTarget();
+				// if we zoom, hide the bubble
+				Log.d(TAG, "onOptionsItemSelected -> zoom in");
+				break;
+			case 2 :
+				// zoom out
+				Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_ZOOM_OUT.ordinal()).sendToTarget();
+				// if we zoom, hide the bubble
+				Log.d(TAG, "onOptionsItemSelected -> zoom out");
+				break;
+			case 3 :
+				// map download menu
+				Intent map_download_list_activity = new Intent(this, NavitDownloadSelectMapActivity.class);
+				startActivityForResult(map_download_list_activity, Navit.NavitDownloaderSelectMap_id);
+				break;
+			case 5 :
+				// toggle the normal POI layers and labels (to avoid double POIs)
+				Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_CALL_CMD.ordinal());
+				Bundle b = new Bundle();
+				b.putString("cmd", "toggle_layer(\"POI Symbols\");");
+				msg.setData(b);
+				msg.sendToTarget();
+
+				msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_CALL_CMD.ordinal());
+				b = new Bundle();
+				b.putString("cmd", "toggle_layer(\"POI Labels\");");
+				msg.setData(b);
+				msg.sendToTarget();
+
+				// toggle full POI icons on/off
+				msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_CALL_CMD.ordinal());
+				b = new Bundle();
+				b.putString("cmd", "toggle_layer(\"Android-POI-Icons-full\");");
+				msg.setData(b);
+				msg.sendToTarget();
+
+				break;
+			case 6 :
+				// ok startup address search activity
+				Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);
+				this.startActivityForResult(search_intent, NavitAddressSearch_id);
+				break;
+			case 7 :
+			    /* Backup / Restore */
+			    showDialog(NavitDialogs.DIALOG_BACKUP_RESTORE);
+			    break;
+			case 10:
+				setMapLocation();
+				break;
+			case 99 :
+				// exit
+				this.onStop();
+				this.exit();
+				break;
+		}
+	}
+	
+	
+	/**
+	 * @brief Shows the Options menu.
+	 * 
+	 * Calling this method has the same effect as pressing the hardware Menu button, where present, or touching
+	 * the overflow button in the Action bar.
+	 */
+	public void showMenu() {
+		openOptionsMenu();
+	}
+
+	
+	/**
+	 * @brief Shows the native keyboard or other input method.
+	 */
+	public int showNativeKeyboard() {
+		/*
+		 * Apologies for the huge mess that this function is, but Android's soft input API is a big
+		 * nightmare. Its devs have mercifully given us an option to show or hide the keyboard, but
+		 * there is no reliable way to figure out if it is actually showing, let alone how much of the
+		 * screen it occupies, so our best bet is guesswork.
+		 */
+		Configuration config = getResources().getConfiguration();
+		if ((config.keyboard == Configuration.KEYBOARD_QWERTY) && (config.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO))
+			/* physical keyboard present, exit */
+			return 0;
+		
+		/* Use SHOW_FORCED here, else keyboard won't show in landscape mode */
+		mgr.showSoftInput(getCurrentFocus(), InputMethodManager.SHOW_FORCED);
+		show_soft_keyboard_now_showing = true;
+
+		/* 
+		 * Crude way to estimate the height occupied by the keyboard: for AOSP on KitKat and Lollipop it
+		 * is about 62-63% of available screen width (in portrait mode) but no more than slightly above
+		 * 46% of height (in landscape mode).
+		 */
+		Display display_ = getWindowManager().getDefaultDisplay();
+		int width_ = display_.getWidth();
+		int height_ = display_.getHeight();
+		int maxHeight = height_ * 47 / 100;
+		int inputHeight = width_ * 63 / 100;
+		if (inputHeight > (maxHeight))
+			inputHeight = maxHeight;
+
+		/* the receiver isn't going to fire before the UI thread becomes idle, well after this method returns */
+		Log.d(TAG, "showNativeKeyboard:return (assuming true)");
+		return inputHeight;
+	}
+	
+	
+	/**
+	 * @brief Hides the native keyboard or other input method.
+	 */
+	public void hideNativeKeyboard() {
+		mgr.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+		show_soft_keyboard_now_showing = false;
+	}
+	
+	
+	void setDestination(float latitude, float longitude, String address) {
+		Toast.makeText( getApplicationContext(),getString(R.string.address_search_set_destination) + "\n" + address, Toast.LENGTH_LONG).show(); //TRANS
+
+		Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());
+		Bundle b = new Bundle();
+		b.putFloat("lat", latitude);
+		b.putFloat("lon", longitude);
+		b.putString("q", address);
+		msg.setData(b);
+		msg.sendToTarget();
+	}
+
+	protected void onActivityResult(int requestCode, int resultCode, Intent data)
+	{
+		switch (requestCode)
+		{
+		case Navit.NavitDownloaderSelectMap_id :
+			if (resultCode == Activity.RESULT_OK)
+			{
+				Message msg = dialogs.obtainMessage(NavitDialogs.MSG_START_MAP_DOWNLOAD
+						, data.getIntExtra("map_index", -1), 0);
+				msg.sendToTarget();
+			}
+			break;
+		case NavitAddressSearch_id :
+			if (resultCode == Activity.RESULT_OK) {
+				Bundle destination = data.getExtras();
+				Toast.makeText( getApplicationContext(),getString(R.string.address_search_set_destination) + "\n" + destination.getString(("q")), Toast.LENGTH_LONG).show(); //TRANS
+
+				Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());
+				msg.setData(destination);
+				msg.sendToTarget();
+			}
+			break;
+		case NavitSelectStorage_id : 
+			if(resultCode == RESULT_OK) {                        
+				String newDir = data.getStringExtra(FileBrowserActivity.returnDirectoryParameter); 
+				Log.d(TAG, "selected path= "+newDir);  
+				if(!newDir.contains("/navit")) 
+					newDir = newDir+"/navit/";
+				else
+					newDir = newDir+"/";
+				SharedPreferences prefs = this.getSharedPreferences(NAVIT_PREFS,MODE_PRIVATE); 
+				SharedPreferences.Editor  prefs_editor = prefs.edit(); 
+				prefs_editor.putString("filenamePath", newDir); 
+				prefs_editor.apply();
+				Toast.makeText(this, String.format(Navit.T("New location set to %s\nRestart Navit to apply the changes."),newDir),Toast.LENGTH_LONG).show();                 
+			} 
+				else Log.w(TAG, "select path failed"); 
+			break; 			
+		default :
+			ActivityResults[requestCode].onActivityResult(requestCode, resultCode, data);
+			break;
+		}
+	}
+
+	@Override
+    protected void onPrepareDialog(int id, Dialog dialog) {
+	    dialogs.prepareDialog(id, dialog);
+        super.onPrepareDialog(id, dialog);
+    }
+
+    protected Dialog onCreateDialog(int id)
+	{
+		return dialogs.createDialog(id);
+	}
+	
+	@Override
+	public boolean onSearchRequested() {
+		/* Launch the internal Search Activity */
+        Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);
+        this.startActivityForResult(search_intent, NavitAddressSearch_id);
+        
+		return true;
+	}
+
+	public void setMapLocation()
+	{ 
+		Intent fileExploreIntent = new Intent(this,FileBrowserActivity.class); 
+		fileExploreIntent
+			.putExtra(FileBrowserActivity.startDirectoryParameter, "/mnt")
+			.setAction(FileBrowserActivity.INTENT_ACTION_SELECT_DIR);
+		startActivityForResult(fileExploreIntent,NavitSelectStorage_id);
+	} 
+
+	@Override
+	public void onDestroy()
+	{
+		super.onDestroy();
+		Log.d(TAG, "OnDestroy");
+		// TODO next call will kill our app the hard way. This should not be necessary, but ensures navit is
+		// properly restarted and no resources are wasted with navit in background. Remove this call after 
+		// code review
+		NavitDestroy();
+	}
+	
+	public void fullscreen(int fullscreen) {
+		int w, h;
+		
+		isFullscreen = (fullscreen != 0);
+		if (isFullscreen) {
+			getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+			getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+		}
+		else {
+			getWindow().addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+			getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		}
+		
+		Display display_ = getWindowManager().getDefaultDisplay();
+		if (Build.VERSION.SDK_INT < 17) {
+			w = display_.getWidth();
+			h = display_.getHeight();
+		} else {
+			Point size = new Point();
+			display_.getRealSize(size);
+			w = size.x;
+			h = size.y;
+		}
+		Log.d(TAG, String.format("Toggle fullscreen, w=%d, h=%d", w, h));
+		N_NavitGraphics.handleResize(w, h);
+	}
+
+	public void disableSuspend()
+	{
+		wl.acquire();
+		wl.release();
+	}
+
+	public void exit()
+	{
+		nm.cancelAll();
+		NavitVehicle.removeListener();
+		NavitDestroy();
+	}
+
+	public native void NavitMain(Navit x, String lang, int version, String display_density_string, String path, String path2);
+	public native void NavitDestroy();
+
+	/*
+	 * this is used to load the 'navit' native library on
+	 * application startup. The library has already been unpacked at
+	 * installation time by the package manager.
+	 */
+	static
+	{
+		System.loadLibrary("navit");
+	}
+}
diff --git a/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java b/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
index 80d285fa5..361a511ab 100644
--- a/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
+++ b/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
@@ -1,385 +1,385 @@
-/**

- * Navit, a modular navigation system.

- * Copyright (C) 2005-2008 Navit Team

- *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * version 2 as published by the Free Software Foundation.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the

- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

- * Boston, MA  02110-1301, USA.

- */

-

-package org.navitproject.navit;

-

-import java.lang.reflect.Field;

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Comparator;

-import java.util.List;

-import java.util.Locale;

-

-import android.app.Activity;

-import android.app.AlertDialog;

-import android.app.Dialog;

-import android.app.ProgressDialog;

-import android.content.DialogInterface;

-import android.content.Intent;

-import android.content.SharedPreferences;

-import android.os.Bundle;

-import android.util.Log;

-import android.util.TypedValue;

-import android.view.Gravity;

-import android.view.View;

-import android.view.View.OnClickListener;

-import android.view.WindowManager;

-import android.widget.AdapterView;

-import android.widget.AdapterView.OnItemClickListener;

-import android.widget.ArrayAdapter;

-import android.widget.Button;

-import android.widget.CheckBox;

-import android.widget.EditText;

-import android.widget.ImageButton;

-import android.widget.LinearLayout;

-import android.widget.ListView;

-import android.widget.RelativeLayout;

-import android.widget.Toast;

-import android.widget.RelativeLayout.LayoutParams;

-import android.widget.TextView;

-

-public class NavitAddressSearchActivity extends Activity {

-	public static final class NavitAddress {

-		public NavitAddress(int type, float latitude, float longitude, String address) {

-			result_type = type;

-			lat = latitude;

-			lon = longitude;

-			addr = address;

-		}

-

-		int    result_type;

-		float  lat;

-		float  lon;

-		String addr;

-	}

-

-	private static final String TAG                         = "NavitAddress";

-	private static final int    ADDRESS_RESULT_PROGRESS_MAX = 10;

-

-	private List<NavitAddress> Addresses_found              = null;

-	private List<NavitAddress> addresses_shown              = null;

-	private String             mAddressString               = "";

-	private boolean            mPartialSearch               = false;

-	private String             mCountry;

-	private ImageButton        mCountryButton;

-	ProgressDialog             search_results_wait          = null;

-	public RelativeLayout      NavitAddressSearchActivity_layout;

-	private int                search_results_towns           = 0;

-	private int                search_results_streets         = 0;

-	private int                search_results_streets_hn      = 0;

-	private long               search_handle                  = 0;

-

-	// TODO remember settings

-	private static String               last_address_search_string = "";

-	private static Boolean              last_address_partial_match = false;

-	private static String               last_country = "";

-

-	private int getDrawableID(String resourceName) {

-		int drawableId = 0;

-		try {

-			Class<?> res = R.drawable.class;

-			Field field = res.getField(resourceName);

-			drawableId = field.getInt(null);

-		} catch (Exception e) {

-			Log.e("NavitAddressSearch", "Failure to get drawable id.", e);

-		}

-		return drawableId;

-	}

-	

-	private void setCountryButtonImage() {

-		// We have all images stored as drawable_nodpi resources which allows native code to manipulate them 

-		// without interference with android builtin choosing and scaling system. But that makes us to

-		// reinvent the wheel here to show an image in android native interface.

-		int flag_icon_sizes[]={24,32,48,64,96};

-		int exact_size, nearest_size;

-		exact_size=(int)(Navit.metrics.density*24.0 -.5);

-		nearest_size=flag_icon_sizes[0];

-		for(int size: flag_icon_sizes) {

-			nearest_size=size;

-			if(exact_size<=size)

-				break;

-		}

-		mCountryButton.setImageResource(getDrawableID("country_" + mCountry+"_"+nearest_size+"_"+nearest_size));

-	}

-

-

-	@Override

-	protected void onCreate(Bundle savedInstanceState) {

-		super.onCreate(savedInstanceState);

-		

-		Bundle extras = getIntent().getExtras();

-		if ( extras != null )

-		{

-			String search_string = extras.getString(("search_string"));

-			if (search_string != null) {

-				mPartialSearch = true;

-				mAddressString = search_string;

-				executeSearch();

-				return;

-			}

-		}

-

-		mPartialSearch = last_address_partial_match;

-		mAddressString = last_address_search_string;

-

-		getWindow().setFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND, WindowManager.LayoutParams.FLAG_BLUR_BEHIND);

-		LinearLayout panel = new LinearLayout(this);

-		panel.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));

-		panel.setOrientation(LinearLayout.VERTICAL);

-

-		// address: label and text field

-		SharedPreferences settings = getSharedPreferences(Navit.NAVIT_PREFS, MODE_PRIVATE);

-		mCountry = settings.getString(("DefaultCountry")	, null);

-

-		if (mCountry == null) {

-			Locale defaultLocale = Locale.getDefault();

-			mCountry = defaultLocale.getCountry().toLowerCase(defaultLocale);

-			SharedPreferences.Editor edit_settings = settings.edit();

-			edit_settings.putString("DefaultCountry", mCountry);

-			edit_settings.commit();

-		}

-

-		mCountryButton = new ImageButton(this);

-		

-		setCountryButtonImage();

-

-		mCountryButton.setOnClickListener(new OnClickListener() {

-			public void onClick(View v) {

-				requestCountryDialog();

-			}

-		});

-

-		// address: label and text field

-		TextView addr_view = new TextView(this);

-		addr_view.setText(Navit.T("Enter Destination")); // TRANS

-		addr_view.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20f);

-		addr_view.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));

-		addr_view.setPadding(4, 4, 4, 4);

-

-		// partial match checkbox

-		final CheckBox checkboxPartialMatch = new CheckBox(this);

-		checkboxPartialMatch.setText(Navit.T("partial match")); // TRANS

-		checkboxPartialMatch.setChecked(last_address_partial_match);

-		checkboxPartialMatch.setGravity(Gravity.CENTER);

-

-		final EditText address_string = new EditText(this);

-		address_string.setText(last_address_search_string);

-		address_string.setSelectAllOnFocus(true);

-

-		// search button

-		final Button btnSearch = new Button(this);

-		btnSearch.setText(Navit.T("Search")); // TRANS

-		btnSearch.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));

-		btnSearch.setGravity(Gravity.CENTER);

-		btnSearch.setOnClickListener(new OnClickListener() {

-			public void onClick(View v) {

-				mPartialSearch = checkboxPartialMatch.isChecked();

-				mAddressString = address_string.getText().toString();

-				last_address_partial_match = mPartialSearch;

-				last_address_search_string = mAddressString;

-				executeSearch();

-			}

-		});

-

-		ListView lastAddresses = new ListView(this);

-		NavitAppConfig navitConfig = (NavitAppConfig) getApplicationContext();

-

-		final List<NavitAddress> addresses = navitConfig.getLastAddresses();

-		int addressCount = addresses.size();

-		if (addressCount > 0) {

-			String[] strAddresses = new String[addressCount];

-			for (int addrIndex = 0; addrIndex < addressCount; addrIndex++) {

-				strAddresses[addrIndex] = addresses.get(addrIndex).addr;

-			}

-			ArrayAdapter<String> addressList =

-			        new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, strAddresses);

-			lastAddresses.setAdapter(addressList);

-			lastAddresses.setOnItemClickListener(new OnItemClickListener() {

-				public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) {

-					NavitAddress addressSelected = addresses.get(arg2);

-					Intent resultIntent = new Intent();

-					

-					resultIntent.putExtra("lat", addressSelected.lat);

-					resultIntent.putExtra("lon", addressSelected.lon);

-					resultIntent.putExtra("q", addressSelected.addr);

-

-					setResult(Activity.RESULT_OK, resultIntent);

-					finish();

-				}

-			});

-		}

-

-		String title = getString(R.string.address_search_title);

-

-		if (title != null && title.length() > 0)

-			this.setTitle(title);

-

-		LinearLayout searchSettingsLayout = new LinearLayout(this);

-		searchSettingsLayout.setOrientation(LinearLayout.HORIZONTAL);

-

-		searchSettingsLayout.addView(mCountryButton);

-		searchSettingsLayout.addView(checkboxPartialMatch);

-		panel.addView(addr_view);

-		panel.addView(address_string);

-		panel.addView(searchSettingsLayout);

-		panel.addView(btnSearch);

-		panel.addView(lastAddresses);

-

-		setContentView(panel);

-	}

-

-	private void requestCountryDialog() {

-		final String[][] all_countries = NavitGraphics.GetAllCountries();

-

-		Comparator<String[]> country_comperator = new Comparator<String[]>() {

-			public int compare(String[] object1, String[] object2) {

-				return object1[1].compareTo(object2[1]);

-			}

-		};

-

-		Arrays.sort(all_countries, country_comperator);

-

-		AlertDialog.Builder mapModeChooser = new AlertDialog.Builder(this);

-		// ToDo also show icons and country code

-		String[] country_name = new String[all_countries.length];

-

-		for (int country_index = 0; country_index < all_countries.length; country_index++) {

-			country_name[country_index] = all_countries[country_index][1];

-		}

-

-		mapModeChooser.setItems(country_name, new DialogInterface.OnClickListener() {

-			public void onClick(DialogInterface dialog, int item) {

-				SharedPreferences settings = getSharedPreferences(Navit.NAVIT_PREFS, MODE_PRIVATE);

-				mCountry = all_countries[item][0];

-				SharedPreferences.Editor edit_settings = settings.edit();

-				edit_settings.putString("DefaultCountry", mCountry);

-				edit_settings.commit();

-

-				setCountryButtonImage();

-			}

-		});

-

-		AlertDialog d=mapModeChooser.create();

-		d.getListView().setFastScrollEnabled(true);

-		d.show();

-	}

-

-	/**

-	 * start a search on the map

-	 */

-	public void receiveAddress(int type, float latitude, float longitude, String address) {

-		Log.e(TAG, "(" + String.valueOf(latitude) + ", " + String.valueOf(longitude) + ") " + address);

-

-		switch (type) {

-		case 0:

-			search_results_towns++;

-			break;

-		case 1:

-			search_results_streets++;

-			break;

-		case 2:

-			search_results_streets_hn++;

-			break;

-

-		}

-		search_results_wait.setMessage(Navit.T("Towns") + ":" + search_results_towns + " "

-		        + Navit.T("Streets") + ":" + search_results_streets + "/"

-		        + search_results_streets_hn);

-

-		search_results_wait.setProgress(Addresses_found.size() % (ADDRESS_RESULT_PROGRESS_MAX + 1));

-

-		Addresses_found.add(new NavitAddress(type, latitude, longitude, address));

-	}

-

-	public void finishAddressSearch() {

-		if (Addresses_found.isEmpty()) {

-			Toast.makeText( getApplicationContext(),getString(R.string.address_search_not_found) + "\n" + mAddressString, Toast.LENGTH_LONG).show(); //TRANS

-			setResult(Activity.RESULT_CANCELED);

-			finish();

-		}

-		ListView addressesFound = new ListView(this);

-		addressesFound.setFastScrollEnabled(true);

-		ArrayAdapter<String> addressList =

-		    new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1);

-		

-		addresses_shown = new ArrayList<NavitAddress>();

-		

-		for (NavitAddress currentAddress : Addresses_found) {

-			if (currentAddress.result_type != 0 || search_results_streets == 0) {

-				addressList.add(currentAddress.addr);

-				addresses_shown.add(currentAddress);

-			}

-		}

-

-		addressesFound.setAdapter(addressList);

-

-		addressesFound.setOnItemClickListener(new OnItemClickListener() {

-			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) {

-				NavitAddress addressSelected = addresses_shown.get(arg2);

-				Intent resultIntent = new Intent();

-				

-				resultIntent.putExtra("lat", addressSelected.lat);

-				resultIntent.putExtra("lon", addressSelected.lon);

-				resultIntent.putExtra("q", addressSelected.addr);

-

-				setResult(Activity.RESULT_OK, resultIntent);

-				finish();

-			}

-		});

-

-		setContentView(addressesFound);

-		search_results_wait.dismiss();

-	}

-

-	public native long CallbackStartAddressSearch(int partial_match, String country, String s);

-	public native void CallbackCancelAddressSearch(long handle);

-

-	@Override

-	protected Dialog onCreateDialog(int id) {

-		search_results_wait = new ProgressDialog(this);

-		search_results_wait.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);

-		search_results_wait.setTitle("Loading search results");

-		search_results_wait.setMessage("--");

-		search_results_wait.setCancelable(true);

-		search_results_wait.setProgress(0);

-		search_results_wait.setMax(10);

-		

-		Addresses_found = new ArrayList<NavitAddress>();

-		search_results_towns = 0;

-		search_results_streets = 0;

-		search_results_streets_hn = 0;

-

-		search_handle = CallbackStartAddressSearch(mPartialSearch ? 1 : 0, mCountry, mAddressString);

-

-		search_results_wait.setOnCancelListener(new DialogInterface.OnCancelListener() {

-			@Override

-			public void onCancel(DialogInterface dialog) {

-				CallbackCancelAddressSearch(search_handle);

-				search_handle = 0;

-				search_results_wait.dismiss();

-			}

-		});

-		return search_results_wait;

-	}

-	

-	void executeSearch() {

-		showDialog(0);

-	}

-}

-

+/**
+ * Navit, a modular navigation system.
+ * Copyright (C) 2005-2008 Navit Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ */
+
+package org.navitproject.navit;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.RelativeLayout;
+import android.widget.Toast;
+import android.widget.RelativeLayout.LayoutParams;
+import android.widget.TextView;
+
+public class NavitAddressSearchActivity extends Activity {
+	public static final class NavitAddress {
+		public NavitAddress(int type, float latitude, float longitude, String address) {
+			result_type = type;
+			lat = latitude;
+			lon = longitude;
+			addr = address;
+		}
+
+		int    result_type;
+		float  lat;
+		float  lon;
+		String addr;
+	}
+
+	private static final String TAG                         = "NavitAddress";
+	private static final int    ADDRESS_RESULT_PROGRESS_MAX = 10;
+
+	private List<NavitAddress> Addresses_found              = null;
+	private List<NavitAddress> addresses_shown              = null;
+	private String             mAddressString               = "";
+	private boolean            mPartialSearch               = false;
+	private String             mCountry;
+	private ImageButton        mCountryButton;
+	ProgressDialog             search_results_wait          = null;
+	public RelativeLayout      NavitAddressSearchActivity_layout;
+	private int                search_results_towns           = 0;
+	private int                search_results_streets         = 0;
+	private int                search_results_streets_hn      = 0;
+	private long               search_handle                  = 0;
+
+	// TODO remember settings
+	private static String               last_address_search_string = "";
+	private static Boolean              last_address_partial_match = false;
+	private static String               last_country = "";
+
+	private int getDrawableID(String resourceName) {
+		int drawableId = 0;
+		try {
+			Class<?> res = R.drawable.class;
+			Field field = res.getField(resourceName);
+			drawableId = field.getInt(null);
+		} catch (Exception e) {
+			Log.e("NavitAddressSearch", "Failure to get drawable id.", e);
+		}
+		return drawableId;
+	}
+	
+	private void setCountryButtonImage() {
+		// We have all images stored as drawable_nodpi resources which allows native code to manipulate them 
+		// without interference with android builtin choosing and scaling system. But that makes us to
+		// reinvent the wheel here to show an image in android native interface.
+		int flag_icon_sizes[]={24,32,48,64,96};
+		int exact_size, nearest_size;
+		exact_size=(int)(Navit.metrics.density*24.0 -.5);
+		nearest_size=flag_icon_sizes[0];
+		for(int size: flag_icon_sizes) {
+			nearest_size=size;
+			if(exact_size<=size)
+				break;
+		}
+		mCountryButton.setImageResource(getDrawableID("country_" + mCountry+"_"+nearest_size+"_"+nearest_size));
+	}
+
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		
+		Bundle extras = getIntent().getExtras();
+		if ( extras != null )
+		{
+			String search_string = extras.getString(("search_string"));
+			if (search_string != null) {
+				mPartialSearch = true;
+				mAddressString = search_string;
+				executeSearch();
+				return;
+			}
+		}
+
+		mPartialSearch = last_address_partial_match;
+		mAddressString = last_address_search_string;
+
+		getWindow().setFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND, WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
+		LinearLayout panel = new LinearLayout(this);
+		panel.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+		panel.setOrientation(LinearLayout.VERTICAL);
+
+		// address: label and text field
+		SharedPreferences settings = getSharedPreferences(Navit.NAVIT_PREFS, MODE_PRIVATE);
+		mCountry = settings.getString(("DefaultCountry")	, null);
+
+		if (mCountry == null) {
+			Locale defaultLocale = Locale.getDefault();
+			mCountry = defaultLocale.getCountry().toLowerCase(defaultLocale);
+			SharedPreferences.Editor edit_settings = settings.edit();
+			edit_settings.putString("DefaultCountry", mCountry);
+			edit_settings.commit();
+		}
+
+		mCountryButton = new ImageButton(this);
+		
+		setCountryButtonImage();
+
+		mCountryButton.setOnClickListener(new OnClickListener() {
+			public void onClick(View v) {
+				requestCountryDialog();
+			}
+		});
+
+		// address: label and text field
+		TextView addr_view = new TextView(this);
+		addr_view.setText(Navit.T("Enter Destination")); // TRANS
+		addr_view.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20f);
+		addr_view.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+		addr_view.setPadding(4, 4, 4, 4);
+
+		// partial match checkbox
+		final CheckBox checkboxPartialMatch = new CheckBox(this);
+		checkboxPartialMatch.setText(Navit.T("partial match")); // TRANS
+		checkboxPartialMatch.setChecked(last_address_partial_match);
+		checkboxPartialMatch.setGravity(Gravity.CENTER);
+
+		final EditText address_string = new EditText(this);
+		address_string.setText(last_address_search_string);
+		address_string.setSelectAllOnFocus(true);
+
+		// search button
+		final Button btnSearch = new Button(this);
+		btnSearch.setText(Navit.T("Search")); // TRANS
+		btnSearch.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
+		btnSearch.setGravity(Gravity.CENTER);
+		btnSearch.setOnClickListener(new OnClickListener() {
+			public void onClick(View v) {
+				mPartialSearch = checkboxPartialMatch.isChecked();
+				mAddressString = address_string.getText().toString();
+				last_address_partial_match = mPartialSearch;
+				last_address_search_string = mAddressString;
+				executeSearch();
+			}
+		});
+
+		ListView lastAddresses = new ListView(this);
+		NavitAppConfig navitConfig = (NavitAppConfig) getApplicationContext();
+
+		final List<NavitAddress> addresses = navitConfig.getLastAddresses();
+		int addressCount = addresses.size();
+		if (addressCount > 0) {
+			String[] strAddresses = new String[addressCount];
+			for (int addrIndex = 0; addrIndex < addressCount; addrIndex++) {
+				strAddresses[addrIndex] = addresses.get(addrIndex).addr;
+			}
+			ArrayAdapter<String> addressList =
+			        new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, strAddresses);
+			lastAddresses.setAdapter(addressList);
+			lastAddresses.setOnItemClickListener(new OnItemClickListener() {
+				public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
+					NavitAddress addressSelected = addresses.get(arg2);
+					Intent resultIntent = new Intent();
+					
+					resultIntent.putExtra("lat", addressSelected.lat);
+					resultIntent.putExtra("lon", addressSelected.lon);
+					resultIntent.putExtra("q", addressSelected.addr);
+
+					setResult(Activity.RESULT_OK, resultIntent);
+					finish();
+				}
+			});
+		}
+
+		String title = getString(R.string.address_search_title);
+
+		if (title != null && title.length() > 0)
+			this.setTitle(title);
+
+		LinearLayout searchSettingsLayout = new LinearLayout(this);
+		searchSettingsLayout.setOrientation(LinearLayout.HORIZONTAL);
+
+		searchSettingsLayout.addView(mCountryButton);
+		searchSettingsLayout.addView(checkboxPartialMatch);
+		panel.addView(addr_view);
+		panel.addView(address_string);
+		panel.addView(searchSettingsLayout);
+		panel.addView(btnSearch);
+		panel.addView(lastAddresses);
+
+		setContentView(panel);
+	}
+
+	private void requestCountryDialog() {
+		final String[][] all_countries = NavitGraphics.GetAllCountries();
+
+		Comparator<String[]> country_comperator = new Comparator<String[]>() {
+			public int compare(String[] object1, String[] object2) {
+				return object1[1].compareTo(object2[1]);
+			}
+		};
+
+		Arrays.sort(all_countries, country_comperator);
+
+		AlertDialog.Builder mapModeChooser = new AlertDialog.Builder(this);
+		// ToDo also show icons and country code
+		String[] country_name = new String[all_countries.length];
+
+		for (int country_index = 0; country_index < all_countries.length; country_index++) {
+			country_name[country_index] = all_countries[country_index][1];
+		}
+
+		mapModeChooser.setItems(country_name, new DialogInterface.OnClickListener() {
+			public void onClick(DialogInterface dialog, int item) {
+				SharedPreferences settings = getSharedPreferences(Navit.NAVIT_PREFS, MODE_PRIVATE);
+				mCountry = all_countries[item][0];
+				SharedPreferences.Editor edit_settings = settings.edit();
+				edit_settings.putString("DefaultCountry", mCountry);
+				edit_settings.commit();
+
+				setCountryButtonImage();
+			}
+		});
+
+		AlertDialog d=mapModeChooser.create();
+		d.getListView().setFastScrollEnabled(true);
+		d.show();
+	}
+
+	/**
+	 * start a search on the map
+	 */
+	public void receiveAddress(int type, float latitude, float longitude, String address) {
+		Log.e(TAG, "(" + String.valueOf(latitude) + ", " + String.valueOf(longitude) + ") " + address);
+
+		switch (type) {
+		case 0:
+			search_results_towns++;
+			break;
+		case 1:
+			search_results_streets++;
+			break;
+		case 2:
+			search_results_streets_hn++;
+			break;
+
+		}
+		search_results_wait.setMessage(Navit.T("Towns") + ":" + search_results_towns + " "
+		        + Navit.T("Streets") + ":" + search_results_streets + "/"
+		        + search_results_streets_hn);
+
+		search_results_wait.setProgress(Addresses_found.size() % (ADDRESS_RESULT_PROGRESS_MAX + 1));
+
+		Addresses_found.add(new NavitAddress(type, latitude, longitude, address));
+	}
+
+	public void finishAddressSearch() {
+		if (Addresses_found.isEmpty()) {
+			Toast.makeText( getApplicationContext(),getString(R.string.address_search_not_found) + "\n" + mAddressString, Toast.LENGTH_LONG).show(); //TRANS
+			setResult(Activity.RESULT_CANCELED);
+			finish();
+		}
+		ListView addressesFound = new ListView(this);
+		addressesFound.setFastScrollEnabled(true);
+		ArrayAdapter<String> addressList =
+		    new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1);
+		
+		addresses_shown = new ArrayList<NavitAddress>();
+		
+		for (NavitAddress currentAddress : Addresses_found) {
+			if (currentAddress.result_type != 0 || search_results_streets == 0) {
+				addressList.add(currentAddress.addr);
+				addresses_shown.add(currentAddress);
+			}
+		}
+
+		addressesFound.setAdapter(addressList);
+
+		addressesFound.setOnItemClickListener(new OnItemClickListener() {
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
+				NavitAddress addressSelected = addresses_shown.get(arg2);
+				Intent resultIntent = new Intent();
+				
+				resultIntent.putExtra("lat", addressSelected.lat);
+				resultIntent.putExtra("lon", addressSelected.lon);
+				resultIntent.putExtra("q", addressSelected.addr);
+
+				setResult(Activity.RESULT_OK, resultIntent);
+				finish();
+			}
+		});
+
+		setContentView(addressesFound);
+		search_results_wait.dismiss();
+	}
+
+	public native long CallbackStartAddressSearch(int partial_match, String country, String s);
+	public native void CallbackCancelAddressSearch(long handle);
+
+	@Override
+	protected Dialog onCreateDialog(int id) {
+		search_results_wait = new ProgressDialog(this);
+		search_results_wait.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+		search_results_wait.setTitle("Loading search results");
+		search_results_wait.setMessage("--");
+		search_results_wait.setCancelable(true);
+		search_results_wait.setProgress(0);
+		search_results_wait.setMax(10);
+		
+		Addresses_found = new ArrayList<NavitAddress>();
+		search_results_towns = 0;
+		search_results_streets = 0;
+		search_results_streets_hn = 0;
+
+		search_handle = CallbackStartAddressSearch(mPartialSearch ? 1 : 0, mCountry, mAddressString);
+
+		search_results_wait.setOnCancelListener(new DialogInterface.OnCancelListener() {
+			@Override
+			public void onCancel(DialogInterface dialog) {
+				CallbackCancelAddressSearch(search_handle);
+				search_handle = 0;
+				search_results_wait.dismiss();
+			}
+		});
+		return search_results_wait;
+	}
+	
+	void executeSearch() {
+		showDialog(0);
+	}
+}
+
diff --git a/navit/android/src/org/navitproject/navit/NavitAppConfig.java b/navit/android/src/org/navitproject/navit/NavitAppConfig.java
index 244cef9ce..7cc5a6173 100755
--- a/navit/android/src/org/navitproject/navit/NavitAppConfig.java
+++ b/navit/android/src/org/navitproject/navit/NavitAppConfig.java
@@ -1,70 +1,70 @@
-package org.navitproject.navit;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.navitproject.navit.NavitAddressSearchActivity.NavitAddress;

-

-import android.app.Application;

-import android.content.SharedPreferences;

-

-

-public class NavitAppConfig extends Application {

-

-	private static final int         MAX_LAST_ADDRESSES = 10;

-	private static final String      TAG                = "Navit";

-

-	private List<NavitAddress> mLastAddresses     = null;

-	private int                      mLastAddressField;

-	private SharedPreferences        mSettings;

-

-	@Override

-	public void onCreate() {

-		mSettings = getSharedPreferences(Navit.NAVIT_PREFS, MODE_PRIVATE);

-		super.onCreate();

-	}

-

-	public List<NavitAddress> getLastAddresses() {

-		if (mLastAddresses == null) {

-			mLastAddresses = new ArrayList<NavitAddress>();

-			int mLastAddressField = mSettings.getInt("LastAddress", -1);

-			if (mLastAddressField >= 0) {

-				int index = mLastAddressField;

-				do {

-					String addr_str = mSettings.getString("LastAddress_" + String.valueOf(index), "");

-

-					if (addr_str.length() > 0) {

-						mLastAddresses.add(new NavitAddress(

-						        1,

-						        mSettings.getFloat("LastAddress_Lat_" + String.valueOf(index), 0),

-						        mSettings.getFloat("LastAddress_Lon_" + String.valueOf(index), 0),

-						        addr_str));

-					}

-

-					if (--index < 0) index = MAX_LAST_ADDRESSES - 1;

-

-				} while (index != mLastAddressField);

-			}

-		}

-		return mLastAddresses;

-	}

-

-	public void addLastAddress(NavitAddress newAddress) {

-		getLastAddresses();

-

-		mLastAddresses.add(newAddress);

-		if (mLastAddresses.size() > MAX_LAST_ADDRESSES) mLastAddresses.remove(0);

-

-		mLastAddressField++;

-		if (mLastAddressField >= MAX_LAST_ADDRESSES) mLastAddressField = 0;

-

-		SharedPreferences.Editor editSettings = mSettings.edit();

-

-		editSettings.putInt("LastAddress", mLastAddressField);

-		editSettings.putString("LastAddress_" + String.valueOf(mLastAddressField), newAddress.addr);

-		editSettings.putFloat("LastAddress_Lat_" + String.valueOf(mLastAddressField), newAddress.lat);

-		editSettings.putFloat("LastAddress_Lon_" + String.valueOf(mLastAddressField), newAddress.lon);

-

-		editSettings.apply();

-	}

-}

+package org.navitproject.navit;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.navitproject.navit.NavitAddressSearchActivity.NavitAddress;
+
+import android.app.Application;
+import android.content.SharedPreferences;
+
+
+public class NavitAppConfig extends Application {
+
+	private static final int         MAX_LAST_ADDRESSES = 10;
+	private static final String      TAG                = "Navit";
+
+	private List<NavitAddress> mLastAddresses     = null;
+	private int                      mLastAddressField;
+	private SharedPreferences        mSettings;
+
+	@Override
+	public void onCreate() {
+		mSettings = getSharedPreferences(Navit.NAVIT_PREFS, MODE_PRIVATE);
+		super.onCreate();
+	}
+
+	public List<NavitAddress> getLastAddresses() {
+		if (mLastAddresses == null) {
+			mLastAddresses = new ArrayList<NavitAddress>();
+			int mLastAddressField = mSettings.getInt("LastAddress", -1);
+			if (mLastAddressField >= 0) {
+				int index = mLastAddressField;
+				do {
+					String addr_str = mSettings.getString("LastAddress_" + String.valueOf(index), "");
+
+					if (addr_str.length() > 0) {
+						mLastAddresses.add(new NavitAddress(
+						        1,
+						        mSettings.getFloat("LastAddress_Lat_" + String.valueOf(index), 0),
+						        mSettings.getFloat("LastAddress_Lon_" + String.valueOf(index), 0),
+						        addr_str));
+					}
+
+					if (--index < 0) index = MAX_LAST_ADDRESSES - 1;
+
+				} while (index != mLastAddressField);
+			}
+		}
+		return mLastAddresses;
+	}
+
+	public void addLastAddress(NavitAddress newAddress) {
+		getLastAddresses();
+
+		mLastAddresses.add(newAddress);
+		if (mLastAddresses.size() > MAX_LAST_ADDRESSES) mLastAddresses.remove(0);
+
+		mLastAddressField++;
+		if (mLastAddressField >= MAX_LAST_ADDRESSES) mLastAddressField = 0;
+
+		SharedPreferences.Editor editSettings = mSettings.edit();
+
+		editSettings.putInt("LastAddress", mLastAddressField);
+		editSettings.putString("LastAddress_" + String.valueOf(mLastAddressField), newAddress.addr);
+		editSettings.putFloat("LastAddress_Lat_" + String.valueOf(mLastAddressField), newAddress.lat);
+		editSettings.putFloat("LastAddress_Lon_" + String.valueOf(mLastAddressField), newAddress.lon);
+
+		editSettings.apply();
+	}
+}
diff --git a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
index 582179492..f0b01ee0f 100644
--- a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
+++ b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
@@ -1,238 +1,238 @@
-/**

- * Navit, a modular navigation system.

- * Copyright (C) 2005-2008 Navit Team

- *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * version 2 as published by the Free Software Foundation.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the

- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

- * Boston, MA  02110-1301, USA.

- */

-

-package org.navitproject.navit;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-

-import android.app.Activity;

-import android.app.AlertDialog;

-import android.app.ExpandableListActivity;

-import android.content.Context;

-import android.content.DialogInterface;

-import android.content.Intent;

-import android.location.Location;

-import android.location.LocationManager;

-import android.os.Bundle;

-import android.os.Message;

-import android.os.StatFs;

-import android.util.Log;

-import android.view.View;

-import android.widget.ExpandableListView;

-import android.widget.RelativeLayout;

-import android.widget.SimpleExpandableListAdapter;

-import android.widget.TextView;

-

-public class NavitDownloadSelectMapActivity extends ExpandableListActivity {

-

-	private static SimpleExpandableListAdapter        adapter                      = null;

-	private static final String                       MAP_BULLETPOINT              = " * ";

-	private static ArrayList<HashMap<String, String>> downloaded_maps_childs       = null;

-	private static ArrayList<HashMap<String, String>> maps_current_position_childs = null;

-	private static boolean                            currentLocationKnown         = false;

-

-	@Override

-	public void onCreate(Bundle savedInstanceState) {

-		super.onCreate(savedInstanceState);

-

-		if (adapter == null) {

-			adapter = createAdapter();

-		}

-		updateDownloadedMaps();

-		updateMapsForLocation(NavitMapDownloader.osm_maps);

-		setListAdapter(adapter);

-		try {

-			setTitle(String.valueOf(getFreeSpace() / 1024 / 1024) + "MB available");

-		} catch (Exception e) {

-			Log.e("Navit","Exception "+e.getClass().getName()+" during getFreeSpace, reporting 'no sdcard present'");

-			NavitDialogs.sendDialogMessage(NavitDialogs.MSG_TOAST_LONG, null, 

-				String.format(Navit.T("Current map location %s is not available\nPlease restart Navit after you attach an SD card or select a different map location."),Navit.map_filename_path),

-				 -1, 0, 0);

-			finish();

-		}

-	}

-

-	protected long getFreeSpace()

-	{

-		StatFs fsInfo = new StatFs(Navit.map_filename_path);

-		return (long)fsInfo.getAvailableBlocks() * fsInfo.getBlockSize();

-	}

-

-	private void updateDownloadedMaps() {

-		downloaded_maps_childs.clear();

-		for (NavitMap map : NavitMapDownloader.getAvailableMaps()) {

-			HashMap<String, String> child = new HashMap<String, String>();

-			child.put("map_name", map.mapName + " " + (map.size() / 1024 / 1024) + "MB");

-			child.put("map_location", map.getLocation());

-			downloaded_maps_childs.add(child);

-		}

-	}

-

-	private void updateMapsForLocation(NavitMapDownloader.osm_map_values osm_maps[]) {

-		Location currentLocation = NavitVehicle.lastLocation;

-		if (maps_current_position_childs.size() == 0 || (currentLocation != null && !currentLocationKnown)) {

-			if (currentLocation == null) {

-				LocationManager mapLocationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);

-				List<String> providers = mapLocationManager.getProviders(true);

-				long lastUpdate = 0;

-				long bestUpdateTime = -1;

-				for (String provider : providers) {

-					Location lastKnownLocation = mapLocationManager.getLastKnownLocation(provider);

-					if (lastKnownLocation != null) {

-						lastUpdate = lastKnownLocation.getTime();

-						if (lastUpdate > bestUpdateTime) {

-							currentLocation = lastKnownLocation;

-							bestUpdateTime = lastUpdate;

-						}

-					}

-				}

-			} else currentLocationKnown = true;

-

-			if (currentLocation != null) {

-				// if this map contains data to our current position, add it to

-				// the

-				// MapsOfCurrentLocation-list

-				for (int currentMapIndex = 0; currentMapIndex < osm_maps.length; currentMapIndex++) {

-					if (osm_maps[currentMapIndex].isInMap(currentLocation)) {

-						HashMap<String, String> currentPositionMapChild = new HashMap<String, String>();

-						currentPositionMapChild.put("map_name", osm_maps[currentMapIndex].map_name + " "

-						        + (osm_maps[currentMapIndex].est_size_bytes / 1024 / 1024) + "MB");

-						currentPositionMapChild.put("map_index", String.valueOf(currentMapIndex));

-

-						maps_current_position_childs.add(currentPositionMapChild);

-					}

-				}

-			}

-		}

-	}

-

-	private SimpleExpandableListAdapter createAdapter() {

-

-		NavitMapDownloader.osm_map_values osm_maps[] = NavitMapDownloader.osm_maps;

-

-		ArrayList<HashMap<String, String>> resultGroups = new ArrayList<HashMap<String, String>>();

-		ArrayList<ArrayList<HashMap<String, String>>> resultChilds =

-		        new ArrayList<ArrayList<HashMap<String, String>>>();

-

-		// add already downloaded maps (group and empty child list

-		HashMap<String, String> downloaded_maps_hash = new HashMap<String, String>();

-		downloaded_maps_hash.put("category_name", Navit.T("Downloaded maps"));

-		resultGroups.add(downloaded_maps_hash);

-		downloaded_maps_childs = new ArrayList<HashMap<String, String>>();

-		resultChilds.add(downloaded_maps_childs);

-

-		ArrayList<HashMap<String, String>> secList = new ArrayList<HashMap<String, String>>();

-		maps_current_position_childs = new ArrayList<HashMap<String, String>>();

-		// maps containing the current location

-		HashMap<String, String> matching_maps = new HashMap<String, String>();

-		matching_maps.put("category_name", Navit.NavitResources.getString(R.string.maps_for_current_location));

-		resultGroups.add(matching_maps);

-		resultChilds.add(maps_current_position_childs);

-

-		// add all maps

-		for (int currentMapIndex = 0; currentMapIndex < osm_maps.length; currentMapIndex++) {

-			if (osm_maps[currentMapIndex].level == 0) {

-				if (secList != null && secList.size() > 0) {

-					resultChilds.add(secList);

-				}

-				secList = new ArrayList<HashMap<String, String>>();

-				HashMap<String, String> map_info_hash = new HashMap<String, String>();

-				map_info_hash.put("category_name", osm_maps[currentMapIndex].map_name);

-				resultGroups.add(map_info_hash);

-			}

-

-			HashMap<String, String> child = new HashMap<String, String>();

-			child.put("map_name", (osm_maps[currentMapIndex].level > 1 ? MAP_BULLETPOINT : "")

-			        + osm_maps[currentMapIndex].map_name + " "

-			        + (osm_maps[currentMapIndex].est_size_bytes / 1024 / 1024) + "MB");

-			child.put("map_index", String.valueOf(currentMapIndex));

-

-			secList.add(child);

-		}

-		resultChilds.add(secList);

-

-		return new SimpleExpandableListAdapter(this, resultGroups, android.R.layout.simple_expandable_list_item_1,

-		        new String[] { "category_name" }, new int[] { android.R.id.text1 }, resultChilds,

-		        android.R.layout.simple_expandable_list_item_1, new String[] { "map_name" },

-		        new int[] { android.R.id.text1 });

-	}

-

-	@Override

-	public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {

-		super.onChildClick(parent, v, groupPosition, childPosition, id);

-		Log.d("Navit", "p:" + groupPosition + ", child_pos:" + childPosition);

-

-		@SuppressWarnings("unchecked")

-		HashMap<String, String> child = (HashMap<String, String>) adapter.getChild(groupPosition, childPosition);

-

-		String map_index = child.get("map_index");

-		if (map_index != null) {

-			int mi=Integer.parseInt(map_index);

-			if(NavitMapDownloader.osm_maps[mi].est_size_bytes/1024/1024/950>=4) {

-				NavitDialogs.sendDialogMessage(NavitDialogs.MSG_TOAST_LONG, null, 

-					Navit.T("Sorry, we currently do not support maps above 3.8G on Android, please select a smaller one."),

-					 -1, 0, 0);

-				return true;

-			}

-			Intent resultIntent = new Intent();

-			resultIntent.putExtra("map_index", mi);

-			setResult(Activity.RESULT_OK, resultIntent);

-			finish();

-		} else {

-			// ask user if to delete this map

-			askForMapDeletion(child.get("map_location"));

-		}

-		return true;

-	}

-

-	private void askForMapDeletion(final String map_location) {

-		AlertDialog.Builder deleteMapBox = new AlertDialog.Builder(this);

-		deleteMapBox.setTitle(R.string.map_delete); // Android also takes recource id

-		deleteMapBox.setCancelable(true);

-		

-		NavitMap maptoDelete = new NavitMap(map_location);

-		deleteMapBox.setMessage(maptoDelete.mapName + " " + String.valueOf(maptoDelete.size() / 1024 / 1024) + "MB");

-		

-

-		// TRANS

-		deleteMapBox.setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() {

-			public void onClick(DialogInterface arg0, int arg1) {

-				Log.e("Navit", "Delete Map");

-				Message msg =

-				        Message.obtain(Navit.getInstance().getNavitGraphics().callback_handler,

-				                NavitGraphics.msg_type.CLB_DELETE_MAP.ordinal());

-				Bundle b = new Bundle();

-				b.putString("title", map_location);

-				msg.setData(b);

-				msg.sendToTarget();

-				finish();

-			}

-		});

-

-		// TRANS

-		deleteMapBox.setNegativeButton(getString(R.string.no), new DialogInterface.OnClickListener() {

-			public void onClick(DialogInterface arg0, int arg1) {

-				Log.e("Navit", "don't delete map");

-			}

-		});

-		deleteMapBox.show();

-	}

-}

+/**
+ * Navit, a modular navigation system.
+ * Copyright (C) 2005-2008 Navit Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ */
+
+package org.navitproject.navit;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.ExpandableListActivity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.location.Location;
+import android.location.LocationManager;
+import android.os.Bundle;
+import android.os.Message;
+import android.os.StatFs;
+import android.util.Log;
+import android.view.View;
+import android.widget.ExpandableListView;
+import android.widget.RelativeLayout;
+import android.widget.SimpleExpandableListAdapter;
+import android.widget.TextView;
+
+public class NavitDownloadSelectMapActivity extends ExpandableListActivity {
+
+	private static SimpleExpandableListAdapter        adapter                      = null;
+	private static final String                       MAP_BULLETPOINT              = " * ";
+	private static ArrayList<HashMap<String, String>> downloaded_maps_childs       = null;
+	private static ArrayList<HashMap<String, String>> maps_current_position_childs = null;
+	private static boolean                            currentLocationKnown         = false;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		if (adapter == null) {
+			adapter = createAdapter();
+		}
+		updateDownloadedMaps();
+		updateMapsForLocation(NavitMapDownloader.osm_maps);
+		setListAdapter(adapter);
+		try {
+			setTitle(String.valueOf(getFreeSpace() / 1024 / 1024) + "MB available");
+		} catch (Exception e) {
+			Log.e("Navit","Exception "+e.getClass().getName()+" during getFreeSpace, reporting 'no sdcard present'");
+			NavitDialogs.sendDialogMessage(NavitDialogs.MSG_TOAST_LONG, null, 
+				String.format(Navit.T("Current map location %s is not available\nPlease restart Navit after you attach an SD card or select a different map location."),Navit.map_filename_path),
+				 -1, 0, 0);
+			finish();
+		}
+	}
+
+	protected long getFreeSpace()
+	{
+		StatFs fsInfo = new StatFs(Navit.map_filename_path);
+		return (long)fsInfo.getAvailableBlocks() * fsInfo.getBlockSize();
+	}
+
+	private void updateDownloadedMaps() {
+		downloaded_maps_childs.clear();
+		for (NavitMap map : NavitMapDownloader.getAvailableMaps()) {
+			HashMap<String, String> child = new HashMap<String, String>();
+			child.put("map_name", map.mapName + " " + (map.size() / 1024 / 1024) + "MB");
+			child.put("map_location", map.getLocation());
+			downloaded_maps_childs.add(child);
+		}
+	}
+
+	private void updateMapsForLocation(NavitMapDownloader.osm_map_values osm_maps[]) {
+		Location currentLocation = NavitVehicle.lastLocation;
+		if (maps_current_position_childs.size() == 0 || (currentLocation != null && !currentLocationKnown)) {
+			if (currentLocation == null) {
+				LocationManager mapLocationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
+				List<String> providers = mapLocationManager.getProviders(true);
+				long lastUpdate = 0;
+				long bestUpdateTime = -1;
+				for (String provider : providers) {
+					Location lastKnownLocation = mapLocationManager.getLastKnownLocation(provider);
+					if (lastKnownLocation != null) {
+						lastUpdate = lastKnownLocation.getTime();
+						if (lastUpdate > bestUpdateTime) {
+							currentLocation = lastKnownLocation;
+							bestUpdateTime = lastUpdate;
+						}
+					}
+				}
+			} else currentLocationKnown = true;
+
+			if (currentLocation != null) {
+				// if this map contains data to our current position, add it to
+				// the
+				// MapsOfCurrentLocation-list
+				for (int currentMapIndex = 0; currentMapIndex < osm_maps.length; currentMapIndex++) {
+					if (osm_maps[currentMapIndex].isInMap(currentLocation)) {
+						HashMap<String, String> currentPositionMapChild = new HashMap<String, String>();
+						currentPositionMapChild.put("map_name", osm_maps[currentMapIndex].map_name + " "
+						        + (osm_maps[currentMapIndex].est_size_bytes / 1024 / 1024) + "MB");
+						currentPositionMapChild.put("map_index", String.valueOf(currentMapIndex));
+
+						maps_current_position_childs.add(currentPositionMapChild);
+					}
+				}
+			}
+		}
+	}
+
+	private SimpleExpandableListAdapter createAdapter() {
+
+		NavitMapDownloader.osm_map_values osm_maps[] = NavitMapDownloader.osm_maps;
+
+		ArrayList<HashMap<String, String>> resultGroups = new ArrayList<HashMap<String, String>>();
+		ArrayList<ArrayList<HashMap<String, String>>> resultChilds =
+		        new ArrayList<ArrayList<HashMap<String, String>>>();
+
+		// add already downloaded maps (group and empty child list
+		HashMap<String, String> downloaded_maps_hash = new HashMap<String, String>();
+		downloaded_maps_hash.put("category_name", Navit.T("Downloaded maps"));
+		resultGroups.add(downloaded_maps_hash);
+		downloaded_maps_childs = new ArrayList<HashMap<String, String>>();
+		resultChilds.add(downloaded_maps_childs);
+
+		ArrayList<HashMap<String, String>> secList = new ArrayList<HashMap<String, String>>();
+		maps_current_position_childs = new ArrayList<HashMap<String, String>>();
+		// maps containing the current location
+		HashMap<String, String> matching_maps = new HashMap<String, String>();
+		matching_maps.put("category_name", Navit.NavitResources.getString(R.string.maps_for_current_location));
+		resultGroups.add(matching_maps);
+		resultChilds.add(maps_current_position_childs);
+
+		// add all maps
+		for (int currentMapIndex = 0; currentMapIndex < osm_maps.length; currentMapIndex++) {
+			if (osm_maps[currentMapIndex].level == 0) {
+				if (secList != null && secList.size() > 0) {
+					resultChilds.add(secList);
+				}
+				secList = new ArrayList<HashMap<String, String>>();
+				HashMap<String, String> map_info_hash = new HashMap<String, String>();
+				map_info_hash.put("category_name", osm_maps[currentMapIndex].map_name);
+				resultGroups.add(map_info_hash);
+			}
+
+			HashMap<String, String> child = new HashMap<String, String>();
+			child.put("map_name", (osm_maps[currentMapIndex].level > 1 ? MAP_BULLETPOINT : "")
+			        + osm_maps[currentMapIndex].map_name + " "
+			        + (osm_maps[currentMapIndex].est_size_bytes / 1024 / 1024) + "MB");
+			child.put("map_index", String.valueOf(currentMapIndex));
+
+			secList.add(child);
+		}
+		resultChilds.add(secList);
+
+		return new SimpleExpandableListAdapter(this, resultGroups, android.R.layout.simple_expandable_list_item_1,
+		        new String[] { "category_name" }, new int[] { android.R.id.text1 }, resultChilds,
+		        android.R.layout.simple_expandable_list_item_1, new String[] { "map_name" },
+		        new int[] { android.R.id.text1 });
+	}
+
+	@Override
+	public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
+		super.onChildClick(parent, v, groupPosition, childPosition, id);
+		Log.d("Navit", "p:" + groupPosition + ", child_pos:" + childPosition);
+
+		@SuppressWarnings("unchecked")
+		HashMap<String, String> child = (HashMap<String, String>) adapter.getChild(groupPosition, childPosition);
+
+		String map_index = child.get("map_index");
+		if (map_index != null) {
+			int mi=Integer.parseInt(map_index);
+			if(NavitMapDownloader.osm_maps[mi].est_size_bytes/1024/1024/950>=4) {
+				NavitDialogs.sendDialogMessage(NavitDialogs.MSG_TOAST_LONG, null, 
+					Navit.T("Sorry, we currently do not support maps above 3.8G on Android, please select a smaller one."),
+					 -1, 0, 0);
+				return true;
+			}
+			Intent resultIntent = new Intent();
+			resultIntent.putExtra("map_index", mi);
+			setResult(Activity.RESULT_OK, resultIntent);
+			finish();
+		} else {
+			// ask user if to delete this map
+			askForMapDeletion(child.get("map_location"));
+		}
+		return true;
+	}
+
+	private void askForMapDeletion(final String map_location) {
+		AlertDialog.Builder deleteMapBox = new AlertDialog.Builder(this);
+		deleteMapBox.setTitle(R.string.map_delete); // Android also takes recource id
+		deleteMapBox.setCancelable(true);
+		
+		NavitMap maptoDelete = new NavitMap(map_location);
+		deleteMapBox.setMessage(maptoDelete.mapName + " " + String.valueOf(maptoDelete.size() / 1024 / 1024) + "MB");
+		
+
+		// TRANS
+		deleteMapBox.setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() {
+			public void onClick(DialogInterface arg0, int arg1) {
+				Log.e("Navit", "Delete Map");
+				Message msg =
+				        Message.obtain(Navit.getInstance().getNavitGraphics().callback_handler,
+				                NavitGraphics.msg_type.CLB_DELETE_MAP.ordinal());
+				Bundle b = new Bundle();
+				b.putString("title", map_location);
+				msg.setData(b);
+				msg.sendToTarget();
+				finish();
+			}
+		});
+
+		// TRANS
+		deleteMapBox.setNegativeButton(getString(R.string.no), new DialogInterface.OnClickListener() {
+			public void onClick(DialogInterface arg0, int arg1) {
+				Log.e("Navit", "don't delete map");
+			}
+		});
+		deleteMapBox.show();
+	}
+}
diff --git a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
index c3a6aadd0..dc520ff30 100644
--- a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
+++ b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
@@ -1,709 +1,709 @@
-/**

- * Navit, a modular navigation system.

- * Copyright (C) 2005-2008 Navit Team

- *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * version 2 as published by the Free Software Foundation.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the

- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

- * Boston, MA  02110-1301, USA.

- */

-

-package org.navitproject.navit;

-

-import java.io.BufferedInputStream;

-import java.io.BufferedOutputStream;

-import java.io.File;

-import java.io.FileInputStream;

-import java.io.FileNotFoundException;

-import java.io.FileOutputStream;

-import java.io.FilenameFilter;

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.ObjectInputStream;

-import java.io.ObjectOutputStream;

-import java.io.OutputStream;

-import java.net.HttpURLConnection;

-import java.net.MalformedURLException;

-import java.net.URL;

-import java.net.URLConnection;

-

-import android.location.Location;

-import android.os.Bundle;

-import android.os.Message;

-import android.os.StatFs;

-import android.util.Log;

-

-/**

- * @author rikky

- *

- */

-public class NavitMapDownloader extends Thread

-{

-	public static class osm_map_values

-	{

-		String  lon1;

-		String  lat1;

-		String  lon2;

-		String  lat2;

-		String  map_name                     = "";

-		long    est_size_bytes               = 0;

-		int     level                        = 0;

-

-

-		private osm_map_values(String mapname, String lon_1, String lat_1, String lon_2, String lat_2,

-				long bytes_est, int level)

-		{

-			this.map_name = mapname;

-			this.lon1 = lon_1;

-			this.lat1 = lat_1;

-			this.lon2 = lon_2;

-			this.lat2 = lat_2;

-			this.est_size_bytes = bytes_est;

-			this.level = level;

-		}

-		

-		public boolean isInMap(Location location) {

-			double longitude_1 = Double.valueOf(this.lon1);

-			double latitude_1 = Double.valueOf(this.lat1);

-			double longitude_2 = Double.valueOf(this.lon2);

-			double latitude_2 = Double.valueOf(this.lat2);

-

-			if (location.getLongitude() < longitude_1)

-				return false;

-			if (location.getLongitude() > longitude_2)

-				return false;

-			if (location.getLatitude() < latitude_1)

-				return false;

-			if (location.getLatitude() > latitude_2)

-				return false;

-

-			return true;

-		}

-	}

-	

-	//

-	// define the maps here

-	// size estimations updated 2017-06-22

-	//

-	public static final osm_map_values[] osm_maps = {

-		new osm_map_values(Navit.T("Whole Planet"), "-180", "-90", "180", "90", 23992258630L, 0),

-		new osm_map_values(Navit.T("Africa"), "-30.89", "-36.17", "61.68", "38.40", 2070076339L, 0),

-		new osm_map_values(Navit.T("Angola"), "11.4", "-18.1", "24.2", "-5.3", 127557789L, 1),

-		new osm_map_values(Navit.T("Burundi"), "28.9", "-4.5", "30.9", "-2.2", 124049667L, 1),

-		new osm_map_values(Navit.T("Canary Islands"), "-18.69", "26.52", "-12.79", "29.99", 133565815L, 1),

-		new osm_map_values(Navit.T("Congo, Democratic Republic of the"), "11.7", "-13.6", "31.5", "5.7", 244228485L, 1),

-		new osm_map_values(Navit.T("Ethiopia"), "32.89", "3.33", "48.07", "14.97", 153067406L, 1),

-		new osm_map_values(Navit.T("Guinea"), "-15.47", "7.12", "-7.58", "12.74", 188047126L, 1),

-		new osm_map_values(Navit.T("Cote d'Ivoire"), "-8.72", "4.09", "-2.43", "10.80", 132187496L, 1),

-		new osm_map_values(Navit.T("Kenya"), "33.8", "-5.2", "42.4", "4.9", 190073089L, 1),

-		new osm_map_values(Navit.T("Lesotho"), "26.9", "-30.7", "29.6", "-28.4", 196189429L, 1),

-		new osm_map_values(Navit.T("Liberia"), "-15.00", "-0.73", "-7.20", "8.65", 156257253L, 1),

-		new osm_map_values(Navit.T("Libya"), "9.32", "19.40", "25.54", "33.63", 126046917L, 1),

-		new osm_map_values(Navit.T("Madagascar"), "42.25", "-26.63", "51.20", "-11.31", 145210721L, 1),

-		new osm_map_values(Navit.T("Namibia")+"+"+Navit.T("Botswana"), "11.4", "-29.1", "29.5", "-16.9", 248970987L, 1),

-		new osm_map_values(Navit.T("Reunion"), "55.2", "-21.4", "55.9", "-20.9", 126008774L, 1),

-		new osm_map_values(Navit.T("Rwanda"), "28.8", "-2.9", "30.9", "-1.0", 128267595L, 1),

-		new osm_map_values(Navit.T("South Africa")+"+"+Navit.T("Lesotho"), "15.93", "-36.36", "33.65", "-22.08", 307280006L, 1),

-		new osm_map_values(Navit.T("Tanzania, United Republic of"), "29.19", "-11.87", "40.74", "-0.88", 253621029L, 1),

-		new osm_map_values(Navit.T("Uganda"), "29.3", "-1.6", "35.1", "4.3", 179134521L, 1),

-		new osm_map_values(Navit.T("Asia"), "23.8", "0.1", "195.0", "82.4", 5113673780L, 0),

-		new osm_map_values(Navit.T("Azerbaijan"), "44.74", "38.34", "51.69", "42.37", 138346406L, 1),

-		new osm_map_values(Navit.T("China"), "67.3", "5.3", "135.0", "54.5", 1718108758L, 1),

-		new osm_map_values(Navit.T("Cyprus"), "32.0", "34.5", "34.9", "35.8", 118472448L, 1),

-		new osm_map_values(Navit.T("India")+"+"+Navit.T("Nepal"), "67.9", "5.5", "89.6", "36.0", 601877877L, 1),

-		new osm_map_values(Navit.T("Indonesia"), "93.7", "-17.3", "155.5", "7.6", 420741405L, 1),

-		new osm_map_values(Navit.T("Iran, Islamic Republic of"), "43.5", "24.4", "63.6", "40.4", 242016066L, 1),

-		new osm_map_values(Navit.T("Iraq"), "38.7", "28.5", "49.2", "37.4", 160751805L, 1),

-		new osm_map_values(Navit.T("Israel"), "33.99", "29.8", "35.95", "33.4", 155685778L, 1),

-		new osm_map_values(Navit.T("Japan")+"+"+Navit.T("Korea"), "123.6", "25.2", "151.3", "47.1", 1029080156L, 1),

-		new osm_map_values(Navit.T("Kazakhstan"), "46.44", "40.89", "87.36", "55.45", 407633007L, 1),

-		new osm_map_values(Navit.T("Kyrgyzstan"), "69.23", "39.13", "80.33", "43.29", 147997835L, 1),

-		new osm_map_values(Navit.T("Malaysia")+"+"+Navit.T("Singapore"), "94.3", "-5.9", "108.6", "6.8", 168816435L, 1),

-		new osm_map_values(Navit.T("Mongolia"), "87.5", "41.4", "120.3", "52.7", 153534851L, 1),

-		new osm_map_values(Navit.T("Pakistan"), "60.83", "23.28", "77.89", "37.15", 217644321L, 1),

-		new osm_map_values(Navit.T("Philippines"), "115.58", "4.47", "127.85", "21.60", 281428307L, 1),

-		new osm_map_values(Navit.T("Saudi Arabia"), "33.2", "16.1", "55.9", "33.5", 242648303L, 1),

-		new osm_map_values(Navit.T("Taiwan"), "119.1", "21.5", "122.5", "25.2", 1029080156L, 1),

-		new osm_map_values(Navit.T("Thailand"), "97.5", "5.7", "105.2", "19.7", 185135492L, 1),

-		new osm_map_values(Navit.T("Turkey"), "25.1", "35.8", "46.4", "42.8", 331087441L, 1),

-		new osm_map_values(Navit.T("Turkmenistan"), "51.78", "35.07", "66.76", "42.91", 131045087L, 1),

-		new osm_map_values(Navit.T("UAE+Other"), "51.5", "22.6", "56.7", "26.5", 128934674L, 1),

-		new osm_map_values(Navit.T("Australia")+"+"+Navit.T("Oceania"), "89.84", "-57.39", "179.79", "7.26", 782722650L, 0),

-		new osm_map_values(Navit.T("Australia"), "110.5", "-44.2", "154.9", "-9.2", 348652900L, 0),

-		new osm_map_values(Navit.T("Tasmania"), "144.0", "-45.1", "155.3", "-24.8", 253231890L, 1),

-		new osm_map_values(Navit.T("Victoria")+"+"+Navit.T("New South Wales"), "140.7", "-39.4", "153.7", "-26.9", 241500829L, 1),

-		new osm_map_values(Navit.T("New Caledonia"), "157.85", "-25.05", "174.15", "-16.85", 115512336L, 1),

-		new osm_map_values(Navit.T("New Zealand"), "165.2", "-47.6", "179.1", "-33.7", 239264192L, 1),

-		new osm_map_values(Navit.T("Europe"), "-12.97", "33.59", "34.15", "72.10", 11984126789L, 0),

-		new osm_map_values(Navit.T("Western Europe"), "-17.6", "34.5", "42.9", "70.9", 12648810717L, 1),

-		new osm_map_values(Navit.T("Austria"), "9.4", "46.32", "17.21", "49.1", 898273634L, 1),

-		new osm_map_values(Navit.T("Azores"), "-31.62", "36.63", "-24.67", "40.13", 112687225L, 1),

-		new osm_map_values(Navit.T("BeNeLux"), "2.08", "48.87", "7.78", "54.52", 1771971595L, 1),

-		new osm_map_values(Navit.T("Netherlands"), "3.07", "50.75", "7.23", "53.73", 1191828033L, 1),

-		new osm_map_values(Navit.T("Denmark"), "7.65", "54.32", "15.58", "58.07", 365606979L, 1),

-		new osm_map_values(Navit.T("Faroe Islands"), "-7.8", "61.3", "-6.1", "62.5", 109377568L, 1),

-		new osm_map_values(Navit.T("France"), "-5.45", "42.00", "8.44", "51.68", 3907969744L, 1),

-		new osm_map_values(Navit.T("Alsace"), "6.79", "47.27", "8.48", "49.17", 354249349L, 2),

-		new osm_map_values(Navit.T("Aquitaine"), "-2.27", "42.44", "1.50", "45.76", 443715019L, 2),

-		new osm_map_values(Navit.T("Auvergne"), "2.01", "44.57", "4.54", "46.85", 287663213L, 2),

-		new osm_map_values(Navit.T("Basse-Normandie"), "-2.09", "48.13", "1.03", "49.98", 262352354L, 2),

-		new osm_map_values(Navit.T("Bourgogne"), "2.80", "46.11", "5.58", "48.45", 298868796L, 2),

-		new osm_map_values(Navit.T("Bretagne"), "-5.58", "46.95", "-0.96", "48.99", 382770794L, 2),

-		new osm_map_values(Navit.T("Centre"), "0.01", "46.29", "3.18", "48.99", 474224721L, 2),

-		new osm_map_values(Navit.T("Champagne-Ardenne"), "3.34", "47.53", "5.94", "50.28", 269947824L, 2),

-		new osm_map_values(Navit.T("Corse"), "8.12", "41.32", "9.95", "43.28", 129902146L, 2),

-		new osm_map_values(Navit.T("Franche-Comte"), "5.20", "46.21", "7.83", "48.07", 324476070L, 2),

-		new osm_map_values(Navit.T("Haute-Normandie"), "-0.15", "48.62", "1.85", "50.18", 202782876L, 2),

-		new osm_map_values(Navit.T("Ile-de-France"), "1.40", "48.07", "3.61", "49.29", 311052699L, 2),

-		new osm_map_values(Navit.T("Languedoc-Roussillon"), "1.53", "42.25", "4.89", "45.02", 380145667L, 2),

-		new osm_map_values(Navit.T("Limousin"), "0.58", "44.87", "2.66", "46.50", 206696539L, 2),

-		new osm_map_values(Navit.T("Lorraine"), "4.84", "47.77", "7.72", "49.73", 330777318L, 2),

-		new osm_map_values(Navit.T("Midi-Pyrenees"), "-0.37", "42.18", "3.50", "45.10", 462618363L, 2),

-		new osm_map_values(Navit.T("Nord-pas-de-Calais"), "1.42", "49.92", "4.49", "51.31", 368467511L, 2),

-		new osm_map_values(Navit.T("Pays-de-la-Loire"), "-2.88", "46.20", "0.97", "48.62", 499471143L, 2),

-		new osm_map_values(Navit.T("Picardie"), "1.25", "48.79", "4.31", "50.43", 374308041L, 2),

-		new osm_map_values(Navit.T("Poitou-Charentes"), "-1.69", "45.04", "1.26", "47.23", 342125526L, 2),

-		new osm_map_values(Navit.T("Provence-Alpes-Cote-d-Azur"), "4.21", "42.91", "7.99", "45.18", 390306134L, 2),

-		new osm_map_values(Navit.T("Rhone-Alpes"), "3.65", "44.07", "7.88", "46.64", 510797942L, 2),

-		new osm_map_values(Navit.T("Germany"), "5.18", "46.84", "15.47", "55.64", 3521359466L, 1),

-		new osm_map_values(Navit.T("Baden-Wuerttemberg"), "7.32", "47.14", "10.57", "49.85", 674361124L, 2),

-		new osm_map_values(Navit.T("Bayern"), "8.92", "47.22", "13.90", "50.62", 860161150L, 2),

-		new osm_map_values(Navit.T("Mittelfranken"), "9.86", "48.78", "11.65", "49.84", 203055195L, 2),

-		new osm_map_values(Navit.T("Niederbayern"), "11.55", "47.75", "14.12", "49.42", 312924770L, 2),

-		new osm_map_values(Navit.T("Oberbayern"), "10.67", "47.05", "13.57", "49.14", 382734883L, 2),

-		new osm_map_values(Navit.T("Oberfranken"), "10.31", "49.54", "12.49", "50.95", 235258691L, 2),

-		new osm_map_values(Navit.T("Oberpfalz"), "11.14", "48.71", "13.47", "50.43", 264536012L, 2),

-		new osm_map_values(Navit.T("Schwaben"), "9.27", "47.10", "11.36", "49.09", 321141607L, 2),

-		new osm_map_values(Navit.T("Unterfranken"), "8.59", "49.16", "10.93", "50.67", 303720890L, 2),

-		new osm_map_values(Navit.T("Berlin"), "13.03", "52.28", "13.81", "52.73", 169019946L, 2),

-		new osm_map_values(Navit.T("Brandenburg"), "11.17", "51.30", "14.83", "53.63", 323497599L, 2),

-		new osm_map_values(Navit.T("Bremen"), "8.43", "52.96", "9.04", "53.66", 150963608L, 2),

-		new osm_map_values(Navit.T("Hamburg"), "9.56", "53.34", "10.39", "53.80", 156284421L, 2),

-		new osm_map_values(Navit.T("Hessen"), "7.72", "49.34", "10.29", "51.71", 432279328L, 2),

-		new osm_map_values(Navit.T("Mecklenburg-Vorpommern"), "10.54", "53.05", "14.48", "55.05", 213183908L, 2),

-		new osm_map_values(Navit.T("Niedersachsen"), "6.40", "51.24", "11.69", "54.22", 819766939L, 2),

-		new osm_map_values(Navit.T("Nordrhein-westfalen"), "5.46", "50.26", "9.52", "52.59", 967053517L, 2),

-		new osm_map_values(Navit.T("Rheinland-Pfalz"), "6.06", "48.91", "8.56", "51.00", 442868899L, 2),

-		new osm_map_values(Navit.T("Saarland"), "6.30", "49.06", "7.46", "49.69", 157721162L, 2),

-		new osm_map_values(Navit.T("Sachsen-Anhalt"), "10.50", "50.88", "13.26", "53.11", 287785088L, 2),

-		new osm_map_values(Navit.T("Sachsen"), "11.82", "50.11", "15.10", "51.73", 342620834L, 2),

-		new osm_map_values(Navit.T("Schleswig-Holstein"), "7.41", "53.30", "11.98", "55.20", 280293910L, 2),

-		new osm_map_values(Navit.T("Thueringen"), "9.81", "50.15", "12.72", "51.70", 269428239L, 2),

-		new osm_map_values(Navit.T("Germany")+"+"+Navit.T("Austria")+"+"+Navit.T("Switzerland"), "3.4", "44.5", "18.6", "55.1", 5746126429L, 1),

-		new osm_map_values(Navit.T("Iceland"), "-25.3", "62.8", "-11.4", "67.5", 124837162L, 1),

-		new osm_map_values(Navit.T("Ireland"), "-11.17", "51.25", "-5.23", "55.9", 234750271L, 1),

-		new osm_map_values(Navit.T("Italy"), "6.52", "36.38", "18.96", "47.19", 1610171395L, 1),

-		new osm_map_values(Navit.T("Spain")+"+"+Navit.T("Portugal"), "-11.04", "34.87", "4.62", "44.41", 1039624918L, 1),

-		new osm_map_values(Navit.T("Mallorca"), "2.2", "38.8", "4.7", "40.2", 137200636L, 2),

-		new osm_map_values(Navit.T("Galicia"), "-10.0", "41.7", "-6.3", "44.1", 174549553L, 2),

-		new osm_map_values(Navit.T("Scandinavia"), "4.0", "54.4", "32.1", "71.5", 1398661090L, 1),

-		new osm_map_values(Navit.T("Finland"), "18.6", "59.2", "32.3", "70.3", 460997178L, 1),

-		new osm_map_values(Navit.T("Denmark"), "7.49", "54.33", "13.05", "57.88", 321870414L, 1),

-		new osm_map_values(Navit.T("Switzerland"), "5.79", "45.74", "10.59", "47.84", 552565332L, 1),

-		new osm_map_values(Navit.T("United Kingdom"), "-9.7", "49.6", "2.2", "61.2", 901724648L, 1),

-		new osm_map_values(Navit.T("England"), "-7.80", "48.93", "2.41", "56.14", 937728414L, 1),

-		new osm_map_values(Navit.T("Buckinghamshire"), "-1.19", "51.44", "-0.43", "52.25", 142256978L, 2),

-		new osm_map_values(Navit.T("Cambridgeshire"), "-0.55", "51.96", "0.56", "52.79", 142334001L, 2),

-		new osm_map_values(Navit.T("Cumbria"), "-3.96", "53.85", "-2.11", "55.24", 144422460L, 2),

-		new osm_map_values(Navit.T("East yorkshire with hull"), "-1.16", "53.50", "0.54", "54.26", 141518744L, 2),

-		new osm_map_values(Navit.T("Essex"), "-0.07", "51.40", "1.36", "52.14", 162542730L, 2),

-		new osm_map_values(Navit.T("Herefordshire"), "-3.19", "51.78", "-2.29", "52.45", 129368660L, 2),

-		new osm_map_values(Navit.T("Kent"), "-0.02", "50.81", "1.65", "51.53", 145482562L, 2),

-		new osm_map_values(Navit.T("Lancashire"), "-3.20", "53.43", "-2.00", "54.29", 148964975L, 2),

-		new osm_map_values(Navit.T("Leicestershire"), "-1.65", "52.34", "-0.61", "53.03", 154199956L, 2),

-		new osm_map_values(Navit.T("Norfolk"),  "0.10", "52.30", "2.04", "53.41", 146017009L, 2),

-		new osm_map_values(Navit.T("Nottinghamshire"), "-1.39", "52.73", "-0.62", "53.55", 147986548L, 2),

-		new osm_map_values(Navit.T("Oxfordshire"), "-1.77", "51.41", "-0.82", "52.22", 142240992L, 2),

-		new osm_map_values(Navit.T("Shropshire"), "-3.29", "52.26", "-2.18", "53.05", 136909363L, 2),

-		new osm_map_values(Navit.T("Somerset"), "-3.89", "50.77", "-2.20", "51.40", 145186096L, 2),

-		new osm_map_values(Navit.T("South yorkshire"), "-1.88", "53.25", "-0.80", "53.71", 145902650L, 2),

-		new osm_map_values(Navit.T("Suffolk"), "0.29", "51.88", "1.81", "52.60", 143799697L, 2),

-		new osm_map_values(Navit.T("Surrey"), "-0.90", "51.02", "0.10", "51.52", 157987139L, 2),

-		new osm_map_values(Navit.T("Wiltshire"),  "-2.41", "50.90", "-1.44", "51.76", 138652346L, 2),

-		new osm_map_values(Navit.T("Scotland"), "-8.13", "54.49", "-0.15", "61.40", 258853845L, 2),

-		new osm_map_values(Navit.T("Wales"), "-5.56", "51.28", "-2.60", "53.60", 193593409L, 2),

-		new osm_map_values(Navit.T("Albania"), "19.09", "39.55", "21.12", "42.72", 146199817L, 1),

-		new osm_map_values(Navit.T("Belarus"), "23.12", "51.21", "32.87", "56.23", 324470696L, 1),

-		new osm_map_values(Navit.T("Russian Federation"), "27.9", "41.5", "190.4", "77.6", 2148314279L, 1),

-		new osm_map_values(Navit.T("Bulgaria"), "24.7", "42.1", "24.8", "42.1", 109869373L, 1),

-		new osm_map_values(Navit.T("Bosnia and Herzegovina"), "15.69", "42.52", "19.67", "45.32", 187122485L, 1),

-		new osm_map_values(Navit.T("Czech Republic"), "11.91", "48.48", "19.02", "51.17", 904838442L, 1),

-		new osm_map_values(Navit.T("Croatia"), "13.4", "42.1", "19.4", "46.9", 460854751L, 1),

-		new osm_map_values(Navit.T("Estonia"), "21.5", "57.5", "28.2", "59.6", 173378927L, 1),

-		new osm_map_values(Navit.T("Greece"), "28.9", "37.8", "29.0", "37.8", 109435051L, 1),

-		new osm_map_values(Navit.T("Crete"), "23.3", "34.5", "26.8", "36.0", 115985063L, 1),

-		new osm_map_values(Navit.T("Hungary"), "16.08", "45.57", "23.03", "48.39", 350318541L, 1),

-		new osm_map_values(Navit.T("Latvia"), "20.7", "55.6", "28.3", "58.1", 188188140L, 1),

-		new osm_map_values(Navit.T("Lithuania"), "20.9", "53.8", "26.9", "56.5", 217852597L, 1),

-		new osm_map_values(Navit.T("Poland"), "13.6", "48.8", "24.5", "55.0", 1464968657L, 1),

-		new osm_map_values(Navit.T("Romania"), "20.3", "43.5", "29.9", "48.4", 347931565L, 1),

-		new osm_map_values(Navit.T("Ukraine"),  "22.0", "44.3", "40.4", "52.4", 793611912L, 1),

-		new osm_map_values(Navit.T("North America"), "-178.1", "6.5", "-10.4", "84.0", 5601866516L, 0),

-		new osm_map_values(Navit.T("Alaska"), "-179.5", "49.5", "-129", "71.6", 207746039L, 1),

-		new osm_map_values(Navit.T("Canada"), "-141.3", "41.5", "-52.2", "70.2", 2635719651L, 1),

-		new osm_map_values(Navit.T("Hawaii"), "-161.07", "18.49", "-154.45", "22.85", 115016656L, 1),

-		new osm_map_values(Navit.T("USA")+Navit.T(" (except Alaska and Hawaii)"), "-125.4", "24.3", "-66.5", "49.3", 4060487198L, 1),

-		new osm_map_values(Navit.T("Midwest"), "-104.11", "35.92", "-80.46", "49.46", 1145596450L, 2),

-		new osm_map_values(Navit.T("Michigan"), "-90.47", "41.64", "-79.00", "49.37", 538247019L, 2),

-		new osm_map_values(Navit.T("Ohio"), "-84.87", "38.05", "-79.85", "43.53", 277022336L, 2),

-		new osm_map_values(Navit.T("Northeast"), "-80.58", "38.72", "-66.83", "47.53", 1017160709L, 2),

-		new osm_map_values(Navit.T("Massachusetts"), "-73.56", "40.78", "-68.67", "42.94", 340055487L, 2),

-		new osm_map_values(Navit.T("Vermont"), "-73.49", "42.68", "-71.41", "45.07", 139626067L, 2),

-		new osm_map_values(Navit.T("Pacific"), "-180.05", "15.87", "-129.75", "73.04", 207090640L, 2),

-		new osm_map_values(Navit.T("South"),  "-106.70", "23.98", "-71.46", "40.70", 1747935356L, 2),

-		new osm_map_values(Navit.T("Arkansas"), "-94.67", "32.95", "-89.59", "36.60", 155658661L, 2),

-		new osm_map_values(Navit.T("District of Columbia"), "-77.17", "38.74", "-76.86", "39.05", 129235755L, 2),

-		new osm_map_values(Navit.T("Florida"), "-88.75", "23.63", "-77.67", "31.05", 224022108L, 2),

-		new osm_map_values(Navit.T("Louisiana"), "-94.09", "28.09", "-88.62", "33.07", 210120605L, 2),

-		new osm_map_values(Navit.T("Maryland"), "-79.54", "37.83", "-74.99", "40.22", 276462622L, 2),

-		new osm_map_values(Navit.T("Mississippi"), "-91.71", "29.99", "-88.04", "35.05", 177858031L, 2),

-		new osm_map_values(Navit.T("Oklahoma"), "-103.41", "33.56", "-94.38", "37.38", 200061473L, 2),

-		new osm_map_values(Navit.T("Texas"), "-106.96", "25.62", "-92.97", "36.58", 430089141L, 2),

-		new osm_map_values(Navit.T("Virginia"), "-83.73", "36.49", "-74.25", "39.52", 384187569L, 2),

-		new osm_map_values(Navit.T("West Virginia"), "-82.70", "37.15", "-77.66", "40.97", 220552071L, 2),

-		new osm_map_values(Navit.T("West"), "-133.11", "31.28", "-101.99", "49.51", 1152909162L, 2),

-		new osm_map_values(Navit.T("Arizona"), "-114.88", "30.01", "-108.99", "37.06", 182826833L, 2),

-		new osm_map_values(Navit.T("California"), "-125.94", "32.43", "-114.08", "42.07", 586923326L, 2),

-		new osm_map_values(Navit.T("Colorado"), "-109.11", "36.52", "-100.41", "41.05", 228623724L, 2),

-		new osm_map_values(Navit.T("Idaho"), "-117.30", "41.93", "-110.99", "49.18", 170684507L, 2),

-		new osm_map_values(Navit.T("Montana"), "-116.10", "44.31", "-102.64", "49.74", 176229800L, 2),

-		new osm_map_values(Navit.T("New Mexico"), "-109.10", "26.98", "-96.07", "37.05", 361793070L, 2),

-		new osm_map_values(Navit.T("Nevada"), "-120.2", "35.0", "-113.8", "42.1", 200614482L, 2),

-		new osm_map_values(Navit.T("Oregon"),  "-124.8", "41.8", "-116.3", "46.3", 211462685L, 2),

-		new osm_map_values(Navit.T("Utah"), "-114.11", "36.95", "-108.99", "42.05", 151590197L, 2),

-		new osm_map_values(Navit.T("Washington State"), "-125.0", "45.5", "-116.9", "49.0", 222553768L, 2),

-		new osm_map_values(Navit.T("South+Middle America"), "-83.5", "-56.3", "-30.8", "13.7", 958895383L, 0),

-		new osm_map_values(Navit.T("Argentina"), "-73.9", "-57.3", "-51.6", "-21.0", 376857648L, 1),

-		new osm_map_values(Navit.T("Argentina")+"+"+Navit.T("Chile"), "-77.2", "-56.3", "-52.7", "-16.1", 420275812L, 1),

-		new osm_map_values(Navit.T("Bolivia"), "-70.5", "-23.1", "-57.3", "-9.3", 175937824L, 1),

-		new osm_map_values(Navit.T("Brazil"), "-71.4", "-34.7", "-32.8", "5.4", 664872975L, 1),

-		new osm_map_values(Navit.T("Chile"), "-81.77", "-58.50", "-65.46", "-17.41", 241657330L, 1),

-		new osm_map_values(Navit.T("Cuba"), "-85.3", "19.6", "-74.0", "23.6", 129043575L, 1),

-		new osm_map_values(Navit.T("Colombia"), "-79.1", "-4.0", "-66.7", "12.6", 212016580L, 1),

-		new osm_map_values(Navit.T("Ecuador"), "-82.6", "-5.4", "-74.4", "2.3", 158857591L, 1),

-		new osm_map_values(Navit.T("Guyana")+"+"+Navit.T("Suriname")+"+"+Navit.T("Guyane Francaise"), "-62.0", "1.0", "-51.2", "8.9", 123000072L, 1),

-		new osm_map_values(Navit.T("Haiti")+"+"+Navit.T("Dominican Republic"), "-74.8", "17.3", "-68.2", "20.1", 149925689L, 1),

-		new osm_map_values(Navit.T("Jamaica"), "-78.6", "17.4", "-75.9", "18.9", 113961998L, 1),

-		new osm_map_values(Navit.T("Mexico"), "-117.6", "14.1", "-86.4", "32.8", 551307973L, 1),

-		new osm_map_values(Navit.T("Paraguay"), "-63.8", "-28.1", "-53.6", "-18.8", 159498397L, 1),

-		new osm_map_values(Navit.T("Peru"), "-82.4", "-18.1", "-67.5", "0.4", 212490557L, 1),

-		new osm_map_values(Navit.T("Uruguay"), "-59.2", "-36.5", "-51.7", "-29.7", 157482719L, 1),

-		new osm_map_values(Navit.T("Venezuela"), "-73.6", "0.4", "-59.7", "12.8", 167295729L, 1)

-	};

-

-	private String map_filename_path;

-	

-	public static NavitMap[] getAvailableMaps() {

-		class filterMaps implements FilenameFilter {

-			public boolean accept(File dir, String filename) {

-				return (filename.endsWith(".bin"));

-			}

-		}

-		NavitMap maps[] = new NavitMap[0];

-		File map_dir = new File(Navit.map_filename_path);

-		String map_file_names[] = map_dir.list(new filterMaps());

-		if (map_file_names != null) {

-			maps = new NavitMap[map_file_names.length];

-			for (int map_file_index = 0; map_file_index < map_file_names.length; map_file_index++) {

-				maps[map_file_index] = new NavitMap(Navit.map_filename_path, map_file_names[map_file_index]);

-			}

-		}

-		return maps;

-	}

-	private Boolean                     stop_me                                 = false;

-	private osm_map_values              map_values;

-	private int                         map_id;

-	private long                        uiLastUpdated                           = -1;

-

-	private Boolean                     retryDownload                           = false; //Download failed, but

-	                                                                                     //we should try to resume

-	private static final int            SOCKET_CONNECT_TIMEOUT                  = 60000;          // 60 secs.

-	private static final int            SOCKET_READ_TIMEOUT                     = 120000;         // 120 secs.

-	private static final int            MAP_WRITE_FILE_BUFFER                   = 1024 * 64;

-	private static final int            MAP_WRITE_MEM_BUFFER                    = 1024 * 64;

-	private static final int            MAP_READ_FILE_BUFFER                    = 1024 * 64;

-	private static final int            UPDATE_PROGRESS_TIME_NS                 = 1000 * 1000000; // 1ns=1E-9s

-	private static final int            MAX_RETRIES                             = 5;

-	private static final String         TAG                                     = "NavitMapDownloader";

-

-	private int                       retry_counter                           = 0;

-

-	NavitMapDownloader(int map_id) {

-		this.map_values = osm_maps[map_id];

-		this.map_id=map_id;

-		this.map_filename_path=Navit.map_filename_path;

-	}

-

-	public void run() {

-		stop_me = false;

-		retry_counter = 0;

-

-		Log.v(TAG, "start download " + map_values.map_name);

-		updateProgress(0, map_values.est_size_bytes, Navit.T("downloading") + ": " + map_values.map_name);

-		

-		boolean success;

-		do {

-			try {

-				Thread.sleep(10 + retry_counter * 1000);

-			} catch (InterruptedException e1) {}

-			retryDownload = false;

-			success = download_osm_map();

-		} while ( !success

-				&& retryDownload

-				&& retry_counter < MAX_RETRIES

-				&& !stop_me);

-

-		if (success) {

-			toast(map_values.map_name + " " + Navit.T("ready"));

-			getMapInfoFile().delete();

-			Log.d(TAG, "success");

-		}

-

-		if (success || stop_me ) {

-			NavitDialogs.sendDialogMessage( NavitDialogs.MSG_MAP_DOWNLOAD_FINISHED

-					, map_filename_path + map_values.map_name + ".bin", null, -1, success ? 1 : 0 , map_id );

-		}

-	}

-	

-	public void stop_thread() {

-		stop_me = true;

-		Log.d(TAG, "stop_me -> true");

-	}

-

-	private boolean checkFreeSpace(long needed_bytes) {

-		long free_space = getFreeSpace();

-	

-		if ( needed_bytes <= 0 )

-			needed_bytes = MAP_WRITE_FILE_BUFFER;

-

-		if (free_space < needed_bytes ) {

-			String msg;

-			Log.e(TAG, "Not enough free space or media not available. Please free at least " + needed_bytes / 1024 /1024 + "Mb.");

-			if(free_space<0)

-				msg=Navit.T("Media selected for map storage is not available");

-			else

-				msg=Navit.T("Not enough free space");

-			updateProgress(free_space, needed_bytes, Navit.T("Error downloading map!") + "\n" + msg);

-			return false;

-		}

-		return true;

-	}

-

-	private boolean deleteMap() {

-		File finalOutputFile = getMapFile();

-

-		if (finalOutputFile.exists()) {

-			Message msg =

-			        Message.obtain(Navit.getInstance().getNavitGraphics().callback_handler,

-			                NavitGraphics.msg_type.CLB_DELETE_MAP.ordinal());

-			Bundle b = new Bundle();

-			b.putString("title", finalOutputFile.getAbsolutePath());

-			msg.setData(b);

-			msg.sendToTarget();

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @param map_values

-	 * @return

-	 */

-	private boolean download_osm_map() {

-		long already_read = 0;

-		long real_size_bytes = 0;

-		boolean resume = true;

-

-		File outputFile = getDestinationFile();

-		long old_download_size = outputFile.length();

-

-		URL url = null;

-		if (old_download_size > 0) {

-			url = readFileInfo();

-		}

-

-		if (url == null) {

-			resume = false;

-			url = getDownloadURL();

-		}

-

-		// URL url = new URL("http://192.168.2.101:8080/zweibruecken.bin");

-		URLConnection c = initConnection(url);

-		if (c != null) {

-

-			if (resume) {

-				c.setRequestProperty("Range", "bytes=" + old_download_size + "-");

-				already_read = old_download_size;

-			}

-			try {

-				real_size_bytes=Long.parseLong(c.getHeaderField("Content-Length")) + already_read;

-			} catch(Exception e) {

-				real_size_bytes=-1;

-			}

-

-			long fileTime = c.getLastModified();

-

-			if (!resume) {

-				outputFile.delete();

-				writeFileInfo(c, real_size_bytes);

-			}

-

-			if (real_size_bytes <= 0)

-				real_size_bytes = map_values.est_size_bytes;

-

-			Log.d(TAG, "size: " + real_size_bytes + ", read: " + already_read + ", timestamp: " + fileTime

-			        + ", Connection ref: " + c.getURL());

-

-			if (checkFreeSpace(real_size_bytes - already_read)

-			        && downloadData(c, already_read, real_size_bytes, resume, outputFile)) {

-

-				File finalOutputFile = getMapFile();

-				// delete an already existing file first

-				finalOutputFile.delete();

-				// rename file to its final name

-				outputFile.renameTo(finalOutputFile);

-				return true;

-			}

-		}

-		return false;

-	}

-

-	private File getDestinationFile() {

-		File outputFile = new File(map_filename_path, map_values.map_name + ".tmp");

-		outputFile.getParentFile().mkdir();

-		return outputFile;

-	}

-

-	private boolean downloadData(URLConnection c, long already_read, long real_size_bytes

-	     , boolean resume,File outputFile) {

-		boolean success = false;

-		BufferedOutputStream buf = getOutputStream(outputFile, resume);

-		BufferedInputStream bif = getInputStream(c);

-

-		if (buf != null && bif != null) {

-			success = readData(buf, bif, already_read, real_size_bytes);

-			// always cleanup, as we might get errors when trying to resume

-			try {

-				buf.flush();

-				buf.close();

-

-				bif.close();

-			} catch (IOException e) {

-			}

-		}

-		return success;

-	}

-

-	private URL getDownloadURL() {

-		URL url = null;

-		try {

-			url =

-			        new URL("http://maps.navit-project.org/api/map/?bbox=" + map_values.lon1 + "," + map_values.lat1

-			                + "," + map_values.lon2 + "," + map_values.lat2);

-		} catch (MalformedURLException e) {

-			Log.e(TAG, "We failed to create a URL to " + map_values.map_name);

-			e.printStackTrace();

-			return null;

-		}

-		Log.v(TAG, "connect to " + url.toString());

-		return url;

-	}

-

-	private long getFreeSpace() {

-		try {

-			StatFs fsInfo = new StatFs(map_filename_path);

-			return (long)fsInfo.getAvailableBlocks() * fsInfo.getBlockSize();

-		} catch(Exception e) {

-			return -1;

-		}

-	}

-

-	private BufferedInputStream getInputStream(URLConnection c) {

-		BufferedInputStream bif = null;

-		try {

-			bif = new BufferedInputStream(c.getInputStream(), MAP_READ_FILE_BUFFER);

-		} catch (FileNotFoundException e) {

-			Log.e(TAG, "File not found on server: " + e);

-			if (retry_counter > 0) {

-				getMapInfoFile().delete();

-			}

-			enableRetry();

-			bif = null;

-		} catch (IOException e) {

-			Log.e(TAG, "Error reading from server: " + e);

-			enableRetry();

-			bif = null;

-		}

-		return bif;

-	}

-

-	private File getMapFile() {

-		return new File(map_filename_path, map_values.map_name + ".bin");

-	}

-

-	private File getMapInfoFile() {

-		return new File(map_filename_path, map_values.map_name + ".tmp.info");

-	}

-

-	private BufferedOutputStream getOutputStream(File outputFile, boolean resume) {

-		BufferedOutputStream buf = null;

-		try {

-			buf = new BufferedOutputStream(new FileOutputStream(outputFile, resume), MAP_WRITE_FILE_BUFFER);

-		} catch (FileNotFoundException e) {

-			Log.e(TAG, "Could not open output file for writing: " + e);

-			buf = null;

-		}

-		return buf;

-	}

-	

-	private URLConnection initConnection(URL url) {

-		HttpURLConnection c = null;

-		try {

-			c = (HttpURLConnection) url.openConnection();

-			c.setRequestMethod("GET");

-		} catch (Exception e) {

-			Log.e(TAG, "Failed connecting server: " + e);

-			enableRetry();

-			return null;

-		}

-

-		c.setReadTimeout(SOCKET_READ_TIMEOUT);

-		c.setConnectTimeout(SOCKET_CONNECT_TIMEOUT);

-		return c;

-	}

-

-	private boolean readData(OutputStream buf, InputStream bif, long already_read, long real_size_bytes) {

-		long start_timestamp = System.nanoTime();

-		byte[] buffer = new byte[MAP_WRITE_MEM_BUFFER];

-		int len1 = 0;

-		long mapFileSize = real_size_bytes;

-		long startOffset = already_read;

-		boolean success = false;

-		

-		try {

-			while (!stop_me && (len1 = bif.read(buffer)) != -1) {

-				already_read += len1;

-				updateProgress(start_timestamp, startOffset, already_read, mapFileSize);

-

-				try {

-					buf.write(buffer, 0, len1);

-				} catch (IOException e) {

-					Log.d(TAG, "Error: " + e);

-					if ( !checkFreeSpace(real_size_bytes - already_read + MAP_WRITE_FILE_BUFFER)) {

-						if (deleteMap()) {

-							enableRetry();

-						} else {

-							updateProgress(already_read, real_size_bytes, Navit.T("Error downloading map!") + "\n"

-							        + Navit.T("Not enough free space"));

-						}

-					} else {

-						updateProgress(already_read, real_size_bytes, Navit.T("Error writing map!"));

-					}

-					

-					return false;

-				}

-			}

-

-			if (stop_me) {

-				toast(Navit.T("Map download aborted!"));

-			} else if ( already_read < real_size_bytes ) {

-				Log.d(TAG, "Server send only " + already_read + " bytes of " + real_size_bytes);

-				enableRetry();

-			} else {

-				success = true;

-			}

-		} catch (IOException e) {

-			Log.d(TAG, "Error: " + e);

-

-			enableRetry();

-			updateProgress(already_read, real_size_bytes, Navit.T("Error downloading map!"));

-		}

-		

-		return success;

-	}

-

-	private URL readFileInfo() {

-		URL url = null;

-		try {

-			ObjectInputStream infoStream = new ObjectInputStream(new FileInputStream(getMapInfoFile()));

-			String resume_proto = infoStream.readUTF();

-			infoStream.readUTF(); // read the host name (unused for now)

-			String resume_file = infoStream.readUTF();

-			infoStream.close();

-			// looks like the same file, try to resume

-			Log.v(TAG, "Try to resume download");

-			url = new URL(resume_proto + "://" + "maps.navit-project.org" + resume_file);

-		} catch (Exception e) {

-			getMapInfoFile().delete();

-		}

-		return url;

-	}

-

-	private void toast(String message) {

-		NavitDialogs.sendDialogMessage(NavitDialogs.MSG_TOAST, null, message, -1, 0, 0);

-	}

-	

-	private void updateProgress(long startTime, long offsetBytes, long readBytes, long maxBytes) {

-		long currentTime = System.nanoTime();

-

-		if ((currentTime > uiLastUpdated + UPDATE_PROGRESS_TIME_NS) && startTime!=currentTime) {

-			float per_second_overall = (readBytes - offsetBytes) / ((currentTime - startTime) / 1000000000f);

-			long bytes_remaining = maxBytes - readBytes;

-			int eta_seconds = (int) (bytes_remaining / per_second_overall);

-

-			String eta_string;

-			if (eta_seconds > 60) {

-				eta_string = (int) (eta_seconds / 60f) + " m";

-			} else {

-				eta_string = eta_seconds + " s";

-			}

-			String info =

-			        String.format("%s: %s\n %dMb / %dMb\n %.1f kb/s %s: %s", Navit.T("downloading")

-			                , map_values.map_name, readBytes / 1024 / 1024, maxBytes / 1024 / 1024,

-			                per_second_overall / 1024f, Navit.T("ETA"), eta_string);

-

-			if (retry_counter > 0) {

-				info += "\n Retry " + retry_counter + "/" + MAX_RETRIES;

-			}

-			Log.e(TAG, "info: " + info);

-

-			updateProgress(readBytes, maxBytes, info);

-			uiLastUpdated = currentTime;

-		}

-	}

-	

-	private void updateProgress(long positionBytes, long maximumBytes, String infoText) {

-		NavitDialogs.sendDialogMessage(NavitDialogs.MSG_PROGRESS_BAR, Navit.T("Map download"), infoText

-		        , NavitDialogs.DIALOG_MAPDOWNLOAD, (int) (maximumBytes / 1024),

-		        (int) (positionBytes / 1024));

-	}

-

-	private void writeFileInfo(URLConnection c, long sizeInBytes) {

-		ObjectOutputStream infoStream;

-		try {

-			infoStream = new ObjectOutputStream(new FileOutputStream(getMapInfoFile()));

-			infoStream.writeUTF(c.getURL().getProtocol());

-			infoStream.writeUTF(c.getURL().getHost());

-			infoStream.writeUTF(c.getURL().getFile());

-			infoStream.writeLong(sizeInBytes);

-			infoStream.close();

-		} catch (Exception e) {

-			Log.e(TAG, "Could not write info file for map download. Resuming will not be possible. (" + e.getMessage() + ")");

-		}

-	}

-

-	private void enableRetry() {

-		retryDownload = true;

-		retry_counter++;

-	}

-	// dialog send helper methods

-}

+/**
+ * Navit, a modular navigation system.
+ * Copyright (C) 2005-2008 Navit Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ */
+
+package org.navitproject.navit;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+
+import android.location.Location;
+import android.os.Bundle;
+import android.os.Message;
+import android.os.StatFs;
+import android.util.Log;
+
+/**
+ * @author rikky
+ *
+ */
+public class NavitMapDownloader extends Thread
+{
+	public static class osm_map_values
+	{
+		String  lon1;
+		String  lat1;
+		String  lon2;
+		String  lat2;
+		String  map_name                     = "";
+		long    est_size_bytes               = 0;
+		int     level                        = 0;
+
+
+		private osm_map_values(String mapname, String lon_1, String lat_1, String lon_2, String lat_2,
+				long bytes_est, int level)
+		{
+			this.map_name = mapname;
+			this.lon1 = lon_1;
+			this.lat1 = lat_1;
+			this.lon2 = lon_2;
+			this.lat2 = lat_2;
+			this.est_size_bytes = bytes_est;
+			this.level = level;
+		}
+		
+		public boolean isInMap(Location location) {
+			double longitude_1 = Double.valueOf(this.lon1);
+			double latitude_1 = Double.valueOf(this.lat1);
+			double longitude_2 = Double.valueOf(this.lon2);
+			double latitude_2 = Double.valueOf(this.lat2);
+
+			if (location.getLongitude() < longitude_1)
+				return false;
+			if (location.getLongitude() > longitude_2)
+				return false;
+			if (location.getLatitude() < latitude_1)
+				return false;
+			if (location.getLatitude() > latitude_2)
+				return false;
+
+			return true;
+		}
+	}
+	
+	//
+	// define the maps here
+	// size estimations updated 2017-06-22
+	//
+	public static final osm_map_values[] osm_maps = {
+		new osm_map_values(Navit.T("Whole Planet"), "-180", "-90", "180", "90", 23992258630L, 0),
+		new osm_map_values(Navit.T("Africa"), "-30.89", "-36.17", "61.68", "38.40", 2070076339L, 0),
+		new osm_map_values(Navit.T("Angola"), "11.4", "-18.1", "24.2", "-5.3", 127557789L, 1),
+		new osm_map_values(Navit.T("Burundi"), "28.9", "-4.5", "30.9", "-2.2", 124049667L, 1),
+		new osm_map_values(Navit.T("Canary Islands"), "-18.69", "26.52", "-12.79", "29.99", 133565815L, 1),
+		new osm_map_values(Navit.T("Congo, Democratic Republic of the"), "11.7", "-13.6", "31.5", "5.7", 244228485L, 1),
+		new osm_map_values(Navit.T("Ethiopia"), "32.89", "3.33", "48.07", "14.97", 153067406L, 1),
+		new osm_map_values(Navit.T("Guinea"), "-15.47", "7.12", "-7.58", "12.74", 188047126L, 1),
+		new osm_map_values(Navit.T("Cote d'Ivoire"), "-8.72", "4.09", "-2.43", "10.80", 132187496L, 1),
+		new osm_map_values(Navit.T("Kenya"), "33.8", "-5.2", "42.4", "4.9", 190073089L, 1),
+		new osm_map_values(Navit.T("Lesotho"), "26.9", "-30.7", "29.6", "-28.4", 196189429L, 1),
+		new osm_map_values(Navit.T("Liberia"), "-15.00", "-0.73", "-7.20", "8.65", 156257253L, 1),
+		new osm_map_values(Navit.T("Libya"), "9.32", "19.40", "25.54", "33.63", 126046917L, 1),
+		new osm_map_values(Navit.T("Madagascar"), "42.25", "-26.63", "51.20", "-11.31", 145210721L, 1),
+		new osm_map_values(Navit.T("Namibia")+"+"+Navit.T("Botswana"), "11.4", "-29.1", "29.5", "-16.9", 248970987L, 1),
+		new osm_map_values(Navit.T("Reunion"), "55.2", "-21.4", "55.9", "-20.9", 126008774L, 1),
+		new osm_map_values(Navit.T("Rwanda"), "28.8", "-2.9", "30.9", "-1.0", 128267595L, 1),
+		new osm_map_values(Navit.T("South Africa")+"+"+Navit.T("Lesotho"), "15.93", "-36.36", "33.65", "-22.08", 307280006L, 1),
+		new osm_map_values(Navit.T("Tanzania, United Republic of"), "29.19", "-11.87", "40.74", "-0.88", 253621029L, 1),
+		new osm_map_values(Navit.T("Uganda"), "29.3", "-1.6", "35.1", "4.3", 179134521L, 1),
+		new osm_map_values(Navit.T("Asia"), "23.8", "0.1", "195.0", "82.4", 5113673780L, 0),
+		new osm_map_values(Navit.T("Azerbaijan"), "44.74", "38.34", "51.69", "42.37", 138346406L, 1),
+		new osm_map_values(Navit.T("China"), "67.3", "5.3", "135.0", "54.5", 1718108758L, 1),
+		new osm_map_values(Navit.T("Cyprus"), "32.0", "34.5", "34.9", "35.8", 118472448L, 1),
+		new osm_map_values(Navit.T("India")+"+"+Navit.T("Nepal"), "67.9", "5.5", "89.6", "36.0", 601877877L, 1),
+		new osm_map_values(Navit.T("Indonesia"), "93.7", "-17.3", "155.5", "7.6", 420741405L, 1),
+		new osm_map_values(Navit.T("Iran, Islamic Republic of"), "43.5", "24.4", "63.6", "40.4", 242016066L, 1),
+		new osm_map_values(Navit.T("Iraq"), "38.7", "28.5", "49.2", "37.4", 160751805L, 1),
+		new osm_map_values(Navit.T("Israel"), "33.99", "29.8", "35.95", "33.4", 155685778L, 1),
+		new osm_map_values(Navit.T("Japan")+"+"+Navit.T("Korea"), "123.6", "25.2", "151.3", "47.1", 1029080156L, 1),
+		new osm_map_values(Navit.T("Kazakhstan"), "46.44", "40.89", "87.36", "55.45", 407633007L, 1),
+		new osm_map_values(Navit.T("Kyrgyzstan"), "69.23", "39.13", "80.33", "43.29", 147997835L, 1),
+		new osm_map_values(Navit.T("Malaysia")+"+"+Navit.T("Singapore"), "94.3", "-5.9", "108.6", "6.8", 168816435L, 1),
+		new osm_map_values(Navit.T("Mongolia"), "87.5", "41.4", "120.3", "52.7", 153534851L, 1),
+		new osm_map_values(Navit.T("Pakistan"), "60.83", "23.28", "77.89", "37.15", 217644321L, 1),
+		new osm_map_values(Navit.T("Philippines"), "115.58", "4.47", "127.85", "21.60", 281428307L, 1),
+		new osm_map_values(Navit.T("Saudi Arabia"), "33.2", "16.1", "55.9", "33.5", 242648303L, 1),
+		new osm_map_values(Navit.T("Taiwan"), "119.1", "21.5", "122.5", "25.2", 1029080156L, 1),
+		new osm_map_values(Navit.T("Thailand"), "97.5", "5.7", "105.2", "19.7", 185135492L, 1),
+		new osm_map_values(Navit.T("Turkey"), "25.1", "35.8", "46.4", "42.8", 331087441L, 1),
+		new osm_map_values(Navit.T("Turkmenistan"), "51.78", "35.07", "66.76", "42.91", 131045087L, 1),
+		new osm_map_values(Navit.T("UAE+Other"), "51.5", "22.6", "56.7", "26.5", 128934674L, 1),
+		new osm_map_values(Navit.T("Australia")+"+"+Navit.T("Oceania"), "89.84", "-57.39", "179.79", "7.26", 782722650L, 0),
+		new osm_map_values(Navit.T("Australia"), "110.5", "-44.2", "154.9", "-9.2", 348652900L, 0),
+		new osm_map_values(Navit.T("Tasmania"), "144.0", "-45.1", "155.3", "-24.8", 253231890L, 1),
+		new osm_map_values(Navit.T("Victoria")+"+"+Navit.T("New South Wales"), "140.7", "-39.4", "153.7", "-26.9", 241500829L, 1),
+		new osm_map_values(Navit.T("New Caledonia"), "157.85", "-25.05", "174.15", "-16.85", 115512336L, 1),
+		new osm_map_values(Navit.T("New Zealand"), "165.2", "-47.6", "179.1", "-33.7", 239264192L, 1),
+		new osm_map_values(Navit.T("Europe"), "-12.97", "33.59", "34.15", "72.10", 11984126789L, 0),
+		new osm_map_values(Navit.T("Western Europe"), "-17.6", "34.5", "42.9", "70.9", 12648810717L, 1),
+		new osm_map_values(Navit.T("Austria"), "9.4", "46.32", "17.21", "49.1", 898273634L, 1),
+		new osm_map_values(Navit.T("Azores"), "-31.62", "36.63", "-24.67", "40.13", 112687225L, 1),
+		new osm_map_values(Navit.T("BeNeLux"), "2.08", "48.87", "7.78", "54.52", 1771971595L, 1),
+		new osm_map_values(Navit.T("Netherlands"), "3.07", "50.75", "7.23", "53.73", 1191828033L, 1),
+		new osm_map_values(Navit.T("Denmark"), "7.65", "54.32", "15.58", "58.07", 365606979L, 1),
+		new osm_map_values(Navit.T("Faroe Islands"), "-7.8", "61.3", "-6.1", "62.5", 109377568L, 1),
+		new osm_map_values(Navit.T("France"), "-5.45", "42.00", "8.44", "51.68", 3907969744L, 1),
+		new osm_map_values(Navit.T("Alsace"), "6.79", "47.27", "8.48", "49.17", 354249349L, 2),
+		new osm_map_values(Navit.T("Aquitaine"), "-2.27", "42.44", "1.50", "45.76", 443715019L, 2),
+		new osm_map_values(Navit.T("Auvergne"), "2.01", "44.57", "4.54", "46.85", 287663213L, 2),
+		new osm_map_values(Navit.T("Basse-Normandie"), "-2.09", "48.13", "1.03", "49.98", 262352354L, 2),
+		new osm_map_values(Navit.T("Bourgogne"), "2.80", "46.11", "5.58", "48.45", 298868796L, 2),
+		new osm_map_values(Navit.T("Bretagne"), "-5.58", "46.95", "-0.96", "48.99", 382770794L, 2),
+		new osm_map_values(Navit.T("Centre"), "0.01", "46.29", "3.18", "48.99", 474224721L, 2),
+		new osm_map_values(Navit.T("Champagne-Ardenne"), "3.34", "47.53", "5.94", "50.28", 269947824L, 2),
+		new osm_map_values(Navit.T("Corse"), "8.12", "41.32", "9.95", "43.28", 129902146L, 2),
+		new osm_map_values(Navit.T("Franche-Comte"), "5.20", "46.21", "7.83", "48.07", 324476070L, 2),
+		new osm_map_values(Navit.T("Haute-Normandie"), "-0.15", "48.62", "1.85", "50.18", 202782876L, 2),
+		new osm_map_values(Navit.T("Ile-de-France"), "1.40", "48.07", "3.61", "49.29", 311052699L, 2),
+		new osm_map_values(Navit.T("Languedoc-Roussillon"), "1.53", "42.25", "4.89", "45.02", 380145667L, 2),
+		new osm_map_values(Navit.T("Limousin"), "0.58", "44.87", "2.66", "46.50", 206696539L, 2),
+		new osm_map_values(Navit.T("Lorraine"), "4.84", "47.77", "7.72", "49.73", 330777318L, 2),
+		new osm_map_values(Navit.T("Midi-Pyrenees"), "-0.37", "42.18", "3.50", "45.10", 462618363L, 2),
+		new osm_map_values(Navit.T("Nord-pas-de-Calais"), "1.42", "49.92", "4.49", "51.31", 368467511L, 2),
+		new osm_map_values(Navit.T("Pays-de-la-Loire"), "-2.88", "46.20", "0.97", "48.62", 499471143L, 2),
+		new osm_map_values(Navit.T("Picardie"), "1.25", "48.79", "4.31", "50.43", 374308041L, 2),
+		new osm_map_values(Navit.T("Poitou-Charentes"), "-1.69", "45.04", "1.26", "47.23", 342125526L, 2),
+		new osm_map_values(Navit.T("Provence-Alpes-Cote-d-Azur"), "4.21", "42.91", "7.99", "45.18", 390306134L, 2),
+		new osm_map_values(Navit.T("Rhone-Alpes"), "3.65", "44.07", "7.88", "46.64", 510797942L, 2),
+		new osm_map_values(Navit.T("Germany"), "5.18", "46.84", "15.47", "55.64", 3521359466L, 1),
+		new osm_map_values(Navit.T("Baden-Wuerttemberg"), "7.32", "47.14", "10.57", "49.85", 674361124L, 2),
+		new osm_map_values(Navit.T("Bayern"), "8.92", "47.22", "13.90", "50.62", 860161150L, 2),
+		new osm_map_values(Navit.T("Mittelfranken"), "9.86", "48.78", "11.65", "49.84", 203055195L, 2),
+		new osm_map_values(Navit.T("Niederbayern"), "11.55", "47.75", "14.12", "49.42", 312924770L, 2),
+		new osm_map_values(Navit.T("Oberbayern"), "10.67", "47.05", "13.57", "49.14", 382734883L, 2),
+		new osm_map_values(Navit.T("Oberfranken"), "10.31", "49.54", "12.49", "50.95", 235258691L, 2),
+		new osm_map_values(Navit.T("Oberpfalz"), "11.14", "48.71", "13.47", "50.43", 264536012L, 2),
+		new osm_map_values(Navit.T("Schwaben"), "9.27", "47.10", "11.36", "49.09", 321141607L, 2),
+		new osm_map_values(Navit.T("Unterfranken"), "8.59", "49.16", "10.93", "50.67", 303720890L, 2),
+		new osm_map_values(Navit.T("Berlin"), "13.03", "52.28", "13.81", "52.73", 169019946L, 2),
+		new osm_map_values(Navit.T("Brandenburg"), "11.17", "51.30", "14.83", "53.63", 323497599L, 2),
+		new osm_map_values(Navit.T("Bremen"), "8.43", "52.96", "9.04", "53.66", 150963608L, 2),
+		new osm_map_values(Navit.T("Hamburg"), "9.56", "53.34", "10.39", "53.80", 156284421L, 2),
+		new osm_map_values(Navit.T("Hessen"), "7.72", "49.34", "10.29", "51.71", 432279328L, 2),
+		new osm_map_values(Navit.T("Mecklenburg-Vorpommern"), "10.54", "53.05", "14.48", "55.05", 213183908L, 2),
+		new osm_map_values(Navit.T("Niedersachsen"), "6.40", "51.24", "11.69", "54.22", 819766939L, 2),
+		new osm_map_values(Navit.T("Nordrhein-westfalen"), "5.46", "50.26", "9.52", "52.59", 967053517L, 2),
+		new osm_map_values(Navit.T("Rheinland-Pfalz"), "6.06", "48.91", "8.56", "51.00", 442868899L, 2),
+		new osm_map_values(Navit.T("Saarland"), "6.30", "49.06", "7.46", "49.69", 157721162L, 2),
+		new osm_map_values(Navit.T("Sachsen-Anhalt"), "10.50", "50.88", "13.26", "53.11", 287785088L, 2),
+		new osm_map_values(Navit.T("Sachsen"), "11.82", "50.11", "15.10", "51.73", 342620834L, 2),
+		new osm_map_values(Navit.T("Schleswig-Holstein"), "7.41", "53.30", "11.98", "55.20", 280293910L, 2),
+		new osm_map_values(Navit.T("Thueringen"), "9.81", "50.15", "12.72", "51.70", 269428239L, 2),
+		new osm_map_values(Navit.T("Germany")+"+"+Navit.T("Austria")+"+"+Navit.T("Switzerland"), "3.4", "44.5", "18.6", "55.1", 5746126429L, 1),
+		new osm_map_values(Navit.T("Iceland"), "-25.3", "62.8", "-11.4", "67.5", 124837162L, 1),
+		new osm_map_values(Navit.T("Ireland"), "-11.17", "51.25", "-5.23", "55.9", 234750271L, 1),
+		new osm_map_values(Navit.T("Italy"), "6.52", "36.38", "18.96", "47.19", 1610171395L, 1),
+		new osm_map_values(Navit.T("Spain")+"+"+Navit.T("Portugal"), "-11.04", "34.87", "4.62", "44.41", 1039624918L, 1),
+		new osm_map_values(Navit.T("Mallorca"), "2.2", "38.8", "4.7", "40.2", 137200636L, 2),
+		new osm_map_values(Navit.T("Galicia"), "-10.0", "41.7", "-6.3", "44.1", 174549553L, 2),
+		new osm_map_values(Navit.T("Scandinavia"), "4.0", "54.4", "32.1", "71.5", 1398661090L, 1),
+		new osm_map_values(Navit.T("Finland"), "18.6", "59.2", "32.3", "70.3", 460997178L, 1),
+		new osm_map_values(Navit.T("Denmark"), "7.49", "54.33", "13.05", "57.88", 321870414L, 1),
+		new osm_map_values(Navit.T("Switzerland"), "5.79", "45.74", "10.59", "47.84", 552565332L, 1),
+		new osm_map_values(Navit.T("United Kingdom"), "-9.7", "49.6", "2.2", "61.2", 901724648L, 1),
+		new osm_map_values(Navit.T("England"), "-7.80", "48.93", "2.41", "56.14", 937728414L, 1),
+		new osm_map_values(Navit.T("Buckinghamshire"), "-1.19", "51.44", "-0.43", "52.25", 142256978L, 2),
+		new osm_map_values(Navit.T("Cambridgeshire"), "-0.55", "51.96", "0.56", "52.79", 142334001L, 2),
+		new osm_map_values(Navit.T("Cumbria"), "-3.96", "53.85", "-2.11", "55.24", 144422460L, 2),
+		new osm_map_values(Navit.T("East yorkshire with hull"), "-1.16", "53.50", "0.54", "54.26", 141518744L, 2),
+		new osm_map_values(Navit.T("Essex"), "-0.07", "51.40", "1.36", "52.14", 162542730L, 2),
+		new osm_map_values(Navit.T("Herefordshire"), "-3.19", "51.78", "-2.29", "52.45", 129368660L, 2),
+		new osm_map_values(Navit.T("Kent"), "-0.02", "50.81", "1.65", "51.53", 145482562L, 2),
+		new osm_map_values(Navit.T("Lancashire"), "-3.20", "53.43", "-2.00", "54.29", 148964975L, 2),
+		new osm_map_values(Navit.T("Leicestershire"), "-1.65", "52.34", "-0.61", "53.03", 154199956L, 2),
+		new osm_map_values(Navit.T("Norfolk"),  "0.10", "52.30", "2.04", "53.41", 146017009L, 2),
+		new osm_map_values(Navit.T("Nottinghamshire"), "-1.39", "52.73", "-0.62", "53.55", 147986548L, 2),
+		new osm_map_values(Navit.T("Oxfordshire"), "-1.77", "51.41", "-0.82", "52.22", 142240992L, 2),
+		new osm_map_values(Navit.T("Shropshire"), "-3.29", "52.26", "-2.18", "53.05", 136909363L, 2),
+		new osm_map_values(Navit.T("Somerset"), "-3.89", "50.77", "-2.20", "51.40", 145186096L, 2),
+		new osm_map_values(Navit.T("South yorkshire"), "-1.88", "53.25", "-0.80", "53.71", 145902650L, 2),
+		new osm_map_values(Navit.T("Suffolk"), "0.29", "51.88", "1.81", "52.60", 143799697L, 2),
+		new osm_map_values(Navit.T("Surrey"), "-0.90", "51.02", "0.10", "51.52", 157987139L, 2),
+		new osm_map_values(Navit.T("Wiltshire"),  "-2.41", "50.90", "-1.44", "51.76", 138652346L, 2),
+		new osm_map_values(Navit.T("Scotland"), "-8.13", "54.49", "-0.15", "61.40", 258853845L, 2),
+		new osm_map_values(Navit.T("Wales"), "-5.56", "51.28", "-2.60", "53.60", 193593409L, 2),
+		new osm_map_values(Navit.T("Albania"), "19.09", "39.55", "21.12", "42.72", 146199817L, 1),
+		new osm_map_values(Navit.T("Belarus"), "23.12", "51.21", "32.87", "56.23", 324470696L, 1),
+		new osm_map_values(Navit.T("Russian Federation"), "27.9", "41.5", "190.4", "77.6", 2148314279L, 1),
+		new osm_map_values(Navit.T("Bulgaria"), "24.7", "42.1", "24.8", "42.1", 109869373L, 1),
+		new osm_map_values(Navit.T("Bosnia and Herzegovina"), "15.69", "42.52", "19.67", "45.32", 187122485L, 1),
+		new osm_map_values(Navit.T("Czech Republic"), "11.91", "48.48", "19.02", "51.17", 904838442L, 1),
+		new osm_map_values(Navit.T("Croatia"), "13.4", "42.1", "19.4", "46.9", 460854751L, 1),
+		new osm_map_values(Navit.T("Estonia"), "21.5", "57.5", "28.2", "59.6", 173378927L, 1),
+		new osm_map_values(Navit.T("Greece"), "28.9", "37.8", "29.0", "37.8", 109435051L, 1),
+		new osm_map_values(Navit.T("Crete"), "23.3", "34.5", "26.8", "36.0", 115985063L, 1),
+		new osm_map_values(Navit.T("Hungary"), "16.08", "45.57", "23.03", "48.39", 350318541L, 1),
+		new osm_map_values(Navit.T("Latvia"), "20.7", "55.6", "28.3", "58.1", 188188140L, 1),
+		new osm_map_values(Navit.T("Lithuania"), "20.9", "53.8", "26.9", "56.5", 217852597L, 1),
+		new osm_map_values(Navit.T("Poland"), "13.6", "48.8", "24.5", "55.0", 1464968657L, 1),
+		new osm_map_values(Navit.T("Romania"), "20.3", "43.5", "29.9", "48.4", 347931565L, 1),
+		new osm_map_values(Navit.T("Ukraine"),  "22.0", "44.3", "40.4", "52.4", 793611912L, 1),
+		new osm_map_values(Navit.T("North America"), "-178.1", "6.5", "-10.4", "84.0", 5601866516L, 0),
+		new osm_map_values(Navit.T("Alaska"), "-179.5", "49.5", "-129", "71.6", 207746039L, 1),
+		new osm_map_values(Navit.T("Canada"), "-141.3", "41.5", "-52.2", "70.2", 2635719651L, 1),
+		new osm_map_values(Navit.T("Hawaii"), "-161.07", "18.49", "-154.45", "22.85", 115016656L, 1),
+		new osm_map_values(Navit.T("USA")+Navit.T(" (except Alaska and Hawaii)"), "-125.4", "24.3", "-66.5", "49.3", 4060487198L, 1),
+		new osm_map_values(Navit.T("Midwest"), "-104.11", "35.92", "-80.46", "49.46", 1145596450L, 2),
+		new osm_map_values(Navit.T("Michigan"), "-90.47", "41.64", "-79.00", "49.37", 538247019L, 2),
+		new osm_map_values(Navit.T("Ohio"), "-84.87", "38.05", "-79.85", "43.53", 277022336L, 2),
+		new osm_map_values(Navit.T("Northeast"), "-80.58", "38.72", "-66.83", "47.53", 1017160709L, 2),
+		new osm_map_values(Navit.T("Massachusetts"), "-73.56", "40.78", "-68.67", "42.94", 340055487L, 2),
+		new osm_map_values(Navit.T("Vermont"), "-73.49", "42.68", "-71.41", "45.07", 139626067L, 2),
+		new osm_map_values(Navit.T("Pacific"), "-180.05", "15.87", "-129.75", "73.04", 207090640L, 2),
+		new osm_map_values(Navit.T("South"),  "-106.70", "23.98", "-71.46", "40.70", 1747935356L, 2),
+		new osm_map_values(Navit.T("Arkansas"), "-94.67", "32.95", "-89.59", "36.60", 155658661L, 2),
+		new osm_map_values(Navit.T("District of Columbia"), "-77.17", "38.74", "-76.86", "39.05", 129235755L, 2),
+		new osm_map_values(Navit.T("Florida"), "-88.75", "23.63", "-77.67", "31.05", 224022108L, 2),
+		new osm_map_values(Navit.T("Louisiana"), "-94.09", "28.09", "-88.62", "33.07", 210120605L, 2),
+		new osm_map_values(Navit.T("Maryland"), "-79.54", "37.83", "-74.99", "40.22", 276462622L, 2),
+		new osm_map_values(Navit.T("Mississippi"), "-91.71", "29.99", "-88.04", "35.05", 177858031L, 2),
+		new osm_map_values(Navit.T("Oklahoma"), "-103.41", "33.56", "-94.38", "37.38", 200061473L, 2),
+		new osm_map_values(Navit.T("Texas"), "-106.96", "25.62", "-92.97", "36.58", 430089141L, 2),
+		new osm_map_values(Navit.T("Virginia"), "-83.73", "36.49", "-74.25", "39.52", 384187569L, 2),
+		new osm_map_values(Navit.T("West Virginia"), "-82.70", "37.15", "-77.66", "40.97", 220552071L, 2),
+		new osm_map_values(Navit.T("West"), "-133.11", "31.28", "-101.99", "49.51", 1152909162L, 2),
+		new osm_map_values(Navit.T("Arizona"), "-114.88", "30.01", "-108.99", "37.06", 182826833L, 2),
+		new osm_map_values(Navit.T("California"), "-125.94", "32.43", "-114.08", "42.07", 586923326L, 2),
+		new osm_map_values(Navit.T("Colorado"), "-109.11", "36.52", "-100.41", "41.05", 228623724L, 2),
+		new osm_map_values(Navit.T("Idaho"), "-117.30", "41.93", "-110.99", "49.18", 170684507L, 2),
+		new osm_map_values(Navit.T("Montana"), "-116.10", "44.31", "-102.64", "49.74", 176229800L, 2),
+		new osm_map_values(Navit.T("New Mexico"), "-109.10", "26.98", "-96.07", "37.05", 361793070L, 2),
+		new osm_map_values(Navit.T("Nevada"), "-120.2", "35.0", "-113.8", "42.1", 200614482L, 2),
+		new osm_map_values(Navit.T("Oregon"),  "-124.8", "41.8", "-116.3", "46.3", 211462685L, 2),
+		new osm_map_values(Navit.T("Utah"), "-114.11", "36.95", "-108.99", "42.05", 151590197L, 2),
+		new osm_map_values(Navit.T("Washington State"), "-125.0", "45.5", "-116.9", "49.0", 222553768L, 2),
+		new osm_map_values(Navit.T("South+Middle America"), "-83.5", "-56.3", "-30.8", "13.7", 958895383L, 0),
+		new osm_map_values(Navit.T("Argentina"), "-73.9", "-57.3", "-51.6", "-21.0", 376857648L, 1),
+		new osm_map_values(Navit.T("Argentina")+"+"+Navit.T("Chile"), "-77.2", "-56.3", "-52.7", "-16.1", 420275812L, 1),
+		new osm_map_values(Navit.T("Bolivia"), "-70.5", "-23.1", "-57.3", "-9.3", 175937824L, 1),
+		new osm_map_values(Navit.T("Brazil"), "-71.4", "-34.7", "-32.8", "5.4", 664872975L, 1),
+		new osm_map_values(Navit.T("Chile"), "-81.77", "-58.50", "-65.46", "-17.41", 241657330L, 1),
+		new osm_map_values(Navit.T("Cuba"), "-85.3", "19.6", "-74.0", "23.6", 129043575L, 1),
+		new osm_map_values(Navit.T("Colombia"), "-79.1", "-4.0", "-66.7", "12.6", 212016580L, 1),
+		new osm_map_values(Navit.T("Ecuador"), "-82.6", "-5.4", "-74.4", "2.3", 158857591L, 1),
+		new osm_map_values(Navit.T("Guyana")+"+"+Navit.T("Suriname")+"+"+Navit.T("Guyane Francaise"), "-62.0", "1.0", "-51.2", "8.9", 123000072L, 1),
+		new osm_map_values(Navit.T("Haiti")+"+"+Navit.T("Dominican Republic"), "-74.8", "17.3", "-68.2", "20.1", 149925689L, 1),
+		new osm_map_values(Navit.T("Jamaica"), "-78.6", "17.4", "-75.9", "18.9", 113961998L, 1),
+		new osm_map_values(Navit.T("Mexico"), "-117.6", "14.1", "-86.4", "32.8", 551307973L, 1),
+		new osm_map_values(Navit.T("Paraguay"), "-63.8", "-28.1", "-53.6", "-18.8", 159498397L, 1),
+		new osm_map_values(Navit.T("Peru"), "-82.4", "-18.1", "-67.5", "0.4", 212490557L, 1),
+		new osm_map_values(Navit.T("Uruguay"), "-59.2", "-36.5", "-51.7", "-29.7", 157482719L, 1),
+		new osm_map_values(Navit.T("Venezuela"), "-73.6", "0.4", "-59.7", "12.8", 167295729L, 1)
+	};
+
+	private String map_filename_path;
+	
+	public static NavitMap[] getAvailableMaps() {
+		class filterMaps implements FilenameFilter {
+			public boolean accept(File dir, String filename) {
+				return (filename.endsWith(".bin"));
+			}
+		}
+		NavitMap maps[] = new NavitMap[0];
+		File map_dir = new File(Navit.map_filename_path);
+		String map_file_names[] = map_dir.list(new filterMaps());
+		if (map_file_names != null) {
+			maps = new NavitMap[map_file_names.length];
+			for (int map_file_index = 0; map_file_index < map_file_names.length; map_file_index++) {
+				maps[map_file_index] = new NavitMap(Navit.map_filename_path, map_file_names[map_file_index]);
+			}
+		}
+		return maps;
+	}
+	private Boolean                     stop_me                                 = false;
+	private osm_map_values              map_values;
+	private int                         map_id;
+	private long                        uiLastUpdated                           = -1;
+
+	private Boolean                     retryDownload                           = false; //Download failed, but
+	                                                                                     //we should try to resume
+	private static final int            SOCKET_CONNECT_TIMEOUT                  = 60000;          // 60 secs.
+	private static final int            SOCKET_READ_TIMEOUT                     = 120000;         // 120 secs.
+	private static final int            MAP_WRITE_FILE_BUFFER                   = 1024 * 64;
+	private static final int            MAP_WRITE_MEM_BUFFER                    = 1024 * 64;
+	private static final int            MAP_READ_FILE_BUFFER                    = 1024 * 64;
+	private static final int            UPDATE_PROGRESS_TIME_NS                 = 1000 * 1000000; // 1ns=1E-9s
+	private static final int            MAX_RETRIES                             = 5;
+	private static final String         TAG                                     = "NavitMapDownloader";
+
+	private int                       retry_counter                           = 0;
+
+	NavitMapDownloader(int map_id) {
+		this.map_values = osm_maps[map_id];
+		this.map_id=map_id;
+		this.map_filename_path=Navit.map_filename_path;
+	}
+
+	public void run() {
+		stop_me = false;
+		retry_counter = 0;
+
+		Log.v(TAG, "start download " + map_values.map_name);
+		updateProgress(0, map_values.est_size_bytes, Navit.T("downloading") + ": " + map_values.map_name);
+		
+		boolean success;
+		do {
+			try {
+				Thread.sleep(10 + retry_counter * 1000);
+			} catch (InterruptedException e1) {}
+			retryDownload = false;
+			success = download_osm_map();
+		} while ( !success
+				&& retryDownload
+				&& retry_counter < MAX_RETRIES
+				&& !stop_me);
+
+		if (success) {
+			toast(map_values.map_name + " " + Navit.T("ready"));
+			getMapInfoFile().delete();
+			Log.d(TAG, "success");
+		}
+
+		if (success || stop_me ) {
+			NavitDialogs.sendDialogMessage( NavitDialogs.MSG_MAP_DOWNLOAD_FINISHED
+					, map_filename_path + map_values.map_name + ".bin", null, -1, success ? 1 : 0 , map_id );
+		}
+	}
+	
+	public void stop_thread() {
+		stop_me = true;
+		Log.d(TAG, "stop_me -> true");
+	}
+
+	private boolean checkFreeSpace(long needed_bytes) {
+		long free_space = getFreeSpace();
+	
+		if ( needed_bytes <= 0 )
+			needed_bytes = MAP_WRITE_FILE_BUFFER;
+
+		if (free_space < needed_bytes ) {
+			String msg;
+			Log.e(TAG, "Not enough free space or media not available. Please free at least " + needed_bytes / 1024 /1024 + "Mb.");
+			if(free_space<0)
+				msg=Navit.T("Media selected for map storage is not available");
+			else
+				msg=Navit.T("Not enough free space");
+			updateProgress(free_space, needed_bytes, Navit.T("Error downloading map!") + "\n" + msg);
+			return false;
+		}
+		return true;
+	}
+
+	private boolean deleteMap() {
+		File finalOutputFile = getMapFile();
+
+		if (finalOutputFile.exists()) {
+			Message msg =
+			        Message.obtain(Navit.getInstance().getNavitGraphics().callback_handler,
+			                NavitGraphics.msg_type.CLB_DELETE_MAP.ordinal());
+			Bundle b = new Bundle();
+			b.putString("title", finalOutputFile.getAbsolutePath());
+			msg.setData(b);
+			msg.sendToTarget();
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @param map_values
+	 * @return
+	 */
+	private boolean download_osm_map() {
+		long already_read = 0;
+		long real_size_bytes = 0;
+		boolean resume = true;
+
+		File outputFile = getDestinationFile();
+		long old_download_size = outputFile.length();
+
+		URL url = null;
+		if (old_download_size > 0) {
+			url = readFileInfo();
+		}
+
+		if (url == null) {
+			resume = false;
+			url = getDownloadURL();
+		}
+
+		// URL url = new URL("http://192.168.2.101:8080/zweibruecken.bin");
+		URLConnection c = initConnection(url);
+		if (c != null) {
+
+			if (resume) {
+				c.setRequestProperty("Range", "bytes=" + old_download_size + "-");
+				already_read = old_download_size;
+			}
+			try {
+				real_size_bytes=Long.parseLong(c.getHeaderField("Content-Length")) + already_read;
+			} catch(Exception e) {
+				real_size_bytes=-1;
+			}
+
+			long fileTime = c.getLastModified();
+
+			if (!resume) {
+				outputFile.delete();
+				writeFileInfo(c, real_size_bytes);
+			}
+
+			if (real_size_bytes <= 0)
+				real_size_bytes = map_values.est_size_bytes;
+
+			Log.d(TAG, "size: " + real_size_bytes + ", read: " + already_read + ", timestamp: " + fileTime
+			        + ", Connection ref: " + c.getURL());
+
+			if (checkFreeSpace(real_size_bytes - already_read)
+			        && downloadData(c, already_read, real_size_bytes, resume, outputFile)) {
+
+				File finalOutputFile = getMapFile();
+				// delete an already existing file first
+				finalOutputFile.delete();
+				// rename file to its final name
+				outputFile.renameTo(finalOutputFile);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private File getDestinationFile() {
+		File outputFile = new File(map_filename_path, map_values.map_name + ".tmp");
+		outputFile.getParentFile().mkdir();
+		return outputFile;
+	}
+
+	private boolean downloadData(URLConnection c, long already_read, long real_size_bytes
+	     , boolean resume,File outputFile) {
+		boolean success = false;
+		BufferedOutputStream buf = getOutputStream(outputFile, resume);
+		BufferedInputStream bif = getInputStream(c);
+
+		if (buf != null && bif != null) {
+			success = readData(buf, bif, already_read, real_size_bytes);
+			// always cleanup, as we might get errors when trying to resume
+			try {
+				buf.flush();
+				buf.close();
+
+				bif.close();
+			} catch (IOException e) {
+			}
+		}
+		return success;
+	}
+
+	private URL getDownloadURL() {
+		URL url = null;
+		try {
+			url =
+			        new URL("http://maps.navit-project.org/api/map/?bbox=" + map_values.lon1 + "," + map_values.lat1
+			                + "," + map_values.lon2 + "," + map_values.lat2);
+		} catch (MalformedURLException e) {
+			Log.e(TAG, "We failed to create a URL to " + map_values.map_name);
+			e.printStackTrace();
+			return null;
+		}
+		Log.v(TAG, "connect to " + url.toString());
+		return url;
+	}
+
+	private long getFreeSpace() {
+		try {
+			StatFs fsInfo = new StatFs(map_filename_path);
+			return (long)fsInfo.getAvailableBlocks() * fsInfo.getBlockSize();
+		} catch(Exception e) {
+			return -1;
+		}
+	}
+
+	private BufferedInputStream getInputStream(URLConnection c) {
+		BufferedInputStream bif = null;
+		try {
+			bif = new BufferedInputStream(c.getInputStream(), MAP_READ_FILE_BUFFER);
+		} catch (FileNotFoundException e) {
+			Log.e(TAG, "File not found on server: " + e);
+			if (retry_counter > 0) {
+				getMapInfoFile().delete();
+			}
+			enableRetry();
+			bif = null;
+		} catch (IOException e) {
+			Log.e(TAG, "Error reading from server: " + e);
+			enableRetry();
+			bif = null;
+		}
+		return bif;
+	}
+
+	private File getMapFile() {
+		return new File(map_filename_path, map_values.map_name + ".bin");
+	}
+
+	private File getMapInfoFile() {
+		return new File(map_filename_path, map_values.map_name + ".tmp.info");
+	}
+
+	private BufferedOutputStream getOutputStream(File outputFile, boolean resume) {
+		BufferedOutputStream buf = null;
+		try {
+			buf = new BufferedOutputStream(new FileOutputStream(outputFile, resume), MAP_WRITE_FILE_BUFFER);
+		} catch (FileNotFoundException e) {
+			Log.e(TAG, "Could not open output file for writing: " + e);
+			buf = null;
+		}
+		return buf;
+	}
+	
+	private URLConnection initConnection(URL url) {
+		HttpURLConnection c = null;
+		try {
+			c = (HttpURLConnection) url.openConnection();
+			c.setRequestMethod("GET");
+		} catch (Exception e) {
+			Log.e(TAG, "Failed connecting server: " + e);
+			enableRetry();
+			return null;
+		}
+
+		c.setReadTimeout(SOCKET_READ_TIMEOUT);
+		c.setConnectTimeout(SOCKET_CONNECT_TIMEOUT);
+		return c;
+	}
+
+	private boolean readData(OutputStream buf, InputStream bif, long already_read, long real_size_bytes) {
+		long start_timestamp = System.nanoTime();
+		byte[] buffer = new byte[MAP_WRITE_MEM_BUFFER];
+		int len1 = 0;
+		long mapFileSize = real_size_bytes;
+		long startOffset = already_read;
+		boolean success = false;
+		
+		try {
+			while (!stop_me && (len1 = bif.read(buffer)) != -1) {
+				already_read += len1;
+				updateProgress(start_timestamp, startOffset, already_read, mapFileSize);
+
+				try {
+					buf.write(buffer, 0, len1);
+				} catch (IOException e) {
+					Log.d(TAG, "Error: " + e);
+					if ( !checkFreeSpace(real_size_bytes - already_read + MAP_WRITE_FILE_BUFFER)) {
+						if (deleteMap()) {
+							enableRetry();
+						} else {
+							updateProgress(already_read, real_size_bytes, Navit.T("Error downloading map!") + "\n"
+							        + Navit.T("Not enough free space"));
+						}
+					} else {
+						updateProgress(already_read, real_size_bytes, Navit.T("Error writing map!"));
+					}
+					
+					return false;
+				}
+			}
+
+			if (stop_me) {
+				toast(Navit.T("Map download aborted!"));
+			} else if ( already_read < real_size_bytes ) {
+				Log.d(TAG, "Server send only " + already_read + " bytes of " + real_size_bytes);
+				enableRetry();
+			} else {
+				success = true;
+			}
+		} catch (IOException e) {
+			Log.d(TAG, "Error: " + e);
+
+			enableRetry();
+			updateProgress(already_read, real_size_bytes, Navit.T("Error downloading map!"));
+		}
+		
+		return success;
+	}
+
+	private URL readFileInfo() {
+		URL url = null;
+		try {
+			ObjectInputStream infoStream = new ObjectInputStream(new FileInputStream(getMapInfoFile()));
+			String resume_proto = infoStream.readUTF();
+			infoStream.readUTF(); // read the host name (unused for now)
+			String resume_file = infoStream.readUTF();
+			infoStream.close();
+			// looks like the same file, try to resume
+			Log.v(TAG, "Try to resume download");
+			url = new URL(resume_proto + "://" + "maps.navit-project.org" + resume_file);
+		} catch (Exception e) {
+			getMapInfoFile().delete();
+		}
+		return url;
+	}
+
+	private void toast(String message) {
+		NavitDialogs.sendDialogMessage(NavitDialogs.MSG_TOAST, null, message, -1, 0, 0);
+	}
+	
+	private void updateProgress(long startTime, long offsetBytes, long readBytes, long maxBytes) {
+		long currentTime = System.nanoTime();
+
+		if ((currentTime > uiLastUpdated + UPDATE_PROGRESS_TIME_NS) && startTime!=currentTime) {
+			float per_second_overall = (readBytes - offsetBytes) / ((currentTime - startTime) / 1000000000f);
+			long bytes_remaining = maxBytes - readBytes;
+			int eta_seconds = (int) (bytes_remaining / per_second_overall);
+
+			String eta_string;
+			if (eta_seconds > 60) {
+				eta_string = (int) (eta_seconds / 60f) + " m";
+			} else {
+				eta_string = eta_seconds + " s";
+			}
+			String info =
+			        String.format("%s: %s\n %dMb / %dMb\n %.1f kb/s %s: %s", Navit.T("downloading")
+			                , map_values.map_name, readBytes / 1024 / 1024, maxBytes / 1024 / 1024,
+			                per_second_overall / 1024f, Navit.T("ETA"), eta_string);
+
+			if (retry_counter > 0) {
+				info += "\n Retry " + retry_counter + "/" + MAX_RETRIES;
+			}
+			Log.e(TAG, "info: " + info);
+
+			updateProgress(readBytes, maxBytes, info);
+			uiLastUpdated = currentTime;
+		}
+	}
+	
+	private void updateProgress(long positionBytes, long maximumBytes, String infoText) {
+		NavitDialogs.sendDialogMessage(NavitDialogs.MSG_PROGRESS_BAR, Navit.T("Map download"), infoText
+		        , NavitDialogs.DIALOG_MAPDOWNLOAD, (int) (maximumBytes / 1024),
+		        (int) (positionBytes / 1024));
+	}
+
+	private void writeFileInfo(URLConnection c, long sizeInBytes) {
+		ObjectOutputStream infoStream;
+		try {
+			infoStream = new ObjectOutputStream(new FileOutputStream(getMapInfoFile()));
+			infoStream.writeUTF(c.getURL().getProtocol());
+			infoStream.writeUTF(c.getURL().getHost());
+			infoStream.writeUTF(c.getURL().getFile());
+			infoStream.writeLong(sizeInBytes);
+			infoStream.close();
+		} catch (Exception e) {
+			Log.e(TAG, "Could not write info file for map download. Resuming will not be possible. (" + e.getMessage() + ")");
+		}
+	}
+
+	private void enableRetry() {
+		retryDownload = true;
+		retry_counter++;
+	}
+	// dialog send helper methods
+}
diff --git a/navit/android/src/org/navitproject/navit/NavitTextTranslations.java b/navit/android/src/org/navitproject/navit/NavitTextTranslations.java
index 93aa5fe76..5deaca305 100644
--- a/navit/android/src/org/navitproject/navit/NavitTextTranslations.java
+++ b/navit/android/src/org/navitproject/navit/NavitTextTranslations.java
@@ -1,204 +1,204 @@
-/**

- * Navit, a modular navigation system.

- * Copyright (C) 2005-2008 Navit Team

- *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * version 2 as published by the Free Software Foundation.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the

- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

- * Boston, MA  02110-1301, USA.

- */

-

-package org.navitproject.navit;

-

-import java.util.HashMap;

-

-import android.util.Log;

-

-public class NavitTextTranslations

-{

-	static String main_language = "en";

-	static String sub_language = "EN";

-	static String fallback_language = "en";

-	static String fallback_sub_language = "EN";

-	private static HashMap<String, HashMap<String, String>>	Navit_text_lookup = new HashMap<String, HashMap<String, String>>();

-

-	public static void init()

-	{

-		Log.e("NavitTextTranslations", "initializing translated text ...");

-		String k = null;

-		String[] v = null;

-/*

-		k = "exit navit";

-		v = new String[]{"en", "Exit Navit", "de", "Navit beenden", "nl", "Navit afsluiten", "fr","Quittez Navit"};

-		p(k, v);

-

-		k = "zoom in";

-		v = new String[]{"en", "Zoom in", "fr", "Zoom-avant"};

-		p(k, v);

-

-		k = "zoom out";

-		v = new String[]{"en", "Zoom out", "fr", "Zoom-arrière", "nl", "Zoom uit"};

-		p(k, v);

-

-		k = "address search";

-		v = new String[]{"en", "Address search", "de", "Adresse suchen", "nl", "Zoek adres", "fr","Cherchez adresse"};

-		p(k, v);

-

-		k = "Mapdownload";

-		v = new String[]{"en", "Mapdownload", "de", "Kartendownload"};

-		p(k, v);

-

-		k = "downloading";

-		v = new String[]{"en", "downloading"};

-		p(k, v);

-

-		k = "Downloaded maps";

-		v = new String[]{"en", "Downloaded maps", "de", "Heruntergeladene Karten", "nl", "Gedownloade kaarten", "fr","Cartes téléchargées" };

-		p(k, v);

-

-		k = "ETA";

-		v = new String[]{"en", "ETA", "de", "fertig in"};

-		p(k, v);

-

-		k = "Error downloading map";

-		v = new String[]{"en", "Error downloading map!", "de", "Fehler beim Kartendownload"};

-		p(k, v);

-

-		k = "ready";

-		v = new String[]{"en", "ready", "de", "fertig"};

-		p(k, v);

-

-		k = "Ok";

-		v = new String[]{"en", "OK"};

-		p(k, v);

-

-		k = "No address found";

-		v = new String[]{"en", "No address found", "de", "Keine Adresse gefunden"};

-		p(k, v);

-

-		k = "Enter: City and Street";

-		v = new String[]{"en", "Enter: City, Street", "de", "Stadt und Straße:"};

-		p(k, v);

-

-		k = "No search string entered";

-		v = new String[]{"en", "No text entered", "de", "Keine Eingabe"};

-		p(k, v);

-

-		k = "setting destination to";

-		v = new String[]{"en", "Setting destination to:", "de", "neues Fahrziel"};

-		p(k, v);

-

-		k = "getting search results";

-		v = new String[]{"en", "getting search results", "de", "lade Suchergebnisse"};

-		p(k, v);

-

-		k = "searching ...";

-		v = new String[]{"en", "searching ...", "de", "Suche läuft ..."};

-		p(k, v);

-

-		k = "No Results found!";

-		v = new String[]{"en", "No Results found!", "de", "Suche liefert kein Ergebnis!"};

-		p(k, v);

-

-		k = "Map data (c) OpenStreetMap contributors, CC-BY-SA";

-		v = new String[]{"en", "Map data (c) OpenStreetMap contributors, CC-BY-SA"};

-		p(k, v);

-

-		k = "partial match";

-		v = new String[]{"en", "partial match", "de", "ungefähr"};

-		p(k, v);

-

-		k = "Search";

-		v = new String[]{"en", "Search", "de", "suchen"};

-		p(k, v);

-

-		k = "drive here";

-		v = new String[]{"en", "Route to here", "de", "Ziel setzen"};

-		p(k, v);

-

-		k = "loading search results";

-		v = new String[]{"en", "Loading search results", "de", "lade Suchergebnisse"};

-		p(k, v);

-

-		k = "towns";

-		v = new String[]{"en", "Towns", "de", "Städte"};

-		p(k, v);

-*/

-		Log.e("NavitTextTranslations", "... ready");

-	}

-

-	private static void p(String key, String[] values)

-	{

-		HashMap<String, String> t = new HashMap<String, String>();

-		//Log.e("NavitTextTranslations", "trying: " + key);

-		try

-		{

-			for (int i = 0; i < (int) (values.length / 2); i++)

-			{

-				t.put(values[i * 2], values[(i * 2) + 1]);

-			}

-			Navit_text_lookup.put(key, t);

-		}

-		catch (Exception e)

-		{

-			Log.e("NavitTextTranslations", "!!Error in translationkey: " + key);

-		}

-	}

-

-	public static String get_text(String in)

-	{

-		String out = null;

-		//Log.e("NavitTextTranslations", "lookup L:" + main_language + " T:" + in);

-		try

-		{

-			out = Navit_text_lookup.get(in).get(main_language);

-		}

-		catch (Exception e)

-		{

-			// most likely there is not translation yet

-			//Log.e("NavitTextTranslations", "lookup: exception");

-			out = null;

-		}

-

-		if (out == null)

-		{

-			// always return a string for output (use fallback language)

-			//Log.e("NavitTextTranslations", "using default language");

-			try

-			{

-				out = Navit_text_lookup.get(in).get(fallback_language);

-			}

-			catch (Exception e)

-			{

-				//Log.e("NavitTextTranslations", "using default language: exception");

-				// most likely there is not translation yet

-				out = null;

-			}

-		}

-

-		if (out == null)

-		{

-			// if we still dont have any text, use the ".mo" file and call the c-function gettext(in)

-			out = NavitGraphics.getLocalizedString(in);

-			if (out != null)

-			{

-				HashMap<String, String> langmap = new HashMap<String, String>();

-				langmap.put(main_language, out);

-				Navit_text_lookup.put(in, langmap);

-			}

-

-			//Log.e("NavitTextTranslations", "return the value from gettext() = " + out);

-		}

-		return out;

-	}

-

-}

+/**
+ * Navit, a modular navigation system.
+ * Copyright (C) 2005-2008 Navit Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ */
+
+package org.navitproject.navit;
+
+import java.util.HashMap;
+
+import android.util.Log;
+
+public class NavitTextTranslations
+{
+	static String main_language = "en";
+	static String sub_language = "EN";
+	static String fallback_language = "en";
+	static String fallback_sub_language = "EN";
+	private static HashMap<String, HashMap<String, String>>	Navit_text_lookup = new HashMap<String, HashMap<String, String>>();
+
+	public static void init()
+	{
+		Log.e("NavitTextTranslations", "initializing translated text ...");
+		String k = null;
+		String[] v = null;
+/*
+		k = "exit navit";
+		v = new String[]{"en", "Exit Navit", "de", "Navit beenden", "nl", "Navit afsluiten", "fr","Quittez Navit"};
+		p(k, v);
+
+		k = "zoom in";
+		v = new String[]{"en", "Zoom in", "fr", "Zoom-avant"};
+		p(k, v);
+
+		k = "zoom out";
+		v = new String[]{"en", "Zoom out", "fr", "Zoom-arrière", "nl", "Zoom uit"};
+		p(k, v);
+
+		k = "address search";
+		v = new String[]{"en", "Address search", "de", "Adresse suchen", "nl", "Zoek adres", "fr","Cherchez adresse"};
+		p(k, v);
+
+		k = "Mapdownload";
+		v = new String[]{"en", "Mapdownload", "de", "Kartendownload"};
+		p(k, v);
+
+		k = "downloading";
+		v = new String[]{"en", "downloading"};
+		p(k, v);
+
+		k = "Downloaded maps";
+		v = new String[]{"en", "Downloaded maps", "de", "Heruntergeladene Karten", "nl", "Gedownloade kaarten", "fr","Cartes téléchargées" };
+		p(k, v);
+
+		k = "ETA";
+		v = new String[]{"en", "ETA", "de", "fertig in"};
+		p(k, v);
+
+		k = "Error downloading map";
+		v = new String[]{"en", "Error downloading map!", "de", "Fehler beim Kartendownload"};
+		p(k, v);
+
+		k = "ready";
+		v = new String[]{"en", "ready", "de", "fertig"};
+		p(k, v);
+
+		k = "Ok";
+		v = new String[]{"en", "OK"};
+		p(k, v);
+
+		k = "No address found";
+		v = new String[]{"en", "No address found", "de", "Keine Adresse gefunden"};
+		p(k, v);
+
+		k = "Enter: City and Street";
+		v = new String[]{"en", "Enter: City, Street", "de", "Stadt und Straße:"};
+		p(k, v);
+
+		k = "No search string entered";
+		v = new String[]{"en", "No text entered", "de", "Keine Eingabe"};
+		p(k, v);
+
+		k = "setting destination to";
+		v = new String[]{"en", "Setting destination to:", "de", "neues Fahrziel"};
+		p(k, v);
+
+		k = "getting search results";
+		v = new String[]{"en", "getting search results", "de", "lade Suchergebnisse"};
+		p(k, v);
+
+		k = "searching ...";
+		v = new String[]{"en", "searching ...", "de", "Suche läuft ..."};
+		p(k, v);
+
+		k = "No Results found!";
+		v = new String[]{"en", "No Results found!", "de", "Suche liefert kein Ergebnis!"};
+		p(k, v);
+
+		k = "Map data (c) OpenStreetMap contributors, CC-BY-SA";
+		v = new String[]{"en", "Map data (c) OpenStreetMap contributors, CC-BY-SA"};
+		p(k, v);
+
+		k = "partial match";
+		v = new String[]{"en", "partial match", "de", "ungefähr"};
+		p(k, v);
+
+		k = "Search";
+		v = new String[]{"en", "Search", "de", "suchen"};
+		p(k, v);
+
+		k = "drive here";
+		v = new String[]{"en", "Route to here", "de", "Ziel setzen"};
+		p(k, v);
+
+		k = "loading search results";
+		v = new String[]{"en", "Loading search results", "de", "lade Suchergebnisse"};
+		p(k, v);
+
+		k = "towns";
+		v = new String[]{"en", "Towns", "de", "Städte"};
+		p(k, v);
+*/
+		Log.e("NavitTextTranslations", "... ready");
+	}
+
+	private static void p(String key, String[] values)
+	{
+		HashMap<String, String> t = new HashMap<String, String>();
+		//Log.e("NavitTextTranslations", "trying: " + key);
+		try
+		{
+			for (int i = 0; i < (int) (values.length / 2); i++)
+			{
+				t.put(values[i * 2], values[(i * 2) + 1]);
+			}
+			Navit_text_lookup.put(key, t);
+		}
+		catch (Exception e)
+		{
+			Log.e("NavitTextTranslations", "!!Error in translationkey: " + key);
+		}
+	}
+
+	public static String get_text(String in)
+	{
+		String out = null;
+		//Log.e("NavitTextTranslations", "lookup L:" + main_language + " T:" + in);
+		try
+		{
+			out = Navit_text_lookup.get(in).get(main_language);
+		}
+		catch (Exception e)
+		{
+			// most likely there is not translation yet
+			//Log.e("NavitTextTranslations", "lookup: exception");
+			out = null;
+		}
+
+		if (out == null)
+		{
+			// always return a string for output (use fallback language)
+			//Log.e("NavitTextTranslations", "using default language");
+			try
+			{
+				out = Navit_text_lookup.get(in).get(fallback_language);
+			}
+			catch (Exception e)
+			{
+				//Log.e("NavitTextTranslations", "using default language: exception");
+				// most likely there is not translation yet
+				out = null;
+			}
+		}
+
+		if (out == null)
+		{
+			// if we still dont have any text, use the ".mo" file and call the c-function gettext(in)
+			out = NavitGraphics.getLocalizedString(in);
+			if (out != null)
+			{
+				HashMap<String, String> langmap = new HashMap<String, String>();
+				langmap.put(main_language, out);
+				Navit_text_lookup.put(in, langmap);
+			}
+
+			//Log.e("NavitTextTranslations", "return the value from gettext() = " + out);
+		}
+		return out;
+	}
+
+}
diff --git a/navit/gui/qml/skins/navit/ButtonIcon.qml b/navit/gui/qml/skins/navit/ButtonIcon.qml
index f969ebb5a..9b5d6ae3a 100644
--- a/navit/gui/qml/skins/navit/ButtonIcon.qml
+++ b/navit/gui/qml/skins/navit/ButtonIcon.qml
@@ -1,40 +1,40 @@
-import Qt 4.7

-

-Rectangle {

+import Qt 4.7
+
+Rectangle {
     id: container
-

-    signal clicked

-    property string text: "Button"

-    property string icon: "Icon.png"

-

-    color: "black"; smooth: true; opacity: 0.75

-    width: imgItem.width+20; height: txtItem.height + 6 + imgItem.height;

-    transformOrigin: Rectangle.Center;

-

-    MouseArea { id: mr; anchors.fill: parent; onClicked: container.clicked() }

-

-   Image {

-	id: imgItem; source: gui.iconPath+container.icon; anchors.top: container.top; anchors.horizontalCenter: container.horizontalCenter;

-	width: gui.height/4; height: gui.height/4

-   }

-

-    Text {

-        id: txtItem; text: container.text; anchors.top: imgItem.bottom; anchors.horizontalCenter: container.horizontalCenter; 

-	color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter

-    }

-

-    states: [

-        State {

-            name: "Pressed"; when: mr.pressed == true

-            PropertyChanges { target: container; scale: 2.0 }

-            PropertyChanges { target: container; opacity: 1 }

-

-        }

-    ]

-

-    transitions: Transition {

-        NumberAnimation { properties: "scale"; easing.type: "OutExpo"; duration: 200 }

-        NumberAnimation { properties: "opacity"; easing.type: "InQuad"; duration: 200 }

-    }

-

-}

+
+    signal clicked
+    property string text: "Button"
+    property string icon: "Icon.png"
+
+    color: "black"; smooth: true; opacity: 0.75
+    width: imgItem.width+20; height: txtItem.height + 6 + imgItem.height;
+    transformOrigin: Rectangle.Center;
+
+    MouseArea { id: mr; anchors.fill: parent; onClicked: container.clicked() }
+
+   Image {
+	id: imgItem; source: gui.iconPath+container.icon; anchors.top: container.top; anchors.horizontalCenter: container.horizontalCenter;
+	width: gui.height/4; height: gui.height/4
+   }
+
+    Text {
+        id: txtItem; text: container.text; anchors.top: imgItem.bottom; anchors.horizontalCenter: container.horizontalCenter; 
+	color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter
+    }
+
+    states: [
+        State {
+            name: "Pressed"; when: mr.pressed == true
+            PropertyChanges { target: container; scale: 2.0 }
+            PropertyChanges { target: container; opacity: 1 }
+
+        }
+    ]
+
+    transitions: Transition {
+        NumberAnimation { properties: "scale"; easing.type: "OutExpo"; duration: 200 }
+        NumberAnimation { properties: "opacity"; easing.type: "InQuad"; duration: 200 }
+    }
+
+}
diff --git a/navit/gui/qml/skins/navit/PageSettingsRules.qml b/navit/gui/qml/skins/navit/PageSettingsRules.qml
index e5238f584..37b18c8d4 100644
--- a/navit/gui/qml/skins/navit/PageSettingsRules.qml
+++ b/navit/gui/qml/skins/navit/PageSettingsRules.qml
@@ -1,38 +1,38 @@
 import Qt 4.7
 import "pagenavigation.js" as Navit
-

-Rectangle {

-    id: page

-

-    width: gui.width; height: gui.height

-    border.width: 1

-    color: "Black"

-    opacity: 0

-

-    function pageOpen() {

-        page.opacity = 1;

-    }

-    

-    Component.onCompleted: pageOpen();    

-    

-    Behavior on opacity {

-        NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }

-    }

-

-  VisualItemModel {

-      	id: selectorsModel

-

-        ToggleSwitch { id: trackingSw; stOn: navit.getAttr("tracking");  text: "Lock on road"; onChanged: navit.setAttr("tracking",trackingSw.stOn)  }

-        ToggleSwitch { id: orientationSw; stOn: navit.getAttr("orientation");  text: "Northing"; onChanged: navit.setAttr("orientation",orientationSw.stOn) }

-	ToggleSwitch { id: followcursorSw; stOn: navit.getAttr("follow_cursor");  text: "Map follows Vehicle"; onChanged: navit.setAttr("follow_cursor",followcursorSw.stOn) }

-	ToggleSwitch { id: autozoomSw; stOn: navit.getAttr("autozoom_active");  text: "Auto zoom"; onChanged: navit.setAttr("autozoom_active",autozoomSw.stOn) }

-  }

-

-  ListView {

-      	id: selectorsList; model: selectorsModel

-        focus: true; clip: true; orientation: Qt.Vertical

-	anchors.verticalCenter: parent.verticalCenter; anchors.horizontalCenter: parent.horizontalCenter;

-	width: trackingSw.width*1.5; height: trackingSw.height*4

-  }

-    Cellar {anchors.bottom: page.bottom; anchors.horizontalCenter: page.horizontalCenter; width: page.width }

-}

+
+Rectangle {
+    id: page
+
+    width: gui.width; height: gui.height
+    border.width: 1
+    color: "Black"
+    opacity: 0
+
+    function pageOpen() {
+        page.opacity = 1;
+    }
+    
+    Component.onCompleted: pageOpen();    
+    
+    Behavior on opacity {
+        NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
+    }
+
+  VisualItemModel {
+      	id: selectorsModel
+
+        ToggleSwitch { id: trackingSw; stOn: navit.getAttr("tracking");  text: "Lock on road"; onChanged: navit.setAttr("tracking",trackingSw.stOn)  }
+        ToggleSwitch { id: orientationSw; stOn: navit.getAttr("orientation");  text: "Northing"; onChanged: navit.setAttr("orientation",orientationSw.stOn) }
+	ToggleSwitch { id: followcursorSw; stOn: navit.getAttr("follow_cursor");  text: "Map follows Vehicle"; onChanged: navit.setAttr("follow_cursor",followcursorSw.stOn) }
+	ToggleSwitch { id: autozoomSw; stOn: navit.getAttr("autozoom_active");  text: "Auto zoom"; onChanged: navit.setAttr("autozoom_active",autozoomSw.stOn) }
+  }
+
+  ListView {
+      	id: selectorsList; model: selectorsModel
+        focus: true; clip: true; orientation: Qt.Vertical
+	anchors.verticalCenter: parent.verticalCenter; anchors.horizontalCenter: parent.horizontalCenter;
+	width: trackingSw.width*1.5; height: trackingSw.height*4
+  }
+    Cellar {anchors.bottom: page.bottom; anchors.horizontalCenter: page.horizontalCenter; width: page.width }
+}
diff --git a/navit/gui/qt5_qml/skins/icons/appbar.chevron.down.svg b/navit/gui/qt5_qml/skins/icons/appbar.chevron.down.svg
index 3917fc7cd..7dfd18eb4 100644
--- a/navit/gui/qt5_qml/skins/icons/appbar.chevron.down.svg
+++ b/navit/gui/qt5_qml/skins/icons/appbar.chevron.down.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 37.8516,39.5833L 52.1016,24.9375L 52.1016,35.2292L 37.8516,50.2708L 23.6016,35.2292L 23.6016,24.9375L 37.8516,39.5833 Z "/>
diff --git a/navit/gui/qt5_qml/skins/icons/appbar.chevron.up.svg b/navit/gui/qt5_qml/skins/icons/appbar.chevron.up.svg
index b737d9773..a84cb0b21 100644
--- a/navit/gui/qt5_qml/skins/icons/appbar.chevron.up.svg
+++ b/navit/gui/qt5_qml/skins/icons/appbar.chevron.up.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 37.8516,35.625L 34.6849,38.7917L 23.6016,50.2708L 23.6016,39.9792L 37.8516,24.9375L 52.1016,39.9792L 52.1016,50.2708L 41.0182,38.7917L 37.8516,35.625 Z "/>
diff --git a/navit/gui/qt5_qml/skins/icons/appbar.cog.svg b/navit/gui/qt5_qml/skins/icons/appbar.cog.svg
index 4ef1ef8c2..0c0590fcc 100644
--- a/navit/gui/qt5_qml/skins/icons/appbar.cog.svg
+++ b/navit/gui/qt5_qml/skins/icons/appbar.cog.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 27.5314,21.8628L 33.0126,19.4224L 34.7616,23.3507C 36.6693,22.9269 38.6044,22.8903 40.4668,23.2026L 42.0083,19.1868L 47.6098,21.337L 46.0683,25.3528C 47.6612,26.3669 49.0747,27.6889 50.2088,29.2803L 54.1371,27.5313L 56.5776,33.0126L 52.6493,34.7616C 53.0731,36.6693 53.1097,38.6043 52.7974,40.4668L 56.8131,42.0083L 54.6629,47.6097L 50.6472,46.0683C 49.6331,47.6613 48.3111,49.0748 46.7197,50.2089L 48.4686,54.1372L 42.9874,56.5776L 41.2384,52.6493C 39.3307,53.0731 37.3957,53.1097 35.5333,52.7974L 33.9918,56.8131L 28.3903,54.6629L 29.9318,50.6472C 28.3388,49.6331 26.9252,48.3111 25.7911,46.7196L 21.8628,48.4686L 19.4224,42.9873L 23.3507,41.2383C 22.9269,39.3307 22.8903,37.3957 23.2026,35.5332L 19.1869,33.9918L 21.3371,28.3903L 25.3528,29.9318C 26.3669,28.3388 27.6889,26.9252 29.2804,25.7911L 27.5314,21.8628 Z M 34.3394,29.7781C 29.7985,31.7998 27.7564,37.1198 29.7781,41.6606C 31.7998,46.2015 37.1198,48.2436 41.6606,46.2219C 46.2015,44.2002 48.2436,38.8802 46.2219,34.3394C 44.2002,29.7985 38.8802,27.7564 34.3394,29.7781 Z "/>
diff --git a/navit/gui/qt5_qml/skins/icons/appbar.cogs.svg b/navit/gui/qt5_qml/skins/icons/appbar.cogs.svg
index e3fdaa4ce..d8c1ab0fa 100644
--- a/navit/gui/qt5_qml/skins/icons/appbar.cogs.svg
+++ b/navit/gui/qt5_qml/skins/icons/appbar.cogs.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 32.6227,68.9728C 33.1208,70.2446 33.7077,71.4719 34.3757,72.6471C 35.567,72.7702 36.7761,72.8333 38,72.8333C 40.6447,72.8333 43.2205,72.5386 45.6965,71.9802C 42.2807,68.5449 40.1698,63.8107 40.1698,58.5835C 40.1698,48.0901 48.6764,39.5835 59.1698,39.5835C 64.2047,39.5835 68.7822,41.5419 72.182,44.7385C 72.6094,42.5584 72.8333,40.3053 72.8333,38C 72.8333,36.442 72.731,34.908 72.5328,33.4041C 70.4772,32.3109 68.2718,31.4621 65.9554,30.8963L 65.6219,22.7367C 63.5664,22.3692 61.4511,22.1741 59.2916,22.1671L 57.491,30.1322C 54.2845,30.3184 51.2204,31.0348 48.3848,32.1949L 43.318,25.7887C 41.3995,26.7177 39.5749,27.8102 37.8622,29.0479L 41.0883,36.5527C 38.6742,38.5364 36.5919,40.9091 34.9373,43.575L 27.0703,41.3697C 26.073,43.2256 25.2319,45.178 24.5646,47.2093L 31.5867,51.385C 30.9883,53.6844 30.6698,56.0968 30.6698,58.5835L 30.746,60.6839L 23.0854,63.5239C 23.3743,65.6539 23.8474,67.7255 24.4881,69.7219L 32.6227,68.9728 Z M 27.0669,37.1755L 34.9338,39.3807C 35.9312,37.5248 36.7723,35.5724 37.4395,33.5412L 30.4175,29.3654C 31.0159,27.066 31.3344,24.6537 31.3344,22.1669L 31.2581,20.0665L 38.9187,17.2265C 38.6299,15.0965 38.1568,13.0249 37.5161,11.0285L 29.3815,11.7776C 28.4787,9.47258 27.2844,7.31377 25.8439,5.34655C 22.7943,6.48232 19.9467,8.03307 17.3698,9.93015C 20.1557,13.2359 21.8344,17.5054 21.8344,22.1669C 21.8344,32.5019 13.5826,40.9096 3.30816,41.1611C 3.60321,44.4411 4.35293,47.59 5.49381,50.5444C 8.34489,50.2806 11.0742,49.5968 13.6194,48.5555L 18.6861,54.9617C 20.6046,54.0327 22.4293,52.9403 24.142,51.7025L 20.9158,44.1977C 23.3299,42.2141 25.4123,39.8414 27.0669,37.1755 Z "/>
diff --git a/navit/gui/qt5_qml/skins/icons/appbar.fullscreen.box.svg b/navit/gui/qt5_qml/skins/icons/appbar.fullscreen.box.svg
index 13e6840e5..a3e73f41a 100644
--- a/navit/gui/qt5_qml/skins/icons/appbar.fullscreen.box.svg
+++ b/navit/gui/qt5_qml/skins/icons/appbar.fullscreen.box.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 19,57L 19,19L 57,19L 57,57L 19,57 Z M 24,29L 47,29L 47,52L 52,52L 52,24L 24,24L 24,29 Z M 24,34L 24,52L 42,52L 42,34L 24,34 Z "/>
diff --git a/navit/gui/qt5_qml/skins/icons/appbar.home.variant.svg b/navit/gui/qt5_qml/skins/icons/appbar.home.variant.svg
index ea951fd19..273ff72cd 100644
--- a/navit/gui/qt5_qml/skins/icons/appbar.home.variant.svg
+++ b/navit/gui/qt5_qml/skins/icons/appbar.home.variant.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76.0106" height="76.0106" viewBox="0 0 76.01 76.01" enable-background="new 0 0 76.01 76.01" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 24.0033,56.0078L 24.0033,38.0053L 22.0031,40.0056L 19.0027,35.0049L 38.0053,20.0028L 45.0063,25.5299L 45.0063,21.753L 49.0068,21.0029L 49.0068,28.6882L 57.008,35.0049L 54.0075,40.0056L 52.0073,38.0053L 52.0073,56.0078L 24.0033,56.0078 Z M 38.0053,26.9204L 27.0038,36.005L 27.0038,53.0074L 38.0045,53.0075L 38.0045,41.0061L 46.0058,41.0061L 46.0059,53.0075L 49.0068,53.0074L 49.0068,36.005L 38.0053,26.9204 Z M 30.004,41.0057L 35.0049,41.0057L 35.0049,47.0066L 30.004,47.0066L 30.004,41.0057 Z "/>
diff --git a/navit/gui/qt5_qml/skins/icons/appbar.information.circle.svg b/navit/gui/qt5_qml/skins/icons/appbar.information.circle.svg
index 031bd37f5..35a156ae9 100644
--- a/navit/gui/qt5_qml/skins/icons/appbar.information.circle.svg
+++ b/navit/gui/qt5_qml/skins/icons/appbar.information.circle.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 38,19C 48.4934,19 57,27.5066 57,38C 57,48.4934 48.4934,57 38,57C 27.5066,57 19,48.4934 19,38C 19,27.5066 27.5066,19 38,19 Z M 33.25,33.25L 33.25,36.4167L 36.4166,36.4167L 36.4166,47.5L 33.25,47.5L 33.25,50.6667L 44.3333,50.6667L 44.3333,47.5L 41.1666,47.5L 41.1666,36.4167L 41.1666,33.25L 33.25,33.25 Z M 38.7917,25.3333C 37.48,25.3333 36.4167,26.3967 36.4167,27.7083C 36.4167,29.02 37.48,30.0833 38.7917,30.0833C 40.1033,30.0833 41.1667,29.02 41.1667,27.7083C 41.1667,26.3967 40.1033,25.3333 38.7917,25.3333 Z "/>
diff --git a/navit/gui/qt5_qml/skins/icons/appbar.layer.delete.svg b/navit/gui/qt5_qml/skins/icons/appbar.layer.delete.svg
index ddbeb21ca..5157af942 100644
--- a/navit/gui/qt5_qml/skins/icons/appbar.layer.delete.svg
+++ b/navit/gui/qt5_qml/skins/icons/appbar.layer.delete.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76.0106" height="76.0106" viewBox="0 0 76.01 76.01" enable-background="new 0 0 76.01 76.01" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 18.5088,44.0374L 21.8676,40.6786L 27.4655,46.2765L 33.0634,40.6786L 36.4222,44.0374L 30.8243,49.6353L 36.4222,55.2332L 33.0634,58.592L 27.4655,52.994L 21.8676,58.592L 18.5088,55.2332L 24.1068,49.6353L 18.5088,44.0374 Z M 57.0079,38.0053L 38.0053,47.5066L 36.7482,46.8781L 39.5889,44.0374L 35.2559,39.7977L 38.0053,41.1724L 50.6737,34.8382L 57.0079,38.0053 Z M 19.0026,38.0053L 25.3369,34.8382L 32.3326,38.3361L 29.8968,40.7719L 28.1098,42.5589L 25.7193,41.3636L 21.8676,37.6052L 20.6459,38.8269L 19.0026,38.0053 Z M 38.0053,19.0027L 57.0079,28.504L 38.0053,38.0053L 19.0026,28.504L 38.0053,19.0027 Z M 57.0079,47.5066L 38.0053,57.008L 37.8778,56.9442L 39.5889,55.2332L 33.9909,49.6353L 34.6367,48.9895L 38.0053,50.6738L 50.6737,44.3395L 57.0079,47.5066 Z "/>
diff --git a/navit/gui/qt5_qml/skins/icons/appbar.layer.svg b/navit/gui/qt5_qml/skins/icons/appbar.layer.svg
index 9eb28235c..b89bb2da3 100644
--- a/navit/gui/qt5_qml/skins/icons/appbar.layer.svg
+++ b/navit/gui/qt5_qml/skins/icons/appbar.layer.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76.0106" height="76.0106" viewBox="0 0 76.01 76.01" enable-background="new 0 0 76.01 76.01" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 57.0079,38.0053L 38.0053,47.5066L 19.0027,38.0053L 25.3369,34.8382L 38.0053,41.1724L 50.6737,34.8382L 57.0079,38.0053 Z M 38.0053,19.0027L 57.0079,28.504L 38.0053,38.0053L 19.0026,28.504L 38.0053,19.0027 Z M 57.0079,47.5066L 38.0053,57.008L 19.0026,47.5066L 25.3369,44.3395L 38.0053,50.6737L 50.6737,44.3395L 57.0079,47.5066 Z "/>
diff --git a/navit/gui/qt5_qml/skins/icons/appbar.location.checkin.svg b/navit/gui/qt5_qml/skins/icons/appbar.location.checkin.svg
index 3b21754c6..a58141d22 100644
--- a/navit/gui/qt5_qml/skins/icons/appbar.location.checkin.svg
+++ b/navit/gui/qt5_qml/skins/icons/appbar.location.checkin.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-linejoin="round" d="M 38,19C 42.9706,19 47,23.0294 47,28C 47,30.5642 45.9276,32.878 38,49C 30.0724,32.878 29,30.5642 29,28C 29,23.0294 33.0294,19 38,19 Z M 38,24C 35.7909,24 34,25.7909 34,28C 34,30.2092 35.7909,32 38,32C 40.2091,32 42,30.2092 42,28C 42,25.7909 40.2091,24 38,24 Z M 19,57L 24,42L 31.5,42L 33.5,46L 27.6641,46L 25.3324,53L 50.6676,53L 48.3359,46L 42.5,46L 44.5,42L 52,42L 57,57L 19,57 Z "/>
diff --git a/navit/gui/qt5_qml/skins/icons/appbar.map.svg b/navit/gui/qt5_qml/skins/icons/appbar.map.svg
index 241f71e59..0a157d0da 100644
--- a/navit/gui/qt5_qml/skins/icons/appbar.map.svg
+++ b/navit/gui/qt5_qml/skins/icons/appbar.map.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 27.7083,23.75L 38.7917,26.9167L 48.2917,20.5833L 62,24L 62,51L 48.2917,47.5L 38.7917,53.8333L 27.7083,50.6667L 16,55.5L 16,28.5L 27.7083,23.75 Z M 27,46.25L 27,29L 20,31.75L 20,49L 27,46.25 Z M 49,25.5L 49,42.75L 58,45.25L 58,28L 49,25.5 Z M 39,31.5L 39,49L 48,43L 48,25.5L 39,31.5 Z M 28,28.75L 28,46L 38,48.5L 38,31.75L 28,28.75 Z "/>
diff --git a/navit/gui/qt5_qml/skins/icons/appbar.power.svg b/navit/gui/qt5_qml/skins/icons/appbar.power.svg
index d3f865c0d..db23bca1f 100644
--- a/navit/gui/qt5_qml/skins/icons/appbar.power.svg
+++ b/navit/gui/qt5_qml/skins/icons/appbar.power.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 36.4167,36.4167L 36.4167,17.4167L 41.1667,17.4167L 41.1667,36.4167L 36.4167,36.4167 Z M 57,39.5833C 57,50.0767 48.4934,58.5833 38,58.5833C 27.5066,58.5833 19,50.0767 19,39.5833C 19,30.7301 25.0552,23.2911 33.25,21.1819L 33.25,27.8374C 28.6079,29.7165 25.3333,34.2675 25.3333,39.5833C 25.3333,46.5789 31.0044,52.25 38,52.25C 44.9956,52.25 50.6667,46.5789 50.6667,39.5833C 50.6667,34.8949 48.1194,30.8014 44.3333,28.6113L 44.3333,21.6645C 51.7129,24.2728 57,31.3106 57,39.5833 Z "/>
diff --git a/navit/gui/qt5_qml/skins/icons/appbar.rocket.svg b/navit/gui/qt5_qml/skins/icons/appbar.rocket.svg
index a8c5c273a..d3b9d0a16 100644
--- a/navit/gui/qt5_qml/skins/icons/appbar.rocket.svg
+++ b/navit/gui/qt5_qml/skins/icons/appbar.rocket.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 38,19C 39.4823,20.6344 43,26.1259 43,41L 47,46L 47,55L 43,50L 33,50L 29,55L 29,46L 33,41C 33,26.1259 36.0177,20.6344 38,19 Z M 38,57.5L 35,51L 41,51L 38,57.5 Z M 38,27L 36.1552,27.4612L 35.6203,30.5949L 38,30L 40.2918,30.573L 39.6953,27.4238L 38,27 Z "/>
diff --git a/navit/gui/qt5_qml/skins/icons/appbar.transit.car.svg b/navit/gui/qt5_qml/skins/icons/appbar.transit.car.svg
index 8ea1a7c5d..3a6e7a287 100644
--- a/navit/gui/qt5_qml/skins/icons/appbar.transit.car.svg
+++ b/navit/gui/qt5_qml/skins/icons/appbar.transit.car.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 17.4167,50.6667C 16.5422,50.6667 15.8333,49.9578 15.8333,49.0833L 15.8333,39.5834C 15.8333,37.0877 17.2768,34.9292 19.3745,33.8972L 25.3333,19L 26.9167,19L 30.0833,19L 45.9167,19L 49.0833,19L 50.6667,19L 56.6255,33.8972C 58.7231,34.9292 60.1666,37.0877 60.1666,39.5834L 60.1667,49.0833C 60.1667,49.9578 59.4578,50.6667 58.5833,50.6667L 57,50.6667L 57,53.8333C 57,55.5822 55.5822,57 53.8333,57C 52.0844,57 50.6667,55.5822 50.6667,53.8333L 50.6667,50.6667L 25.3333,50.6667L 25.3333,53.8333C 25.3333,55.5822 23.9156,57 22.1667,57C 20.4178,57 19,55.5822 19,53.8333L 19,50.6667L 17.4167,50.6667 Z M 24.3833,33.25L 51.6166,33.25L 47.8166,23.75L 28.1833,23.75L 24.3833,33.25 Z M 24.1458,36.0209C 22.3969,36.0209 20.5833,37.8344 20.5833,39.5833C 20.5833,41.3322 22.3969,43.1458 24.1458,43.1458C 25.8947,43.1458 27.7083,41.3323 27.7083,39.5834C 27.7083,37.8345 25.8947,36.0209 24.1458,36.0209 Z M 51.8542,36.0208C 50.1053,36.0208 48.2917,37.8344 48.2917,39.5833C 48.2917,41.3322 50.1053,43.1458 51.8542,43.1458C 53.6031,43.1458 55.4167,41.3322 55.4167,39.5833C 55.4167,37.8344 53.6031,36.0208 51.8542,36.0208 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.book.list.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.book.list.svg
index 9dda725d2..c8e86b13f 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.book.list.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.book.list.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 22,19L 24,19L 24,57L 22,57L 22,19 Z M 26,57L 26,19.0001L 53.9999,19.0001L 53.9999,57L 26,57 Z M 30,24L 30,27L 50,27L 50,24L 30,24 Z M 30,32L 30,35L 33,35L 33,32L 30,32 Z M 36,32L 36,35L 49,35L 49,32L 36,32 Z M 30,40L 30,43L 33,43L 33,40L 30,40 Z M 36,40L 36,43L 48,43L 48,40L 36,40 Z M 30,48L 30,51L 33,51L 33,48L 30,48 Z M 36,48L 36,51L 50,51L 50,48L 36,48 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.chevron.down.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.chevron.down.svg
index 3917fc7cd..7dfd18eb4 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.chevron.down.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.chevron.down.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 37.8516,39.5833L 52.1016,24.9375L 52.1016,35.2292L 37.8516,50.2708L 23.6016,35.2292L 23.6016,24.9375L 37.8516,39.5833 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.chevron.up.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.chevron.up.svg
index b737d9773..a84cb0b21 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.chevron.up.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.chevron.up.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 37.8516,35.625L 34.6849,38.7917L 23.6016,50.2708L 23.6016,39.9792L 37.8516,24.9375L 52.1016,39.9792L 52.1016,50.2708L 41.0182,38.7917L 37.8516,35.625 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.city.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.city.svg
index f66893f7e..b23bfadeb 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.city.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.city.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 44.3333,30.0833L 57,30.0833L 57,57L 44.3333,57L 44.3333,30.0833 Z M 46.3125,35.2292L 46.3125,38L 49.0833,38L 49.0833,35.2292L 46.3125,35.2292 Z M 52.25,35.2292L 52.25,38L 55.0208,38L 55.0208,35.2292L 52.25,35.2292 Z M 46.3125,39.9792L 46.3125,42.75L 49.0833,42.75L 49.0833,39.9792L 46.3125,39.9792 Z M 52.25,39.9792L 52.25,42.75L 55.0208,42.75L 55.0208,39.9792L 52.25,39.9792 Z M 46.3125,44.7292L 46.3125,47.5L 49.0833,47.5L 49.0833,44.7292L 46.3125,44.7292 Z M 52.25,44.7292L 52.25,47.5L 55.0208,47.5L 55.0208,44.7292L 52.25,44.7292 Z M 46.3125,49.4792L 46.3125,52.25L 49.0833,52.25L 49.0833,49.4792L 46.3125,49.4792 Z M 52.25,49.4792L 52.25,52.25L 55.0208,52.25L 55.0208,49.4792L 52.25,49.4792 Z M 23.75,25.3333L 25.3333,22.1667L 26.9167,22.1667L 26.9167,18.2084L 28.5,18.2084L 28.5,22.1667L 31.6667,22.1667L 31.6667,18.2084L 33.25,18.2084L 33.25,22.1667L 34.8333,22.1667L 36.4167,25.3333L 36.4167,34.8334L 38.7917,34.8333L 41.1667,37.2083L 41.1667,57L 19,57L 19,37.2083L 21.375,34.8333L 23.75,34.8334L 23.75,25.3333 Z M 25.7291,27.3125L 25.7291,30.0834L 28.1041,30.0834L 28.1041,27.3125L 25.7291,27.3125 Z M 32.0625,27.3125L 32.0625,30.0834L 34.4375,30.0834L 34.4375,27.3125L 32.0625,27.3125 Z M 25.7291,32.0625L 25.7291,34.8334L 28.1041,34.8334L 28.1041,32.0625L 25.7291,32.0625 Z M 32.0625,32.0625L 32.0625,34.8334L 34.4375,34.8334L 34.4375,32.0625L 32.0625,32.0625 Z M 30.875,39.9792L 28.8958,39.9792L 28.8958,42.75L 30.875,42.75L 30.875,39.9792 Z M 24.5416,39.9792L 24.5416,42.75L 26.9166,42.75L 26.9166,39.9792L 24.5416,39.9792 Z M 36.0208,39.9792L 33.25,39.9792L 33.25,42.75L 36.0208,42.75L 36.0208,39.9792 Z M 30.875,44.7292L 28.8958,44.7292L 28.8958,47.5L 30.875,47.5L 30.875,44.7292 Z M 26.9166,44.7292L 24.5416,44.7292L 24.5416,47.5L 26.9166,47.5L 26.9166,44.7292 Z M 36.0208,44.7292L 33.25,44.7292L 33.25,47.5L 36.0208,47.5L 36.0208,44.7292 Z M 30.875,49.4792L 28.8958,49.4792L 28.8958,52.25L 30.875,52.25L 30.875,49.4792 Z M 26.9166,49.4792L 24.5416,49.4792L 24.5417,52.25L 26.9167,52.25L 26.9166,49.4792 Z M 36.0208,49.4792L 33.25,49.4792L 33.25,52.25L 36.0208,52.25L 36.0208,49.4792 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.cog.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.cog.svg
index 4ef1ef8c2..0c0590fcc 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.cog.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.cog.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 27.5314,21.8628L 33.0126,19.4224L 34.7616,23.3507C 36.6693,22.9269 38.6044,22.8903 40.4668,23.2026L 42.0083,19.1868L 47.6098,21.337L 46.0683,25.3528C 47.6612,26.3669 49.0747,27.6889 50.2088,29.2803L 54.1371,27.5313L 56.5776,33.0126L 52.6493,34.7616C 53.0731,36.6693 53.1097,38.6043 52.7974,40.4668L 56.8131,42.0083L 54.6629,47.6097L 50.6472,46.0683C 49.6331,47.6613 48.3111,49.0748 46.7197,50.2089L 48.4686,54.1372L 42.9874,56.5776L 41.2384,52.6493C 39.3307,53.0731 37.3957,53.1097 35.5333,52.7974L 33.9918,56.8131L 28.3903,54.6629L 29.9318,50.6472C 28.3388,49.6331 26.9252,48.3111 25.7911,46.7196L 21.8628,48.4686L 19.4224,42.9873L 23.3507,41.2383C 22.9269,39.3307 22.8903,37.3957 23.2026,35.5332L 19.1869,33.9918L 21.3371,28.3903L 25.3528,29.9318C 26.3669,28.3388 27.6889,26.9252 29.2804,25.7911L 27.5314,21.8628 Z M 34.3394,29.7781C 29.7985,31.7998 27.7564,37.1198 29.7781,41.6606C 31.7998,46.2015 37.1198,48.2436 41.6606,46.2219C 46.2015,44.2002 48.2436,38.8802 46.2219,34.3394C 44.2002,29.7985 38.8802,27.7564 34.3394,29.7781 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.cogs.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.cogs.svg
index e3fdaa4ce..d8c1ab0fa 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.cogs.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.cogs.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 32.6227,68.9728C 33.1208,70.2446 33.7077,71.4719 34.3757,72.6471C 35.567,72.7702 36.7761,72.8333 38,72.8333C 40.6447,72.8333 43.2205,72.5386 45.6965,71.9802C 42.2807,68.5449 40.1698,63.8107 40.1698,58.5835C 40.1698,48.0901 48.6764,39.5835 59.1698,39.5835C 64.2047,39.5835 68.7822,41.5419 72.182,44.7385C 72.6094,42.5584 72.8333,40.3053 72.8333,38C 72.8333,36.442 72.731,34.908 72.5328,33.4041C 70.4772,32.3109 68.2718,31.4621 65.9554,30.8963L 65.6219,22.7367C 63.5664,22.3692 61.4511,22.1741 59.2916,22.1671L 57.491,30.1322C 54.2845,30.3184 51.2204,31.0348 48.3848,32.1949L 43.318,25.7887C 41.3995,26.7177 39.5749,27.8102 37.8622,29.0479L 41.0883,36.5527C 38.6742,38.5364 36.5919,40.9091 34.9373,43.575L 27.0703,41.3697C 26.073,43.2256 25.2319,45.178 24.5646,47.2093L 31.5867,51.385C 30.9883,53.6844 30.6698,56.0968 30.6698,58.5835L 30.746,60.6839L 23.0854,63.5239C 23.3743,65.6539 23.8474,67.7255 24.4881,69.7219L 32.6227,68.9728 Z M 27.0669,37.1755L 34.9338,39.3807C 35.9312,37.5248 36.7723,35.5724 37.4395,33.5412L 30.4175,29.3654C 31.0159,27.066 31.3344,24.6537 31.3344,22.1669L 31.2581,20.0665L 38.9187,17.2265C 38.6299,15.0965 38.1568,13.0249 37.5161,11.0285L 29.3815,11.7776C 28.4787,9.47258 27.2844,7.31377 25.8439,5.34655C 22.7943,6.48232 19.9467,8.03307 17.3698,9.93015C 20.1557,13.2359 21.8344,17.5054 21.8344,22.1669C 21.8344,32.5019 13.5826,40.9096 3.30816,41.1611C 3.60321,44.4411 4.35293,47.59 5.49381,50.5444C 8.34489,50.2806 11.0742,49.5968 13.6194,48.5555L 18.6861,54.9617C 20.6046,54.0327 22.4293,52.9403 24.142,51.7025L 20.9158,44.1977C 23.3299,42.2141 25.4123,39.8414 27.0669,37.1755 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.fullscreen.box.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.fullscreen.box.svg
index 13e6840e5..a3e73f41a 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.fullscreen.box.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.fullscreen.box.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 19,57L 19,19L 57,19L 57,57L 19,57 Z M 24,29L 47,29L 47,52L 52,52L 52,24L 24,24L 24,29 Z M 24,34L 24,52L 42,52L 42,34L 24,34 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.home.variant.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.home.variant.svg
index ea951fd19..273ff72cd 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.home.variant.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.home.variant.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76.0106" height="76.0106" viewBox="0 0 76.01 76.01" enable-background="new 0 0 76.01 76.01" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 24.0033,56.0078L 24.0033,38.0053L 22.0031,40.0056L 19.0027,35.0049L 38.0053,20.0028L 45.0063,25.5299L 45.0063,21.753L 49.0068,21.0029L 49.0068,28.6882L 57.008,35.0049L 54.0075,40.0056L 52.0073,38.0053L 52.0073,56.0078L 24.0033,56.0078 Z M 38.0053,26.9204L 27.0038,36.005L 27.0038,53.0074L 38.0045,53.0075L 38.0045,41.0061L 46.0058,41.0061L 46.0059,53.0075L 49.0068,53.0074L 49.0068,36.005L 38.0053,26.9204 Z M 30.004,41.0057L 35.0049,41.0057L 35.0049,47.0066L 30.004,47.0066L 30.004,41.0057 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.information.circle.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.information.circle.svg
index 031bd37f5..35a156ae9 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.information.circle.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.information.circle.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 38,19C 48.4934,19 57,27.5066 57,38C 57,48.4934 48.4934,57 38,57C 27.5066,57 19,48.4934 19,38C 19,27.5066 27.5066,19 38,19 Z M 33.25,33.25L 33.25,36.4167L 36.4166,36.4167L 36.4166,47.5L 33.25,47.5L 33.25,50.6667L 44.3333,50.6667L 44.3333,47.5L 41.1666,47.5L 41.1666,36.4167L 41.1666,33.25L 33.25,33.25 Z M 38.7917,25.3333C 37.48,25.3333 36.4167,26.3967 36.4167,27.7083C 36.4167,29.02 37.48,30.0833 38.7917,30.0833C 40.1033,30.0833 41.1667,29.02 41.1667,27.7083C 41.1667,26.3967 40.1033,25.3333 38.7917,25.3333 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.layer.delete.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.layer.delete.svg
index ddbeb21ca..5157af942 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.layer.delete.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.layer.delete.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76.0106" height="76.0106" viewBox="0 0 76.01 76.01" enable-background="new 0 0 76.01 76.01" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 18.5088,44.0374L 21.8676,40.6786L 27.4655,46.2765L 33.0634,40.6786L 36.4222,44.0374L 30.8243,49.6353L 36.4222,55.2332L 33.0634,58.592L 27.4655,52.994L 21.8676,58.592L 18.5088,55.2332L 24.1068,49.6353L 18.5088,44.0374 Z M 57.0079,38.0053L 38.0053,47.5066L 36.7482,46.8781L 39.5889,44.0374L 35.2559,39.7977L 38.0053,41.1724L 50.6737,34.8382L 57.0079,38.0053 Z M 19.0026,38.0053L 25.3369,34.8382L 32.3326,38.3361L 29.8968,40.7719L 28.1098,42.5589L 25.7193,41.3636L 21.8676,37.6052L 20.6459,38.8269L 19.0026,38.0053 Z M 38.0053,19.0027L 57.0079,28.504L 38.0053,38.0053L 19.0026,28.504L 38.0053,19.0027 Z M 57.0079,47.5066L 38.0053,57.008L 37.8778,56.9442L 39.5889,55.2332L 33.9909,49.6353L 34.6367,48.9895L 38.0053,50.6738L 50.6737,44.3395L 57.0079,47.5066 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.layer.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.layer.svg
index 9eb28235c..b89bb2da3 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.layer.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.layer.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76.0106" height="76.0106" viewBox="0 0 76.01 76.01" enable-background="new 0 0 76.01 76.01" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 57.0079,38.0053L 38.0053,47.5066L 19.0027,38.0053L 25.3369,34.8382L 38.0053,41.1724L 50.6737,34.8382L 57.0079,38.0053 Z M 38.0053,19.0027L 57.0079,28.504L 38.0053,38.0053L 19.0026,28.504L 38.0053,19.0027 Z M 57.0079,47.5066L 38.0053,57.008L 19.0026,47.5066L 25.3369,44.3395L 38.0053,50.6737L 50.6737,44.3395L 57.0079,47.5066 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.location.checkin.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.location.checkin.svg
index 3b21754c6..a58141d22 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.location.checkin.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.location.checkin.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-linejoin="round" d="M 38,19C 42.9706,19 47,23.0294 47,28C 47,30.5642 45.9276,32.878 38,49C 30.0724,32.878 29,30.5642 29,28C 29,23.0294 33.0294,19 38,19 Z M 38,24C 35.7909,24 34,25.7909 34,28C 34,30.2092 35.7909,32 38,32C 40.2091,32 42,30.2092 42,28C 42,25.7909 40.2091,24 38,24 Z M 19,57L 24,42L 31.5,42L 33.5,46L 27.6641,46L 25.3324,53L 50.6676,53L 48.3359,46L 42.5,46L 44.5,42L 52,42L 57,57L 19,57 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.location.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.location.svg
index fff6bf3e1..22f2d7001 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.location.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.location.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 26.9167,13.8542L 50.6666,13.8542L 50.6667,39.5833L 26.9167,63.3333L 26.9167,13.8542 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.map.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.map.svg
index 241f71e59..0a157d0da 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.map.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.map.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 27.7083,23.75L 38.7917,26.9167L 48.2917,20.5833L 62,24L 62,51L 48.2917,47.5L 38.7917,53.8333L 27.7083,50.6667L 16,55.5L 16,28.5L 27.7083,23.75 Z M 27,46.25L 27,29L 20,31.75L 20,49L 27,46.25 Z M 49,25.5L 49,42.75L 58,45.25L 58,28L 49,25.5 Z M 39,31.5L 39,49L 48,43L 48,25.5L 39,31.5 Z M 28,28.75L 28,46L 38,48.5L 38,31.75L 28,28.75 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.power.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.power.svg
index d3f865c0d..db23bca1f 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.power.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.power.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 36.4167,36.4167L 36.4167,17.4167L 41.1667,17.4167L 41.1667,36.4167L 36.4167,36.4167 Z M 57,39.5833C 57,50.0767 48.4934,58.5833 38,58.5833C 27.5066,58.5833 19,50.0767 19,39.5833C 19,30.7301 25.0552,23.2911 33.25,21.1819L 33.25,27.8374C 28.6079,29.7165 25.3333,34.2675 25.3333,39.5833C 25.3333,46.5789 31.0044,52.25 38,52.25C 44.9956,52.25 50.6667,46.5789 50.6667,39.5833C 50.6667,34.8949 48.1194,30.8014 44.3333,28.6113L 44.3333,21.6645C 51.7129,24.2728 57,31.3106 57,39.5833 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.rocket.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.rocket.svg
index a8c5c273a..d3b9d0a16 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.rocket.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.rocket.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 38,19C 39.4823,20.6344 43,26.1259 43,41L 47,46L 47,55L 43,50L 33,50L 29,55L 29,46L 33,41C 33,26.1259 36.0177,20.6344 38,19 Z M 38,57.5L 35,51L 41,51L 38,57.5 Z M 38,27L 36.1552,27.4612L 35.6203,30.5949L 38,30L 40.2918,30.573L 39.6953,27.4238L 38,27 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.timer.rewind.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.timer.rewind.svg
index a02cff6b7..7aded7af0 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.timer.rewind.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.timer.rewind.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 53.8333,41.1667C 53.8333,49.9112 46.7445,57 38,57C 29.2555,57 22.1667,49.9112 22.1667,41.1667C 22.1667,32.9565 28.4156,26.2059 36.4167,25.4115L 36.4167,23.75L 31.6667,23.75L 31.6667,19L 44.3333,19L 44.3333,23.75L 39.5833,23.75L 39.5833,25.4115C 42.7678,25.7277 45.6747,26.9874 48.0205,28.907L 49.1629,27.7646L 46.9237,25.5254L 50.2825,22.1667L 57,28.8842L 53.6412,32.2429L 51.4021,30.0038L 50.2597,31.1462C 52.4932,33.8756 53.8333,37.3647 53.8333,41.1667 Z M 26.2296,39.5834L 30.0833,39.5834L 30.0833,42.75L 26.2296,42.75C 26.9347,48.0419 31.1248,52.232 36.4166,52.9371L 36.4166,49.0833L 39.5833,49.0833L 39.5833,52.9371C 44.8752,52.232 49.0653,48.0419 49.7703,42.75L 45.9166,42.75L 45.9166,39.5834L 49.7703,39.5834C 49.0652,34.2915 44.8751,30.1014 39.5833,29.3964L 39.5833,33.25L 36.4166,33.25L 36.4166,29.3964C 31.1248,30.1014 26.9347,34.2915 26.2296,39.5834 Z M 38,38C 39.7488,38 41.1666,39.4178 41.1666,41.1667C 41.1666,42.9156 39.7488,44.3334 38,44.3334L 31.6666,49.0834L 34.8333,41.1667C 34.8333,39.4178 36.2511,38 38,38 Z M 19.7917,33.25L 19.7917,26.938C 17.2963,30.5244 15.8333,34.883 15.8333,39.5833C 15.8333,51.8257 25.7577,61.75 38,61.75L 42.3542,61.75C 54.3778,61.75 64.1249,51.8257 64.125,39.5835C 64.125,54.0119 52.4284,65.7083 38,65.7083C 23.5716,65.7083 11.875,54.0118 11.875,39.5833C 11.875,33.9832 13.6371,28.7946 16.637,24.5417L 11.0833,24.5417L 15.0417,20.5834L 23.75,20.5833L 23.75,29.2917L 19.7917,33.25 Z "/>
diff --git a/navit/gui/qt5_qml/skins/modern/icons/appbar.transit.car.svg b/navit/gui/qt5_qml/skins/modern/icons/appbar.transit.car.svg
index 8ea1a7c5d..3a6e7a287 100644
--- a/navit/gui/qt5_qml/skins/modern/icons/appbar.transit.car.svg
+++ b/navit/gui/qt5_qml/skins/modern/icons/appbar.transit.car.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
 	<path fill="#ffffff" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 17.4167,50.6667C 16.5422,50.6667 15.8333,49.9578 15.8333,49.0833L 15.8333,39.5834C 15.8333,37.0877 17.2768,34.9292 19.3745,33.8972L 25.3333,19L 26.9167,19L 30.0833,19L 45.9167,19L 49.0833,19L 50.6667,19L 56.6255,33.8972C 58.7231,34.9292 60.1666,37.0877 60.1666,39.5834L 60.1667,49.0833C 60.1667,49.9578 59.4578,50.6667 58.5833,50.6667L 57,50.6667L 57,53.8333C 57,55.5822 55.5822,57 53.8333,57C 52.0844,57 50.6667,55.5822 50.6667,53.8333L 50.6667,50.6667L 25.3333,50.6667L 25.3333,53.8333C 25.3333,55.5822 23.9156,57 22.1667,57C 20.4178,57 19,55.5822 19,53.8333L 19,50.6667L 17.4167,50.6667 Z M 24.3833,33.25L 51.6166,33.25L 47.8166,23.75L 28.1833,23.75L 24.3833,33.25 Z M 24.1458,36.0209C 22.3969,36.0209 20.5833,37.8344 20.5833,39.5833C 20.5833,41.3322 22.3969,43.1458 24.1458,43.1458C 25.8947,43.1458 27.7083,41.3323 27.7083,39.5834C 27.7083,37.8345 25.8947,36.0209 24.1458,36.0209 Z M 51.8542,36.0208C 50.1053,36.0208 48.2917,37.8344 48.2917,39.5833C 48.2917,41.3322 50.1053,43.1458 51.8542,43.1458C 53.6031,43.1458 55.4167,41.3322 55.4167,39.5833C 55.4167,37.8344 53.6031,36.0208 51.8542,36.0208 Z "/>
diff --git a/navit/gui/win32/ceglue.c b/navit/gui/win32/ceglue.c
index a0817f935..772eb782d 100644
--- a/navit/gui/win32/ceglue.c
+++ b/navit/gui/win32/ceglue.c
@@ -1,77 +1,77 @@
-#include <windows.h>

-#include "ceglue.h"

-

-BOOL FAR (*SHFullScreenPtr)(HWND hwnd, DWORD state) = NULL;

-

-void InitCeGlue (void)

-{

-  HINSTANCE ayg = LoadLibraryW (TEXT ("aygshell.dll"));

-  if (ayg != NULL) {

-    SHFullScreenPtr = (BOOL (*)(HWND, DWORD))

-      GetProcAddressW (ayg, TEXT ("SHFullScreen"));

-  }

-}

-

-// code to turn of screen adopted from

-// http://msdn.microsoft.com/en-us/library/ms838354.aspx

-

-// GDI Escapes for ExtEscape()

-#define QUERYESCSUPPORT    8

- 

-// The following are unique to CE

-#define GETVFRAMEPHYSICAL   6144

-#define GETVFRAMELEN    6145

-#define DBGDRIVERSTAT    6146

-#define SETPOWERMANAGEMENT   6147

-#define GETPOWERMANAGEMENT   6148

- 

- 

-typedef enum _VIDEO_POWER_STATE {

-    VideoPowerOn = 1,

-    VideoPowerStandBy,

-    VideoPowerSuspend,

-    VideoPowerOff

-} VIDEO_POWER_STATE, *PVIDEO_POWER_STATE;

- 

- 

-typedef struct _VIDEO_POWER_MANAGEMENT {

-    ULONG Length;

-    ULONG DPMSVersion;

-    ULONG PowerState;

-} VIDEO_POWER_MANAGEMENT, *PVIDEO_POWER_MANAGEMENT;

-

-

-int CeEnableBacklight(int enable)

-{

-  HDC gdc;

-  int iESC=SETPOWERMANAGEMENT;

-

-  gdc = GetDC(NULL);

-  if (ExtEscape(gdc, QUERYESCSUPPORT, sizeof(int), (LPCSTR)&iESC, 

-      0, NULL)==0)

-  {

-    MessageBox(NULL,

-                L"Sorry, your Pocket PC does not support DisplayOff",

-                L"Pocket PC Display Off Feature",

-              MB_OK);

-    ReleaseDC(NULL, gdc);

-    return FALSE;

-  }

-  else

-  {

-    VIDEO_POWER_MANAGEMENT vpm;

-    vpm.Length = sizeof(VIDEO_POWER_MANAGEMENT);

-    vpm.DPMSVersion = 0x0001;

-    if (enable) {

-      vpm.PowerState = VideoPowerOn;

-    } else {

-      vpm.PowerState = VideoPowerOff;

-    }

-    // Power off the display

-    ExtEscape(gdc, SETPOWERMANAGEMENT, vpm.Length, (LPCSTR) &vpm, 

-              0, NULL);

-    ReleaseDC(NULL, gdc);

-    return TRUE;

-  }

-}

-

+#include <windows.h>
+#include "ceglue.h"
+
+BOOL FAR (*SHFullScreenPtr)(HWND hwnd, DWORD state) = NULL;
+
+void InitCeGlue (void)
+{
+  HINSTANCE ayg = LoadLibraryW (TEXT ("aygshell.dll"));
+  if (ayg != NULL) {
+    SHFullScreenPtr = (BOOL (*)(HWND, DWORD))
+      GetProcAddressW (ayg, TEXT ("SHFullScreen"));
+  }
+}
+
+// code to turn of screen adopted from
+// http://msdn.microsoft.com/en-us/library/ms838354.aspx
+
+// GDI Escapes for ExtEscape()
+#define QUERYESCSUPPORT    8
+ 
+// The following are unique to CE
+#define GETVFRAMEPHYSICAL   6144
+#define GETVFRAMELEN    6145
+#define DBGDRIVERSTAT    6146
+#define SETPOWERMANAGEMENT   6147
+#define GETPOWERMANAGEMENT   6148
+ 
+ 
+typedef enum _VIDEO_POWER_STATE {
+    VideoPowerOn = 1,
+    VideoPowerStandBy,
+    VideoPowerSuspend,
+    VideoPowerOff
+} VIDEO_POWER_STATE, *PVIDEO_POWER_STATE;
+ 
+ 
+typedef struct _VIDEO_POWER_MANAGEMENT {
+    ULONG Length;
+    ULONG DPMSVersion;
+    ULONG PowerState;
+} VIDEO_POWER_MANAGEMENT, *PVIDEO_POWER_MANAGEMENT;
+
+
+int CeEnableBacklight(int enable)
+{
+  HDC gdc;
+  int iESC=SETPOWERMANAGEMENT;
+
+  gdc = GetDC(NULL);
+  if (ExtEscape(gdc, QUERYESCSUPPORT, sizeof(int), (LPCSTR)&iESC, 
+      0, NULL)==0)
+  {
+    MessageBox(NULL,
+                L"Sorry, your Pocket PC does not support DisplayOff",
+                L"Pocket PC Display Off Feature",
+              MB_OK);
+    ReleaseDC(NULL, gdc);
+    return FALSE;
+  }
+  else
+  {
+    VIDEO_POWER_MANAGEMENT vpm;
+    vpm.Length = sizeof(VIDEO_POWER_MANAGEMENT);
+    vpm.DPMSVersion = 0x0001;
+    if (enable) {
+      vpm.PowerState = VideoPowerOn;
+    } else {
+      vpm.PowerState = VideoPowerOff;
+    }
+    // Power off the display
+    ExtEscape(gdc, SETPOWERMANAGEMENT, vpm.Length, (LPCSTR) &vpm, 
+              0, NULL);
+    ReleaseDC(NULL, gdc);
+    return TRUE;
+  }
+}
+
diff --git a/navit/gui/win32/ceglue.h b/navit/gui/win32/ceglue.h
index b0dc79d42..bb185dbed 100644
--- a/navit/gui/win32/ceglue.h
+++ b/navit/gui/win32/ceglue.h
@@ -1,16 +1,16 @@
-#ifndef CEGLUE_H

-#define CEGLUE_H

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-extern BOOL (*SHFullScreenPtr)(HWND hwnd, DWORD state);

-void InitCeGlue (void);

-

-int CeEnableBacklight(int enable);

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

+#ifndef CEGLUE_H
+#define CEGLUE_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern BOOL (*SHFullScreenPtr)(HWND hwnd, DWORD state);
+void InitCeGlue (void);
+
+int CeEnableBacklight(int enable);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/navit/icons/gui_layers.svg b/navit/icons/gui_layers.svg
index 810b5a1d6..44bb0a32e 100644
--- a/navit/icons/gui_layers.svg
+++ b/navit/icons/gui_layers.svg
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<!-- Created with Inkscape (http://www.inkscape.org/) -->

-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="18.02128" height="18" id="svg5952">

-  <defs id="defs5954">

-    <linearGradient id="linearGradient2485-94">

-      <stop id="stop2486-7" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>

-      <stop id="stop2487-83" style="stop-color:#aaaaaa;stop-opacity:1" offset="1"/>

-    </linearGradient>

-    <linearGradient id="linearGradient5704-5">

-      <stop id="stop5706-120" style="stop-color:#5a5a5a;stop-opacity:1" offset="0"/>

-      <stop id="stop5708-16" style="stop-color:#000000;stop-opacity:1" offset="1"/>

-    </linearGradient>

-    <linearGradient x1="974.19751" y1="182.46863" x2="979.80444" y2="184.8026" id="linearGradient4351" xlink:href="#linearGradient2485-94" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-173.95451)"/>

-    <linearGradient x1="968.88806" y1="178.31856" x2="977.93347" y2="181.70978" id="linearGradient4353" xlink:href="#linearGradient5704-5" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-173.95451)"/>

-    <linearGradient x1="974.19751" y1="182.46863" x2="979.80444" y2="184.8026" id="linearGradient4356" xlink:href="#linearGradient2485-94" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-170.95451)"/>

-    <linearGradient x1="968.88806" y1="178.31856" x2="977.93347" y2="181.70978" id="linearGradient4358" xlink:href="#linearGradient5704-5" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-170.95451)"/>

-    <linearGradient x1="974.19751" y1="182.46863" x2="979.80444" y2="184.8026" id="linearGradient4362" xlink:href="#linearGradient2485-94" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-167.95454)"/>

-    <linearGradient x1="968.88806" y1="178.31856" x2="977.93347" y2="181.70978" id="linearGradient4364" xlink:href="#linearGradient5704-5" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-167.95454)"/>

-  </defs>

-  <metadata id="metadata5957">

-    <rdf:RDF>

-      <cc:Work rdf:about="">

-        <dc:format>image/svg+xml</dc:format>

-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>

-        <dc:title/>

-      </cc:Work>

-    </rdf:RDF>

-  </metadata>

-  <use transform="translate(-961.86731,-168.04527)" id="use13602" x="0" y="0" width="1250" height="1250" xlink:href="#rect12856"/>

-  <path d="m 5.5212776,14.545453 11.0000004,0 -4,-4.9999999 -11.0000004,0 4,4.9999999 z" id="use8977" style="color:#000000;fill:url(#linearGradient4362);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4364);stroke-width:0.99994743;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"/>

-  <path d="m 5.5212776,11.545483 11.0000004,0 -4,-4.9999999 -11.0000004,0 4,4.9999999 z" id="use8059" style="color:#000000;fill:url(#linearGradient4356);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4358);stroke-width:0.99994743;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"/>

-  <path d="m 5.5212776,8.5454831 11.0000004,0 -4,-5 -11.0000004,0 4,5 z" id="use8061" style="color:#000000;fill:url(#linearGradient4351);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4353);stroke-width:0.99994743;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"/>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="18.02128" height="18" id="svg5952">
+  <defs id="defs5954">
+    <linearGradient id="linearGradient2485-94">
+      <stop id="stop2486-7" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>
+      <stop id="stop2487-83" style="stop-color:#aaaaaa;stop-opacity:1" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient5704-5">
+      <stop id="stop5706-120" style="stop-color:#5a5a5a;stop-opacity:1" offset="0"/>
+      <stop id="stop5708-16" style="stop-color:#000000;stop-opacity:1" offset="1"/>
+    </linearGradient>
+    <linearGradient x1="974.19751" y1="182.46863" x2="979.80444" y2="184.8026" id="linearGradient4351" xlink:href="#linearGradient2485-94" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-173.95451)"/>
+    <linearGradient x1="968.88806" y1="178.31856" x2="977.93347" y2="181.70978" id="linearGradient4353" xlink:href="#linearGradient5704-5" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-173.95451)"/>
+    <linearGradient x1="974.19751" y1="182.46863" x2="979.80444" y2="184.8026" id="linearGradient4356" xlink:href="#linearGradient2485-94" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-170.95451)"/>
+    <linearGradient x1="968.88806" y1="178.31856" x2="977.93347" y2="181.70978" id="linearGradient4358" xlink:href="#linearGradient5704-5" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-170.95451)"/>
+    <linearGradient x1="974.19751" y1="182.46863" x2="979.80444" y2="184.8026" id="linearGradient4362" xlink:href="#linearGradient2485-94" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-167.95454)"/>
+    <linearGradient x1="968.88806" y1="178.31856" x2="977.93347" y2="181.70978" id="linearGradient4364" xlink:href="#linearGradient5704-5" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-167.95454)"/>
+  </defs>
+  <metadata id="metadata5957">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <use transform="translate(-961.86731,-168.04527)" id="use13602" x="0" y="0" width="1250" height="1250" xlink:href="#rect12856"/>
+  <path d="m 5.5212776,14.545453 11.0000004,0 -4,-4.9999999 -11.0000004,0 4,4.9999999 z" id="use8977" style="color:#000000;fill:url(#linearGradient4362);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4364);stroke-width:0.99994743;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"/>
+  <path d="m 5.5212776,11.545483 11.0000004,0 -4,-4.9999999 -11.0000004,0 4,4.9999999 z" id="use8059" style="color:#000000;fill:url(#linearGradient4356);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4358);stroke-width:0.99994743;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"/>
+  <path d="m 5.5212776,8.5454831 11.0000004,0 -4,-5 -11.0000004,0 4,5 z" id="use8061" style="color:#000000;fill:url(#linearGradient4351);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4353);stroke-width:0.99994743;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"/>
 </svg>
\ No newline at end of file
diff --git a/navit/script/download_index.html b/navit/script/download_index.html
index fed33e179..7439f4b6a 100644
--- a/navit/script/download_index.html
+++ b/navit/script/download_index.html
@@ -1,145 +1,145 @@
-<html xmlns="http://www.w3.org/1999/xhtml">

-  <head>

-    <title>Planet Extraction</title>

-    <style type="text/css">

-        html, body {

-          margin: 0;

-          padding: 1em;

-          font: 0.9em Verdana, Arial, sans serif;

-        }

-        input, select, textarea {

-          font: 1em Verdana, Arial, sans serif;

-        }

-        .input {

-          border: none;

-          width: 100px;

-        }

-        .bbox {

-          font-size: 12px;

-          color: #000;

-          background-color: #fff;

-          width: 300px;

-          border: 1px solid gray;

-        }

-        .button {

-          width: 200px;

-          height: 50px;

-          font-weight: bold;

-        }

-        #map {

-          float: left;

-		  width: 500px;

-          height: 500px;

-          border: 1px solid gray;

-        }

-        #controls {

-          float: left;

-          

-        }

-    </style>

-    <script src="http://openlayers.org/dev/lib/OpenLayers.js"></script>

-    <script type="text/javascript">

-	var map, polygonControl, polygonLayer, bbox_set;

-	

-	OpenLayers.Util.onImageLoadErrorColor = "transparent";

-	function init(){

-		map = new OpenLayers.Map('map');

-		

-		var wmsLayer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 

-		"http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'}); 

-		

-		polygonLayer = new OpenLayers.Layer.Vector("Polygon Layer");

-		

-		map.addLayers([wmsLayer, polygonLayer]);

-		map.addControl(new OpenLayers.Control.LayerSwitcher());

-		map.addControl(new OpenLayers.Control.MousePosition());

-		

-		polyOptions = {sides: 4, irregular: true};

-		polygonControl = new OpenLayers.Control.DrawFeature(polygonLayer,

-		OpenLayers.Handler.RegularPolygon,

-		{handlerOptions: polyOptions});

-		//alert(polygonControl);

-		

-		map.addControl(polygonControl);

-		

-		polygonControl.featureAdded=featureInsert;

-		

-		map.setCenter(new OpenLayers.LonLat(0, 0), 3);

-		

-		document.getElementById('noneToggle').checked = true;

-		//document.getElementById('irregularToggle').checked = false;

-		

-		//var polyOptions = {sides: 4, irregular: true};

-		//polygonControl.handler.setOptions(polyOptions);

-	}

-	

-	function featureInsert(feature){

-		var old=[];

-		for (var i = 0; i < polygonLayer.features.length; i++) {

-			if (polygonLayer.features[i] != feature) {

-				old.push(polygonLayer.features[i]);

-			}

-		}

-		polygonLayer.destroyFeatures(old);

-		

-		var bounds = feature.geometry.getBounds();

-		

-		document.form.bounds_top.value = bounds.top;

-		document.form.bounds_right.value = bounds.right;

-		document.form.bounds_btm.value = bounds.bottom;

-		document.form.bounds_left.value = bounds.left;

-		bbox_set=true;

-	}

-	function download() {

-		var bbox = document.form.bounds_left.value + "," +

-		           document.form.bounds_btm.value + "," +

-		           document.form.bounds_right.value + "," +

-			   document.form.bounds_top.value;

-		if (bbox_set) {

-			location.href="http://maps.navit-project.org/api/map?bbox=" + bbox;

-		} else {

-			alert("Please select a bounding box first\n");

-		}

-	}

-	function setOptions(options) {

-		polygonControl.handler.setOptions(options);

-	}

-	function setSize(fraction) {

-		var radius = fraction * map.getExtent().getHeight();

-		polygonControl.handler.setOptions({radius: radius,

-		angle: 0});

-	}

-    </script>

-  </head>

-  <body onload="init()">

-    <h2>Planet extract</h2>

-    <div id="map"></div>

-    <div id="controls">

-        <ul style="list-style:none;"><b>Map Controls</b>

-            <li>

-                <input type="radio" name="type"

-                       value="none" id="noneToggle"

-                       onclick="polygonControl.deactivate()"

-                       checked="checked" />

-                <label for="noneToggle">navigate</label>

-            </li>

-            <li>

-                <input type="radio" name="type"

-                       value="polygon" id="polygonToggle"

-                       onclick="polygonControl.activate()" />

-                <label for="polygonToggle">select</label>

-            </li>

-        </ul>

-        <ul style="list-style:none"><b>Fetch box</b>

-		<form name="form">

-        	<li>Top Right: <input type="text" name="bounds_top" class="input">,

-        				   <input type="text" name="bounds_right" class="input"></li>

-			<li>Bottom left: <input type="text" name="bounds_btm" class="input">,

-			                 <input type="text" name="bounds_left" class="input"></li>

-		</form>

-			<li>&nbsp;</li>

-			<li><input type="button" class="button" value="Get map!" onclick="javascript:download()"></li>

-        </ul>

-    </div>

-  </body>

-</html>

+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Planet Extraction</title>
+    <style type="text/css">
+        html, body {
+          margin: 0;
+          padding: 1em;
+          font: 0.9em Verdana, Arial, sans serif;
+        }
+        input, select, textarea {
+          font: 1em Verdana, Arial, sans serif;
+        }
+        .input {
+          border: none;
+          width: 100px;
+        }
+        .bbox {
+          font-size: 12px;
+          color: #000;
+          background-color: #fff;
+          width: 300px;
+          border: 1px solid gray;
+        }
+        .button {
+          width: 200px;
+          height: 50px;
+          font-weight: bold;
+        }
+        #map {
+          float: left;
+		  width: 500px;
+          height: 500px;
+          border: 1px solid gray;
+        }
+        #controls {
+          float: left;
+          
+        }
+    </style>
+    <script src="http://openlayers.org/dev/lib/OpenLayers.js"></script>
+    <script type="text/javascript">
+	var map, polygonControl, polygonLayer, bbox_set;
+	
+	OpenLayers.Util.onImageLoadErrorColor = "transparent";
+	function init(){
+		map = new OpenLayers.Map('map');
+		
+		var wmsLayer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
+		"http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'}); 
+		
+		polygonLayer = new OpenLayers.Layer.Vector("Polygon Layer");
+		
+		map.addLayers([wmsLayer, polygonLayer]);
+		map.addControl(new OpenLayers.Control.LayerSwitcher());
+		map.addControl(new OpenLayers.Control.MousePosition());
+		
+		polyOptions = {sides: 4, irregular: true};
+		polygonControl = new OpenLayers.Control.DrawFeature(polygonLayer,
+		OpenLayers.Handler.RegularPolygon,
+		{handlerOptions: polyOptions});
+		//alert(polygonControl);
+		
+		map.addControl(polygonControl);
+		
+		polygonControl.featureAdded=featureInsert;
+		
+		map.setCenter(new OpenLayers.LonLat(0, 0), 3);
+		
+		document.getElementById('noneToggle').checked = true;
+		//document.getElementById('irregularToggle').checked = false;
+		
+		//var polyOptions = {sides: 4, irregular: true};
+		//polygonControl.handler.setOptions(polyOptions);
+	}
+	
+	function featureInsert(feature){
+		var old=[];
+		for (var i = 0; i < polygonLayer.features.length; i++) {
+			if (polygonLayer.features[i] != feature) {
+				old.push(polygonLayer.features[i]);
+			}
+		}
+		polygonLayer.destroyFeatures(old);
+		
+		var bounds = feature.geometry.getBounds();
+		
+		document.form.bounds_top.value = bounds.top;
+		document.form.bounds_right.value = bounds.right;
+		document.form.bounds_btm.value = bounds.bottom;
+		document.form.bounds_left.value = bounds.left;
+		bbox_set=true;
+	}
+	function download() {
+		var bbox = document.form.bounds_left.value + "," +
+		           document.form.bounds_btm.value + "," +
+		           document.form.bounds_right.value + "," +
+			   document.form.bounds_top.value;
+		if (bbox_set) {
+			location.href="http://maps.navit-project.org/api/map?bbox=" + bbox;
+		} else {
+			alert("Please select a bounding box first\n");
+		}
+	}
+	function setOptions(options) {
+		polygonControl.handler.setOptions(options);
+	}
+	function setSize(fraction) {
+		var radius = fraction * map.getExtent().getHeight();
+		polygonControl.handler.setOptions({radius: radius,
+		angle: 0});
+	}
+    </script>
+  </head>
+  <body onload="init()">
+    <h2>Planet extract</h2>
+    <div id="map"></div>
+    <div id="controls">
+        <ul style="list-style:none;"><b>Map Controls</b>
+            <li>
+                <input type="radio" name="type"
+                       value="none" id="noneToggle"
+                       onclick="polygonControl.deactivate()"
+                       checked="checked" />
+                <label for="noneToggle">navigate</label>
+            </li>
+            <li>
+                <input type="radio" name="type"
+                       value="polygon" id="polygonToggle"
+                       onclick="polygonControl.activate()" />
+                <label for="polygonToggle">select</label>
+            </li>
+        </ul>
+        <ul style="list-style:none"><b>Fetch box</b>
+		<form name="form">
+        	<li>Top Right: <input type="text" name="bounds_top" class="input">,
+        				   <input type="text" name="bounds_right" class="input"></li>
+			<li>Bottom left: <input type="text" name="bounds_btm" class="input">,
+			                 <input type="text" name="bounds_left" class="input"></li>
+		</form>
+			<li>&nbsp;</li>
+			<li><input type="button" class="button" value="Get map!" onclick="javascript:download()"></li>
+        </ul>
+    </div>
+  </body>
+</html>
diff --git a/navit/script/mapextract.php b/navit/script/mapextract.php
index 004b63caf..33441ba95 100644
--- a/navit/script/mapextract.php
+++ b/navit/script/mapextract.php
@@ -1,225 +1,225 @@
-#!/usr/local/bin/php &#8211;q

-<?php

-function getmercator($sx,$sy,$ex,$ey) {

-	

-	$sx = $sx*6371000.0*M_PI/180;

-	$sy = log(tan(M_PI_4+$sy*M_PI/360))*6371000.0;

-	

-	$ex = $ex*6371000.0*M_PI/180;

-	$ey = log(tan(M_PI_4+$ey*M_PI/360))*6371000.0;

-	

-	return array(

-		'l' => array(

-				'x' => $sx,

-				'y' => $sy

-			),

-		'h' => array(

-				'x' => $ex,

-				'y' => $ey

-			)

-	);

-	

-}

-function contains_bbox($c, &$r) {

-	if ($c['l']['x'] > $r['h']['x'])

-		return false;

-	elseif ($c['h']['x'] < $r['l']['x'])

-		return false;

-	elseif ($c['l']['y'] > $r['h']['y'])

-		return false;

-	elseif ($c['h']['y'] < $r['l']['y'])

-		return false;

-	else 

-		return true;

-}

-

-$fetch_bbox = getmercator(11.3, 47.9, 11.4, 48.0);

-

-$files = array();

-$files['input']  = '/home/burner/carputer/navit/src/maps/osm_bbox_11.3,47.9,11.7,48.2.bin';

-$files['output'] = 'myarea.bin';

-

-$formats = array();

-$formats['ziphpack'] = "lssssslLLSS";

-$formats['zipheader']  = "l" . "ziplocsig";	# Signature (is always the same)

-$formats['zipheader'] .= "/s" . "zipver";	# zip version needed

-$formats['zipheader'] .= "/s" . "zipgenfld";# type of os that generated the file

-$formats['zipheader'] .= "/s" . "zipmthd";	# 

-$formats['zipheader'] .= "/s" . "ziptime";	# time

-$formats['zipheader'] .= "/s" . "zipdate";	# date

-$formats['zipheader'] .= "/l" . "zipcrc";	# crc checksum

-$formats['zipheader'] .= "/L" . "zipsize";	# data size

-$formats['zipheader'] .= "/L" . "zipuncmp";	# uncompressed size

-$formats['zipheader'] .= "/S" . "zipfnln";	# length of filename

-$formats['zipheader'] .= "/S" . "zipxtraln";# length of extra data (always 0)

-

-$formats['zipcd'] = "".

-	"i" . "zipcensig/".

-	"c" . "zipcver/".

-	"c" . "zipcos/".

-	"c" . "zipcvxt/".

-	"c" . "zipcexos/".

-	"s" . "zipcflg/".

-	"s" . "zipcmthd/".

-	"s" . "ziptim/".

-	"s" . "zipdat/".

-	"i" . "zipccrc/".

-	"I" . "zipcsiz/".

-	"I" . "zipcunc/".

-	"S" . "zipcfnl/".

-	"S" . "zipcxtl/".

-	"S" . "zipccml/".

-	"S" . "zipdsk/".

-	"S" . "zipint/".

-	"I" . "zipext/".

-	"I" . "zipofst/".

-$formats['zipcdpack'] = "iccccssssiIISSSSSII";

-

-$formats['zipcontent'] = "i5x/i5y/ii";

-

-$world_bbox = array();

-$world_bbox['l']['x'] = -20000000;

-$world_bbox['l']['y'] = -20000000;

-$world_bbox['h']['x'] = 20000000;

-$world_bbox['h']['y'] = 20000000;

-

-$fp = fopen($files['input'], 'r');

-$sp = fopen($files['output'], 'w');

-

-$files = array();

-$offset = 0;

-

-/**

- * Read through zipheaders

- * 

- */

-while (!feof($fp)) {

-	

-	$buffer = fread($fp, 30);

-	$tileinfo = unpack($formats['zipheader'], $buffer);

-	

-	if ($tileinfo['zipfnln'] <= 0)

-		break;

-	

-	$filename = fread($fp, $tileinfo['zipfnln']);

-	$x=0;

-	$done=false;

-	

-	$r = $world_bbox;

-	

-	while (!$done) {

-		$c['x'] = floor( ($r['l']['x'] + $r['h']['x'])/2 );

-		$c['y'] = floor( ($r['l']['y'] + $r['h']['y'])/2 );

-		

-		switch($filename[$x]) {

-		case 'a':

-			$r['l']['x'] = $c['x'];

-			$r['l']['y'] = $c['y'];

-			break;

-		case 'b':

-			$r['h']['x'] = $c['x'];

-			$r['l']['y'] = $c['y'];

-			break;

-		case 'c':

-			$r['l']['x'] = $c['x'];

-			$r['h']['y'] = $c['y'];

-			break;

-		case 'd':

-			$r['h']['x'] = $c['x'];

-			$r['h']['y'] = $c['y'];

-			break;

-		default:

-			$done=true;

-		}

-		$x++;

-	}

-	

-	$tilecontent = fread($fp, $tileinfo['zipsize']);

-	

-	/* Area inside box, save it! */

-	if (contains_bbox($fetch_bbox, $r)) {

-		#echo "In box. ";

-		#echo $filename . " ";

-		$zipheader = $buffer;

-		#echo "\n";

-		

-	/* Area outside of box, set zipcontent=0 */

-	} else {

-		$tileinfo['zipmthd'] = $tileinfo['zipcrc'] = $tileinfo['zipsize'] = $tileinfo['zipuncmp'] = 0;

-		#echo "Out of box";

-		$zipheader = $tileinfo;

-		$tilecontent = '';

-		$zipheader = pack($formats['ziphpack'], 

-							$tileinfo['ziplocsig'],

-							$tileinfo['zipver'],

-							$tileinfo['zipgenfld'],

-							$tileinfo['zipmthd'],

-							$tileinfo['ziptime'],

-							$tileinfo['zipdate'],

-							$tileinfo['zipcrc'],

-							$tileinfo['zipsize'],

-							$tileinfo['zipuncmp'],

-							$tileinfo['zipfnln'],

-							$tileinfo['zipxtraln']

-							);

-	}

-	

-	$put = $zipheader.$filename.$tilecontent;

-	$files[$filename]['header'] = $tileinfo;

-	$files[$filename]['size'] = strlen($put);

-	

-	$zipcd = array();

-	$zipcd['zipcensig'] = 0x02014b50;

-	$zipcd['zipcver'] 	= $tileinfo['zipver'];

-	$zipcd['zipcos']	= 0x00;

-	$zipcd['zipcvxt']	= 0x0a;

-	$zipcd['zipcexos']	= 0x00;

-	$zipcd['zipcflg']	= 0x00;

-	$zipcd['zipcmthd']	= $tileinfo['zipmthd'];

-	$zipcd['ziptim']	= $tileinfo['ziptime'];

-	$zipcd['zipdat']	= $tileinfo['zipdate'];

-	$zipcd['zipccrc']	= $tileinfo['zipcrc'];

-	$zipcd['zipcsiz']	= $tileinfo['zipsize'];

-	$zipcd['zipcunc']	= $tileinfo['zipuncmp'];

-	$zipcd['zipcfnl']	= $tileinfo['zipfnln'];

-	$zipcd['zipcxtl']	= 0x00;

-	$zipcd['zipccml']	= 0x00;

-	$zipcd['zipdsk']	= 0x00;

-	$zipcd['zipint']	= 0x00;

-	$zipcd['zipext']	= 0x00;

-	$zipcd['zipofst']	= $offset;

-

-	$zipcd_data .= pack($formats['zipcdpack'],

-		$zipcd['zipcensig'],

-		$zipcd['zipcver'],

-		$zipcd['zipcos'],

-		$zipcd['zipcvxt'],

-		$zipcd['zipcexos'],

-		$zipcd['zipcflg'],

-		$zipcd['zipcmthd'],

-		$zipcd['ziptim'],

-		$zipcd['zipdat'],

-		$zipcd['zipccrc'],

-		$zipcd['zipcsiz'],

-		$zipcd['zipcunc'],

-		$zipcd['zipcfnl'],

-		$zipcd['zipcxtl'],

-		$zipcd['zipccml'],

-		$zipcd['zipdsk'],

-		$zipcd['zipint'],

-		$zipcd['zipext'],

-		$zipcd['zipofst']

-	) . $filename;

-		

-	

-	fwrite($sp, $put);

-	$offset += strlen($put);

-	

-}

-

-fwrite($sp, $zipcd_data);

-

-fclose($fp);

-fclose($sp);

-

-?>

+#!/usr/local/bin/php &#8211;q
+<?php
+function getmercator($sx,$sy,$ex,$ey) {
+	
+	$sx = $sx*6371000.0*M_PI/180;
+	$sy = log(tan(M_PI_4+$sy*M_PI/360))*6371000.0;
+	
+	$ex = $ex*6371000.0*M_PI/180;
+	$ey = log(tan(M_PI_4+$ey*M_PI/360))*6371000.0;
+	
+	return array(
+		'l' => array(
+				'x' => $sx,
+				'y' => $sy
+			),
+		'h' => array(
+				'x' => $ex,
+				'y' => $ey
+			)
+	);
+	
+}
+function contains_bbox($c, &$r) {
+	if ($c['l']['x'] > $r['h']['x'])
+		return false;
+	elseif ($c['h']['x'] < $r['l']['x'])
+		return false;
+	elseif ($c['l']['y'] > $r['h']['y'])
+		return false;
+	elseif ($c['h']['y'] < $r['l']['y'])
+		return false;
+	else 
+		return true;
+}
+
+$fetch_bbox = getmercator(11.3, 47.9, 11.4, 48.0);
+
+$files = array();
+$files['input']  = '/home/burner/carputer/navit/src/maps/osm_bbox_11.3,47.9,11.7,48.2.bin';
+$files['output'] = 'myarea.bin';
+
+$formats = array();
+$formats['ziphpack'] = "lssssslLLSS";
+$formats['zipheader']  = "l" . "ziplocsig";	# Signature (is always the same)
+$formats['zipheader'] .= "/s" . "zipver";	# zip version needed
+$formats['zipheader'] .= "/s" . "zipgenfld";# type of os that generated the file
+$formats['zipheader'] .= "/s" . "zipmthd";	# 
+$formats['zipheader'] .= "/s" . "ziptime";	# time
+$formats['zipheader'] .= "/s" . "zipdate";	# date
+$formats['zipheader'] .= "/l" . "zipcrc";	# crc checksum
+$formats['zipheader'] .= "/L" . "zipsize";	# data size
+$formats['zipheader'] .= "/L" . "zipuncmp";	# uncompressed size
+$formats['zipheader'] .= "/S" . "zipfnln";	# length of filename
+$formats['zipheader'] .= "/S" . "zipxtraln";# length of extra data (always 0)
+
+$formats['zipcd'] = "".
+	"i" . "zipcensig/".
+	"c" . "zipcver/".
+	"c" . "zipcos/".
+	"c" . "zipcvxt/".
+	"c" . "zipcexos/".
+	"s" . "zipcflg/".
+	"s" . "zipcmthd/".
+	"s" . "ziptim/".
+	"s" . "zipdat/".
+	"i" . "zipccrc/".
+	"I" . "zipcsiz/".
+	"I" . "zipcunc/".
+	"S" . "zipcfnl/".
+	"S" . "zipcxtl/".
+	"S" . "zipccml/".
+	"S" . "zipdsk/".
+	"S" . "zipint/".
+	"I" . "zipext/".
+	"I" . "zipofst/".
+$formats['zipcdpack'] = "iccccssssiIISSSSSII";
+
+$formats['zipcontent'] = "i5x/i5y/ii";
+
+$world_bbox = array();
+$world_bbox['l']['x'] = -20000000;
+$world_bbox['l']['y'] = -20000000;
+$world_bbox['h']['x'] = 20000000;
+$world_bbox['h']['y'] = 20000000;
+
+$fp = fopen($files['input'], 'r');
+$sp = fopen($files['output'], 'w');
+
+$files = array();
+$offset = 0;
+
+/**
+ * Read through zipheaders
+ * 
+ */
+while (!feof($fp)) {
+	
+	$buffer = fread($fp, 30);
+	$tileinfo = unpack($formats['zipheader'], $buffer);
+	
+	if ($tileinfo['zipfnln'] <= 0)
+		break;
+	
+	$filename = fread($fp, $tileinfo['zipfnln']);
+	$x=0;
+	$done=false;
+	
+	$r = $world_bbox;
+	
+	while (!$done) {
+		$c['x'] = floor( ($r['l']['x'] + $r['h']['x'])/2 );
+		$c['y'] = floor( ($r['l']['y'] + $r['h']['y'])/2 );
+		
+		switch($filename[$x]) {
+		case 'a':
+			$r['l']['x'] = $c['x'];
+			$r['l']['y'] = $c['y'];
+			break;
+		case 'b':
+			$r['h']['x'] = $c['x'];
+			$r['l']['y'] = $c['y'];
+			break;
+		case 'c':
+			$r['l']['x'] = $c['x'];
+			$r['h']['y'] = $c['y'];
+			break;
+		case 'd':
+			$r['h']['x'] = $c['x'];
+			$r['h']['y'] = $c['y'];
+			break;
+		default:
+			$done=true;
+		}
+		$x++;
+	}
+	
+	$tilecontent = fread($fp, $tileinfo['zipsize']);
+	
+	/* Area inside box, save it! */
+	if (contains_bbox($fetch_bbox, $r)) {
+		#echo "In box. ";
+		#echo $filename . " ";
+		$zipheader = $buffer;
+		#echo "\n";
+		
+	/* Area outside of box, set zipcontent=0 */
+	} else {
+		$tileinfo['zipmthd'] = $tileinfo['zipcrc'] = $tileinfo['zipsize'] = $tileinfo['zipuncmp'] = 0;
+		#echo "Out of box";
+		$zipheader = $tileinfo;
+		$tilecontent = '';
+		$zipheader = pack($formats['ziphpack'], 
+							$tileinfo['ziplocsig'],
+							$tileinfo['zipver'],
+							$tileinfo['zipgenfld'],
+							$tileinfo['zipmthd'],
+							$tileinfo['ziptime'],
+							$tileinfo['zipdate'],
+							$tileinfo['zipcrc'],
+							$tileinfo['zipsize'],
+							$tileinfo['zipuncmp'],
+							$tileinfo['zipfnln'],
+							$tileinfo['zipxtraln']
+							);
+	}
+	
+	$put = $zipheader.$filename.$tilecontent;
+	$files[$filename]['header'] = $tileinfo;
+	$files[$filename]['size'] = strlen($put);
+	
+	$zipcd = array();
+	$zipcd['zipcensig'] = 0x02014b50;
+	$zipcd['zipcver'] 	= $tileinfo['zipver'];
+	$zipcd['zipcos']	= 0x00;
+	$zipcd['zipcvxt']	= 0x0a;
+	$zipcd['zipcexos']	= 0x00;
+	$zipcd['zipcflg']	= 0x00;
+	$zipcd['zipcmthd']	= $tileinfo['zipmthd'];
+	$zipcd['ziptim']	= $tileinfo['ziptime'];
+	$zipcd['zipdat']	= $tileinfo['zipdate'];
+	$zipcd['zipccrc']	= $tileinfo['zipcrc'];
+	$zipcd['zipcsiz']	= $tileinfo['zipsize'];
+	$zipcd['zipcunc']	= $tileinfo['zipuncmp'];
+	$zipcd['zipcfnl']	= $tileinfo['zipfnln'];
+	$zipcd['zipcxtl']	= 0x00;
+	$zipcd['zipccml']	= 0x00;
+	$zipcd['zipdsk']	= 0x00;
+	$zipcd['zipint']	= 0x00;
+	$zipcd['zipext']	= 0x00;
+	$zipcd['zipofst']	= $offset;
+
+	$zipcd_data .= pack($formats['zipcdpack'],
+		$zipcd['zipcensig'],
+		$zipcd['zipcver'],
+		$zipcd['zipcos'],
+		$zipcd['zipcvxt'],
+		$zipcd['zipcexos'],
+		$zipcd['zipcflg'],
+		$zipcd['zipcmthd'],
+		$zipcd['ziptim'],
+		$zipcd['zipdat'],
+		$zipcd['zipccrc'],
+		$zipcd['zipcsiz'],
+		$zipcd['zipcunc'],
+		$zipcd['zipcfnl'],
+		$zipcd['zipcxtl'],
+		$zipcd['zipccml'],
+		$zipcd['zipdsk'],
+		$zipcd['zipint'],
+		$zipcd['zipext'],
+		$zipcd['zipofst']
+	) . $filename;
+		
+	
+	fwrite($sp, $put);
+	$offset += strlen($put);
+	
+}
+
+fwrite($sp, $zipcd_data);
+
+fclose($fp);
+fclose($sp);
+
+?>
diff --git a/navit/support/espeak/espeak-data/voices/!v/m7 b/navit/support/espeak/espeak-data/voices/!v/m7
index 9a8370622..05f5b3e86 100755
--- a/navit/support/espeak/espeak-data/voices/!v/m7
+++ b/navit/support/espeak/espeak-data/voices/!v/m7
@@ -1,18 +1,18 @@
-language variant

-gender male 35

-name male5

-

-formant 0 120 150 220

-

-formant 1 100 100 100

-formant 2 100 100 100

-formant 3 100 100 100

-

-formant 4 100 80 100

-formant 5 100 100 100

-

-formant 6 80 200 80

-formant 7 80 200 100

-

-pitch 80 118

-tone 600 150 255 50  100 100

+language variant
+gender male 35
+name male5
+
+formant 0 120 150 220
+
+formant 1 100 100 100
+formant 2 100 100 100
+formant 3 100 100 100
+
+formant 4 100 80 100
+formant 5 100 100 100
+
+formant 6 80 200 80
+formant 7 80 200 100
+
+pitch 80 118
+tone 600 150 255 50  100 100
diff --git a/navit/support/win32/X11/XF86keysym.h b/navit/support/win32/X11/XF86keysym.h
index ff4980457..ee783c2fc 100644
--- a/navit/support/win32/X11/XF86keysym.h
+++ b/navit/support/win32/X11/XF86keysym.h
@@ -1,189 +1,189 @@
-/* $XFree86: xc/include/XF86keysym.h,v 1.16 2003/02/11 02:51:10 dawes Exp $ */

-

-/*

- * XFree86 vendor specific keysyms.

- *

- * The XFree86 keysym range is 0x10080001 - 0x1008FFFF.

- *

- * When adding new entries, the xc/lib/XKeysymDB file should also be

- * updated to make the new entries visible to Xlib.

- */

-

-/*

- * ModeLock

- *

- * This one is old, and not really used any more since XKB offers this

- * functionality.

- */

-

-#define XF86XK_ModeLock		0x1008FF01	/* Mode Switch Lock */

-

-/*

- * Note, 0x1008FF02 - 0x1008FF0F are free and should be used for misc new

- * keysyms that don't fit into any of the groups below.

- *

- * 0x1008FF64, 0x1008FF6F, 0x1008FF71, 0x1008FF83 are no longer used,

- * and should be used first for new keysyms.

- *

- * Check in keysymdef.h for generic symbols before adding new XFree86-specific

- * symbols here.

- */

-

-

-/*

- * Keys found on some "Internet" keyboards.

- */

-#define XF86XK_Standby		0x1008FF10

-#define XF86XK_AudioLowerVolume	0x1008FF11

-#define XF86XK_AudioMute	0x1008FF12

-#define XF86XK_AudioRaiseVolume	0x1008FF13

-#define XF86XK_AudioPlay	0x1008FF14

-#define XF86XK_AudioStop	0x1008FF15

-#define XF86XK_AudioPrev	0x1008FF16

-#define XF86XK_AudioNext	0x1008FF17

-#define XF86XK_HomePage		0x1008FF18

-#define XF86XK_Mail		0x1008FF19

-#define XF86XK_Start		0x1008FF1A

-#define XF86XK_Search		0x1008FF1B

-#define XF86XK_AudioRecord	0x1008FF1C

-

-/* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere) */

-#define XF86XK_Calculator	0x1008FF1D

-#define XF86XK_Memo		0x1008FF1E

-#define XF86XK_ToDoList		0x1008FF1F

-#define XF86XK_Calendar		0x1008FF20

-#define XF86XK_PowerDown	0x1008FF21

-#define XF86XK_ContrastAdjust	0x1008FF22

-#define XF86XK_RockerUp		0x1008FF23

-#define XF86XK_RockerDown	0x1008FF24

-#define XF86XK_RockerEnter	0x1008FF25

-

-/* Some more "Internet" keyboard symbols */

-#define XF86XK_Back		0x1008FF26

-#define XF86XK_Forward		0x1008FF27

-#define XF86XK_Stop		0x1008FF28

-#define XF86XK_Refresh		0x1008FF29

-#define XF86XK_PowerOff		0x1008FF2A

-#define XF86XK_WakeUp		0x1008FF2B

-#define XF86XK_Eject            0x1008FF2C

-#define XF86XK_ScreenSaver      0x1008FF2D

-#define XF86XK_WWW              0x1008FF2E

-#define XF86XK_Sleep            0x1008FF2F

-#define XF86XK_Favorites	0x1008FF30

-#define XF86XK_AudioPause	0x1008FF31

-#define XF86XK_AudioMedia	0x1008FF32

-#define XF86XK_MyComputer	0x1008FF33

-#define XF86XK_VendorHome	0x1008FF34

-#define XF86XK_LightBulb	0x1008FF35

-#define XF86XK_Shop		0x1008FF36

-#define XF86XK_History		0x1008FF37

-#define XF86XK_OpenURL		0x1008FF38

-#define XF86XK_AddFavorite	0x1008FF39

-#define XF86XK_HotLinks		0x1008FF3A

-#define XF86XK_BrightnessAdjust	0x1008FF3B

-#define XF86XK_Finance		0x1008FF3C

-#define XF86XK_Community	0x1008FF3D

-#define XF86XK_AudioRewind	0x1008FF3E

-#define XF86XK_XF86BackForward	0x1008FF3F

-#define XF86XK_Launch0		0x1008FF40

-#define XF86XK_Launch1		0x1008FF41

-#define XF86XK_Launch2		0x1008FF42

-#define XF86XK_Launch3		0x1008FF43

-#define XF86XK_Launch4		0x1008FF44

-#define XF86XK_Launch5		0x1008FF45

-#define XF86XK_Launch6		0x1008FF46

-#define XF86XK_Launch7		0x1008FF47

-#define XF86XK_Launch8		0x1008FF48

-#define XF86XK_Launch9		0x1008FF49

-#define XF86XK_LaunchA		0x1008FF4A

-#define XF86XK_LaunchB		0x1008FF4B

-#define XF86XK_LaunchC		0x1008FF4C

-#define XF86XK_LaunchD		0x1008FF4D

-#define XF86XK_LaunchE		0x1008FF4E

-#define XF86XK_LaunchF		0x1008FF4F

-

-#define XF86XK_ApplicationLeft	0x1008FF50

-#define XF86XK_ApplicationRight	0x1008FF51

-#define XF86XK_Book		0x1008FF52

-#define XF86XK_CD		0x1008FF53

-#define XF86XK_Calculater	0x1008FF54

-#define XF86XK_Clear		0x1008FF55

-#define XF86XK_Close		0x1008FF56

-#define XF86XK_Copy		0x1008FF57

-#define XF86XK_Cut		0x1008FF58

-#define XF86XK_Display		0x1008FF59

-#define XF86XK_DOS		0x1008FF5A

-#define XF86XK_Documents	0x1008FF5B

-#define XF86XK_Excel		0x1008FF5C

-#define XF86XK_Explorer		0x1008FF5D

-#define XF86XK_Game		0x1008FF5E

-#define XF86XK_Go		0x1008FF5F

-#define XF86XK_iTouch		0x1008FF60

-#define XF86XK_LogOff		0x1008FF61

-#define XF86XK_Market		0x1008FF62

-#define XF86XK_Meeting		0x1008FF63

-#define XF86XK_MenuKB		0x1008FF65

-#define XF86XK_MenuPB		0x1008FF66

-#define XF86XK_MySites		0x1008FF67

-#define XF86XK_New		0x1008FF68

-#define XF86XK_News		0x1008FF69

-#define XF86XK_OfficeHome	0x1008FF6A

-#define XF86XK_Open		0x1008FF6B

-#define XF86XK_Option		0x1008FF6C

-#define XF86XK_Paste		0x1008FF6D

-#define XF86XK_Phone		0x1008FF6E

-#define XF86XK_Q		0x1008FF70

-#define XF86XK_Reply		0x1008FF72

-#define XF86XK_Reload		0x1008FF73

-#define XF86XK_RotateWindows	0x1008FF74

-#define XF86XK_RotationPB	0x1008FF75

-#define XF86XK_RotationKB	0x1008FF76

-#define XF86XK_Save		0x1008FF77

-#define XF86XK_ScrollUp		0x1008FF78

-#define XF86XK_ScrollDown	0x1008FF79

-#define XF86XK_ScrollClick	0x1008FF7A

-#define XF86XK_Send		0x1008FF7B

-#define XF86XK_Spell		0x1008FF7C

-#define XF86XK_SplitScreen	0x1008FF7D

-#define XF86XK_Support		0x1008FF7E

-#define XF86XK_TaskPane		0x1008FF7F

-#define XF86XK_Terminal		0x1008FF80

-#define XF86XK_Tools		0x1008FF81

-#define XF86XK_Travel		0x1008FF82

-#define XF86XK_UserPB		0x1008FF84

-#define XF86XK_User1KB		0x1008FF85

-#define XF86XK_User2KB		0x1008FF86

-#define XF86XK_Video		0x1008FF87

-#define XF86XK_WheelButton	0x1008FF88

-#define XF86XK_Word		0x1008FF89

-#define XF86XK_Xfer		0x1008FF8A

-#define XF86XK_ZoomIn		0x1008FF8B

-#define XF86XK_ZoomOut		0x1008FF8C

-

-#define XF86XK_Away		0x1008FF8D

-#define XF86XK_Messenger	0x1008FF8E

-#define XF86XK_WebCam		0x1008FF8F

-#define XF86XK_MailForward	0x1008FF90

-#define XF86XK_Pictures		0x1008FF91

-#define XF86XK_Music		0x1008FF92

-

-/* Keys for special action keys (hot keys) */

-#define XF86XK_Switch_VT_1	0x1008FE01

-#define XF86XK_Switch_VT_2	0x1008FE02

-#define XF86XK_Switch_VT_3	0x1008FE03

-#define XF86XK_Switch_VT_4	0x1008FE04

-#define XF86XK_Switch_VT_5	0x1008FE05

-#define XF86XK_Switch_VT_6	0x1008FE06

-#define XF86XK_Switch_VT_7	0x1008FE07

-#define XF86XK_Switch_VT_8	0x1008FE08

-#define XF86XK_Switch_VT_9	0x1008FE09

-#define XF86XK_Switch_VT_10	0x1008FE0A

-#define XF86XK_Switch_VT_11	0x1008FE0B

-#define XF86XK_Switch_VT_12	0x1008FE0C

-

-#define XF86XK_Ungrab		0x1008FE20

-#define XF86XK_ClearGrab	0x1008FE21

-#define XF86XK_Next_VMode	0x1008FE22

-#define XF86XK_Prev_VMode	0x1008FE23

-

-

+/* $XFree86: xc/include/XF86keysym.h,v 1.16 2003/02/11 02:51:10 dawes Exp $ */
+
+/*
+ * XFree86 vendor specific keysyms.
+ *
+ * The XFree86 keysym range is 0x10080001 - 0x1008FFFF.
+ *
+ * When adding new entries, the xc/lib/XKeysymDB file should also be
+ * updated to make the new entries visible to Xlib.
+ */
+
+/*
+ * ModeLock
+ *
+ * This one is old, and not really used any more since XKB offers this
+ * functionality.
+ */
+
+#define XF86XK_ModeLock		0x1008FF01	/* Mode Switch Lock */
+
+/*
+ * Note, 0x1008FF02 - 0x1008FF0F are free and should be used for misc new
+ * keysyms that don't fit into any of the groups below.
+ *
+ * 0x1008FF64, 0x1008FF6F, 0x1008FF71, 0x1008FF83 are no longer used,
+ * and should be used first for new keysyms.
+ *
+ * Check in keysymdef.h for generic symbols before adding new XFree86-specific
+ * symbols here.
+ */
+
+
+/*
+ * Keys found on some "Internet" keyboards.
+ */
+#define XF86XK_Standby		0x1008FF10
+#define XF86XK_AudioLowerVolume	0x1008FF11
+#define XF86XK_AudioMute	0x1008FF12
+#define XF86XK_AudioRaiseVolume	0x1008FF13
+#define XF86XK_AudioPlay	0x1008FF14
+#define XF86XK_AudioStop	0x1008FF15
+#define XF86XK_AudioPrev	0x1008FF16
+#define XF86XK_AudioNext	0x1008FF17
+#define XF86XK_HomePage		0x1008FF18
+#define XF86XK_Mail		0x1008FF19
+#define XF86XK_Start		0x1008FF1A
+#define XF86XK_Search		0x1008FF1B
+#define XF86XK_AudioRecord	0x1008FF1C
+
+/* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere) */
+#define XF86XK_Calculator	0x1008FF1D
+#define XF86XK_Memo		0x1008FF1E
+#define XF86XK_ToDoList		0x1008FF1F
+#define XF86XK_Calendar		0x1008FF20
+#define XF86XK_PowerDown	0x1008FF21
+#define XF86XK_ContrastAdjust	0x1008FF22
+#define XF86XK_RockerUp		0x1008FF23
+#define XF86XK_RockerDown	0x1008FF24
+#define XF86XK_RockerEnter	0x1008FF25
+
+/* Some more "Internet" keyboard symbols */
+#define XF86XK_Back		0x1008FF26
+#define XF86XK_Forward		0x1008FF27
+#define XF86XK_Stop		0x1008FF28
+#define XF86XK_Refresh		0x1008FF29
+#define XF86XK_PowerOff		0x1008FF2A
+#define XF86XK_WakeUp		0x1008FF2B
+#define XF86XK_Eject            0x1008FF2C
+#define XF86XK_ScreenSaver      0x1008FF2D
+#define XF86XK_WWW              0x1008FF2E
+#define XF86XK_Sleep            0x1008FF2F
+#define XF86XK_Favorites	0x1008FF30
+#define XF86XK_AudioPause	0x1008FF31
+#define XF86XK_AudioMedia	0x1008FF32
+#define XF86XK_MyComputer	0x1008FF33
+#define XF86XK_VendorHome	0x1008FF34
+#define XF86XK_LightBulb	0x1008FF35
+#define XF86XK_Shop		0x1008FF36
+#define XF86XK_History		0x1008FF37
+#define XF86XK_OpenURL		0x1008FF38
+#define XF86XK_AddFavorite	0x1008FF39
+#define XF86XK_HotLinks		0x1008FF3A
+#define XF86XK_BrightnessAdjust	0x1008FF3B
+#define XF86XK_Finance		0x1008FF3C
+#define XF86XK_Community	0x1008FF3D
+#define XF86XK_AudioRewind	0x1008FF3E
+#define XF86XK_XF86BackForward	0x1008FF3F
+#define XF86XK_Launch0		0x1008FF40
+#define XF86XK_Launch1		0x1008FF41
+#define XF86XK_Launch2		0x1008FF42
+#define XF86XK_Launch3		0x1008FF43
+#define XF86XK_Launch4		0x1008FF44
+#define XF86XK_Launch5		0x1008FF45
+#define XF86XK_Launch6		0x1008FF46
+#define XF86XK_Launch7		0x1008FF47
+#define XF86XK_Launch8		0x1008FF48
+#define XF86XK_Launch9		0x1008FF49
+#define XF86XK_LaunchA		0x1008FF4A
+#define XF86XK_LaunchB		0x1008FF4B
+#define XF86XK_LaunchC		0x1008FF4C
+#define XF86XK_LaunchD		0x1008FF4D
+#define XF86XK_LaunchE		0x1008FF4E
+#define XF86XK_LaunchF		0x1008FF4F
+
+#define XF86XK_ApplicationLeft	0x1008FF50
+#define XF86XK_ApplicationRight	0x1008FF51
+#define XF86XK_Book		0x1008FF52
+#define XF86XK_CD		0x1008FF53
+#define XF86XK_Calculater	0x1008FF54
+#define XF86XK_Clear		0x1008FF55
+#define XF86XK_Close		0x1008FF56
+#define XF86XK_Copy		0x1008FF57
+#define XF86XK_Cut		0x1008FF58
+#define XF86XK_Display		0x1008FF59
+#define XF86XK_DOS		0x1008FF5A
+#define XF86XK_Documents	0x1008FF5B
+#define XF86XK_Excel		0x1008FF5C
+#define XF86XK_Explorer		0x1008FF5D
+#define XF86XK_Game		0x1008FF5E
+#define XF86XK_Go		0x1008FF5F
+#define XF86XK_iTouch		0x1008FF60
+#define XF86XK_LogOff		0x1008FF61
+#define XF86XK_Market		0x1008FF62
+#define XF86XK_Meeting		0x1008FF63
+#define XF86XK_MenuKB		0x1008FF65
+#define XF86XK_MenuPB		0x1008FF66
+#define XF86XK_MySites		0x1008FF67
+#define XF86XK_New		0x1008FF68
+#define XF86XK_News		0x1008FF69
+#define XF86XK_OfficeHome	0x1008FF6A
+#define XF86XK_Open		0x1008FF6B
+#define XF86XK_Option		0x1008FF6C
+#define XF86XK_Paste		0x1008FF6D
+#define XF86XK_Phone		0x1008FF6E
+#define XF86XK_Q		0x1008FF70
+#define XF86XK_Reply		0x1008FF72
+#define XF86XK_Reload		0x1008FF73
+#define XF86XK_RotateWindows	0x1008FF74
+#define XF86XK_RotationPB	0x1008FF75
+#define XF86XK_RotationKB	0x1008FF76
+#define XF86XK_Save		0x1008FF77
+#define XF86XK_ScrollUp		0x1008FF78
+#define XF86XK_ScrollDown	0x1008FF79
+#define XF86XK_ScrollClick	0x1008FF7A
+#define XF86XK_Send		0x1008FF7B
+#define XF86XK_Spell		0x1008FF7C
+#define XF86XK_SplitScreen	0x1008FF7D
+#define XF86XK_Support		0x1008FF7E
+#define XF86XK_TaskPane		0x1008FF7F
+#define XF86XK_Terminal		0x1008FF80
+#define XF86XK_Tools		0x1008FF81
+#define XF86XK_Travel		0x1008FF82
+#define XF86XK_UserPB		0x1008FF84
+#define XF86XK_User1KB		0x1008FF85
+#define XF86XK_User2KB		0x1008FF86
+#define XF86XK_Video		0x1008FF87
+#define XF86XK_WheelButton	0x1008FF88
+#define XF86XK_Word		0x1008FF89
+#define XF86XK_Xfer		0x1008FF8A
+#define XF86XK_ZoomIn		0x1008FF8B
+#define XF86XK_ZoomOut		0x1008FF8C
+
+#define XF86XK_Away		0x1008FF8D
+#define XF86XK_Messenger	0x1008FF8E
+#define XF86XK_WebCam		0x1008FF8F
+#define XF86XK_MailForward	0x1008FF90
+#define XF86XK_Pictures		0x1008FF91
+#define XF86XK_Music		0x1008FF92
+
+/* Keys for special action keys (hot keys) */
+#define XF86XK_Switch_VT_1	0x1008FE01
+#define XF86XK_Switch_VT_2	0x1008FE02
+#define XF86XK_Switch_VT_3	0x1008FE03
+#define XF86XK_Switch_VT_4	0x1008FE04
+#define XF86XK_Switch_VT_5	0x1008FE05
+#define XF86XK_Switch_VT_6	0x1008FE06
+#define XF86XK_Switch_VT_7	0x1008FE07
+#define XF86XK_Switch_VT_8	0x1008FE08
+#define XF86XK_Switch_VT_9	0x1008FE09
+#define XF86XK_Switch_VT_10	0x1008FE0A
+#define XF86XK_Switch_VT_11	0x1008FE0B
+#define XF86XK_Switch_VT_12	0x1008FE0C
+
+#define XF86XK_Ungrab		0x1008FE20
+#define XF86XK_ClearGrab	0x1008FE21
+#define XF86XK_Next_VMode	0x1008FE22
+#define XF86XK_Prev_VMode	0x1008FE23
+
+
diff --git a/navit/support/win32/addwinsock.c b/navit/support/win32/addwinsock.c
index 63ae968d5..55f8d2167 100644
--- a/navit/support/win32/addwinsock.c
+++ b/navit/support/win32/addwinsock.c
@@ -1,8 +1,8 @@
-#include "addwinsock.h"

-

-int inet_aton(const char *cp, struct in_addr *inp)

-{

-	unsigned long addr = inet_addr(cp);

-	inp->S_un.S_addr = addr;

-	return addr != -1;

-}

+#include "addwinsock.h"
+
+int inet_aton(const char *cp, struct in_addr *inp)
+{
+	unsigned long addr = inet_addr(cp);
+	inp->S_un.S_addr = addr;
+	return addr != -1;
+}
diff --git a/navit/support/win32/addwinsock.h b/navit/support/win32/addwinsock.h
index 49dfdc0cb..f55aceaf1 100644
--- a/navit/support/win32/addwinsock.h
+++ b/navit/support/win32/addwinsock.h
@@ -1,8 +1,8 @@
-#ifndef ADD_WINSOCK

-#define ADD_WINSOCK

-

-#include <winsock2.h>

-

-int inet_aton(const char *cp, struct in_addr *inp);

-

-#endif

+#ifndef ADD_WINSOCK
+#define ADD_WINSOCK
+
+#include <winsock2.h>
+
+int inet_aton(const char *cp, struct in_addr *inp);
+
+#endif
diff --git a/navit/support/xgetopt/XGetopt.c b/navit/support/xgetopt/XGetopt.c
index d6174d826..60bc0f474 100644
--- a/navit/support/xgetopt/XGetopt.c
+++ b/navit/support/xgetopt/XGetopt.c
@@ -1,216 +1,216 @@
-// XGetopt.cpp  Version 1.2

-//

-// Author:  Hans Dietrich

-//          hdietrich2@hotmail.com

-//

-// Description:

-//     XGetopt.cpp implements getopt(), a function to parse command lines.

-//

-// History

-//     Version 1.2 - 2003 May 17

-//     - Added Unicode support

-//

-//     Version 1.1 - 2002 March 10

-//     - Added example to XGetopt.cpp module header 

-//

-// This software is released into the public domain.

-// You are free to use it in any way you like.

-//

-// This software is provided "as is" with no expressed

-// or implied warranty.  I accept no liability for any

-// damage or loss of business that this software may cause.

-//

-///////////////////////////////////////////////////////////////////////////////

-

-

-

-///////////////////////////////////////////////////////////////////////////////

-// if you are not using precompiled headers then include these lines:

-#include <windows.h>

-#include <stdio.h>

-///////////////////////////////////////////////////////////////////////////////

-

-

-#include "XGetopt.h"

-

-

-///////////////////////////////////////////////////////////////////////////////

-//

-//  X G e t o p t . c p p

-//

-//

-//  NAME

-//       getopt -- parse command line options

-//

-//  SYNOPSIS

-//       int getopt(int argc, char *argv[], char *optstring)

-//

-//       extern char *optarg;

-//       extern int optind;

-//

-//  DESCRIPTION

-//       The getopt() function parses the command line arguments. Its

-//       arguments argc and argv are the argument count and array as

-//       passed into the application on program invocation.  In the case

-//       of Visual C++ programs, argc and argv are available via the

-//       variables __argc and __argv (double underscores), respectively.

-//       getopt returns the next option letter in argv that matches a

-//       letter in optstring.  (Note:  Unicode programs should use

-//       __targv instead of __argv.  Also, all character and string

-//       literals should be enclosed in _T( ) ).

-//

-//       optstring is a string of recognized option letters;  if a letter

-//       is followed by a colon, the option is expected to have an argument

-//       that may or may not be separated from it by white space.  optarg

-//       is set to point to the start of the option argument on return from

-//       getopt.

-//

-//       Option letters may be combined, e.g., "-ab" is equivalent to

-//       "-a -b".  Option letters are case sensitive.

-//

-//       getopt places in the external variable optind the argv index

-//       of the next argument to be processed.  optind is initialized

-//       to 0 before the first call to getopt.

-//

-//       When all options have been processed (i.e., up to the first

-//       non-option argument), getopt returns EOF, optarg will point

-//       to the argument, and optind will be set to the argv index of

-//       the argument.  If there are no non-option arguments, optarg

-//       will be set to NULL.

-//

-//       The special option "--" may be used to delimit the end of the

-//       options;  EOF will be returned, and "--" (and everything after it)

-//       will be skipped.

-//

-//  RETURN VALUE

-//       For option letters contained in the string optstring, getopt

-//       will return the option letter.  getopt returns a question mark (?)

-//       when it encounters an option letter not included in optstring.

-//       EOF is returned when processing is finished.

-//

-//  BUGS

-//       1)  Long options are not supported.

-//       2)  The GNU double-colon extension is not supported.

-//       3)  The environment variable POSIXLY_CORRECT is not supported.

-//       4)  The + syntax is not supported.

-//       5)  The automatic permutation of arguments is not supported.

-//       6)  This implementation of getopt() returns EOF if an error is

-//           encountered, instead of -1 as the latest standard requires.

-//

-//  EXAMPLE

-//       BOOL CMyApp::ProcessCommandLine(int argc, char *argv[])

-//       {

-//           int c;

-//

-//           while ((c = getopt(argc, argv, "aBn:")) != EOF)

-//           {

-//               switch (c)

-//               {

-//                   case 'a':

-//                       TRACE("option a\n");

-//                       //

-//                       // set some flag here

-//                       //

-//                       break;

-//

-//                   case 'B':

-//                       TRACE( "option B\n");

-//                       //

-//                       // set some other flag here

-//                       //

-//                       break;

-//

-//                   case 'n':

-//                       TRACE("option n: value=%d\n", atoi(optarg));

-//                       //

-//                       // do something with value here

-//                       //

-//                       break;

-//

-//                   case '?':

-//                       TRACE("ERROR: illegal option %s\n", argv[optind-1]);

-//                       return FALSE;

-//                       break;

-//

-//                   default:

-//                       TRACE("WARNING: no handler for option %c\n", c);

-//                       return FALSE;

-//                       break;

-//               }

-//           }

-//           //

-//           // check for non-option args here

-//           //

-//           return TRUE;

-//       }

-//

-///////////////////////////////////////////////////////////////////////////////

-

-char	*optarg;		// global argument pointer

-int		optind = 0; 	// global argv index

-

-int getopt(int argc, char *argv[], char *optstring)

-{

-	static char *next = NULL;

-	char c;

-	char *cp;

-

-	if (optind == 0)

-		next = NULL;

-

-	optarg = NULL;

-

-	if (next == NULL || *next == '\0')

-	{

-		if (optind == 0)

-			optind++;

-

-		if (optind >= argc || argv[optind][0] != '-' || argv[optind][1] == '\0')

-		{

-			optarg = NULL;

-			if (optind < argc)

-				optarg = argv[optind];

-			return EOF;

-		}

-

-		if (strcmp(argv[optind], "--") == 0)

-		{

-			optind++;

-			optarg = NULL;

-			if (optind < argc)

-				optarg = argv[optind];

-			return EOF;

-		}

-

-		next = argv[optind];

-		next++;		// skip past -

-		optind++;

-	}

-

-	c = *next++;

-	cp = strchr(optstring, c);

-

-	if (cp == NULL || c == ':')

-		return '?';

-

-	cp++;

-	if (*cp == ':')

-	{

-		if (*next != '\0')

-		{

-			optarg = next;

-			next = NULL;

-		}

-		else if (optind < argc)

-		{

-			optarg = argv[optind];

-			optind++;

-		}

-		else

-		{

-			return '?';

-		}

-	}

-

-	return c;

-}

+// XGetopt.cpp  Version 1.2
+//
+// Author:  Hans Dietrich
+//          hdietrich2@hotmail.com
+//
+// Description:
+//     XGetopt.cpp implements getopt(), a function to parse command lines.
+//
+// History
+//     Version 1.2 - 2003 May 17
+//     - Added Unicode support
+//
+//     Version 1.1 - 2002 March 10
+//     - Added example to XGetopt.cpp module header 
+//
+// This software is released into the public domain.
+// You are free to use it in any way you like.
+//
+// This software is provided "as is" with no expressed
+// or implied warranty.  I accept no liability for any
+// damage or loss of business that this software may cause.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+
+///////////////////////////////////////////////////////////////////////////////
+// if you are not using precompiled headers then include these lines:
+#include <windows.h>
+#include <stdio.h>
+///////////////////////////////////////////////////////////////////////////////
+
+
+#include "XGetopt.h"
+
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//  X G e t o p t . c p p
+//
+//
+//  NAME
+//       getopt -- parse command line options
+//
+//  SYNOPSIS
+//       int getopt(int argc, char *argv[], char *optstring)
+//
+//       extern char *optarg;
+//       extern int optind;
+//
+//  DESCRIPTION
+//       The getopt() function parses the command line arguments. Its
+//       arguments argc and argv are the argument count and array as
+//       passed into the application on program invocation.  In the case
+//       of Visual C++ programs, argc and argv are available via the
+//       variables __argc and __argv (double underscores), respectively.
+//       getopt returns the next option letter in argv that matches a
+//       letter in optstring.  (Note:  Unicode programs should use
+//       __targv instead of __argv.  Also, all character and string
+//       literals should be enclosed in _T( ) ).
+//
+//       optstring is a string of recognized option letters;  if a letter
+//       is followed by a colon, the option is expected to have an argument
+//       that may or may not be separated from it by white space.  optarg
+//       is set to point to the start of the option argument on return from
+//       getopt.
+//
+//       Option letters may be combined, e.g., "-ab" is equivalent to
+//       "-a -b".  Option letters are case sensitive.
+//
+//       getopt places in the external variable optind the argv index
+//       of the next argument to be processed.  optind is initialized
+//       to 0 before the first call to getopt.
+//
+//       When all options have been processed (i.e., up to the first
+//       non-option argument), getopt returns EOF, optarg will point
+//       to the argument, and optind will be set to the argv index of
+//       the argument.  If there are no non-option arguments, optarg
+//       will be set to NULL.
+//
+//       The special option "--" may be used to delimit the end of the
+//       options;  EOF will be returned, and "--" (and everything after it)
+//       will be skipped.
+//
+//  RETURN VALUE
+//       For option letters contained in the string optstring, getopt
+//       will return the option letter.  getopt returns a question mark (?)
+//       when it encounters an option letter not included in optstring.
+//       EOF is returned when processing is finished.
+//
+//  BUGS
+//       1)  Long options are not supported.
+//       2)  The GNU double-colon extension is not supported.
+//       3)  The environment variable POSIXLY_CORRECT is not supported.
+//       4)  The + syntax is not supported.
+//       5)  The automatic permutation of arguments is not supported.
+//       6)  This implementation of getopt() returns EOF if an error is
+//           encountered, instead of -1 as the latest standard requires.
+//
+//  EXAMPLE
+//       BOOL CMyApp::ProcessCommandLine(int argc, char *argv[])
+//       {
+//           int c;
+//
+//           while ((c = getopt(argc, argv, "aBn:")) != EOF)
+//           {
+//               switch (c)
+//               {
+//                   case 'a':
+//                       TRACE("option a\n");
+//                       //
+//                       // set some flag here
+//                       //
+//                       break;
+//
+//                   case 'B':
+//                       TRACE( "option B\n");
+//                       //
+//                       // set some other flag here
+//                       //
+//                       break;
+//
+//                   case 'n':
+//                       TRACE("option n: value=%d\n", atoi(optarg));
+//                       //
+//                       // do something with value here
+//                       //
+//                       break;
+//
+//                   case '?':
+//                       TRACE("ERROR: illegal option %s\n", argv[optind-1]);
+//                       return FALSE;
+//                       break;
+//
+//                   default:
+//                       TRACE("WARNING: no handler for option %c\n", c);
+//                       return FALSE;
+//                       break;
+//               }
+//           }
+//           //
+//           // check for non-option args here
+//           //
+//           return TRUE;
+//       }
+//
+///////////////////////////////////////////////////////////////////////////////
+
+char	*optarg;		// global argument pointer
+int		optind = 0; 	// global argv index
+
+int getopt(int argc, char *argv[], char *optstring)
+{
+	static char *next = NULL;
+	char c;
+	char *cp;
+
+	if (optind == 0)
+		next = NULL;
+
+	optarg = NULL;
+
+	if (next == NULL || *next == '\0')
+	{
+		if (optind == 0)
+			optind++;
+
+		if (optind >= argc || argv[optind][0] != '-' || argv[optind][1] == '\0')
+		{
+			optarg = NULL;
+			if (optind < argc)
+				optarg = argv[optind];
+			return EOF;
+		}
+
+		if (strcmp(argv[optind], "--") == 0)
+		{
+			optind++;
+			optarg = NULL;
+			if (optind < argc)
+				optarg = argv[optind];
+			return EOF;
+		}
+
+		next = argv[optind];
+		next++;		// skip past -
+		optind++;
+	}
+
+	c = *next++;
+	cp = strchr(optstring, c);
+
+	if (cp == NULL || c == ':')
+		return '?';
+
+	cp++;
+	if (*cp == ':')
+	{
+		if (*next != '\0')
+		{
+			optarg = next;
+			next = NULL;
+		}
+		else if (optind < argc)
+		{
+			optarg = argv[optind];
+			optind++;
+		}
+		else
+		{
+			return '?';
+		}
+	}
+
+	return c;
+}
diff --git a/navit/support/xgetopt/XGetopt.h b/navit/support/xgetopt/XGetopt.h
index b975026c1..4bf8c8779 100644
--- a/navit/support/xgetopt/XGetopt.h
+++ b/navit/support/xgetopt/XGetopt.h
@@ -1,29 +1,29 @@
-// XGetopt.h  Version 1.2

-//

-// Author:  Hans Dietrich

-//          hdietrich2@hotmail.com

-//

-// This software is released into the public domain.

-// You are free to use it in any way you like.

-//

-// This software is provided "as is" with no expressed

-// or implied warranty.  I accept no liability for any

-// damage or loss of business that this software may cause.

-//

-///////////////////////////////////////////////////////////////////////////////

-

-#ifndef XGETOPT_H

-#define XGETOPT_H

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-extern int optind, opterr;

-extern char *optarg;

-

-int getopt(int argc, char *argv[], char *optstring);

-#ifdef __cplusplus

-}

-#endif

-#endif //XGETOPT_H

+// XGetopt.h  Version 1.2
+//
+// Author:  Hans Dietrich
+//          hdietrich2@hotmail.com
+//
+// This software is released into the public domain.
+// You are free to use it in any way you like.
+//
+// This software is provided "as is" with no expressed
+// or implied warranty.  I accept no liability for any
+// damage or loss of business that this software may cause.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef XGETOPT_H
+#define XGETOPT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int optind, opterr;
+extern char *optarg;
+
+int getopt(int argc, char *argv[], char *optstring);
+#ifdef __cplusplus
+}
+#endif
+#endif //XGETOPT_H
diff --git a/navit/tools/latlon2bookmark/latlon2bookmark.c b/navit/tools/latlon2bookmark/latlon2bookmark.c
index 9f0eff79a..4f5fe54cb 100644
--- a/navit/tools/latlon2bookmark/latlon2bookmark.c
+++ b/navit/tools/latlon2bookmark/latlon2bookmark.c
@@ -1,140 +1,140 @@
-/**

- * Navit, a modular navigation system.

- * 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

- * version 2 as published by the Free Software Foundation.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the

- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

- * Boston, MA  02110-1301, USA.

- */

-

-/**

- * this program is free software, please use it as you like.

- * i am not a programmer, so please have this code reviewed

- * to make sure it has nog bugs or ill side efects.

- * use at your own risk

- * compile it with: gcc -l m -o latlon2bookmark latlon2bookmark.c

- * Credits for this work goes to edje in #navit

-**/

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <math.h>

-#include <string.h>

-

-int main( int argc, char **argv )

-{

-    char        description[256];

-    char        lngsign[10];

-    char        latsign[10];

-    float       lat;

-    float       lng;

-    long        intlat;

-    long        intlng;

-    int         i;

-    int         n;

-

-    if ( argc < 4 )

-     {

-     printf("\n");

-     printf("This program converts a lat/lon coordinates pair\n");

-     printf("into a bookmark you can use with navit.\n");

-     printf("This program expects 3 arguments in the following order:\n");

-     printf("Lat, Lon and a description\n");

-     printf("and will print a bookmark.\n");

-     printf("for example: latlon2bookmark 51.980344 4.358005 this is my house \n");

-     printf("\n");

-     return 1;

-     }

-

-    lat=atof(argv[1]);

-    lng=atof(argv[2]);

-

-    /* concatenate all parts of the description string */

-    strcpy(description, argv[3]);

-    n=0;

-    for (i=4; i < argc; i++)

-     {

-     /* add spaces between the parts of the description */

-     if ( i < argc )

-      {

-      strcat(description, " ");

-      }

-     strcat(description, argv[i]);

-     n=n+1;

-     }

-

-    if ( lat < -90 )

-     {

-     printf("\n");

-     printf("The first argument must be the lattitude\n");

-     printf("and can't be smaller then -90 (southpole)\n");

-     printf("\n");

-     return 2;

-     }

-

-    if ( lat > 90 )

-     {

-     printf("\n");

-     printf("The first argument must be the lattitude\n");

-     printf("and can't be bigger then 90 (northpole)\n");

-     printf("\n");

-     return 3;

-     }

-

-    if ( lng < -180 )

-     {

-     printf("\n");

-     printf("The second argument must be the longitude\n");

-     printf("and can't be smaller then -180 (oposite the 0 meridian)\n");

-     printf("\n");

-     return 4;

-     }

-

-    if ( lng > 180 )

-     {

-     printf("\n");

-     printf("The first argument must be the longitude\n");

-     printf("and can't be bigger then 180 (oposite the 0 meridian)\n");

-     printf("\n");

-     return 5;

-     }

-

-    /* convert the longitude to an integer */

-    intlng=lng*6371000.0*M_PI/180;

-

-    /* aparently if inlng < 0 , inlng needs to be inverted and a - sign used in the output */

-    strcpy(lngsign, "0x");

-    if ( intlng < 0)

-     {

-     intlng=(intlng ^ 0xffffffff);

-     strcpy(lngsign, "-0x");

-     }

-

-    /* and the same for the latitude */

-    intlat=log(tan(M_PI_4+lat*M_PI/360))*6371000.0;

-

-    /* aparently if inlat < 0 , inlat needs to be inverted and a - sign used in the output */

-    strcpy(latsign, "0x");

-    if ( intlat < 0)

-     {

-     intlat=(intlat ^ 0xffffffff);

-     strcpy(latsign, "-0x");

-     }

-

-    /* print the bookmark */

-    fprintf(stderr,"\n");

-    fprintf(stdout,"mg:%s%x %s%x type=bookmark label=\"%s\"\n",lngsign,intlng,latsign,intlat,description);

-    fprintf(stderr,"\n");

-

-    return 0;

-}

+/**
+ * Navit, a modular navigation system.
+ * 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
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ */
+
+/**
+ * this program is free software, please use it as you like.
+ * i am not a programmer, so please have this code reviewed
+ * to make sure it has nog bugs or ill side efects.
+ * use at your own risk
+ * compile it with: gcc -l m -o latlon2bookmark latlon2bookmark.c
+ * Credits for this work goes to edje in #navit
+**/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <string.h>
+
+int main( int argc, char **argv )
+{
+    char        description[256];
+    char        lngsign[10];
+    char        latsign[10];
+    float       lat;
+    float       lng;
+    long        intlat;
+    long        intlng;
+    int         i;
+    int         n;
+
+    if ( argc < 4 )
+     {
+     printf("\n");
+     printf("This program converts a lat/lon coordinates pair\n");
+     printf("into a bookmark you can use with navit.\n");
+     printf("This program expects 3 arguments in the following order:\n");
+     printf("Lat, Lon and a description\n");
+     printf("and will print a bookmark.\n");
+     printf("for example: latlon2bookmark 51.980344 4.358005 this is my house \n");
+     printf("\n");
+     return 1;
+     }
+
+    lat=atof(argv[1]);
+    lng=atof(argv[2]);
+
+    /* concatenate all parts of the description string */
+    strcpy(description, argv[3]);
+    n=0;
+    for (i=4; i < argc; i++)
+     {
+     /* add spaces between the parts of the description */
+     if ( i < argc )
+      {
+      strcat(description, " ");
+      }
+     strcat(description, argv[i]);
+     n=n+1;
+     }
+
+    if ( lat < -90 )
+     {
+     printf("\n");
+     printf("The first argument must be the lattitude\n");
+     printf("and can't be smaller then -90 (southpole)\n");
+     printf("\n");
+     return 2;
+     }
+
+    if ( lat > 90 )
+     {
+     printf("\n");
+     printf("The first argument must be the lattitude\n");
+     printf("and can't be bigger then 90 (northpole)\n");
+     printf("\n");
+     return 3;
+     }
+
+    if ( lng < -180 )
+     {
+     printf("\n");
+     printf("The second argument must be the longitude\n");
+     printf("and can't be smaller then -180 (oposite the 0 meridian)\n");
+     printf("\n");
+     return 4;
+     }
+
+    if ( lng > 180 )
+     {
+     printf("\n");
+     printf("The first argument must be the longitude\n");
+     printf("and can't be bigger then 180 (oposite the 0 meridian)\n");
+     printf("\n");
+     return 5;
+     }
+
+    /* convert the longitude to an integer */
+    intlng=lng*6371000.0*M_PI/180;
+
+    /* aparently if inlng < 0 , inlng needs to be inverted and a - sign used in the output */
+    strcpy(lngsign, "0x");
+    if ( intlng < 0)
+     {
+     intlng=(intlng ^ 0xffffffff);
+     strcpy(lngsign, "-0x");
+     }
+
+    /* and the same for the latitude */
+    intlat=log(tan(M_PI_4+lat*M_PI/360))*6371000.0;
+
+    /* aparently if inlat < 0 , inlat needs to be inverted and a - sign used in the output */
+    strcpy(latsign, "0x");
+    if ( intlat < 0)
+     {
+     intlat=(intlat ^ 0xffffffff);
+     strcpy(latsign, "-0x");
+     }
+
+    /* print the bookmark */
+    fprintf(stderr,"\n");
+    fprintf(stdout,"mg:%s%x %s%x type=bookmark label=\"%s\"\n",lngsign,intlng,latsign,intlat,description);
+    fprintf(stderr,"\n");
+
+    return 0;
+}