cleanup:global:Use astyle to reformat everything

17 files changed, 1649 insertions, 1781 deletions

diff --git a/navit/android/src/org/navitproject/navit/FileBrowserActivity.java b/navit/android/src/org/navitproject/navit/FileBrowserActivity.java
index d24be64e3..319623a83 100644
--- a/navit/android/src/org/navitproject/navit/FileBrowserActivity.java
+++ b/navit/android/src/org/navitproject/navit/FileBrowserActivity.java
@@ -7,10 +7,10 @@ package org.navitproject.navit;
 //  Sugan Krishnan (https://github.com/rgksugan) - Jan 2013.
 //
 
-//Project type now is Android library: 
+//Project type now is Android library:
 //  http://developer.android.com/guide/developing/projects/projects-eclipse.html#ReferencingLibraryProject
 
-//General Java imports 
+//General Java imports
 import java.io.File;
 import java.io.FilenameFilter;
 import java.util.ArrayList;
@@ -18,7 +18,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Collections;
 
-//Android imports 
+//Android imports
 import android.app.Activity;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -36,395 +36,395 @@ import android.widget.*;
 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){
+    // 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 d6c3a609d..34aeab857 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -67,8 +67,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class Navit extends Activity
-{
+public class Navit extends Activity {
 
     private NavitDialogs               dialogs;
     private PowerManager.WakeLock      wl;
@@ -110,7 +109,7 @@ public class Navit extends Activity
 
     /**
      * @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.
      */
@@ -128,7 +127,7 @@ public class Navit extends Activity
             return;
 
         file.delete();
-        }
+    }
 
     public void copyFileIfExists(String source, String destination) throws IOException {
         File file = new File(source);
@@ -152,10 +151,10 @@ public class Navit extends Activity
         } finally {
             /* Close the FileStreams to prevent Resource leaks */
             if (is != null)
-                        is.close();
+                is.close();
 
             if (os != null)
-                        os.close();
+                os.close();
         }
     }
 
@@ -165,7 +164,7 @@ public class Navit extends Activity
      * @param Rid resource identifier
      * @retrun translated string
      */
-    String getTstring(int Rid){
+    String getTstring(int Rid) {
         return getLocalizedString(getString(Rid));
     }
 
@@ -209,7 +208,7 @@ public class Navit extends Activity
                 while ((i = resourcestream.read(buf)) != -1) {
                     resultfilestream.write(buf, 0, i);
                 }
-                 resultfilestream.close();
+                resultfilestream.close();
             } catch (Exception e) {
                 Log.e(TAG, "Exception " + e.getMessage());
                 return false;
@@ -218,17 +217,15 @@ public class Navit extends Activity
         return true;
     }
 
-    private void showInfos()
-    {
+    private void showInfos() {
         SharedPreferences settings = getSharedPreferences(NAVIT_PREFS, MODE_PRIVATE);
         boolean firstStart = settings.getBoolean("firstStart", true);
 
-        if (firstStart)
-        {
+        if (firstStart) {
             AlertDialog.Builder infobox = new AlertDialog.Builder(this);
             infobox.setTitle(getTstring(R.string.initial_info_box_title)); // TRANS
             infobox.setCancelable(false);
-            
+
             infobox.setMessage(getTstring(R.string.initial_info_box_message));
 
             infobox.setPositiveButton(getTstring(R.string.initial_info_box_OK), new DialogInterface.OnClickListener() {
@@ -255,8 +252,7 @@ public class Navit extends Activity
 
     /** Called when the activity is first created. */
     @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
+    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);
@@ -276,7 +272,7 @@ public class Navit extends Activity
         Log.d(TAG, "**1**D " + startup_intent.getDataString());
 
         // NOTIFICATION
-        // Setup the status bar 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);
@@ -304,13 +300,17 @@ public class Navit extends Activity
         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,
+              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);
+                                              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();
@@ -318,14 +318,11 @@ public class Navit extends Activity
         String langc = lang;
         Log.d(TAG, "lang=" + lang);
         int pos = lang.indexOf('_');
-        if (pos != -1)
-        {
+        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));
-        }
-        else
-        {
+        } else {
             String country = locale.getCountry();
             Log.d(TAG, "Country1 " + country);
             Log.d(TAG, "Country2 " + country.toUpperCase(locale));
@@ -360,49 +357,35 @@ public class Navit extends Activity
         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"))
-        {
+        if (!extractRes(langc, NAVIT_DATA_DIR + "/locale/" + langc + "/LC_MESSAGES/navit.mo")) {
             Log.e(TAG, "Failed to extract language resource " + langc);
         }
 
-        if (densityDpi <= 120)
-        {
+        if (densityDpi <= 120) {
             my_display_density = "ldpi";
-        }
-        else if (densityDpi <= 160)
-        {
+        } else if (densityDpi <= 160) {
             my_display_density = "mdpi";
-        }
-        else if (densityDpi < 240)
-        {
+        } else if (densityDpi < 240) {
             my_display_density = "hdpi";
-        }
-        else if (densityDpi < 320)
-        {
+        } else if (densityDpi < 320) {
             my_display_density = "xhdpi";
-        }
-        else if (densityDpi < 480)
-        {
+        } else if (densityDpi < 480) {
             my_display_density = "xxhdpi";
-        }
-        else if (densityDpi < 640)
-        {
+        } else if (densityDpi < 640) {
             my_display_density = "xxxhdpi";
-        }
-        else
-        {
+        } 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"))
-        {
+        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);
+        NavitMain(this, NavitLanguage, Integer.valueOf(android.os.Build.VERSION.SDK), my_display_density,
+                  NAVIT_DATA_DIR+"/bin/navit",map_filename_path);
 
         showInfos();
 
@@ -410,8 +393,7 @@ public class Navit extends Activity
     }
 
     @Override
-    public void onResume()
-    {
+    public void onResume() {
         super.onResume();
         Log.d(TAG, "OnResume");
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
@@ -426,18 +408,15 @@ public class Navit extends Activity
         // 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)
-            {
+        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 {
+            } else {
                 Log.e(TAG, "timestamp for navigate_to expired! not using data");
             }
         }
@@ -466,23 +445,23 @@ public class Navit extends Activity
     @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(getTstring(R.string.permissions_info_box_title)); // TRANS
-                infobox.setCancelable(false);
-                infobox.setMessage(getTstring(R.string.permissions_not_granted));
-                // TRANS
-                infobox.setPositiveButton(getTstring(R.string.initial_info_box_OK), new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface arg0, int arg1) {
-                        exit();
-                    }
-                });
-                infobox.show();
+        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(getTstring(R.string.permissions_info_box_title)); // TRANS
+            infobox.setCancelable(false);
+            infobox.setMessage(getTstring(R.string.permissions_not_granted));
+            // TRANS
+            infobox.setPositiveButton(getTstring(R.string.initial_info_box_OK), new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface arg0, int arg1) {
+                    exit();
+                }
+            });
+            infobox.show();
+        }
         }
     }
 
@@ -511,8 +490,7 @@ public class Navit extends Activity
         if (geoString != null) {
             String address = params.get("q");
             if (address != null) b.putString("q", address);
-        }
-        else {
+        } else {
             geoString = params.get("q");
         }
 
@@ -534,22 +512,19 @@ public class Navit extends Activity
                         e.printStackTrace();
                     }
                 }
-            }
-            else {
+            } else {
                 start_targetsearch_from_intent(geoString);
             }
         }
     }
 
-    public void setActivityResult(int requestCode, NavitActivityResult ActivityResult)
-    {
+    public void setActivityResult(int requestCode, NavitActivityResult ActivityResult) {
         ActivityResults[requestCode] = ActivityResult;
     }
 
 
     @Override
-    public boolean onPrepareOptionsMenu(Menu menu)
-    {
+    public boolean onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
         //Log.e("Navit","onPrepareOptionsMenu");
         // this gets called every time the menu is opened!!
@@ -567,7 +542,7 @@ public class Navit extends Activity
         menu.add(1, 10, 600, getTstring(R.string.optionsmenu_set_map_location));
 
         menu.add(1, 99, 900, getTstring(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, getTstring(R.string.optionsmenu_backup_restore)); //TRANS
@@ -579,13 +554,11 @@ public class Navit extends Activity
     private NavitGraphics N_NavitGraphics = null;
 
     // callback id gets set here when called from NavitGraphics
-    public void setKeypressCallback(int kp_cb_id, NavitGraphics ng)
-    {
+    public void setKeypressCallback(int kp_cb_id, NavitGraphics ng) {
         N_NavitGraphics = ng;
     }
 
-    public void setMotionCallback(int mo_cb_id, NavitGraphics ng)
-    {
+    public void setMotionCallback(int mo_cb_id, NavitGraphics ng) {
         N_NavitGraphics = ng;
     }
 
@@ -594,15 +567,12 @@ public class Navit extends Activity
     }
 
 
-    public void start_targetsearch_from_intent(String target_address)
-    {
-        if (target_address == null || target_address.equals(""))
-        {
+    public void start_targetsearch_from_intent(String target_address) {
+        if (target_address == null || target_address.equals("")) {
             // empty search string entered
-            Toast.makeText(getApplicationContext(), getTstring(R.string.address_search_not_found), Toast.LENGTH_LONG).show(); //TRANS
-        }
-        else
-        {
+            Toast.makeText(getApplicationContext(), getTstring(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);
@@ -610,79 +580,76 @@ public class Navit extends Activity
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
+    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();
+    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;
+            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.
      */
@@ -690,7 +657,7 @@ public class Navit extends Activity
         openOptionsMenu();
     }
 
-    
+
     /**
      * @brief Shows the native keyboard or other input method.
      */
@@ -702,7 +669,8 @@ public class Navit extends Activity
          * screen it occupies, so our best bet is guesswork.
          */
         Configuration config = getResources().getConfiguration();
-        if ((config.keyboard == Configuration.KEYBOARD_QWERTY) && (config.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO))
+        if ((config.keyboard == Configuration.KEYBOARD_QWERTY)
+                && (config.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO))
             /* physical keyboard present, exit */
             return 0;
 
@@ -710,7 +678,7 @@ public class Navit extends Activity
         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).
@@ -739,7 +707,8 @@ public class Navit extends Activity
 
 
     void setDestination(float latitude, float longitude, String address) {
-        Toast.makeText( getApplicationContext(),getTstring(R.string.address_search_set_destination) + "\n" + address, Toast.LENGTH_LONG).show(); //TRANS
+        Toast.makeText( getApplicationContext(),getTstring(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();
@@ -750,45 +719,43 @@ public class Navit extends Activity
         msg.sendToTarget();
     }
 
-    protected void onActivityResult(int requestCode, int resultCode, Intent data)
-    {
-        switch (requestCode)
-        {
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
         case Navit.NavitDownloaderSelectMap_id :
-            if (resultCode == Activity.RESULT_OK)
-            {
+            if (resultCode == Activity.RESULT_OK) {
                 Message msg = dialogs.obtainMessage(NavitDialogs.MSG_START_MAP_DOWNLOAD
-                        , data.getIntExtra("map_index", -1), 0);
+                                                    , data.getIntExtra("map_index", -1), 0);
                 msg.sendToTarget();
             }
             break;
         case NavitAddressSearch_id :
             if (resultCode == Activity.RESULT_OK) {
                 Bundle destination = data.getExtras();
-                Toast.makeText( getApplicationContext(),getTstring(R.string.address_search_set_destination) + "\n" + destination.getString(("q")), Toast.LENGTH_LONG).show(); //TRANS
+                Toast.makeText( getApplicationContext(),
+                                getTstring(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")) 
+        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); 
+                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(getTstring(R.string.map_location_changed),newDir),Toast.LENGTH_LONG).show();
-            } 
-                else Log.w(TAG, "select path failed"); 
-            break;          
+            } else Log.w(TAG, "select path failed");
+            break;
         default :
             ActivityResults[requestCode].onActivityResult(requestCode, resultCode, data);
             break;
@@ -801,36 +768,33 @@ public class Navit extends Activity
         super.onPrepareDialog(id, dialog);
     }
 
-    protected Dialog onCreateDialog(int id)
-    {
+    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;
     }
 
-    private void setMapLocation()
-    { 
-        Intent fileExploreIntent = new Intent(this,FileBrowserActivity.class); 
+    private void setMapLocation() {
+        Intent fileExploreIntent = new Intent(this,FileBrowserActivity.class);
         fileExploreIntent
-            .putExtra(FileBrowserActivity.startDirectoryParameter, "/mnt")
-            .setAction(FileBrowserActivity.INTENT_ACTION_SELECT_DIR);
+        .putExtra(FileBrowserActivity.startDirectoryParameter, "/mnt")
+        .setAction(FileBrowserActivity.INTENT_ACTION_SELECT_DIR);
         startActivityForResult(fileExploreIntent,NavitSelectStorage_id);
-    } 
+    }
 
     @Override
-    public void onDestroy()
-    {
+    public void onDestroy() {
         super.onDestroy();
         Log.d(TAG, "OnDestroy");
         // 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 
+        // properly restarted and no resources are wasted with navit in background. Remove this call after
         // code review
         NavitDestroy();
     }
@@ -842,8 +806,7 @@ public class Navit extends Activity
         if (isFullscreen) {
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
             getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
-        }
-        else {
+        } else {
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
             getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         }
@@ -862,25 +825,23 @@ public class Navit extends Activity
         N_NavitGraphics.handleResize(w, h);
     }
 
-    public void disableSuspend()
-    {
+    public void disableSuspend() {
         wl.acquire();
         wl.release();
     }
 
-    private void exit()
-    {
+    private 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 NavitMain(Navit x, String lang, int version, String display_density_string, String path,
+                                 String path2);
     public native void NavitDestroy();
 
 
-    private String getLocalizedString(String text)
-    {
+    private String getLocalizedString(String text) {
         return NavitGraphics.CallbackLocalizedString(text);
     }
 
@@ -890,8 +851,7 @@ public class Navit extends Activity
      * application startup. The library has already been unpacked at
      * installation time by the package manager.
      */
-    static
-    {
+    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 48ff266d0..ef5f7ed52 100644
--- a/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
+++ b/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
@@ -100,9 +100,9 @@ public class NavitAddressSearchActivity extends Activity {
         }
         return drawableId;
     }
-    
+
     private void setCountryButtonImage() {
-        // We have all images stored as drawable_nodpi resources which allows native code to manipulate them 
+        // 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};
@@ -121,10 +121,9 @@ public class NavitAddressSearchActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        
+
         Bundle extras = getIntent().getExtras();
-        if ( extras != null )
-        {
+        if ( extras != null ) {
             String search_string = extras.getString(("search_string"));
             if (search_string != null) {
                 mPartialSearch = true;
@@ -144,7 +143,7 @@ public class NavitAddressSearchActivity extends Activity {
 
         // address: label and text field
         SharedPreferences settings = getSharedPreferences(Navit.NAVIT_PREFS, MODE_PRIVATE);
-        mCountry = settings.getString(("DefaultCountry")    , null);
+        mCountry = settings.getString(("DefaultCountry"), null);
 
         if (mCountry == null) {
             Locale defaultLocale = Locale.getDefault();
@@ -155,7 +154,7 @@ public class NavitAddressSearchActivity extends Activity {
         }
 
         mCountryButton = new ImageButton(this);
-        
+
         setCountryButtonImage();
 
         mCountryButton.setOnClickListener(new OnClickListener() {
@@ -207,13 +206,13 @@ public class NavitAddressSearchActivity extends Activity {
                 strAddresses[addrIndex] = addresses.get(addrIndex).addr;
             }
             ArrayAdapter<String> addressList =
-                    new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, strAddresses);
+                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);
@@ -295,9 +294,10 @@ public class NavitAddressSearchActivity extends Activity {
             break;
 
         }
-        search_results_wait.setMessage(Navit.getInstance().getTstring(R.string.address_search_towns) + ":" + search_results_towns + " "
-                + Navit.getInstance().getTstring(R.string.address_search_streets) + ":" + search_results_streets + "/"
-                + search_results_streets_hn);
+        search_results_wait.setMessage(Navit.getInstance().getTstring(R.string.address_search_towns) + ":" +
+                                       search_results_towns + " "
+                                       + Navit.getInstance().getTstring(R.string.address_search_streets) + ":" + search_results_streets + "/"
+                                       + search_results_streets_hn);
 
         search_results_wait.setProgress(Addresses_found.size() % (ADDRESS_RESULT_PROGRESS_MAX + 1));
 
@@ -306,7 +306,8 @@ public class NavitAddressSearchActivity extends Activity {
 
     public void finishAddressSearch() {
         if (Addresses_found.isEmpty()) {
-            Toast.makeText( getApplicationContext(),getString(R.string.address_search_not_found) + "\n" + mAddressString, Toast.LENGTH_LONG).show(); //TRANS
+            Toast.makeText( getApplicationContext(),getString(R.string.address_search_not_found) + "\n" + mAddressString,
+                            Toast.LENGTH_LONG).show(); //TRANS
             setResult(Activity.RESULT_CANCELED);
             finish();
         }
@@ -314,9 +315,9 @@ public class NavitAddressSearchActivity extends Activity {
         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);
@@ -330,7 +331,7 @@ public class NavitAddressSearchActivity extends Activity {
             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);
@@ -356,7 +357,7 @@ public class NavitAddressSearchActivity extends Activity {
         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;
@@ -374,7 +375,7 @@ public class NavitAddressSearchActivity extends Activity {
         });
         return search_results_wait;
     }
-    
+
     private 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 f9569825f..fe87b26c8 100755
--- a/navit/android/src/org/navitproject/navit/NavitAppConfig.java
+++ b/navit/android/src/org/navitproject/navit/NavitAppConfig.java
@@ -34,10 +34,10 @@ public class NavitAppConfig extends Application {
 
                     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));
+                                               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;
diff --git a/navit/android/src/org/navitproject/navit/NavitBackupTask.java b/navit/android/src/org/navitproject/navit/NavitBackupTask.java
index d7b41cee3..93d0c4c33 100644
--- a/navit/android/src/org/navitproject/navit/NavitBackupTask.java
+++ b/navit/android/src/org/navitproject/navit/NavitBackupTask.java
@@ -39,7 +39,7 @@ public class NavitBackupTask extends AsyncTask<Void, Void, String> {
 
         /* This is the Directory where all Subdirectories are stored by date */
         File mainBackupDir = new File(
-                Environment.getExternalStorageDirectory().getPath() + "/navit/backup/");
+            Environment.getExternalStorageDirectory().getPath() + "/navit/backup/");
 
         /* Create the Main Backup Directory if it doesn't exist */
         if (!mainBackupDir.isDirectory()) {
@@ -50,7 +50,7 @@ public class NavitBackupTask extends AsyncTask<Void, Void, String> {
 
         /* Create a Timestamp in the format YYYY-MM-DD-Index */
         String timestamp = now.year + "-" + String.format("%02d", now.month + 1) + "-" + String
-                .format("%02d", now.monthDay);
+                           .format("%02d", now.monthDay);
         /* Get the next free index */
         int index = 1;
         for (String s : mainBackupDir.list()) {
@@ -65,7 +65,7 @@ public class NavitBackupTask extends AsyncTask<Void, Void, String> {
 
         /* This is the Directory in which the Files are copied into */
         File backupDir = new File(
-                Environment.getExternalStorageDirectory().getPath() + "/navit/backup/" + timestamp);
+            Environment.getExternalStorageDirectory().getPath() + "/navit/backup/" + timestamp);
 
         /* Create the Backup Directory if it doesn't exist */
         if (!backupDir.isDirectory()) {
@@ -78,18 +78,18 @@ public class NavitBackupTask extends AsyncTask<Void, Void, String> {
         try {
             /* Backup Files in home */
             mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/bookmark.txt",
-                    backupDir.getPath() + "/bookmark.txt");
+                                       backupDir.getPath() + "/bookmark.txt");
             mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/destination.txt",
-                    backupDir.getPath() + "/destination.txt");
+                                       backupDir.getPath() + "/destination.txt");
             mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/gui_internal.txt",
-                    backupDir.getPath() + "/gui_internal.txt");
+                                       backupDir.getPath() + "/gui_internal.txt");
 
             /* Backup Shared Preferences */
             preferencesOOs = new ObjectOutputStream(
-                    new FileOutputStream(backupDir.getPath() + "/preferences.bak"));
+                new FileOutputStream(backupDir.getPath() + "/preferences.bak"));
             preferencesOOs.writeObject(
-                    mActivity.getSharedPreferences(Navit.NAVIT_PREFS, Context.MODE_PRIVATE)
-                            .getAll());
+                mActivity.getSharedPreferences(Navit.NAVIT_PREFS, Context.MODE_PRIVATE)
+                .getAll());
         } catch (IOException e) {
             e.printStackTrace();
             return mActivity.getTstring(R.string.backup_failed);
@@ -122,14 +122,14 @@ public class NavitBackupTask extends AsyncTask<Void, Void, String> {
         }
 
         Toast.makeText(mActivity, mActivity.getTstring(R.string.backup_successful),
-                Toast.LENGTH_LONG).show();
+                       Toast.LENGTH_LONG).show();
     }
 
     @Override
     protected void onCancelled() {
         super.onCancelled();
         Toast.makeText(mActivity, mActivity.getTstring(R.string.backup_failed), Toast.LENGTH_LONG)
-                .show();
+        .show();
         mDialog.dismiss();
     }
 }
diff --git a/navit/android/src/org/navitproject/navit/NavitCamera.java b/navit/android/src/org/navitproject/navit/NavitCamera.java
index 1f08afca8..a10150c48 100644
--- a/navit/android/src/org/navitproject/navit/NavitCamera.java
+++ b/navit/android/src/org/navitproject/navit/NavitCamera.java
@@ -27,20 +27,19 @@ import java.io.IOException;
 
 
 public class NavitCamera extends SurfaceView implements SurfaceHolder.Callback {
-     SurfaceHolder mHolder;
+    SurfaceHolder mHolder;
     Camera mCamera;
 
 
 
-    NavitCamera(Context context) 
-    {
+    NavitCamera(Context context) {
         super(context);
-          mHolder = getHolder();
+        mHolder = getHolder();
         mHolder.addCallback(this);
         mHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
         Log.e("NavitCamera","Creator");
 
-        
+
     }
 
 
@@ -48,8 +47,8 @@ public class NavitCamera extends SurfaceView implements SurfaceHolder.Callback {
         // The Surface has been created, acquire the camera and tell it where
         // to draw.
         try {
-       mCamera = Camera.open();
-           mCamera.setPreviewDisplay(holder);
+            mCamera = Camera.open();
+            mCamera.setPreviewDisplay(holder);
         } catch (IOException exception) {
             mCamera.release();
             mCamera = null;
@@ -70,7 +69,7 @@ public class NavitCamera extends SurfaceView implements SurfaceHolder.Callback {
     public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
         // Now that the size is known, set up the camera parameters and begin
         // the preview.
-    Log.e("NavitCamera","surfaceChanged "+w+"x"+h);
+        Log.e("NavitCamera","surfaceChanged "+w+"x"+h);
         mCamera.stopPreview();
         Camera.Parameters parameters = mCamera.getParameters();
         parameters.setPreviewSize(w, h);
diff --git a/navit/android/src/org/navitproject/navit/NavitDialogs.java b/navit/android/src/org/navitproject/navit/NavitDialogs.java
index 465db9133..2b28b57d5 100644
--- a/navit/android/src/org/navitproject/navit/NavitDialogs.java
+++ b/navit/android/src/org/navitproject/navit/NavitDialogs.java
@@ -41,7 +41,7 @@ public class NavitDialogs extends Handler {
     }
 
     static public void sendDialogMessage(int what, String title, String text, int dialog_num,
-            int value1, int value2) {
+                                         int value1, int value2) {
         Message msg = mHandler.obtainMessage(what);
         Bundle data = new Bundle();
 
@@ -58,65 +58,65 @@ public class NavitDialogs extends Handler {
     @Override
     public void handleMessage(Message msg) {
         switch (msg.what) {
-            case MSG_MAP_DOWNLOAD_FINISHED: {
-                // dismiss dialog, remove dialog
-                mActivity.dismissDialog(DIALOG_MAPDOWNLOAD);
-                mActivity.removeDialog(DIALOG_MAPDOWNLOAD);
-                if (msg.getData().getInt("value1") == 1) {
-                    Message msg_out =
-                            Message.obtain(Navit.getInstance().getNavitGraphics().callback_handler,
-                                    NavitGraphics.msg_type.CLB_LOAD_MAP.ordinal());
-                    msg_out.setData(msg.getData());
-                    msg_out.sendToTarget();
-
-                    msg_out = Message
-                            .obtain(Navit.getInstance().getNavitGraphics().callback_handler,
-                                    NavitGraphics.msg_type.CLB_CALL_CMD.ordinal());
-                    Bundle b = new Bundle();
-                    int mi = msg.getData().getInt("value2");
-                    double lon = (Double.parseDouble(NavitMapDownloader.osm_maps[mi].lon1) + Double
-                            .parseDouble(NavitMapDownloader.osm_maps[mi].lon2)) / 2.0;
-                    double lat = (Double.parseDouble(NavitMapDownloader.osm_maps[mi].lat1) + Double
-                            .parseDouble(NavitMapDownloader.osm_maps[mi].lat2)) / 2.0;
-                    b.putString("cmd", "set_center(\"" + lon + " " + lat + "\",1); zoom=256");
-                    msg_out.setData(b);
-                    msg_out.sendToTarget();
-                }
-                break;
+        case MSG_MAP_DOWNLOAD_FINISHED: {
+            // dismiss dialog, remove dialog
+            mActivity.dismissDialog(DIALOG_MAPDOWNLOAD);
+            mActivity.removeDialog(DIALOG_MAPDOWNLOAD);
+            if (msg.getData().getInt("value1") == 1) {
+                Message msg_out =
+                    Message.obtain(Navit.getInstance().getNavitGraphics().callback_handler,
+                                   NavitGraphics.msg_type.CLB_LOAD_MAP.ordinal());
+                msg_out.setData(msg.getData());
+                msg_out.sendToTarget();
+
+                msg_out = Message
+                          .obtain(Navit.getInstance().getNavitGraphics().callback_handler,
+                                  NavitGraphics.msg_type.CLB_CALL_CMD.ordinal());
+                Bundle b = new Bundle();
+                int mi = msg.getData().getInt("value2");
+                double lon = (Double.parseDouble(NavitMapDownloader.osm_maps[mi].lon1) + Double
+                              .parseDouble(NavitMapDownloader.osm_maps[mi].lon2)) / 2.0;
+                double lat = (Double.parseDouble(NavitMapDownloader.osm_maps[mi].lat1) + Double
+                              .parseDouble(NavitMapDownloader.osm_maps[mi].lat2)) / 2.0;
+                b.putString("cmd", "set_center(\"" + lon + " " + lat + "\",1); zoom=256");
+                msg_out.setData(b);
+                msg_out.sendToTarget();
             }
-            case MSG_PROGRESS_BAR:
-                // change progressbar values
-                mapdownloader_dialog.setMax(msg.getData().getInt("value1"));
-                mapdownloader_dialog.setProgress(msg.getData().getInt("value2"));
-                mapdownloader_dialog.setTitle(msg.getData().getString(("title")));
-                mapdownloader_dialog.setMessage(msg.getData().getString(("text")));
-                break;
-            case MSG_TOAST:
-                Toast.makeText(mActivity, msg.getData().getString(("text")), Toast.LENGTH_SHORT)
-                        .show();
-                break;
-            case MSG_TOAST_LONG:
-                Toast.makeText(mActivity, msg.getData().getString(("text")), Toast.LENGTH_LONG)
-                        .show();
-                break;
-            case MSG_START_MAP_DOWNLOAD: {
-                int download_map_id = msg.arg1;
-                Log.d(TAG, "PRI id=" + download_map_id);
-                // set map id to download
-
-                // show the map download progressbar, and download the map
-                if (download_map_id > -1) {
-                    mapdownloader = new NavitMapDownloader(download_map_id);
-                    mActivity.showDialog(NavitDialogs.DIALOG_MAPDOWNLOAD);
-                    mapdownloader.start();
-                }
+            break;
+        }
+        case MSG_PROGRESS_BAR:
+            // change progressbar values
+            mapdownloader_dialog.setMax(msg.getData().getInt("value1"));
+            mapdownloader_dialog.setProgress(msg.getData().getInt("value2"));
+            mapdownloader_dialog.setTitle(msg.getData().getString(("title")));
+            mapdownloader_dialog.setMessage(msg.getData().getString(("text")));
+            break;
+        case MSG_TOAST:
+            Toast.makeText(mActivity, msg.getData().getString(("text")), Toast.LENGTH_SHORT)
+            .show();
+            break;
+        case MSG_TOAST_LONG:
+            Toast.makeText(mActivity, msg.getData().getString(("text")), Toast.LENGTH_LONG)
+            .show();
+            break;
+        case MSG_START_MAP_DOWNLOAD: {
+            int download_map_id = msg.arg1;
+            Log.d(TAG, "PRI id=" + download_map_id);
+            // set map id to download
+
+            // show the map download progressbar, and download the map
+            if (download_map_id > -1) {
+                mapdownloader = new NavitMapDownloader(download_map_id);
+                mActivity.showDialog(NavitDialogs.DIALOG_MAPDOWNLOAD);
+                mapdownloader.start();
             }
+        }
+        break;
+        case MSG_REMOVE_DIALOG_GENERIC:
+            // dismiss dialog, remove dialog - generic
+            mActivity.dismissDialog(msg.getData().getInt("dialog_num"));
+            mActivity.removeDialog(msg.getData().getInt("dialog_num"));
             break;
-            case MSG_REMOVE_DIALOG_GENERIC:
-                // dismiss dialog, remove dialog - generic
-                mActivity.dismissDialog(msg.getData().getInt("dialog_num"));
-                mActivity.removeDialog(msg.getData().getInt("dialog_num"));
-                break;
         }
     }
 
@@ -124,90 +124,90 @@ public class NavitDialogs extends Handler {
         AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
 
         switch (id) {
-            case DIALOG_MAPDOWNLOAD:
-                mapdownloader_dialog = new ProgressDialog(mActivity);
-                mapdownloader_dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
-                mapdownloader_dialog.setTitle("--");
-                mapdownloader_dialog.setMessage("--");
-                mapdownloader_dialog.setCancelable(true);
-                mapdownloader_dialog.setProgress(0);
-                mapdownloader_dialog.setMax(200);
-                DialogInterface.OnDismissListener onDismissListener = new DialogInterface.OnDismissListener() {
-                    public void onDismiss(DialogInterface dialog) {
-                        Log.e(TAG, "onDismiss: mapdownloader_dialog");
-                        if (mapdownloader != null) {
-                            mapdownloader.stop_thread();
-                        }
+        case DIALOG_MAPDOWNLOAD:
+            mapdownloader_dialog = new ProgressDialog(mActivity);
+            mapdownloader_dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+            mapdownloader_dialog.setTitle("--");
+            mapdownloader_dialog.setMessage("--");
+            mapdownloader_dialog.setCancelable(true);
+            mapdownloader_dialog.setProgress(0);
+            mapdownloader_dialog.setMax(200);
+            DialogInterface.OnDismissListener onDismissListener = new DialogInterface.OnDismissListener() {
+                public void onDismiss(DialogInterface dialog) {
+                    Log.e(TAG, "onDismiss: mapdownloader_dialog");
+                    if (mapdownloader != null) {
+                        mapdownloader.stop_thread();
                     }
-                };
-                mapdownloader_dialog.setOnDismissListener(onDismissListener);
-                // show license for OSM maps
-                Toast.makeText(mActivity.getApplicationContext(),
-                        Navit.getInstance().getString(R.string.osm_copyright),
-                        Toast.LENGTH_LONG).show();
-                return mapdownloader_dialog;
-
-            case DIALOG_BACKUP_RESTORE:
-                /* Create a Dialog that Displays Options wether to Backup or Restore */
-                builder.setTitle(mActivity.getTstring(R.string.choose_an_action)).
-                        setCancelable(true).
-                        setItems(R.array.dialog_backup_restore_items,
-                                new DialogInterface.OnClickListener() {
-
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        /* Notify User if no SD Card present */
-                                        if (!Environment.getExternalStorageState()
-                                                .equals(Environment.MEDIA_MOUNTED)) {
-                                            Toast.makeText(mActivity, mActivity
-                                                            .getTstring(R.string.please_insert_an_sd_card),
-                                                    Toast.LENGTH_LONG).show();
-                                        }
-
-                                        switch (which) {
-                                            case 0:
-                                                /* Backup */
-                                                new NavitBackupTask(mActivity).execute();
-                                                break;
-                                            case 1:
-                                                /* Restore */
-                                                mActivity.showDialog(DIALOG_SELECT_BACKUP);
-                                                break;
-                                        }
-                                    }
-                                });
-                return builder.create();
-
-            case DIALOG_SELECT_BACKUP:
-                /* Create a Dialog with a list from which the user selects the Backup to be restored */
-                File mainBackupDir = new File(
-                        Environment.getExternalStorageDirectory().getPath() + "/navit/backup/");
-
-                String[] backups = null;
-                if (mainBackupDir.isDirectory()) {
-                    backups = mainBackupDir.list();
                 }
+            };
+            mapdownloader_dialog.setOnDismissListener(onDismissListener);
+            // show license for OSM maps
+            Toast.makeText(mActivity.getApplicationContext(),
+                           Navit.getInstance().getString(R.string.osm_copyright),
+                           Toast.LENGTH_LONG).show();
+            return mapdownloader_dialog;
+
+        case DIALOG_BACKUP_RESTORE:
+            /* Create a Dialog that Displays Options wether to Backup or Restore */
+            builder.setTitle(mActivity.getTstring(R.string.choose_an_action)).
+            setCancelable(true).
+            setItems(R.array.dialog_backup_restore_items,
+            new DialogInterface.OnClickListener() {
+
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    /* Notify User if no SD Card present */
+                    if (!Environment.getExternalStorageState()
+                            .equals(Environment.MEDIA_MOUNTED)) {
+                        Toast.makeText(mActivity, mActivity
+                                       .getTstring(R.string.please_insert_an_sd_card),
+                                       Toast.LENGTH_LONG).show();
+                    }
 
-                if (backups == null || backups.length == 0) {
-                    /* No Backups were found */
-                    builder.setTitle(mActivity.getTstring(R.string.no_backup_found));
-                    builder.setNegativeButton(mActivity.getTstring(android.R.string.cancel), null);
-                    return builder.create();
+                    switch (which) {
+                    case 0:
+                        /* Backup */
+                        new NavitBackupTask(mActivity).execute();
+                        break;
+                    case 1:
+                        /* Restore */
+                        mActivity.showDialog(DIALOG_SELECT_BACKUP);
+                        break;
+                    }
                 }
+            });
+            return builder.create();
 
-                builder.setTitle(mActivity.getTstring(R.string.select_backup));
-                final ArrayAdapter<String> adapter = new ArrayAdapter<String>(mActivity,
-                        android.R.layout.simple_spinner_item, backups);
-                builder.setAdapter(adapter, new OnClickListener() {
+        case DIALOG_SELECT_BACKUP:
+            /* Create a Dialog with a list from which the user selects the Backup to be restored */
+            File mainBackupDir = new File(
+                Environment.getExternalStorageDirectory().getPath() + "/navit/backup/");
 
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        new NavitRestoreTask(mActivity, adapter.getItem(which)).execute();
-                    }
-                });
-                builder.setNegativeButton(mActivity.getTstring(android.R.string.cancel), null);
+            String[] backups = null;
+            if (mainBackupDir.isDirectory()) {
+                backups = mainBackupDir.list();
+            }
 
+            if (backups == null || backups.length == 0) {
+                /* No Backups were found */
+                builder.setTitle(mActivity.getTstring(R.string.no_backup_found));
+                builder.setNegativeButton(mActivity.getTstring(android.R.string.cancel), null);
                 return builder.create();
+            }
+
+            builder.setTitle(mActivity.getTstring(R.string.select_backup));
+            final ArrayAdapter<String> adapter = new ArrayAdapter<String>(mActivity,
+                    android.R.layout.simple_spinner_item, backups);
+            builder.setAdapter(adapter, new OnClickListener() {
+
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    new NavitRestoreTask(mActivity, adapter.getItem(which)).execute();
+                }
+            });
+            builder.setNegativeButton(mActivity.getTstring(android.R.string.cancel), null);
+
+            return builder.create();
         }
         // should never get here!!
         return null;
diff --git a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
index 365c0d312..10805d467 100644
--- a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
+++ b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
@@ -60,12 +60,12 @@ public class NavitDownloadSelectMapActivity extends ExpandableListActivity {
             setTitle(String.valueOf(getFreeSpace() / 1024 / 1024) + "MB available");
         } catch (Exception e) {
             Log.e(TAG, "Exception " + e.getClass().getName()
-                    + " during getFreeSpace, reporting 'no sdcard present'");
+                  + " during getFreeSpace, reporting 'no sdcard present'");
             NavitDialogs.sendDialogMessage(NavitDialogs.MSG_TOAST_LONG, null,
-                    String.format(
-                            (Navit.getInstance().getTstring(R.string.map_location_unavailable)),
-                            Navit.map_filename_path),
-                    -1, 0, 0);
+                                           String.format(
+                                               (Navit.getInstance().getTstring(R.string.map_location_unavailable)),
+                                               Navit.map_filename_path),
+                                           -1, 0, 0);
             finish();
         }
     }
@@ -125,9 +125,9 @@ public class NavitDownloadSelectMapActivity extends ExpandableListActivity {
                     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");
+                        .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);
@@ -143,12 +143,12 @@ public class NavitDownloadSelectMapActivity extends ExpandableListActivity {
 
         ArrayList<HashMap<String, String>> resultGroups = new ArrayList<HashMap<String, String>>();
         ArrayList<ArrayList<HashMap<String, String>>> resultChilds =
-                new ArrayList<ArrayList<HashMap<String, String>>>();
+            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.getInstance().getTstring(R.string.maps_installed));
+        .put("category_name", Navit.getInstance().getTstring(R.string.maps_installed));
         resultGroups.add(downloaded_maps_hash);
         downloaded_maps_childs = new ArrayList<HashMap<String, String>>();
         resultChilds.add(downloaded_maps_childs);
@@ -158,7 +158,7 @@ public class NavitDownloadSelectMapActivity extends ExpandableListActivity {
         // maps containing the current location
         HashMap<String, String> matching_maps = new HashMap<String, String>();
         matching_maps.put("category_name",
-                Navit.getInstance().getTstring(R.string.maps_for_current_location));
+                          Navit.getInstance().getTstring(R.string.maps_for_current_location));
         resultGroups.add(matching_maps);
         resultChilds.add(maps_current_position_childs);
 
@@ -176,8 +176,8 @@ public class NavitDownloadSelectMapActivity extends ExpandableListActivity {
 
             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");
+                      + osm_maps[currentMapIndex].map_name + " "
+                      + (osm_maps[currentMapIndex].est_size_bytes / 1024 / 1024) + "MB");
             child.put("map_index", String.valueOf(currentMapIndex));
 
             secList.add(child);
@@ -185,29 +185,29 @@ public class NavitDownloadSelectMapActivity extends ExpandableListActivity {
         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});
+                                               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) {
+                                int childPosition, long id) {
         super.onChildClick(parent, v, groupPosition, childPosition, id);
         Log.d(TAG, "p:" + groupPosition + ", child_pos:" + childPosition);
 
         @SuppressWarnings("unchecked")
         HashMap<String, String> child = (HashMap<String, String>) adapter
-                .getChild(groupPosition, childPosition);
+                                        .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.getInstance().getTstring(R.string.map_download_oversize),
-                        -1, 0, 0);
+                                               Navit.getInstance().getTstring(R.string.map_download_oversize),
+                                               -1, 0, 0);
                 return true;
             }
             Intent resultIntent = new Intent();
@@ -228,33 +228,33 @@ public class NavitDownloadSelectMapActivity extends ExpandableListActivity {
 
         NavitMap maptoDelete = new NavitMap(map_location);
         deleteMapBox.setMessage(
-                maptoDelete.mapName + " " + String.valueOf(maptoDelete.size() / 1024 / 1024)
-                        + "MB");
+            maptoDelete.mapName + " " + String.valueOf(maptoDelete.size() / 1024 / 1024)
+            + "MB");
 
         // TRANS
         deleteMapBox.setPositiveButton(Navit.getInstance().getTstring(R.string.yes),
-                new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface arg0, int arg1) {
-                        Log.d(TAG, "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();
-                    }
-                });
+        new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface arg0, int arg1) {
+                Log.d(TAG, "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((Navit.getInstance().getTstring(R.string.no)),
-                new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface arg0, int arg1) {
-                        Log.d(TAG, "don't delete map");
-                    }
-                });
+        new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface arg0, int arg1) {
+                Log.d(TAG, "don't delete map");
+            }
+        });
         deleteMapBox.show();
     }
 }
diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java
index 227e7509b..d5c0cbed8 100644
--- a/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -51,8 +51,7 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 
 
-public class NavitGraphics
-{
+public class NavitGraphics {
     private static final String            TAG = "NavitGraphics";
     private final NavitGraphics            parent_graphics;
     private final ArrayList<NavitGraphics> overlays = new ArrayList<NavitGraphics>();
@@ -86,10 +85,8 @@ public class NavitGraphics
             statusTintView.setBackgroundColor(bgcolor);
     }
 
-    private void SetCamera(int use_camera)
-    {
-        if (use_camera != 0 && camera == null)
-        {
+    private void SetCamera(int use_camera) {
+        if (use_camera != 0 && camera == null) {
             // activity.requestWindowFeature(Window.FEATURE_NO_TITLE);
             camera = new NavitCamera(activity);
             relativelayout.addView(camera);
@@ -97,8 +94,7 @@ public class NavitGraphics
         }
     }
 
-    private Rect get_rect()
-    {
+    private Rect get_rect() {
         Rect ret=new Rect();
         ret.left=pos_x;
         ret.top=pos_y;
@@ -123,7 +119,7 @@ public class NavitGraphics
         return ret;
     }
 
-    private class NavitView extends View implements Runnable, MenuItem.OnMenuItemClickListener{
+    private class NavitView extends View implements Runnable, MenuItem.OnMenuItemClickListener {
         int               touch_mode = NONE;
         float             oldDist    = 0;
         static final int  NONE       = 0;
@@ -138,13 +134,10 @@ public class NavitGraphics
 
         public NavitView(Context context) {
             super(context);
-            try
-            {
+            try {
                 eventGetX = android.view.MotionEvent.class.getMethod("getX", int.class);
                 eventGetY = android.view.MotionEvent.class.getMethod("getY", int.class);
-            }
-            catch (Exception e)
-            {
+            } catch (Exception e) {
                 Log.e(TAG, "Multitouch zoom not supported");
             }
         }
@@ -163,38 +156,30 @@ public class NavitGraphics
             switch(item.getItemId()) {
             case 1:
                 Message msg = Message.obtain(callback_handler, msg_type.CLB_SET_DISPLAY_DESTINATION.ordinal()
-                   , (int)mPressedPosition.x, (int)mPressedPosition.y);
+                                             , (int)mPressedPosition.x, (int)mPressedPosition.y);
                 msg.sendToTarget();
                 break;
             }
             return false;
         }
 
-        
+
         @Override
-        protected void onDraw(Canvas canvas)
-        {
+        protected void onDraw(Canvas canvas) {
             super.onDraw(canvas);
             canvas.drawBitmap(draw_bitmap, pos_x, pos_y, null);
-            if (overlay_disabled == 0)
-            {
+            if (overlay_disabled == 0) {
                 // assume we ARE in map view mode!
                 in_map = true;
-                for (NavitGraphics overlay : overlays)
-                {
-                    if (overlay.overlay_disabled == 0)
-                    {
+                for (NavitGraphics overlay : overlays) {
+                    if (overlay.overlay_disabled == 0) {
                         Rect r=overlay.get_rect();
                         canvas.drawBitmap(overlay.draw_bitmap, r.left, r.top, null);
                     }
                 }
-            }
-            else
-            {
-                if (Navit.show_soft_keyboard)
-                {
-                    if (Navit.mgr != null)
-                    {
+            } else {
+                if (Navit.show_soft_keyboard) {
+                    if (Navit.mgr != null) {
                         Navit.mgr.showSoftInput(this, InputMethodManager.SHOW_IMPLICIT);
                         Navit.show_soft_keyboard_now_showing = true;
                         // clear the variable now, keyboard will stay on screen until backbutton pressed
@@ -203,51 +188,42 @@ public class NavitGraphics
                 }
             }
         }
-        
+
         @Override
-        protected void onSizeChanged(int w, int h, int oldw, int oldh)
-        {
+        protected void onSizeChanged(int w, int h, int oldw, int oldh) {
             Log.d(TAG, "onSizeChanged pixels x=" + w + " pixels y=" + h);
             Log.d(TAG, "onSizeChanged density=" + Navit.metrics.density);
             Log.d(TAG, "onSizeChanged scaledDensity="
-                    + Navit.metrics.scaledDensity);
+                  + Navit.metrics.scaledDensity);
             super.onSizeChanged(w, h, oldw, oldh);
-            
+
             handleResize(w, h);
         }
 
-        void do_longpress_action()
-        {
+        void do_longpress_action() {
             Log.d(TAG, "do_longpress_action enter");
 
             activity.openContextMenu(this);
         }
 
-        private int getActionField(String fieldname, Object obj)
-        {
+        private int getActionField(String fieldname, Object obj) {
             int ret_value = -999;
-            try
-            {
+            try {
                 java.lang.reflect.Field field = android.view.MotionEvent.class.getField(fieldname);
-                try
-                {
+                try {
                     ret_value = field.getInt(obj);
-                }
-                catch (Exception e)
-                {
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
-            }
-            catch (NoSuchFieldException ex) {
+            } catch (NoSuchFieldException ex) {
                 ex.printStackTrace();
             }
             return ret_value;
         }
-        
+
         @SuppressLint("ClickableViewAccessibility")
         @Override
-        public boolean onTouchEvent(MotionEvent event)
-        {
+        public boolean onTouchEvent(MotionEvent event) {
             super.onTouchEvent(event);
             int x = (int) event.getX();
             int y = (int) event.getY();
@@ -257,114 +233,100 @@ public class NavitGraphics
             int _ACTION_MASK_ = getActionField("ACTION_MASK", event);
 
             int switch_value = event.getAction();
-            if (_ACTION_MASK_ != -999)
-            {
+            if (_ACTION_MASK_ != -999) {
                 switch_value = (event.getAction() & _ACTION_MASK_);
             }
 
-            if (switch_value == MotionEvent.ACTION_DOWN)
-            {
+            if (switch_value == MotionEvent.ACTION_DOWN) {
                 touch_mode = PRESSED;
                 if (!in_map) ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
                 mPressedPosition = new PointF(x, y);
                 postDelayed(this, time_for_long_press);
-            }
-            else if ((switch_value == MotionEvent.ACTION_UP) || (switch_value == _ACTION_POINTER_UP_))
-            {
+            } else if ((switch_value == MotionEvent.ACTION_UP) || (switch_value == _ACTION_POINTER_UP_)) {
                 Log.d(TAG, "ACTION_UP");
 
                 switch (touch_mode) {
-                    case DRAG:
-                        Log.d(TAG, "onTouch move");
-
-                        MotionCallback(MotionCallbackID, x, y);
-                        ButtonCallback(ButtonCallbackID, 0, 1, x, y); // up
-
-                        break;
-                    case ZOOM:
-                        float newDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
-                        float scale = 0;
-                        if (newDist > 10f) {
-                            scale = newDist / oldDist;
-                        }
+                case DRAG:
+                    Log.d(TAG, "onTouch move");
 
-                        if (scale > 1.3) {
-                            // zoom in
-                            CallbackMessageChannel(1, null);
-                        } else if (scale < 0.8) {
-                            // zoom out
-                            CallbackMessageChannel(2, null);
-                        }
-                        break;
-                    case PRESSED:
-                        if (in_map) ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
-                        ButtonCallback(ButtonCallbackID, 0, 1, x, y); // up
+                    MotionCallback(MotionCallbackID, x, y);
+                    ButtonCallback(ButtonCallbackID, 0, 1, x, y); // up
+
+                    break;
+                case ZOOM:
+                    float newDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
+                    float scale = 0;
+                    if (newDist > 10f) {
+                        scale = newDist / oldDist;
+                    }
 
-                        break;
+                    if (scale > 1.3) {
+                        // zoom in
+                        CallbackMessageChannel(1, null);
+                    } else if (scale < 0.8) {
+                        // zoom out
+                        CallbackMessageChannel(2, null);
+                    }
+                    break;
+                case PRESSED:
+                    if (in_map) ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
+                    ButtonCallback(ButtonCallbackID, 0, 1, x, y); // up
+
+                    break;
                 }
                 touch_mode = NONE;
-            }
-            else if (switch_value == MotionEvent.ACTION_MOVE)
-            {
+            } else if (switch_value == MotionEvent.ACTION_MOVE) {
                 switch (touch_mode) {
-                    case DRAG:
-                        MotionCallback(MotionCallbackID, x, y);
-                        break;
-                    case ZOOM:
-                        float newDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
-                        float scale = newDist / oldDist;
-                        Log.d(TAG, "New scale = " + scale);
-                        if (scale > 1.2) {
-                            // zoom in
-                            CallbackMessageChannel(1, "");
-                            oldDist = newDist;
-                        } else if (scale < 0.8) {
-                            oldDist = newDist;
-                            // zoom out
-                            CallbackMessageChannel(2, "");
-                        }
-                        break;
-                    case PRESSED:
-                        Log.d(TAG, "Start drag mode");
-                        if (spacing(mPressedPosition, new PointF(event.getX(), event.getY())) > 20f) {
-                            ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
-                            touch_mode = DRAG;
-                        }
-                        break;
+                case DRAG:
+                    MotionCallback(MotionCallbackID, x, y);
+                    break;
+                case ZOOM:
+                    float newDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
+                    float scale = newDist / oldDist;
+                    Log.d(TAG, "New scale = " + scale);
+                    if (scale > 1.2) {
+                        // zoom in
+                        CallbackMessageChannel(1, "");
+                        oldDist = newDist;
+                    } else if (scale < 0.8) {
+                        oldDist = newDist;
+                        // zoom out
+                        CallbackMessageChannel(2, "");
+                    }
+                    break;
+                case PRESSED:
+                    Log.d(TAG, "Start drag mode");
+                    if (spacing(mPressedPosition, new PointF(event.getX(), event.getY())) > 20f) {
+                        ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
+                        touch_mode = DRAG;
+                    }
+                    break;
                 }
-            }
-            else if (switch_value == _ACTION_POINTER_DOWN_)
-            {
+            } else if (switch_value == _ACTION_POINTER_DOWN_) {
                 oldDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
-                if (oldDist > 2f)
-                {
+                if (oldDist > 2f) {
                     touch_mode = ZOOM;
                 }
             }
             return true;
         }
 
-        private float spacing(PointF a, PointF b)
-        {
+        private float spacing(PointF a, PointF b) {
             float x = a.x - b.x;
             float y = a.y - b.y;
             return (float)Math.sqrt(x * x + y * y);
         }
 
-        private PointF getFloatValue(Object instance, Object argument)
-        {
-            PointF pos = new PointF(0,0); 
-            
-            if (eventGetX != null && eventGetY != null)
-            {
-                try
-                {
+        private PointF getFloatValue(Object instance, Object argument) {
+            PointF pos = new PointF(0,0);
+
+            if (eventGetX != null && eventGetY != null) {
+                try {
                     Float x = (java.lang.Float) eventGetX.invoke(instance, argument);
                     Float y = (java.lang.Float) eventGetY.invoke(instance, argument);
                     pos.set(x, y);
-                    
-                }
-                catch (Exception e){
+
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
             }
@@ -372,169 +334,158 @@ public class NavitGraphics
         }
 
         @Override
-        public boolean onKeyDown(int keyCode, KeyEvent event)
-        {
+        public boolean onKeyDown(int keyCode, KeyEvent event) {
             int i;
             String s = null;
             long interval_for_long_press = 200L;
             i = event.getUnicodeChar();
-            if (i == 0)
-            {
+            if (i == 0) {
                 switch (keyCode) {
-                    case KeyEvent.KEYCODE_DEL:
-                        s = String.valueOf((char) 8);
-                        break;
-                    case KeyEvent.KEYCODE_MENU:
-                        if (!in_map) {
-                            // if last menukeypress is less than 0.2 seconds away then count longpress
-                            if ((System.currentTimeMillis() - Navit.last_pressed_menu_key) < interval_for_long_press) {
-                                Navit.time_pressed_menu_key = Navit.time_pressed_menu_key
-                                        + (System.currentTimeMillis() - Navit.last_pressed_menu_key);
-                                // on long press let softkeyboard popup
-                                if (Navit.time_pressed_menu_key > time_for_long_press) {
-                                    Navit.show_soft_keyboard = true;
-                                    Navit.time_pressed_menu_key = 0L;
-                                    // need to draw to get the keyboard showing
-                                    this.postInvalidate();
-                                }
-                            } else {
+                case KeyEvent.KEYCODE_DEL:
+                    s = String.valueOf((char) 8);
+                    break;
+                case KeyEvent.KEYCODE_MENU:
+                    if (!in_map) {
+                        // if last menukeypress is less than 0.2 seconds away then count longpress
+                        if ((System.currentTimeMillis() - Navit.last_pressed_menu_key) < interval_for_long_press) {
+                            Navit.time_pressed_menu_key = Navit.time_pressed_menu_key
+                                                          + (System.currentTimeMillis() - Navit.last_pressed_menu_key);
+                            // on long press let softkeyboard popup
+                            if (Navit.time_pressed_menu_key > time_for_long_press) {
+                                Navit.show_soft_keyboard = true;
                                 Navit.time_pressed_menu_key = 0L;
+                                // need to draw to get the keyboard showing
+                                this.postInvalidate();
                             }
-                            Navit.last_pressed_menu_key = System.currentTimeMillis();
-                            // if in menu view:
-                            // use as OK (Enter) key
-                            // dont use menu key here (use it in onKeyUp)
-                            return true;
-                        } else {
-                            // if on map view:
-                            // volume UP
-                            //s = java.lang.String.valueOf((char) 1);
-                            return true;
-                        }
-                    case KeyEvent.KEYCODE_SEARCH:
-                        /* Handle event in Main Activity if map is shown */
-                        if (in_map)
-                            return false;
-
-                        s = String.valueOf((char) 19);
-                        break;
-                    case KeyEvent.KEYCODE_BACK:
-                        s = String.valueOf((char) 27);
-                        break;
-                    case KeyEvent.KEYCODE_CALL:
-                        s = String.valueOf((char) 3);
-                        break;
-                    case KeyEvent.KEYCODE_VOLUME_UP:
-                        if (!in_map) {
-                            // if in menu view:
-                            // use as UP key
-                            s = String.valueOf((char) 16);
-                        } else {
-                            // if on map view:
-                            // volume UP
-                            //s = java.lang.String.valueOf((char) 21);
-                            return false;
-                        }
-                        break;
-                    case KeyEvent.KEYCODE_VOLUME_DOWN:
-                        if (!in_map) {
-                            // if in menu view:
-                            // use as DOWN key
-                            s = String.valueOf((char) 14);
                         } else {
-                            // if on map view:
-                            // volume DOWN
-                            //s = java.lang.String.valueOf((char) 4);
-                            return false;
+                            Navit.time_pressed_menu_key = 0L;
                         }
-                        break;
-                    case KeyEvent.KEYCODE_DPAD_CENTER:
-                        s = String.valueOf((char) 13);
-                        break;
-                    case KeyEvent.KEYCODE_DPAD_DOWN:
-                        s = String.valueOf((char) 14);
-                        break;
-                    case KeyEvent.KEYCODE_DPAD_LEFT:
-                        s = String.valueOf((char) 2);
-                        break;
-                    case KeyEvent.KEYCODE_DPAD_RIGHT:
-                        s = String.valueOf((char) 6);
-                        break;
-                    case KeyEvent.KEYCODE_DPAD_UP:
+                        Navit.last_pressed_menu_key = System.currentTimeMillis();
+                        // if in menu view:
+                        // use as OK (Enter) key
+                        // dont use menu key here (use it in onKeyUp)
+                        return true;
+                    } else {
+                        // if on map view:
+                        // volume UP
+                        //s = java.lang.String.valueOf((char) 1);
+                        return true;
+                    }
+                case KeyEvent.KEYCODE_SEARCH:
+                    /* Handle event in Main Activity if map is shown */
+                    if (in_map)
+                        return false;
+
+                    s = String.valueOf((char) 19);
+                    break;
+                case KeyEvent.KEYCODE_BACK:
+                    s = String.valueOf((char) 27);
+                    break;
+                case KeyEvent.KEYCODE_CALL:
+                    s = String.valueOf((char) 3);
+                    break;
+                case KeyEvent.KEYCODE_VOLUME_UP:
+                    if (!in_map) {
+                        // if in menu view:
+                        // use as UP key
                         s = String.valueOf((char) 16);
-                        break;
+                    } else {
+                        // if on map view:
+                        // volume UP
+                        //s = java.lang.String.valueOf((char) 21);
+                        return false;
+                    }
+                    break;
+                case KeyEvent.KEYCODE_VOLUME_DOWN:
+                    if (!in_map) {
+                        // if in menu view:
+                        // use as DOWN key
+                        s = String.valueOf((char) 14);
+                    } else {
+                        // if on map view:
+                        // volume DOWN
+                        //s = java.lang.String.valueOf((char) 4);
+                        return false;
+                    }
+                    break;
+                case KeyEvent.KEYCODE_DPAD_CENTER:
+                    s = String.valueOf((char) 13);
+                    break;
+                case KeyEvent.KEYCODE_DPAD_DOWN:
+                    s = String.valueOf((char) 14);
+                    break;
+                case KeyEvent.KEYCODE_DPAD_LEFT:
+                    s = String.valueOf((char) 2);
+                    break;
+                case KeyEvent.KEYCODE_DPAD_RIGHT:
+                    s = String.valueOf((char) 6);
+                    break;
+                case KeyEvent.KEYCODE_DPAD_UP:
+                    s = String.valueOf((char) 16);
+                    break;
                 }
-            }
-            else if (i == 10)
-            {
+            } else if (i == 10) {
                 s = java.lang.String.valueOf((char) 13);
             }
 
-            if (s != null)
-            {
+            if (s != null) {
                 KeypressCallback(KeypressCallbackID, s);
             }
             return true;
         }
 
         @Override
-        public boolean onKeyUp(int keyCode, KeyEvent event)
-        {
+        public boolean onKeyUp(int keyCode, KeyEvent event) {
             int i;
             String s = null;
             i = event.getUnicodeChar();
 
-            if (i == 0)
-            {
+            if (i == 0) {
                 switch (keyCode) {
-                    case KeyEvent.KEYCODE_VOLUME_UP:
-                        return (!in_map);
-                    case KeyEvent.KEYCODE_VOLUME_DOWN:
-                        return (!in_map);
-                    case KeyEvent.KEYCODE_SEARCH:
-                        /* Handle event in Main Activity if map is shown */
-                        if (in_map)
-                            return false;
-                        break;
-                    case KeyEvent.KEYCODE_BACK:
+                case KeyEvent.KEYCODE_VOLUME_UP:
+                    return (!in_map);
+                case KeyEvent.KEYCODE_VOLUME_DOWN:
+                    return (!in_map);
+                case KeyEvent.KEYCODE_SEARCH:
+                    /* Handle event in Main Activity if map is shown */
+                    if (in_map)
+                        return false;
+                    break;
+                case KeyEvent.KEYCODE_BACK:
+                    if (Navit.show_soft_keyboard_now_showing) {
+                        Navit.show_soft_keyboard_now_showing = false;
+                    }
+                    //s = java.lang.String.valueOf((char) 27);
+                    return true;
+                case KeyEvent.KEYCODE_MENU:
+                    if (!in_map) {
                         if (Navit.show_soft_keyboard_now_showing) {
-                            Navit.show_soft_keyboard_now_showing = false;
-                        }
-                        //s = java.lang.String.valueOf((char) 27);
-                        return true;
-                    case KeyEvent.KEYCODE_MENU:
-                        if (!in_map) {
-                            if (Navit.show_soft_keyboard_now_showing) {
-                                // if soft keyboard showing on screen, dont use menu button as select key
-                            } else {
-                                // if in menu view:
-                                // use as OK (Enter) key
-                                s = String.valueOf((char) 13);
-                            }
+                            // if soft keyboard showing on screen, dont use menu button as select key
                         } else {
-                            // if on map view:
-                            // volume UP
-                            //s = java.lang.String.valueOf((char) 1);
-                            return false;
+                            // if in menu view:
+                            // use as OK (Enter) key
+                            s = String.valueOf((char) 13);
                         }
-                        break;
+                    } else {
+                        // if on map view:
+                        // volume UP
+                        //s = java.lang.String.valueOf((char) 1);
+                        return false;
+                    }
+                    break;
                 }
-            }
-            else if(i!=10)
-            {
+            } else if(i!=10) {
                 s = java.lang.String.valueOf((char) i);
-            } 
-                        
-            if (s != null)
-            {
+            }
+
+            if (s != null) {
                 KeypressCallback(KeypressCallbackID, s);
             }
             return true;
         }
 
         @Override
-        public boolean onKeyMultiple (int keyCode, int count, KeyEvent event)
-        {
+        public boolean onKeyMultiple (int keyCode, int count, KeyEvent event) {
             String s;
             if(keyCode == KeyEvent.KEYCODE_UNKNOWN) {
                 s=event.getCharacters();
@@ -545,53 +496,44 @@ public class NavitGraphics
         }
 
         @Override
-        public boolean onTrackballEvent(MotionEvent event)
-        {
+        public boolean onTrackballEvent(MotionEvent event) {
             String s = null;
-            if (event.getAction() == android.view.MotionEvent.ACTION_DOWN)
-            {
+            if (event.getAction() == android.view.MotionEvent.ACTION_DOWN) {
                 s = java.lang.String.valueOf((char) 13);
             }
-            if (event.getAction() == android.view.MotionEvent.ACTION_MOVE)
-            {
+            if (event.getAction() == android.view.MotionEvent.ACTION_MOVE) {
                 trackball_x += event.getX();
                 trackball_y += event.getY();
-                if (trackball_x <= -1)
-                {
+                if (trackball_x <= -1) {
                     s = java.lang.String.valueOf((char) 2);
                     trackball_x += 1;
                 }
-                if (trackball_x >= 1)
-                {
+                if (trackball_x >= 1) {
                     s = java.lang.String.valueOf((char) 6);
                     trackball_x -= 1;
                 }
-                if (trackball_y <= -1)
-                {
+                if (trackball_y <= -1) {
                     s = java.lang.String.valueOf((char) 16);
                     trackball_y += 1;
                 }
-                if (trackball_y >= 1)
-                {
+                if (trackball_y >= 1) {
                     s = java.lang.String.valueOf((char) 14);
                     trackball_y -= 1;
                 }
             }
-            if (s != null)
-            {
+            if (s != null) {
                 KeypressCallback(KeypressCallbackID, s);
             }
             return true;
         }
 
         public void run() {
-            if (in_map && touch_mode == PRESSED)
-            {
+            if (in_map && touch_mode == PRESSED) {
                 do_longpress_action();
                 touch_mode = NONE;
             }
         }
-        
+
     }
 
     private class SystemBarTintView extends View {
@@ -600,14 +542,12 @@ public class NavitGraphics
             super(context);
             this.setBackgroundColor(bgcolor);
         }
-        
+
     }
 
     public NavitGraphics(final Activity activity, NavitGraphics parent, int x, int y, int w, int h,
-            int wraparound, int use_camera)
-    {
-        if (parent == null)
-        {
+                         int wraparound, int use_camera) {
+        if (parent == null) {
             this.activity = (Navit) activity;
             view = new NavitView(activity);
             //activity.registerForContextMenu(view);
@@ -616,15 +556,13 @@ public class NavitGraphics
             view.setFocusableInTouchMode(true);
             view.setKeepScreenOn(true);
             relativelayout = new RelativeLayout(activity);
-            if (use_camera != 0)
-            {
+            if (use_camera != 0) {
                 SetCamera(use_camera);
             }
             relativelayout.addView(view);
 
             /* The navigational and status bar tinting code is meaningful only on API19+ */
-            if(Build.VERSION.SDK_INT >= 19)
-            {
+            if(Build.VERSION.SDK_INT >= 19) {
                 frameLayout = new FrameLayout(activity);
                 frameLayout.addView(relativelayout);
                 navigationTintView = new SystemBarTintView(activity);
@@ -632,16 +570,12 @@ public class NavitGraphics
                 frameLayout.addView(navigationTintView);
                 frameLayout.addView(statusTintView);
                 activity.setContentView(frameLayout);
+            } else {
+                activity.setContentView(relativelayout);
             }
-            else
-            {
-            activity.setContentView(relativelayout);
-            }
-            
+
             view.requestFocus();
-        }
-        else
-        {
+        } else {
             draw_bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
             bitmap_w = w;
             bitmap_h = h;
@@ -660,58 +594,55 @@ public class NavitGraphics
     }
 
     static private final msg_type[] msg_values = msg_type.values();
-    
-    public final Handler    callback_handler    = new Handler()
-        {
-            public void handleMessage(Message msg)
-            {
-                switch (msg_values[msg.what])
-                {
-                case CLB_ZOOM_IN:
-                    CallbackMessageChannel(1, "");
-                    break;
-                case CLB_ZOOM_OUT:
-                    CallbackMessageChannel(2, "");
-                    break;
-                case CLB_MOVE:
-                    MotionCallback(MotionCallbackID, msg.getData().getInt("x"), msg.getData().getInt("y"));
-                    break;
-                case CLB_SET_DESTINATION:
-                    String lat = Float.toString(msg.getData().getFloat("lat"));
-                    String lon = Float.toString(msg.getData().getFloat("lon"));
-                    String q = msg.getData().getString(("q"));
-                    CallbackMessageChannel(3, lat + "#" + lon + "#" + q);
-                    break;
-                case CLB_SET_DISPLAY_DESTINATION:
-                    int x = msg.arg1;
-                    int y = msg.arg2;
-                    CallbackMessageChannel(4, "" + x + "#" + y);
-                    break;
-                case CLB_CALL_CMD:
-                    String cmd = msg.getData().getString(("cmd"));
-                    CallbackMessageChannel(5, cmd);
-                    break;
-                case CLB_BUTTON_UP:
-                    ButtonCallback(ButtonCallbackID, 0, 1, msg.getData().getInt("x"), msg.getData().getInt("y")); // up
-                    break;
-                case CLB_BUTTON_DOWN:
-                    ButtonCallback(ButtonCallbackID, 1, 1, msg.getData().getInt("x"), msg.getData().getInt("y")); // down
-                    break;
-                case CLB_COUNTRY_CHOOSER:
-                    break;
-                case CLB_LOAD_MAP:
-                    CallbackMessageChannel(6, msg.getData().getString(("title")));
-                    break;
-                case CLB_DELETE_MAP:
-                    File toDelete = new File( msg.getData().getString(("title")));
-                    toDelete.delete();
-                //fallthrough
-                case CLB_UNLOAD_MAP:
-                    CallbackMessageChannel(7, msg.getData().getString(("title")));
-                    break;
-                }
+
+    public final Handler    callback_handler    = new Handler() {
+        public void handleMessage(Message msg) {
+            switch (msg_values[msg.what]) {
+            case CLB_ZOOM_IN:
+                CallbackMessageChannel(1, "");
+                break;
+            case CLB_ZOOM_OUT:
+                CallbackMessageChannel(2, "");
+                break;
+            case CLB_MOVE:
+                MotionCallback(MotionCallbackID, msg.getData().getInt("x"), msg.getData().getInt("y"));
+                break;
+            case CLB_SET_DESTINATION:
+                String lat = Float.toString(msg.getData().getFloat("lat"));
+                String lon = Float.toString(msg.getData().getFloat("lon"));
+                String q = msg.getData().getString(("q"));
+                CallbackMessageChannel(3, lat + "#" + lon + "#" + q);
+                break;
+            case CLB_SET_DISPLAY_DESTINATION:
+                int x = msg.arg1;
+                int y = msg.arg2;
+                CallbackMessageChannel(4, "" + x + "#" + y);
+                break;
+            case CLB_CALL_CMD:
+                String cmd = msg.getData().getString(("cmd"));
+                CallbackMessageChannel(5, cmd);
+                break;
+            case CLB_BUTTON_UP:
+                ButtonCallback(ButtonCallbackID, 0, 1, msg.getData().getInt("x"), msg.getData().getInt("y")); // up
+                break;
+            case CLB_BUTTON_DOWN:
+                ButtonCallback(ButtonCallbackID, 1, 1, msg.getData().getInt("x"), msg.getData().getInt("y")); // down
+                break;
+            case CLB_COUNTRY_CHOOSER:
+                break;
+            case CLB_LOAD_MAP:
+                CallbackMessageChannel(6, msg.getData().getString(("title")));
+                break;
+            case CLB_DELETE_MAP:
+                File toDelete = new File( msg.getData().getString(("title")));
+                toDelete.delete();
+            //fallthrough
+            case CLB_UNLOAD_MAP:
+                CallbackMessageChannel(7, msg.getData().getString(("title")));
+                break;
             }
-        };
+        }
+    };
 
     public native void SizeChangedCallback(int id, int x, int y);
     public native void PaddingChangedCallback(int id, int left, int right, int top, int bottom);
@@ -759,22 +690,24 @@ public class NavitGraphics
          * devices which allow switching between hw and sw buttons (OnePlus One running CyanogenMod).
          */
         final Boolean isNavShowing = !ViewConfigurationCompat.hasPermanentMenuKey(ViewConfiguration.get(navit));
-            Log.d(TAG, String.format("isStatusShowing=%b isNavShowing=%b", isStatusShowing, isNavShowing));
+        Log.d(TAG, String.format("isStatusShowing=%b isNavShowing=%b", isStatusShowing, isNavShowing));
 
         /*
          * Determine where the navigation bar would be displayed.
          * Logic is taken from AOSP RenderSessionImpl.findNavigationBar()
          * (platform/frameworks/base/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java)
          */
-        final Boolean isLandscape = (navit.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE);
+        final Boolean isLandscape = (navit.getResources().getConfiguration().orientation ==
+                                     Configuration.ORIENTATION_LANDSCAPE);
         final Boolean isNavAtBottom = (!isLandscape) || (navit.getResources().getConfiguration().smallestScreenWidthDp >= 600);
         Log.d(TAG, String.format("isNavAtBottom=%b (Configuration.smallestScreenWidthDp=%d, isLandscape=%b)",
-            isNavAtBottom, navit.getResources().getConfiguration().smallestScreenWidthDp, isLandscape));
+                                 isNavAtBottom, navit.getResources().getConfiguration().smallestScreenWidthDp, isLandscape));
 
         int left = 0;
         int top = isStatusShowing ? Navit.status_bar_height : 0;
         int right = (isNavShowing && !isNavAtBottom) ? Navit.navigation_bar_width : 0;
-        final int bottom = (!(isNavShowing && isNavAtBottom)) ? 0 : isLandscape ? Navit.navigation_bar_height_landscape : Navit.navigation_bar_height;
+        final int bottom = (!(isNavShowing
+                              && isNavAtBottom)) ? 0 : isLandscape ? Navit.navigation_bar_height_landscape : Navit.navigation_bar_height;
 
         /* hide tint bars during update to prevent ugly effects */
         statusTintView.setVisibility(View.GONE);
@@ -784,13 +717,14 @@ public class NavitGraphics
             @Override
             public void run() {
                 statusTintView.setVisibility(isStatusShowing ? View.VISIBLE : View.GONE);
-                FrameLayout.LayoutParams statusLayoutParams = new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, Navit.status_bar_height, Gravity.TOP);
+                FrameLayout.LayoutParams statusLayoutParams = new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT,
+                        Navit.status_bar_height, Gravity.TOP);
 
                 /* Prevent tint views from overlapping when navigation is on the right */
                 statusLayoutParams.setMargins(0, 0, (isNavShowing && !isNavAtBottom) ? Navit.navigation_bar_width : 0, 0);
                 statusTintView.setLayoutParams(statusLayoutParams);
                 Log.d(TAG, String.format("statusTintView: width=%d height=%d",
-                        statusTintView.getWidth(), statusTintView.getHeight()));
+                                         statusTintView.getWidth(), statusTintView.getHeight()));
                 navigationTintView.setVisibility(isNavShowing ? View.VISIBLE : View.GONE);
                 LayoutParams navigationLayoutParams = new FrameLayout.LayoutParams(
                     isNavAtBottom ? LayoutParams.MATCH_PARENT : Navit.navigation_bar_width,  // X
@@ -798,7 +732,7 @@ public class NavitGraphics
                     Gravity.BOTTOM | Gravity.RIGHT);
                 navigationTintView.setLayoutParams(navigationLayoutParams);
                 Log.d(TAG, String.format("navigationTintView: width=%d height=%d",
-                    navigationTintView.getWidth(), navigationTintView.getHeight()));
+                                         navigationTintView.getWidth(), navigationTintView.getHeight()));
             }
         });
 
@@ -809,10 +743,10 @@ public class NavitGraphics
 
     /**
      * @brief Handles resize events.
-     * 
+     *
      * This method is called whenever the main View is resized in any way. This is the case when its
      * {@code onSizeChanged()} event handler fires or when toggling Fullscreen mode.
-     * 
+     *
      */
     public void handleResize(int w, int h) {
         if (this.parent_graphics != null)
@@ -832,13 +766,13 @@ public class NavitGraphics
 
     /**
      * @brief Returns whether the device has a hardware menu button.
-     * 
+     *
      * Only Android versions starting with ICS (API version 14) support the API call to detect the presence of a
      * Menu button. On earlier Android versions, the following assumptions will be made: On API levels up to 10,
      * this method will always return {@code true}, as these Android versions relied on devices having a physical
      * Menu button. On API levels 11 through 13 (Honeycomb releases), this method will always return
      * {@code false}, as Honeycomb was a tablet-only release and did not require devices to have a Menu button.
-     * 
+     *
      * Note that this method is not aware of non-standard mechanisms on some customized builds of Android. For
      * example, CyanogenMod has an option to add a menu button to the navigation bar. Even with that option,
      * this method will still return `false`.
@@ -852,28 +786,23 @@ public class NavitGraphics
             return ViewConfiguration.get(activity.getApplication()).hasPermanentMenuKey();
     }
 
-    public void setSizeChangedCallback(int id)
-    {
+    public void setSizeChangedCallback(int id) {
         SizeChangedCallbackID = id;
     }
-    public void setPaddingChangedCallback(int id)
-    {
+    public void setPaddingChangedCallback(int id) {
         PaddingChangedCallbackID = id;
     }
-    public void setButtonCallback(int id)
-    {
+    public void setButtonCallback(int id) {
         ButtonCallbackID = id;
     }
-    public void setMotionCallback(int id)
-    {
+    public void setMotionCallback(int id) {
         MotionCallbackID = id;
-        if(activity != null){
+        if(activity != null) {
             activity.setMotionCallback(id, this);
         }
     }
 
-    public void setKeypressCallback(int id)
-    {
+    public void setKeypressCallback(int id) {
         KeypressCallbackID = id;
         // set callback id also in main intent (for menus)
         if(activity != null) {
@@ -882,8 +811,7 @@ public class NavitGraphics
     }
 
 
-    protected void draw_polyline(Paint paint, int[] c)
-    {
+    protected void draw_polyline(Paint paint, int[] c) {
         int i, ndashes;
         float [] intervals;
         paint.setStrokeWidth(c[0]);
@@ -904,8 +832,7 @@ public class NavitGraphics
 
         Path path = new Path();
         path.moveTo(c[6+ndashes], c[7+ndashes]);
-        for (i = 8+ndashes; i < c.length; i += 2)
-        {
+        for (i = 8+ndashes; i < c.length; i += 2) {
             path.lineTo(c[i], c[i + 1]);
         }
         //global_path.close();
@@ -913,8 +840,7 @@ public class NavitGraphics
         paint.setPathEffect(null);
     }
 
-    protected void draw_polygon(Paint paint, int[] c)
-    {
+    protected void draw_polygon(Paint paint, int[] c) {
         paint.setStrokeWidth(c[0]);
         paint.setARGB(c[1],c[2],c[3],c[4]);
         paint.setStyle(Paint.Style.FILL);
@@ -922,16 +848,14 @@ public class NavitGraphics
         //paint.setStrokeWidth(0);
         Path path = new Path();
         path.moveTo(c[5], c[6]);
-        for (int i = 7; i < c.length; i += 2)
-        {
+        for (int i = 7; i < c.length; i += 2) {
             path.lineTo(c[i], c[i + 1]);
         }
         //global_path.close();
         draw_canvas.drawPath(path, paint);
     }
 
-    protected void draw_rectangle(Paint paint, int x, int y, int w, int h)
-    {
+    protected void draw_rectangle(Paint paint, int x, int y, int w, int h) {
         Rect r = new Rect(x, y, x + w, y + h);
         paint.setStyle(Paint.Style.FILL);
         paint.setAntiAlias(true);
@@ -939,14 +863,12 @@ public class NavitGraphics
         draw_canvas.drawRect(r, paint);
     }
 
-    protected void draw_circle(Paint paint, int x, int y, int r)
-    {
+    protected void draw_circle(Paint paint, int x, int y, int r) {
         paint.setStyle(Paint.Style.STROKE);
         draw_canvas.drawCircle(x, y, r / 2, paint);
     }
 
-    protected void draw_text(Paint paint, int x, int y, String text, int size, int dx, int dy, int bgcolor)
-    {
+    protected void draw_text(Paint paint, int x, int y, String text, int size, int dx, int dy, int bgcolor) {
         int oldcolor=paint.getColor();
         Path path=null;
 
@@ -980,48 +902,46 @@ public class NavitGraphics
         }
         paint.clearShadowLayer();
     }
-    protected void draw_image(Paint paint, int x, int y, Bitmap bitmap)
-    {
+    protected void draw_image(Paint paint, int x, int y, Bitmap bitmap) {
         draw_canvas.drawBitmap(bitmap, x, y, null);
     }
 
     /* takes an image and draws it on the screen as a prerendered maptile
-     * 
-     * 
-     * 
+     *
+     *
+     *
      * @param paint     Paint object used to draw the image
-     * @param count     the number of points specified 
+     * @param count     the number of points specified
      * @param p0x and p0y   specifying the top left point
      * @param p1x and p1y   specifying the top right point
-     * @param p2x and p2y   specifying the bottom left point, not yet used but kept 
+     * @param p2x and p2y   specifying the bottom left point, not yet used but kept
      *                      for compatibility with the linux port
      * @param bitmap    Bitmap object holding the image to draw
-     * 
+     *
      * TODO make it work with 4 points specified to make it work for 3D mapview, so it can be used
      *      for small but very detailed maps as well as for large maps with very little detail but large
      *      coverage.
      * TODO make it work with rectangular tiles as well ?
      */
-    protected void draw_image_warp(Paint paint, int count, int p0x, int p0y, int p1x, int p1y, int p2x, int p2y, Bitmap bitmap)
-    {
+    protected void draw_image_warp(Paint paint, int count, int p0x, int p0y, int p1x, int p1y, int p2x, int p2y,
+                                   Bitmap bitmap) {
 
         float width;
         float scale;
         float deltaY;
         float deltaX;
         float angle;
-        Matrix matrix;  
+        Matrix matrix;
 
-        if (count == 3)
-        {
+        if (count == 3) {
             matrix = new Matrix();
             deltaX = p1x - p0x;
             deltaY = p1y - p0y;
-            width = (float) (Math.sqrt((deltaX * deltaX) + (deltaY * deltaY)));         
+            width = (float) (Math.sqrt((deltaX * deltaX) + (deltaY * deltaY)));
             angle = (float) (Math.atan2(deltaY, deltaX) * 180d / Math.PI);
             scale = width / bitmap.getWidth();
             matrix.preScale(scale, scale);
-            matrix.postTranslate(p0x, p0y);         
+            matrix.postTranslate(p0x, p0y);
             matrix.postRotate(angle, p0x, p0y);
             draw_canvas.drawBitmap(bitmap, matrix, paint);
         }
@@ -1031,8 +951,7 @@ public class NavitGraphics
     private static final int draw_mode_begin = 0;
     private static final int draw_mode_end = 1;
 
-    protected void draw_mode(int mode)
-    {
+    protected void draw_mode(int mode) {
         if (mode == draw_mode_end) {
             if (parent_graphics == null) {
                 view.invalidate();
@@ -1045,13 +964,11 @@ public class NavitGraphics
         }
 
     }
-    protected void draw_drag(int x, int y)
-    {
+    protected void draw_drag(int x, int y) {
         pos_x = x;
         pos_y = y;
     }
-    protected void overlay_disable(int disable)
-    {
+    protected void overlay_disable(int disable) {
         Log.d(TAG,"overlay_disable: " + disable + "Parent: " + (parent_graphics != null));
         // assume we are NOT in map view mode!
         if (parent_graphics == null)
@@ -1064,8 +981,7 @@ public class NavitGraphics
         }
     }
 
-    protected void overlay_resize(int x, int y, int w, int h, int wraparound)
-    {
+    protected void overlay_resize(int x, int y, int w, int h, int wraparound) {
         draw_bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
         bitmap_w = w;
         bitmap_h = h;
diff --git a/navit/android/src/org/navitproject/navit/NavitMap.java b/navit/android/src/org/navitproject/navit/NavitMap.java
index 274cbdd8b..ee0f11bb7 100644
--- a/navit/android/src/org/navitproject/navit/NavitMap.java
+++ b/navit/android/src/org/navitproject/navit/NavitMap.java
@@ -3,38 +3,38 @@ package org.navitproject.navit;
 import java.io.File;
 
 public class NavitMap {
-	private String fileName;
-	String mapName;
-	private String mapPath;
+    private String fileName;
+    String mapName;
+    private String mapPath;
 
-	NavitMap(String path, String map_file_name) {
-		mapPath = path;
-		fileName = map_file_name;
-		if (map_file_name.endsWith(".bin")) {
-			mapName = map_file_name.substring(0, map_file_name.length() - 4);
-		} else {
-			mapName = map_file_name;
-		}
-	}
+    NavitMap(String path, String map_file_name) {
+        mapPath = path;
+        fileName = map_file_name;
+        if (map_file_name.endsWith(".bin")) {
+            mapName = map_file_name.substring(0, map_file_name.length() - 4);
+        } else {
+            mapName = map_file_name;
+        }
+    }
 
-	NavitMap(String map_location) {
-		File mapFile = new File(map_location);
-		
-		mapPath = mapFile.getParent() + "/";
-		fileName = mapFile.getName();
-		if (fileName.endsWith(".bin")) {
-			mapName = fileName.substring(0, fileName.length() - 4);
-		} else {
-			mapName = fileName;
-		}
-	}
+    NavitMap(String map_location) {
+        File mapFile = new File(map_location);
 
-	public long size() {
-		File map_file = new File(mapPath + fileName);
-		return map_file.length();
-	}
+        mapPath = mapFile.getParent() + "/";
+        fileName = mapFile.getName();
+        if (fileName.endsWith(".bin")) {
+            mapName = fileName.substring(0, fileName.length() - 4);
+        } else {
+            mapName = fileName;
+        }
+    }
 
-	public String getLocation() {
-		return mapPath + fileName;
-	}
+    public long size() {
+        File map_file = new File(mapPath + fileName);
+        return map_file.length();
+    }
+
+    public String getLocation() {
+        return mapPath + fileName;
+    }
 }
diff --git a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
index 08821175c..a8ee7f98c 100644
--- a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
+++ b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
@@ -48,426 +48,426 @@ public class NavitMapDownloader extends Thread {
     // size estimations updated 2017-06-22
     //
     public static final osm_map_values[] osm_maps = {
-            new osm_map_values(Navit.getInstance().getTstring(R.string.whole_planet), "-180", "-90", "180", "90",
-                    23992258630L, 0),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.africa), "-30.89", "-36.17", "61.68",
-                    "38.40", 2070076339L, 0),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.angola), "11.4", "-18.1", "24.2", "-5.3",
-                    127557789L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.burundi), "28.9", "-4.5", "30.9", "-2.2",
-                    124049667L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.canary_islands), "-18.69", "26.52", "-12.79",
-                    "29.99", 133565815L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.congo), "11.7",
-                    "-13.6", "31.5", "5.7", 244228485L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.ethiopia), "32.89", "3.33", "48.07", "14.97",
-                    153067406L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.guinea), "-15.47", "7.12", "-7.58", "12.74",
-                    188047126L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.cotedivoire), "-8.72", "4.09", "-2.43",
-                    "10.80", 132187496L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.kenya), "33.8", "-5.2", "42.4", "4.9",
-                    190073089L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.lesotho), "26.9", "-30.7", "29.6", "-28.4",
-                    196189429L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.liberia), "-15.00", "-0.73", "-7.20", "8.65",
-                    156257253L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.libya), "9.32", "19.40", "25.54", "33.63",
-                    126046917L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.madagascar), "42.25", "-26.63", "51.20",
-                    "-11.31", 145210721L, 1),
-            new osm_map_values(
-                    Navit.getInstance().getTstring(R.string.namibia) + "+" + Navit.getInstance().getTstring(R.string.botswana),
-                    "11.4", "-29.1", "29.5", "-16.9", 248970987L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.reunion), "55.2", "-21.4", "55.9", "-20.9",
-                    126008774L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.rwanda), "28.8", "-2.9", "30.9", "-1.0",
-                    128267595L, 1),
-            new osm_map_values(
-                    Navit.getInstance().getTstring(R.string.south_africa) + "+" + Navit.getInstance().getTstring(R.string.lesotho),
-                    "15.93", "-36.36", "33.65", "-22.08", 307280006L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.tanzania), "29.19",
-                    "-11.87", "40.74", "-0.88", 253621029L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.uganda), "29.3", "-1.6", "35.1", "4.3",
-                    179134521L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.asia), "23.8", "0.1", "195.0", "82.4",
-                    5113673780L, 0),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.azerbaijan), "44.74", "38.34", "51.69",
-                    "42.37", 138346406L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.china), "67.3", "5.3", "135.0", "54.5",
-                    1718108758L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.cyprus), "32.0", "34.5", "34.9", "35.8",
-                    118472448L, 1),
-            new osm_map_values(
-                    Navit.getInstance().getTstring(R.string.india) + "+" + Navit.getInstance().getTstring(R.string.nepal), "67.9",
-                    "5.5", "89.6", "36.0", 601877877L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.indonesia), "93.7", "-17.3", "155.5", "7.6",
-                    420741405L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.iran), "43.5", "24.4",
-                    "63.6", "40.4", 242016066L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.iraq), "38.7", "28.5", "49.2", "37.4",
-                    160751805L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.israel), "33.99", "29.8", "35.95", "33.4",
-                    155685778L, 1),
-            new osm_map_values(
-                    Navit.getInstance().getTstring(R.string.japan) + "+" + Navit.getInstance().getTstring(R.string.korea), "123.6",
-                    "25.2", "151.3", "47.1", 1029080156L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.kazakhstan), "46.44", "40.89", "87.36",
-                    "55.45", 407633007L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.kyrgyzsyan), "69.23", "39.13", "80.33",
-                    "43.29", 147997835L, 1),
-            new osm_map_values(
-                    Navit.getInstance().getTstring(R.string.malaysia) + "+" + Navit.getInstance().getTstring(R.string.singapore),
-                    "94.3", "-5.9", "108.6", "6.8", 168816435L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.mongolia), "87.5", "41.4", "120.3", "52.7",
-                    153534851L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.pakistan), "60.83", "23.28", "77.89",
-                    "37.15", 217644321L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.philippines), "115.58", "4.47", "127.85",
-                    "21.60", 281428307L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.saudi_arabia), "33.2", "16.1", "55.9",
-                    "33.5", 242648303L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.taiwan), "119.1", "21.5", "122.5", "25.2",
-                    1029080156L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.thailand), "97.5", "5.7", "105.2", "19.7",
-                    185135492L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.turkey), "25.1", "35.8", "46.4", "42.8",
-                    331087441L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.turkmenistan), "51.78", "35.07", "66.76",
-                    "42.91", 131045087L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.uae_other), "51.5", "22.6", "56.7", "26.5",
-                    128934674L, 1),
-            new osm_map_values(
-                    Navit.getInstance().getTstring(R.string.australia) + "+" + Navit.getInstance().getTstring(R.string.oceania),
-                    "89.84", "-57.39", "179.79", "7.26", 782722650L, 0),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.australia), "110.5", "-44.2", "154.9",
-                    "-9.2", 348652900L, 0),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.tasmania), "144.0", "-45.1", "155.3",
-                    "-24.8", 253231890L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.victoria) + " + " + Navit.getInstance()
-                    .getTstring(R.string.new_south_wales), "140.7", "-39.4", "153.7", "-26.9", 241500829L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.new_caledonia), "157.85", "-25.05", "174.15",
-                    "-16.85", 115512336L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.newzealand), "165.2", "-47.6", "179.1",
-                    "-33.7", 239264192L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.europe), "-12.97", "33.59", "34.15", "72.10",
-                    11984126789L, 0),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.western_europe), "-17.6", "34.5", "42.9",
-                    "70.9", 12648810717L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.austria), "9.4", "46.32", "17.21", "49.1",
-                    898273634L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.azores), "-31.62", "36.63", "-24.67",
-                    "40.13", 112687225L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.belgium), "2.3", "49.5", "6.5", "51.6",
-                    733035524L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.benelux), "2.08", "48.87", "7.78", "54.52",
-                    1771971595L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.netherlands), "3.07", "50.75", "7.23",
-                    "53.73", 1191828033L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.denmark), "7.65", "54.32", "15.58", "58.07",
-                    365606979L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.faroe_islands), "-7.8", "61.3", "-6.1",
-                    "62.5", 109377568L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.france), "-5.45", "42.00", "8.44", "51.68",
-                    3907969744L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.alsace), "6.79", "47.27", "8.48", "49.17",
-                    354249349L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.aquitaine), "-2.27", "42.44", "1.50",
-                    "45.76", 443715019L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.auvergne), "2.01", "44.57", "4.54", "46.85",
-                    287663213L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.basse_normandie), "-2.09", "48.13", "1.03",
-                    "49.98", 262352354L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.bourgogne), "2.80", "46.11", "5.58", "48.45",
-                    298868796L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.bretagne), "-5.58", "46.95", "-0.96",
-                    "48.99", 382770794L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.centre), "0.01", "46.29", "3.18", "48.99",
-                    474224721L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.champagne_ardenne), "3.34", "47.53", "5.94",
-                    "50.28", 269947824L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.corse), "8.12", "41.32", "9.95", "43.28",
-                    129902146L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.franche_comte), "5.20", "46.21", "7.83",
-                    "48.07", 324476070L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.haute_normandie), "-0.15", "48.62", "1.85",
-                    "50.18", 202782876L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.ile_de_france), "1.40", "48.07", "3.61",
-                    "49.29", 311052699L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.languedoc_roussillon), "1.53", "42.25",
-                    "4.89", "45.02", 380145667L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.limousin), "0.58", "44.87", "2.66", "46.50",
-                    206696539L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.lorraine), "4.84", "47.77", "7.72", "49.73",
-                    330777318L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.midi_pyrenees), "-0.37", "42.18", "3.50",
-                    "45.10", 462618363L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.nord_pas_de_calais), "1.42", "49.92", "4.49",
-                    "51.31", 368467511L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.pays_de_la_loire), "-2.88", "46.20", "0.97",
-                    "48.62", 499471143L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.picardie), "1.25", "48.79", "4.31", "50.43",
-                    374308041L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.poitou_charentes), "-1.69", "45.04", "1.26",
-                    "47.23", 342125526L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.provence_alpes_cote_d_azur), "4.21", "42.91",
-                    "7.99", "45.18", 390306134L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.rhone_alpes), "3.65", "44.07", "7.88",
-                    "46.64", 510797942L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.luxembourg), "5.7", "49.4", "6.5", "50.2",
-                    1771971595L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.germany), "5.18", "46.84", "15.47", "55.64",
-                    3521359466L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.baden_wuerttemberg), "7.32", "47.14",
-                    "10.57", "49.85", 674361124L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.bayern), "8.92", "47.22", "13.90", "50.62",
-                    860161150L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.mittelfranken), "9.86", "48.78", "11.65",
-                    "49.84", 203055195L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.niederbayern), "11.55", "47.75", "14.12",
-                    "49.42", 312924770L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.oberbayern), "10.67", "47.05", "13.57",
-                    "49.14", 382734883L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.oberfranken), "10.31", "49.54", "12.49",
-                    "50.95", 235258691L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.oberpfalz), "11.14", "48.71", "13.47",
-                    "50.43", 264536012L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.schwaben), "9.27", "47.10", "11.36", "49.09",
-                    321141607L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.unterfranken), "8.59", "49.16", "10.93",
-                    "50.67", 303720890L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.berlin), "13.03", "52.28", "13.81", "52.73",
-                    169019946L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.brandenburg), "11.17", "51.30", "14.83",
-                    "53.63", 323497599L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.bremen), "8.43", "52.96", "9.04", "53.66",
-                    150963608L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.hamburg), "9.56", "53.34", "10.39", "53.80",
-                    156284421L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.hessen), "7.72", "49.34", "10.29", "51.71",
-                    432279328L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.mecklenburg_vorpommern), "10.54", "53.05",
-                    "14.48", "55.05", 213183908L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.niedersachsen), "6.40", "51.24", "11.69",
-                    "54.22", 819766939L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.nordrhein_westfalen), "5.46", "50.26",
-                    "9.52", "52.59", 967053517L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.rheinland_pfalz), "6.06", "48.91", "8.56",
-                    "51.00", 442868899L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.saarland), "6.30", "49.06", "7.46", "49.69",
-                    157721162L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.sachsen_anhalt), "10.50", "50.88", "13.26",
-                    "53.11", 287785088L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.sachsen), "11.82", "50.11", "15.10", "51.73",
-                    342620834L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.schleswig_holstein), "7.41", "53.30",
-                    "11.98", "55.20", 280293910L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.thueringen), "9.81", "50.15", "12.72",
-                    "51.70", 269428239L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.iceland), "-25.3", "62.8", "-11.4", "67.5",
-                    124837162L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.ireland), "-11.17", "51.25", "-5.23", "55.9",
-                    234750271L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.italy), "6.52", "36.38", "18.96", "47.19",
-                    1610171395L, 1),
-            new osm_map_values(
-                    Navit.getInstance().getTstring(R.string.spain) + "+" + Navit.getInstance().getTstring(R.string.portugal),
-                    "-11.04", "34.87", "4.62", "44.41", 1039624918L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.mallorca), "2.2", "38.8", "4.7", "40.2",
-                    137200636L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.galicia), "-10.0", "41.7", "-6.3", "44.1",
-                    174549553L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.scandinavia), "4.0", "54.4", "32.1", "71.5",
-                    1398661090L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.finland), "18.6", "59.2", "32.3", "70.3",
-                    460997178L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.denmark), "7.49", "54.33", "13.05", "57.88",
-                    321870414L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.switzerland), "5.79", "45.74", "10.59",
-                    "47.84", 552565332L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.united_kingdom), "-9.7", "49.6", "2.2",
-                    "61.2", 901724648L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.england), "-7.80", "48.93", "2.41", "56.14",
-                    937728414L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.buckinghamshire), "-1.19", "51.44", "-0.43",
-                    "52.25", 142256978L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.cambridgeshire), "-0.55", "51.96", "0.56",
-                    "52.79", 142334001L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.cumbria), "-3.96", "53.85", "-2.11", "55.24",
-                    144422460L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.east_yorkshire_with_hull), "-1.16", "53.50",
-                    "0.54", "54.26", 141518744L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.essex), "-0.07", "51.40", "1.36", "52.14",
-                    162542730L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.herefordshire), "-3.19", "51.78", "-2.29",
-                    "52.45", 129368660L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.kent), "-0.02", "50.81", "1.65", "51.53",
-                    145482562L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.lancashire), "-3.20", "53.43", "-2.00",
-                    "54.29", 148964975L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.leicestershire), "-1.65", "52.34", "-0.61",
-                    "53.03", 154199956L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.norfolk), "0.10", "52.30", "2.04", "53.41",
-                    146017009L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.nottinghamshire), "-1.39", "52.73", "-0.62",
-                    "53.55", 147986548L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.oxfordshire), "-1.77", "51.41", "-0.82",
-                    "52.22", 142240992L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.shropshire), "-3.29", "52.26", "-2.18",
-                    "53.05", 136909363L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.somerset), "-3.89", "50.77", "-2.20",
-                    "51.40", 145186096L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.south_yorkshire), "-1.88", "53.25", "-0.80",
-                    "53.71", 145902650L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.suffolk), "0.29", "51.88", "1.81", "52.60",
-                    143799697L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.surrey), "-0.90", "51.02", "0.10", "51.52",
-                    157987139L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.wiltshire), "-2.41", "50.90", "-1.44",
-                    "51.76", 138652346L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.scotland), "-8.13", "54.49", "-0.15",
-                    "61.40", 258853845L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.wales), "-5.56", "51.28", "-2.60", "53.60",
-                    193593409L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.albania), "19.09", "39.55", "21.12", "42.72",
-                    146199817L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.belarus), "23.12", "51.21", "32.87", "56.23",
-                    324470696L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.russian_federation), "27.9", "41.5", "190.4",
-                    "77.6", 2148314279L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.bulgaria), "24.7", "42.1", "24.8", "42.1",
-                    109869373L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.bosnia_and_herzegovina), "15.69", "42.52",
-                    "19.67", "45.32", 187122485L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.czech_republic), "11.91", "48.48", "19.02",
-                    "51.17", 904838442L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.croatia), "13.4", "42.1", "19.4", "46.9",
-                    460854751L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.estonia), "21.5", "57.5", "28.2", "59.6",
-                    173378927L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.greece), "28.9", "37.8", "29.0", "37.8",
-                    109435051L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.crete), "23.3", "34.5", "26.8", "36.0",
-                    115985063L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.hungary), "16.08", "45.57", "23.03", "48.39",
-                    350318541L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.latvia), "20.7", "55.6", "28.3", "58.1",
-                    188188140L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.lithuania), "20.9", "53.8", "26.9", "56.5",
-                    217852597L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.poland), "13.6", "48.8", "24.5", "55.0",
-                    1464968657L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.romania), "20.3", "43.5", "29.9", "48.4",
-                    347931565L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.slovakia), "16.8", "47.7", "22.6", "49.7",
-                    420533039L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.ukraine), "22.0", "44.3", "40.4", "52.4",
-                    793611912L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.north_america), "-178.1", "6.5", "-10.4",
-                    "84.0", 5601866516L, 0),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.alaska), "-179.5", "49.5", "-129", "71.6",
-                    207746039L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.canada), "-141.3", "41.5", "-52.2", "70.2",
-                    2635719651L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.hawaii), "-161.07", "18.49", "-154.45",
-                    "22.85", 115016656L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.usa) + Navit.getInstance()
-                    .getTstring(R.string.except_alaska_and_hawaii), "-125.4", "24.3", "-66.5", "49.3",
-                    4060487198L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.midwest), "-104.11", "35.92", "-80.46",
-                    "49.46", 1145596450L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.michigan), "-90.47", "41.64", "-79.00",
-                    "49.37", 538247019L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.ohio), "-84.87", "38.05", "-79.85", "43.53",
-                    277022336L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.northeast), "-80.58", "38.72", "-66.83",
-                    "47.53", 1017160709L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.massachusetts), "-73.56", "40.78", "-68.67",
-                    "42.94", 340055487L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.vermont), "-73.49", "42.68", "-71.41",
-                    "45.07", 139626067L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.pacific), "-180.05", "15.87", "-129.75",
-                    "73.04", 207090640L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.south), "-106.70", "23.98", "-71.46",
-                    "40.70", 1747935356L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.arkansas), "-94.67", "32.95", "-89.59",
-                    "36.60", 155658661L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.district_of_columbia), "-77.17", "38.74",
-                    "-76.86", "39.05", 129235755L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.florida), "-88.75", "23.63", "-77.67",
-                    "31.05", 224022108L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.louisiana), "-94.09", "28.09", "-88.62",
-                    "33.07", 210120605L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.maryland), "-79.54", "37.83", "-74.99",
-                    "40.22", 276462622L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.mississippi), "-91.71", "29.99", "-88.04",
-                    "35.05", 177858031L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.oklahoma), "-103.41", "33.56", "-94.38",
-                    "37.38", 200061473L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.texas), "-106.96", "25.62", "-92.97",
-                    "36.58", 430089141L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.virginia), "-83.73", "36.49", "-74.25",
-                    "39.52", 384187569L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.west_virginia), "-82.70", "37.15", "-77.66",
-                    "40.97", 220552071L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.west), "-133.11", "31.28", "-101.99",
-                    "49.51", 1152909162L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.arizona), "-114.88", "30.01", "-108.99",
-                    "37.06", 182826833L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.california), "-125.94", "32.43", "-114.08",
-                    "42.07", 586923326L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.colorado), "-109.11", "36.52", "-100.41",
-                    "41.05", 228623724L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.idaho), "-117.30", "41.93", "-110.99",
-                    "49.18", 170684507L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.montana), "-116.10", "44.31", "-102.64",
-                    "49.74", 176229800L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.new_mexico), "-109.10", "26.98", "-96.07",
-                    "37.05", 361793070L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.nevada), "-120.2", "35.0", "-113.8", "42.1",
-                    200614482L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.oregon), "-124.8", "41.8", "-116.3", "46.3",
-                    211462685L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.utah), "-114.11", "36.95", "-108.99",
-                    "42.05", 151590197L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.washington_state), "-125.0", "45.5",
-                    "-116.9", "49.0", 222553768L, 2),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.south_middle_america), "-83.5", "-56.3",
-                    "-30.8", "13.7", 958895383L, 0),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.argentina), "-73.9", "-57.3", "-51.6",
-                    "-21.0", 376857648L, 1),
-            new osm_map_values(
-                    Navit.getInstance().getTstring(R.string.argentina) + "+" + Navit.getInstance().getTstring(R.string.chile),
-                    "-77.2", "-56.3", "-52.7", "-16.1", 420275812L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.bolivia), "-70.5", "-23.1", "-57.3", "-9.3",
-                    175937824L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.brazil), "-71.4", "-34.7", "-32.8", "5.4",
-                    664872975L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.chile), "-81.77", "-58.50", "-65.46",
-                    "-17.41", 241657330L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.cuba), "-85.3", "19.6", "-74.0", "23.6",
-                    129043575L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.colombia), "-79.1", "-4.0", "-66.7", "12.6",
-                    212016580L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.ecuador), "-82.6", "-5.4", "-74.4", "2.3",
-                    158857591L, 1),
-            new osm_map_values(
-                    Navit.getInstance().getTstring(R.string.guyana) + "+" + Navit.getInstance().getTstring(R.string.suriname) + "+"
-                            + Navit.getInstance().getTstring(R.string.guyane_francaise), "-62.0", "1.0", "-51.2",
-                    "8.9", 123000072L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.haiti) + "+" + Navit.getInstance().getTstring(R.string.dominican_republic), "-74.8", "17.3", "-68.2", "20.1", 149925689L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.jamaica), "-78.6", "17.4", "-75.9", "18.9",
-                    113961998L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.mexico), "-117.6", "14.1", "-86.4", "32.8",
-                    551307973L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.paraguay), "-63.8", "-28.1", "-53.6",
-                    "-18.8", 159498397L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.peru), "-82.4", "-18.1", "-67.5", "0.4",
-                    212490557L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.uruguay), "-59.2", "-36.5", "-51.7", "-29.7",
-                    157482719L, 1),
-            new osm_map_values(Navit.getInstance().getTstring(R.string.venezuela), "-73.6", "0.4", "-59.7", "12.8",
-                    167295729L, 1)
+        new osm_map_values(Navit.getInstance().getTstring(R.string.whole_planet), "-180", "-90", "180", "90",
+                           23992258630L, 0),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.africa), "-30.89", "-36.17", "61.68",
+                           "38.40", 2070076339L, 0),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.angola), "11.4", "-18.1", "24.2", "-5.3",
+                           127557789L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.burundi), "28.9", "-4.5", "30.9", "-2.2",
+                           124049667L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.canary_islands), "-18.69", "26.52", "-12.79",
+                           "29.99", 133565815L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.congo), "11.7",
+                           "-13.6", "31.5", "5.7", 244228485L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.ethiopia), "32.89", "3.33", "48.07", "14.97",
+                           153067406L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.guinea), "-15.47", "7.12", "-7.58", "12.74",
+                           188047126L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.cotedivoire), "-8.72", "4.09", "-2.43",
+                           "10.80", 132187496L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.kenya), "33.8", "-5.2", "42.4", "4.9",
+                           190073089L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.lesotho), "26.9", "-30.7", "29.6", "-28.4",
+                           196189429L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.liberia), "-15.00", "-0.73", "-7.20", "8.65",
+                           156257253L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.libya), "9.32", "19.40", "25.54", "33.63",
+                           126046917L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.madagascar), "42.25", "-26.63", "51.20",
+                           "-11.31", 145210721L, 1),
+        new osm_map_values(
+            Navit.getInstance().getTstring(R.string.namibia) + "+" + Navit.getInstance().getTstring(R.string.botswana),
+            "11.4", "-29.1", "29.5", "-16.9", 248970987L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.reunion), "55.2", "-21.4", "55.9", "-20.9",
+                           126008774L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.rwanda), "28.8", "-2.9", "30.9", "-1.0",
+                           128267595L, 1),
+        new osm_map_values(
+            Navit.getInstance().getTstring(R.string.south_africa) + "+" + Navit.getInstance().getTstring(R.string.lesotho),
+            "15.93", "-36.36", "33.65", "-22.08", 307280006L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.tanzania), "29.19",
+                           "-11.87", "40.74", "-0.88", 253621029L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.uganda), "29.3", "-1.6", "35.1", "4.3",
+                           179134521L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.asia), "23.8", "0.1", "195.0", "82.4",
+                           5113673780L, 0),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.azerbaijan), "44.74", "38.34", "51.69",
+                           "42.37", 138346406L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.china), "67.3", "5.3", "135.0", "54.5",
+                           1718108758L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.cyprus), "32.0", "34.5", "34.9", "35.8",
+                           118472448L, 1),
+        new osm_map_values(
+            Navit.getInstance().getTstring(R.string.india) + "+" + Navit.getInstance().getTstring(R.string.nepal), "67.9",
+            "5.5", "89.6", "36.0", 601877877L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.indonesia), "93.7", "-17.3", "155.5", "7.6",
+                           420741405L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.iran), "43.5", "24.4",
+                           "63.6", "40.4", 242016066L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.iraq), "38.7", "28.5", "49.2", "37.4",
+                           160751805L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.israel), "33.99", "29.8", "35.95", "33.4",
+                           155685778L, 1),
+        new osm_map_values(
+            Navit.getInstance().getTstring(R.string.japan) + "+" + Navit.getInstance().getTstring(R.string.korea), "123.6",
+            "25.2", "151.3", "47.1", 1029080156L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.kazakhstan), "46.44", "40.89", "87.36",
+                           "55.45", 407633007L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.kyrgyzsyan), "69.23", "39.13", "80.33",
+                           "43.29", 147997835L, 1),
+        new osm_map_values(
+            Navit.getInstance().getTstring(R.string.malaysia) + "+" + Navit.getInstance().getTstring(R.string.singapore),
+            "94.3", "-5.9", "108.6", "6.8", 168816435L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.mongolia), "87.5", "41.4", "120.3", "52.7",
+                           153534851L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.pakistan), "60.83", "23.28", "77.89",
+                           "37.15", 217644321L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.philippines), "115.58", "4.47", "127.85",
+                           "21.60", 281428307L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.saudi_arabia), "33.2", "16.1", "55.9",
+                           "33.5", 242648303L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.taiwan), "119.1", "21.5", "122.5", "25.2",
+                           1029080156L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.thailand), "97.5", "5.7", "105.2", "19.7",
+                           185135492L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.turkey), "25.1", "35.8", "46.4", "42.8",
+                           331087441L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.turkmenistan), "51.78", "35.07", "66.76",
+                           "42.91", 131045087L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.uae_other), "51.5", "22.6", "56.7", "26.5",
+                           128934674L, 1),
+        new osm_map_values(
+            Navit.getInstance().getTstring(R.string.australia) + "+" + Navit.getInstance().getTstring(R.string.oceania),
+            "89.84", "-57.39", "179.79", "7.26", 782722650L, 0),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.australia), "110.5", "-44.2", "154.9",
+                           "-9.2", 348652900L, 0),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.tasmania), "144.0", "-45.1", "155.3",
+                           "-24.8", 253231890L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.victoria) + " + " + Navit.getInstance()
+                           .getTstring(R.string.new_south_wales), "140.7", "-39.4", "153.7", "-26.9", 241500829L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.new_caledonia), "157.85", "-25.05", "174.15",
+                           "-16.85", 115512336L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.newzealand), "165.2", "-47.6", "179.1",
+                           "-33.7", 239264192L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.europe), "-12.97", "33.59", "34.15", "72.10",
+                           11984126789L, 0),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.western_europe), "-17.6", "34.5", "42.9",
+                           "70.9", 12648810717L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.austria), "9.4", "46.32", "17.21", "49.1",
+                           898273634L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.azores), "-31.62", "36.63", "-24.67",
+                           "40.13", 112687225L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.belgium), "2.3", "49.5", "6.5", "51.6",
+                           733035524L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.benelux), "2.08", "48.87", "7.78", "54.52",
+                           1771971595L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.netherlands), "3.07", "50.75", "7.23",
+                           "53.73", 1191828033L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.denmark), "7.65", "54.32", "15.58", "58.07",
+                           365606979L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.faroe_islands), "-7.8", "61.3", "-6.1",
+                           "62.5", 109377568L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.france), "-5.45", "42.00", "8.44", "51.68",
+                           3907969744L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.alsace), "6.79", "47.27", "8.48", "49.17",
+                           354249349L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.aquitaine), "-2.27", "42.44", "1.50",
+                           "45.76", 443715019L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.auvergne), "2.01", "44.57", "4.54", "46.85",
+                           287663213L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.basse_normandie), "-2.09", "48.13", "1.03",
+                           "49.98", 262352354L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.bourgogne), "2.80", "46.11", "5.58", "48.45",
+                           298868796L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.bretagne), "-5.58", "46.95", "-0.96",
+                           "48.99", 382770794L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.centre), "0.01", "46.29", "3.18", "48.99",
+                           474224721L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.champagne_ardenne), "3.34", "47.53", "5.94",
+                           "50.28", 269947824L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.corse), "8.12", "41.32", "9.95", "43.28",
+                           129902146L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.franche_comte), "5.20", "46.21", "7.83",
+                           "48.07", 324476070L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.haute_normandie), "-0.15", "48.62", "1.85",
+                           "50.18", 202782876L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.ile_de_france), "1.40", "48.07", "3.61",
+                           "49.29", 311052699L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.languedoc_roussillon), "1.53", "42.25",
+                           "4.89", "45.02", 380145667L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.limousin), "0.58", "44.87", "2.66", "46.50",
+                           206696539L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.lorraine), "4.84", "47.77", "7.72", "49.73",
+                           330777318L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.midi_pyrenees), "-0.37", "42.18", "3.50",
+                           "45.10", 462618363L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.nord_pas_de_calais), "1.42", "49.92", "4.49",
+                           "51.31", 368467511L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.pays_de_la_loire), "-2.88", "46.20", "0.97",
+                           "48.62", 499471143L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.picardie), "1.25", "48.79", "4.31", "50.43",
+                           374308041L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.poitou_charentes), "-1.69", "45.04", "1.26",
+                           "47.23", 342125526L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.provence_alpes_cote_d_azur), "4.21", "42.91",
+                           "7.99", "45.18", 390306134L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.rhone_alpes), "3.65", "44.07", "7.88",
+                           "46.64", 510797942L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.luxembourg), "5.7", "49.4", "6.5", "50.2",
+                           1771971595L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.germany), "5.18", "46.84", "15.47", "55.64",
+                           3521359466L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.baden_wuerttemberg), "7.32", "47.14",
+                           "10.57", "49.85", 674361124L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.bayern), "8.92", "47.22", "13.90", "50.62",
+                           860161150L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.mittelfranken), "9.86", "48.78", "11.65",
+                           "49.84", 203055195L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.niederbayern), "11.55", "47.75", "14.12",
+                           "49.42", 312924770L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.oberbayern), "10.67", "47.05", "13.57",
+                           "49.14", 382734883L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.oberfranken), "10.31", "49.54", "12.49",
+                           "50.95", 235258691L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.oberpfalz), "11.14", "48.71", "13.47",
+                           "50.43", 264536012L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.schwaben), "9.27", "47.10", "11.36", "49.09",
+                           321141607L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.unterfranken), "8.59", "49.16", "10.93",
+                           "50.67", 303720890L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.berlin), "13.03", "52.28", "13.81", "52.73",
+                           169019946L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.brandenburg), "11.17", "51.30", "14.83",
+                           "53.63", 323497599L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.bremen), "8.43", "52.96", "9.04", "53.66",
+                           150963608L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.hamburg), "9.56", "53.34", "10.39", "53.80",
+                           156284421L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.hessen), "7.72", "49.34", "10.29", "51.71",
+                           432279328L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.mecklenburg_vorpommern), "10.54", "53.05",
+                           "14.48", "55.05", 213183908L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.niedersachsen), "6.40", "51.24", "11.69",
+                           "54.22", 819766939L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.nordrhein_westfalen), "5.46", "50.26",
+                           "9.52", "52.59", 967053517L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.rheinland_pfalz), "6.06", "48.91", "8.56",
+                           "51.00", 442868899L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.saarland), "6.30", "49.06", "7.46", "49.69",
+                           157721162L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.sachsen_anhalt), "10.50", "50.88", "13.26",
+                           "53.11", 287785088L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.sachsen), "11.82", "50.11", "15.10", "51.73",
+                           342620834L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.schleswig_holstein), "7.41", "53.30",
+                           "11.98", "55.20", 280293910L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.thueringen), "9.81", "50.15", "12.72",
+                           "51.70", 269428239L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.iceland), "-25.3", "62.8", "-11.4", "67.5",
+                           124837162L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.ireland), "-11.17", "51.25", "-5.23", "55.9",
+                           234750271L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.italy), "6.52", "36.38", "18.96", "47.19",
+                           1610171395L, 1),
+        new osm_map_values(
+            Navit.getInstance().getTstring(R.string.spain) + "+" + Navit.getInstance().getTstring(R.string.portugal),
+            "-11.04", "34.87", "4.62", "44.41", 1039624918L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.mallorca), "2.2", "38.8", "4.7", "40.2",
+                           137200636L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.galicia), "-10.0", "41.7", "-6.3", "44.1",
+                           174549553L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.scandinavia), "4.0", "54.4", "32.1", "71.5",
+                           1398661090L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.finland), "18.6", "59.2", "32.3", "70.3",
+                           460997178L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.denmark), "7.49", "54.33", "13.05", "57.88",
+                           321870414L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.switzerland), "5.79", "45.74", "10.59",
+                           "47.84", 552565332L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.united_kingdom), "-9.7", "49.6", "2.2",
+                           "61.2", 901724648L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.england), "-7.80", "48.93", "2.41", "56.14",
+                           937728414L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.buckinghamshire), "-1.19", "51.44", "-0.43",
+                           "52.25", 142256978L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.cambridgeshire), "-0.55", "51.96", "0.56",
+                           "52.79", 142334001L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.cumbria), "-3.96", "53.85", "-2.11", "55.24",
+                           144422460L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.east_yorkshire_with_hull), "-1.16", "53.50",
+                           "0.54", "54.26", 141518744L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.essex), "-0.07", "51.40", "1.36", "52.14",
+                           162542730L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.herefordshire), "-3.19", "51.78", "-2.29",
+                           "52.45", 129368660L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.kent), "-0.02", "50.81", "1.65", "51.53",
+                           145482562L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.lancashire), "-3.20", "53.43", "-2.00",
+                           "54.29", 148964975L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.leicestershire), "-1.65", "52.34", "-0.61",
+                           "53.03", 154199956L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.norfolk), "0.10", "52.30", "2.04", "53.41",
+                           146017009L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.nottinghamshire), "-1.39", "52.73", "-0.62",
+                           "53.55", 147986548L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.oxfordshire), "-1.77", "51.41", "-0.82",
+                           "52.22", 142240992L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.shropshire), "-3.29", "52.26", "-2.18",
+                           "53.05", 136909363L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.somerset), "-3.89", "50.77", "-2.20",
+                           "51.40", 145186096L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.south_yorkshire), "-1.88", "53.25", "-0.80",
+                           "53.71", 145902650L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.suffolk), "0.29", "51.88", "1.81", "52.60",
+                           143799697L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.surrey), "-0.90", "51.02", "0.10", "51.52",
+                           157987139L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.wiltshire), "-2.41", "50.90", "-1.44",
+                           "51.76", 138652346L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.scotland), "-8.13", "54.49", "-0.15",
+                           "61.40", 258853845L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.wales), "-5.56", "51.28", "-2.60", "53.60",
+                           193593409L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.albania), "19.09", "39.55", "21.12", "42.72",
+                           146199817L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.belarus), "23.12", "51.21", "32.87", "56.23",
+                           324470696L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.russian_federation), "27.9", "41.5", "190.4",
+                           "77.6", 2148314279L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.bulgaria), "24.7", "42.1", "24.8", "42.1",
+                           109869373L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.bosnia_and_herzegovina), "15.69", "42.52",
+                           "19.67", "45.32", 187122485L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.czech_republic), "11.91", "48.48", "19.02",
+                           "51.17", 904838442L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.croatia), "13.4", "42.1", "19.4", "46.9",
+                           460854751L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.estonia), "21.5", "57.5", "28.2", "59.6",
+                           173378927L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.greece), "28.9", "37.8", "29.0", "37.8",
+                           109435051L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.crete), "23.3", "34.5", "26.8", "36.0",
+                           115985063L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.hungary), "16.08", "45.57", "23.03", "48.39",
+                           350318541L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.latvia), "20.7", "55.6", "28.3", "58.1",
+                           188188140L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.lithuania), "20.9", "53.8", "26.9", "56.5",
+                           217852597L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.poland), "13.6", "48.8", "24.5", "55.0",
+                           1464968657L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.romania), "20.3", "43.5", "29.9", "48.4",
+                           347931565L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.slovakia), "16.8", "47.7", "22.6", "49.7",
+                           420533039L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.ukraine), "22.0", "44.3", "40.4", "52.4",
+                           793611912L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.north_america), "-178.1", "6.5", "-10.4",
+                           "84.0", 5601866516L, 0),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.alaska), "-179.5", "49.5", "-129", "71.6",
+                           207746039L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.canada), "-141.3", "41.5", "-52.2", "70.2",
+                           2635719651L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.hawaii), "-161.07", "18.49", "-154.45",
+                           "22.85", 115016656L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.usa) + Navit.getInstance()
+                           .getTstring(R.string.except_alaska_and_hawaii), "-125.4", "24.3", "-66.5", "49.3",
+                           4060487198L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.midwest), "-104.11", "35.92", "-80.46",
+                           "49.46", 1145596450L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.michigan), "-90.47", "41.64", "-79.00",
+                           "49.37", 538247019L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.ohio), "-84.87", "38.05", "-79.85", "43.53",
+                           277022336L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.northeast), "-80.58", "38.72", "-66.83",
+                           "47.53", 1017160709L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.massachusetts), "-73.56", "40.78", "-68.67",
+                           "42.94", 340055487L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.vermont), "-73.49", "42.68", "-71.41",
+                           "45.07", 139626067L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.pacific), "-180.05", "15.87", "-129.75",
+                           "73.04", 207090640L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.south), "-106.70", "23.98", "-71.46",
+                           "40.70", 1747935356L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.arkansas), "-94.67", "32.95", "-89.59",
+                           "36.60", 155658661L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.district_of_columbia), "-77.17", "38.74",
+                           "-76.86", "39.05", 129235755L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.florida), "-88.75", "23.63", "-77.67",
+                           "31.05", 224022108L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.louisiana), "-94.09", "28.09", "-88.62",
+                           "33.07", 210120605L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.maryland), "-79.54", "37.83", "-74.99",
+                           "40.22", 276462622L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.mississippi), "-91.71", "29.99", "-88.04",
+                           "35.05", 177858031L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.oklahoma), "-103.41", "33.56", "-94.38",
+                           "37.38", 200061473L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.texas), "-106.96", "25.62", "-92.97",
+                           "36.58", 430089141L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.virginia), "-83.73", "36.49", "-74.25",
+                           "39.52", 384187569L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.west_virginia), "-82.70", "37.15", "-77.66",
+                           "40.97", 220552071L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.west), "-133.11", "31.28", "-101.99",
+                           "49.51", 1152909162L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.arizona), "-114.88", "30.01", "-108.99",
+                           "37.06", 182826833L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.california), "-125.94", "32.43", "-114.08",
+                           "42.07", 586923326L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.colorado), "-109.11", "36.52", "-100.41",
+                           "41.05", 228623724L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.idaho), "-117.30", "41.93", "-110.99",
+                           "49.18", 170684507L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.montana), "-116.10", "44.31", "-102.64",
+                           "49.74", 176229800L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.new_mexico), "-109.10", "26.98", "-96.07",
+                           "37.05", 361793070L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.nevada), "-120.2", "35.0", "-113.8", "42.1",
+                           200614482L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.oregon), "-124.8", "41.8", "-116.3", "46.3",
+                           211462685L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.utah), "-114.11", "36.95", "-108.99",
+                           "42.05", 151590197L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.washington_state), "-125.0", "45.5",
+                           "-116.9", "49.0", 222553768L, 2),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.south_middle_america), "-83.5", "-56.3",
+                           "-30.8", "13.7", 958895383L, 0),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.argentina), "-73.9", "-57.3", "-51.6",
+                           "-21.0", 376857648L, 1),
+        new osm_map_values(
+            Navit.getInstance().getTstring(R.string.argentina) + "+" + Navit.getInstance().getTstring(R.string.chile),
+            "-77.2", "-56.3", "-52.7", "-16.1", 420275812L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.bolivia), "-70.5", "-23.1", "-57.3", "-9.3",
+                           175937824L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.brazil), "-71.4", "-34.7", "-32.8", "5.4",
+                           664872975L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.chile), "-81.77", "-58.50", "-65.46",
+                           "-17.41", 241657330L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.cuba), "-85.3", "19.6", "-74.0", "23.6",
+                           129043575L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.colombia), "-79.1", "-4.0", "-66.7", "12.6",
+                           212016580L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.ecuador), "-82.6", "-5.4", "-74.4", "2.3",
+                           158857591L, 1),
+        new osm_map_values(
+            Navit.getInstance().getTstring(R.string.guyana) + "+" + Navit.getInstance().getTstring(R.string.suriname) + "+"
+            + Navit.getInstance().getTstring(R.string.guyane_francaise), "-62.0", "1.0", "-51.2",
+            "8.9", 123000072L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.haiti) + "+" + Navit.getInstance().getTstring(R.string.dominican_republic), "-74.8", "17.3", "-68.2", "20.1", 149925689L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.jamaica), "-78.6", "17.4", "-75.9", "18.9",
+                           113961998L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.mexico), "-117.6", "14.1", "-86.4", "32.8",
+                           551307973L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.paraguay), "-63.8", "-28.1", "-53.6",
+                           "-18.8", 159498397L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.peru), "-82.4", "-18.1", "-67.5", "0.4",
+                           212490557L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.uruguay), "-59.2", "-36.5", "-51.7", "-29.7",
+                           157482719L, 1),
+        new osm_map_values(Navit.getInstance().getTstring(R.string.venezuela), "-73.6", "0.4", "-59.7", "12.8",
+                           167295729L, 1)
     };
     //we should try to resume
     private static final int SOCKET_CONNECT_TIMEOUT = 60000;          // 60 secs.
@@ -505,7 +505,7 @@ public class NavitMapDownloader extends Thread {
             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]);
+                                                    map_file_names[map_file_index]);
             }
         }
         return maps;
@@ -517,7 +517,7 @@ public class NavitMapDownloader extends Thread {
 
         Log.v(TAG, "start download " + map_values.map_name);
         updateProgress(0, map_values.est_size_bytes,
-                Navit.getInstance().getTstring(R.string.map_downloading) + ": " + map_values.map_name);
+                       Navit.getInstance().getTstring(R.string.map_downloading) + ": " + map_values.map_name);
 
         boolean success;
         do {
@@ -529,9 +529,9 @@ public class NavitMapDownloader extends Thread {
             retryDownload = false;
             success = download_osm_map();
         } while (!success
-                && retryDownload
-                && retry_counter < MAX_RETRIES
-                && !stop_me);
+                 && retryDownload
+                 && retry_counter < MAX_RETRIES
+                 && !stop_me);
 
         if (success) {
             toast(map_values.map_name + " " + Navit.getInstance().getTstring(R.string.map_download_ready));
@@ -541,8 +541,8 @@ public class NavitMapDownloader extends Thread {
 
         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);
+                                           , map_filename_path + map_values.map_name + ".bin", null, -1, success ? 1 : 0,
+                                           map_id);
         }
     }
 
@@ -561,14 +561,14 @@ public class NavitMapDownloader extends Thread {
         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.");
+                  + needed_bytes / 1024 / 1024 + "Mb.");
             if (free_space < 0) {
                 msg = Navit.getInstance().getTstring(R.string.map_download_medium_unavailable);
             } else {
                 msg = Navit.getInstance().getTstring(R.string.map_download_not_enough_free_space);
             }
             updateProgress(free_space, needed_bytes,
-                    Navit.getInstance().getTstring(R.string.map_download_download_error) + "\n" + msg);
+                           Navit.getInstance().getTstring(R.string.map_download_download_error) + "\n" + msg);
             return false;
         }
         return true;
@@ -579,8 +579,8 @@ public class NavitMapDownloader extends Thread {
 
         if (finalOutputFile.exists()) {
             Message msg =
-                    Message.obtain(Navit.getInstance().getNavitGraphics().callback_handler,
-                            NavitGraphics.msg_type.CLB_DELETE_MAP.ordinal());
+                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);
@@ -635,8 +635,8 @@ public class NavitMapDownloader extends Thread {
             }
 
             Log.d(TAG, "size: " + real_size_bytes + ", read: " + already_read + ", timestamp: "
-                    + fileTime
-                    + ", Connection ref: " + c.getURL());
+                  + fileTime
+                  + ", Connection ref: " + c.getURL());
 
             if (checkFreeSpace(real_size_bytes - already_read)
                     && downloadData(c, already_read, real_size_bytes, resume, outputFile)) {
@@ -659,7 +659,7 @@ public class NavitMapDownloader extends Thread {
     }
 
     private boolean downloadData(URLConnection c, long already_read, long real_size_bytes
-            , boolean resume, File outputFile) {
+                                 , boolean resume, File outputFile) {
         boolean success = false;
         BufferedOutputStream buf = getOutputStream(outputFile, resume);
         BufferedInputStream bif = getInputStream(c);
@@ -683,9 +683,9 @@ public class NavitMapDownloader extends Thread {
         URL url;
         try {
             url =
-                    new URL("http://maps.navit-project.org/api/map/?bbox=" + map_values.lon1 + ","
-                            + map_values.lat1
-                            + "," + map_values.lon2 + "," + map_values.lat2);
+                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();
@@ -735,7 +735,7 @@ public class NavitMapDownloader extends Thread {
         BufferedOutputStream buf;
         try {
             buf = new BufferedOutputStream(new FileOutputStream(outputFile, resume),
-                    MAP_WRITE_FILE_BUFFER);
+                                           MAP_WRITE_FILE_BUFFER);
         } catch (FileNotFoundException e) {
             Log.e(TAG, "Could not open output file for writing: " + e);
             buf = null;
@@ -760,7 +760,7 @@ public class NavitMapDownloader extends Thread {
     }
 
     private boolean readData(OutputStream buf, InputStream bif, long already_read,
-            long real_size_bytes) {
+                             long real_size_bytes) {
         long start_timestamp = System.nanoTime();
         byte[] buffer = new byte[MAP_WRITE_MEM_BUFFER];
         int len1;
@@ -781,12 +781,12 @@ public class NavitMapDownloader extends Thread {
                             enableRetry();
                         } else {
                             updateProgress(already_read, real_size_bytes,
-                                    Navit.getInstance().getTstring(R.string.map_download_download_error) + "\n"
-                                            + Navit.getInstance().getTstring(R.string.map_download_not_enough_free_space));
+                                           Navit.getInstance().getTstring(R.string.map_download_download_error) + "\n"
+                                           + Navit.getInstance().getTstring(R.string.map_download_not_enough_free_space));
                         }
                     } else {
                         updateProgress(already_read, real_size_bytes,
-                                Navit.getInstance().getTstring(R.string.map_download_error_writing_map));
+                                       Navit.getInstance().getTstring(R.string.map_download_error_writing_map));
                     }
 
                     return false;
@@ -806,7 +806,7 @@ public class NavitMapDownloader extends Thread {
 
             enableRetry();
             updateProgress(already_read, real_size_bytes,
-                    Navit.getInstance().getTstring(R.string.map_download_download_error));
+                           Navit.getInstance().getTstring(R.string.map_download_download_error));
         }
 
         return success;
@@ -816,7 +816,7 @@ public class NavitMapDownloader extends Thread {
         URL url = null;
         try {
             ObjectInputStream infoStream = new ObjectInputStream(
-                    new FileInputStream(getMapInfoFile()));
+                new FileInputStream(getMapInfoFile()));
             String resume_proto = infoStream.readUTF();
             infoStream.readUTF(); // read the host name (unused for now)
             String resume_file = infoStream.readUTF();
@@ -839,7 +839,7 @@ public class NavitMapDownloader extends Thread {
 
         if ((currentTime > uiLastUpdated + UPDATE_PROGRESS_TIME_NS) && startTime != currentTime) {
             float per_second_overall =
-                    (readBytes - offsetBytes) / ((currentTime - startTime) / 1000000000f);
+                (readBytes - offsetBytes) / ((currentTime - startTime) / 1000000000f);
             long bytes_remaining = maxBytes - readBytes;
             int eta_seconds = (int) (bytes_remaining / per_second_overall);
 
@@ -850,10 +850,10 @@ public class NavitMapDownloader extends Thread {
                 eta_string = eta_seconds + " s";
             }
             String info =
-                    String.format("%s: %s\n %dMb / %dMb\n %.1f kb/s %s: %s",
-                            Navit.getInstance().getTstring(R.string.map_downloading)
-                            , map_values.map_name, readBytes / 1024 / 1024, maxBytes / 1024 / 1024,
-                            per_second_overall / 1024f, Navit.getInstance().getTstring(R.string.map_download_eta), eta_string);
+                String.format("%s: %s\n %dMb / %dMb\n %.1f kb/s %s: %s",
+                              Navit.getInstance().getTstring(R.string.map_downloading)
+                              , map_values.map_name, readBytes / 1024 / 1024, maxBytes / 1024 / 1024,
+                              per_second_overall / 1024f, Navit.getInstance().getTstring(R.string.map_download_eta), eta_string);
 
             if (retry_counter > 0) {
                 info += "\n Retry " + retry_counter + "/" + MAX_RETRIES;
@@ -867,9 +867,9 @@ public class NavitMapDownloader extends Thread {
 
     private void updateProgress(long positionBytes, long maximumBytes, String infoText) {
         NavitDialogs.sendDialogMessage(NavitDialogs.MSG_PROGRESS_BAR,
-                Navit.getInstance().getTstring(R.string.map_download_title), infoText
-                , NavitDialogs.DIALOG_MAPDOWNLOAD, (int) (maximumBytes / 1024),
-                (int) (positionBytes / 1024));
+                                       Navit.getInstance().getTstring(R.string.map_download_title), infoText
+                                       , NavitDialogs.DIALOG_MAPDOWNLOAD, (int) (maximumBytes / 1024),
+                                       (int) (positionBytes / 1024));
     }
 
     private void writeFileInfo(URLConnection c, long sizeInBytes) {
@@ -883,8 +883,8 @@ public class NavitMapDownloader extends Thread {
             infoStream.close();
         } catch (Exception e) {
             Log.e(TAG,
-                    "Could not write info file for map download. Resuming will not be possible. ("
-                            + e.getMessage() + ")");
+                  "Could not write info file for map download. Resuming will not be possible. ("
+                  + e.getMessage() + ")");
         }
     }
 
@@ -905,8 +905,8 @@ public class NavitMapDownloader extends Thread {
 
 
         private osm_map_values(String mapname, String lon_1, String lat_1, String lon_2,
-                String lat_2,
-                long bytes_est, int level) {
+                               String lat_2,
+                               long bytes_est, int level) {
             this.map_name = mapname;
             this.lon1 = lon_1;
             this.lat1 = lat_1;
diff --git a/navit/android/src/org/navitproject/navit/NavitRestoreTask.java b/navit/android/src/org/navitproject/navit/NavitRestoreTask.java
index 2cd76a931..a44ef7b2e 100644
--- a/navit/android/src/org/navitproject/navit/NavitRestoreTask.java
+++ b/navit/android/src/org/navitproject/navit/NavitRestoreTask.java
@@ -44,8 +44,8 @@ public class NavitRestoreTask extends AsyncTask<Void, Void, String> {
 
         /* This is the Directory where all Subdirectories are stored by date */
         File backupDir = new File(
-                Environment.getExternalStorageDirectory().getPath() + "/navit/backup/"
-                        + mTimestamp);
+            Environment.getExternalStorageDirectory().getPath() + "/navit/backup/"
+            + mTimestamp);
 
         /* Check if there is a Backup Directory */
         if (!backupDir.isDirectory()) {
@@ -62,19 +62,19 @@ public class NavitRestoreTask extends AsyncTask<Void, Void, String> {
 
             /* Restore Files in home */
             mActivity.copyFileIfExists(backupDir.getPath() + "/bookmark.txt",
-                    Navit.NAVIT_DATA_DIR + "/home/bookmark.txt");
+                                       Navit.NAVIT_DATA_DIR + "/home/bookmark.txt");
             mActivity.copyFileIfExists(backupDir.getPath() + "/destination.txt",
-                    Navit.NAVIT_DATA_DIR + "/home/destination.txt");
+                                       Navit.NAVIT_DATA_DIR + "/home/destination.txt");
             mActivity.copyFileIfExists(backupDir.getPath() + "/gui_internal.txt",
-                    Navit.NAVIT_DATA_DIR + "/home/gui_internal.txt");
+                                       Navit.NAVIT_DATA_DIR + "/home/gui_internal.txt");
 
             /* Restore Shared Preferences */
             preferenceOIS = new ObjectInputStream(
-                    new FileInputStream(backupDir.getPath() + "/preferences.bak"));
+                new FileInputStream(backupDir.getPath() + "/preferences.bak"));
             Map<String, ?> entries = (Map<String, ?>) preferenceOIS.readObject();
 
             Editor prefEditor = mActivity
-                    .getSharedPreferences(Navit.NAVIT_PREFS, Context.MODE_PRIVATE).edit();
+                                .getSharedPreferences(Navit.NAVIT_PREFS, Context.MODE_PRIVATE).edit();
 
             /* Remove all old Preferences */
             prefEditor.clear();
@@ -133,10 +133,10 @@ public class NavitRestoreTask extends AsyncTask<Void, Void, String> {
 
         /* Navit needs to be restarted. Currently the User has to restart it by himself */
         Toast.makeText(mActivity,
-                mActivity.getTstring(R.string.restore_successful_please_restart_navit),
-                Toast.LENGTH_LONG).show();
+                       mActivity.getTstring(R.string.restore_successful_please_restart_navit),
+                       Toast.LENGTH_LONG).show();
         NotificationManager nm = (NotificationManager) mActivity
-                .getSystemService(Context.NOTIFICATION_SERVICE);
+                                 .getSystemService(Context.NOTIFICATION_SERVICE);
         nm.cancel(R.string.app_name);
         NavitVehicle.removeListener();
         mActivity.finish();
@@ -146,7 +146,7 @@ public class NavitRestoreTask extends AsyncTask<Void, Void, String> {
     protected void onCancelled() {
         super.onCancelled();
         Toast.makeText(mActivity, mActivity.getTstring(R.string.restore_failed), Toast.LENGTH_LONG)
-                .show();
+        .show();
         mDialog.dismiss();
     }
 }
diff --git a/navit/android/src/org/navitproject/navit/NavitSensors.java b/navit/android/src/org/navitproject/navit/NavitSensors.java
index a0d300223..24ae9f796 100644
--- a/navit/android/src/org/navitproject/navit/NavitSensors.java
+++ b/navit/android/src/org/navitproject/navit/NavitSensors.java
@@ -30,22 +30,21 @@ public class NavitSensors implements SensorEventListener {
     public native void SensorCallback(int id, int sensor, float x, float y, float z);
 
 
-    NavitSensors(Context context, int cbid) 
-    {
+    NavitSensors(Context context, int cbid) {
         mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
-        mSensorManager.registerListener((SensorEventListener)this, mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER), SensorManager.SENSOR_DELAY_NORMAL);
-        mSensorManager.registerListener((SensorEventListener)this, mSensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD), SensorManager.SENSOR_DELAY_NORMAL);
+        mSensorManager.registerListener((SensorEventListener)this, mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER),
+                                        SensorManager.SENSOR_DELAY_NORMAL);
+        mSensorManager.registerListener((SensorEventListener)this, mSensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD),
+                                        SensorManager.SENSOR_DELAY_NORMAL);
         callbackid=cbid;
     }
 
     public void
-    onAccuracyChanged(Sensor sensor, int accuracy)
-    {
+    onAccuracyChanged(Sensor sensor, int accuracy) {
     }
 
     public void
-    onSensorChanged(SensorEvent sev)
-    {
+    onSensorChanged(SensorEvent sev) {
         // Log.e("NavitSensor","Type:" + sev.sensor.getType() + " X:" + sev.values[0] + " Y:"+sev.values[1]+" Z:"+sev.values[2]);
         SensorCallback(callbackid, sev.sensor.getType(), sev.values[0], sev.values[1], sev.values[2]);
     }
diff --git a/navit/android/src/org/navitproject/navit/NavitSpeech2.java b/navit/android/src/org/navitproject/navit/NavitSpeech2.java
index 37685c681..573696698 100644
--- a/navit/android/src/org/navitproject/navit/NavitSpeech2.java
+++ b/navit/android/src/org/navitproject/navit/NavitSpeech2.java
@@ -62,19 +62,19 @@ public class NavitSpeech2 implements TextToSpeech.OnInitListener, NavitActivityR
                 // missing data, ask to install it
                 AlertDialog.Builder builder = new AlertDialog.Builder(navit);
                 builder
-                        .setTitle(navit.getTstring(R.string.TTS_title_data_missing))
-                        .setMessage(navit.getTstring(R.string.TTS_qery_install_data))
-                        .setPositiveButton(navit.getTstring(R.string.yes),
-                                new DialogInterface.OnClickListener() {
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        Intent installIntent = new Intent();
-                                        installIntent.setAction(
-                                                TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA);
-                                        navit.startActivity(installIntent);
-                                    }
-                                })
-                        .setNegativeButton(navit.getTstring(R.string.no), null)
-                        .show();
+                .setTitle(navit.getTstring(R.string.TTS_title_data_missing))
+                .setMessage(navit.getTstring(R.string.TTS_qery_install_data))
+                .setPositiveButton(navit.getTstring(R.string.yes),
+                new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        Intent installIntent = new Intent();
+                        installIntent.setAction(
+                            TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA);
+                        navit.startActivity(installIntent);
+                    }
+                })
+                .setNegativeButton(navit.getTstring(R.string.no), null)
+                .show();
             }
         }
     }
diff --git a/navit/android/src/org/navitproject/navit/NavitTimeout.java b/navit/android/src/org/navitproject/navit/NavitTimeout.java
index b70d8a1ad..011555049 100644
--- a/navit/android/src/org/navitproject/navit/NavitTimeout.java
+++ b/navit/android/src/org/navitproject/navit/NavitTimeout.java
@@ -26,33 +26,31 @@ import android.util.Log;
 
 
 public class NavitTimeout implements Runnable {
-	private static Handler handler =new Handler() {
-			public void handleMessage(Message m) {
-				Log.e("Navit","Handler received message");
-			}
-		};
-	private boolean event_multi;
-	private int event_callbackid;
-	private int event_timeout;
-	public native void TimeoutCallback(int id);
+    private static Handler handler =new Handler() {
+        public void handleMessage(Message m) {
+            Log.e("Navit","Handler received message");
+        }
+    };
+    private boolean event_multi;
+    private int event_callbackid;
+    private int event_timeout;
+    public native void TimeoutCallback(int id);
 
-	NavitTimeout(int timeout, boolean multi, int callbackid)
-	{
-		event_timeout=timeout;
-		event_multi=multi;
-		event_callbackid=callbackid;
-		handler.postDelayed(this, event_timeout);
-	}
-	public void run() {
-		// Log.e("Navit","Handle Event");
-		if (event_multi) {
-			handler.postDelayed(this, event_timeout);
-		}
-		TimeoutCallback(event_callbackid);
-	}
-	public void remove()
-	{
-		handler.removeCallbacks(this);
-	}
+    NavitTimeout(int timeout, boolean multi, int callbackid) {
+        event_timeout=timeout;
+        event_multi=multi;
+        event_callbackid=callbackid;
+        handler.postDelayed(this, event_timeout);
+    }
+    public void run() {
+        // Log.e("Navit","Handle Event");
+        if (event_multi) {
+            handler.postDelayed(this, event_timeout);
+        }
+        TimeoutCallback(event_callbackid);
+    }
+    public void remove() {
+        handler.removeCallbacks(this);
+    }
 }
 
diff --git a/navit/android/src/org/navitproject/navit/NavitVehicle.java b/navit/android/src/org/navitproject/navit/NavitVehicle.java
index b224f9e3a..46ffd3562 100644
--- a/navit/android/src/org/navitproject/navit/NavitVehicle.java
+++ b/navit/android/src/org/navitproject/navit/NavitVehicle.java
@@ -39,7 +39,7 @@ import java.util.List;
 
 
 public class NavitVehicle {
-    
+
     private static final String GPS_FIX_CHANGE = "android.location.GPS_FIX_CHANGE";
 
     public static Location lastLocation = null;
@@ -68,11 +68,11 @@ public class NavitVehicle {
                 sLocationManager.removeUpdates(fastLocationListener);
                 fastProvider = null;
             }
-            
+
             VehicleCallback(vehicle_pcbid, location);
             VehicleCallback(vehicle_fcbid, 1);
         }
-        public void onProviderDisabled(String provider){}
+        public void onProviderDisabled(String provider) {}
         public void onProviderEnabled(String provider) {}
         public void onStatusChanged(String provider, int status, Bundle extras) {}
 
@@ -81,9 +81,9 @@ public class NavitVehicle {
          */
         public void onGpsStatusChanged (int event) {
             if (ContextCompat.checkSelfPermission(context, android.Manifest.permission.ACCESS_FINE_LOCATION)
-                != PackageManager.PERMISSION_GRANTED) {
-            // Permission is not granted
-            return;
+                    != PackageManager.PERMISSION_GRANTED) {
+                // Permission is not granted
+                return;
             }
             GpsStatus status = sLocationManager.getGpsStatus(null);
             int satsInView = 0;
@@ -97,7 +97,7 @@ public class NavitVehicle {
             }
             VehicleCallback(vehicle_scbid, satsInView, satsUsed);
         }
-        
+
         @Override
         public void onReceive(Context context, Intent intent) {
             if (intent.getAction().equals(GPS_FIX_CHANGE)) {
@@ -111,7 +111,7 @@ public class NavitVehicle {
 
     /**
      * @brief Creates a new {@code NavitVehicle}
-     * 
+     *
      * @param context
      * @param pcbid The address of the position callback function which will be called when a location update is received
      * @param scbid The address of the status callback function which will be called when a status update is received
diff --git a/navit/android/src/org/navitproject/navit/NavitWatch.java b/navit/android/src/org/navitproject/navit/NavitWatch.java
index c73d451be..7933d1b0a 100644
--- a/navit/android/src/org/navitproject/navit/NavitWatch.java
+++ b/navit/android/src/org/navitproject/navit/NavitWatch.java
@@ -42,8 +42,7 @@ public class NavitWatch implements Runnable {
     public native void poll(int func, int fd, int cond);
     public native void WatchCallback(int id);
 
-    NavitWatch(int func, int fd, int cond, int callbackid) 
-    {
+    NavitWatch(int func, int fd, int cond, int callbackid) {
         // Log.e("NavitWatch","Creating new thread for "+fd+" "+cond+" from current thread " + java.lang.Thread.currentThread().getName());
         watch_func=func;
         watch_fd=fd;
@@ -51,16 +50,14 @@ public class NavitWatch implements Runnable {
         watch_callbackid=callbackid;
         final NavitWatch navitwatch=this;
         callback_runnable = new Runnable() {
-            public void run()
-            {
+            public void run() {
                 navitwatch.callback();
             }
         };
         thread = new Thread(this, "poll thread");
         thread.start();
     }
-    public void run()
-    {
+    public void run() {
         for (;;) {
             // Log.e("NavitWatch","Polling "+watch_fd+" "+watch_cond + " from " + java.lang.Thread.currentThread().getName());
             poll(watch_func, watch_fd, watch_cond);
@@ -68,11 +65,11 @@ public class NavitWatch implements Runnable {
             if (removed)
                 break;
             callback_pending=true;
-            handler.post(callback_runnable);    
+            handler.post(callback_runnable);
             try {
                 // Log.e("NavitWatch","wait");
                 synchronized(this) {
-                    if (callback_pending) 
+                    if (callback_pending)
                         this.wait();
                 }
                 // Log.e("NavitWatch","wait returned");
@@ -83,8 +80,7 @@ public class NavitWatch implements Runnable {
                 break;
         }
     }
-    public void callback()
-    {
+    public void callback() {
         // Log.e("NavitWatch","Calling Callback");
         if (!removed)
             WatchCallback(watch_callbackid);
@@ -94,8 +90,7 @@ public class NavitWatch implements Runnable {
             this.notify();
         }
     }
-    public void remove()
-    {
+    public void remove() {
         removed=true;
         thread.interrupt();
     }