From 247dcbd0512a29cb753cb43b9231e86d20fee418 Mon Sep 17 00:00:00 2001
From: anhr <anhr@mail.ru>
Date: Mon, 20 Apr 2015 07:46:00 +0700
Subject: [PATCH 1/6] I have removed some strings from resources

I think, good idea, to use some android's strings instead some strings
from app's resources. Android's strings are already localized.

I can remove all my comments from resources files if you want.
---
 OpenVehicleApp/res/layout/progress_layer.xml              | 2 +-
 OpenVehicleApp/res/values-de/strings.xml                  | 8 ++++++++
 OpenVehicleApp/res/values-fr/strings.xml                  | 8 ++++++++
 OpenVehicleApp/res/values-nl/strings.xml                  | 8 ++++++++
 OpenVehicleApp/res/values-no/strings.xml                  | 8 ++++++++
 OpenVehicleApp/res/values/strings.xml                     | 8 ++++++++
 .../src/com/openvehicles/OVMS/ui/CarFragment.java         | 4 ++--
 .../src/com/openvehicles/OVMS/ui/InfoFragment.java        | 4 ++--
 .../openvehicles/OVMS/ui/settings/CarEditorFragment.java  | 4 ++--
 .../com/openvehicles/OVMS/ui/settings/LogsFragment.java   | 4 ++--
 OpenVehicleApp/src/com/openvehicles/OVMS/ui/utils/Ui.java | 4 ++--
 11 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/OpenVehicleApp/res/layout/progress_layer.xml b/OpenVehicleApp/res/layout/progress_layer.xml
index 990c1c65..6e90365d 100644
--- a/OpenVehicleApp/res/layout/progress_layer.xml
+++ b/OpenVehicleApp/res/layout/progress_layer.xml
@@ -68,7 +68,7 @@
         <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/Cancel"
+            android:text="@android:string/cancel"
             android:id="@+id/progress_cancel"
             android:layout_gravity="center_horizontal"
             />
diff --git a/OpenVehicleApp/res/values-de/strings.xml b/OpenVehicleApp/res/values-de/strings.xml
index eb490d02..01648a3f 100644
--- a/OpenVehicleApp/res/values-de/strings.xml
+++ b/OpenVehicleApp/res/values-de/strings.xml
@@ -7,7 +7,11 @@
     <string name="LastUpdated" formatted="false">Letztes Update: %1$tD %1$tT</string>
     <string formatted="false" name="SOC">%s%%</string>
     <string name="AddCar">+</string>
+<!-- Use android.R.string.cancel istead R.string.Cancel
+	Use "@android:string/cancel" istead "@string/Cancel"
+
     <string name="Cancel">Abbrechen</string>
+-->
     <string name="Delete">Entfernen</string>
     <string name="Save">Speichern</string>
     <string name="Send">Absenden</string>
@@ -19,8 +23,12 @@
     <string name="UserPass">Benutzer Passwort (Paranoid Modus)</string>
     <string name="Quit">App beenden</string>
     <string name="Edit">Bearbeiten</string>
+<!-- Use android.R.string.yes istead R.string.Yes
+	Use "@android:string/yes" istead "@string/Yes"
+	
     <string name="Yes">Ja</string>
     <string name="No">Nein</string>
+-->
     <string name="ClearNotifications">Benachrichtigungen löschen</string>
     <string name="VehicleImage">Fahrzeug-Bild</string>
     <string name="btnAddCar">Auto hinzufügen</string>
diff --git a/OpenVehicleApp/res/values-fr/strings.xml b/OpenVehicleApp/res/values-fr/strings.xml
index 3dead6a6..a938337a 100644
--- a/OpenVehicleApp/res/values-fr/strings.xml
+++ b/OpenVehicleApp/res/values-fr/strings.xml
@@ -7,7 +7,11 @@
     <string name="LastUpdated" formatted="false">mise à jour: %1$tF %1$tT</string>
     <string name="SOC">%s%%</string>
     <string name="AddCar">+</string>
+<!-- Use android.R.string.cancel istead R.string.Cancel
+	Use "@android:string/cancel" istead "@string/Cancel"
+
     <string name="Cancel">Annuler</string>
+-->
     <string name="Delete">Supprimer</string>
     <string name="Save">Enregister</string>
     <string name="Send">Envoyer</string>
@@ -19,8 +23,12 @@
     <string name="UserPass">Mot de passe utilisateur(Mode Paranoïa)</string>
     <string name="Quit">Quitter l\'application</string>
     <string name="Edit">Modifier</string>
+<!-- Use android.R.string.yes istead R.string.Yes
+	Use "@android:string/yes" istead "@string/Yes"
+	
     <string name="Yes">Oui</string>
     <string name="No">Non</string>
+-->
     <string name="ClearNotifications">Effacer les notifications</string>
     <string name="VehicleImage">Image du véhicule</string>
     <string name="btnAddCar">Ajouter</string>
diff --git a/OpenVehicleApp/res/values-nl/strings.xml b/OpenVehicleApp/res/values-nl/strings.xml
index bcf73317..75863e5f 100644
--- a/OpenVehicleApp/res/values-nl/strings.xml
+++ b/OpenVehicleApp/res/values-nl/strings.xml
@@ -7,7 +7,11 @@
     <string name="LastUpdated" formatted="false">Bijgewerkt: %1$tD %1$tT</string>
     <string name="SOC">%s%%</string>
     <string name="AddCar">+</string>
+<!-- Use android.R.string.cancel istead R.string.Cancel
+	Use "@android:string/cancel" istead "@string/Cancel"
+
     <string name="Cancel">Annuleren</string>
+-->
     <string name="Delete">Verwijderen</string>
     <string name="Save">Bewaren</string>
     <string name="Send">Zenden</string>
@@ -19,8 +23,12 @@
     <string name="UserPass">Gebruikerswachtwoord (Paranoid Mode)</string>
     <string name="Quit">Verlaat Applicatie</string>
     <string name="Edit">Wijzigen</string>
+<!-- Use android.R.string.yes istead R.string.Yes
+	Use "@android:string/yes" istead "@string/Yes"
+	
     <string name="Yes">Ja</string>
     <string name="No">Nee</string>
+-->
     <string name="ClearNotifications">Verwijder Merdingen</string>
     <string name="VehicleImage">Voertuig Afbeelding</string>
     <string name="btnAddCar">Voertuig Toevoegen</string>
diff --git a/OpenVehicleApp/res/values-no/strings.xml b/OpenVehicleApp/res/values-no/strings.xml
index 353f05ee..1686b46a 100644
--- a/OpenVehicleApp/res/values-no/strings.xml
+++ b/OpenVehicleApp/res/values-no/strings.xml
@@ -7,7 +7,11 @@
     <string name="LastUpdated" formatted="false">Oppdatert: %1$tD %1$tT</string>
     <string name="SOC">%s%%</string>
     <string name="AddCar">+</string>
+<!-- Use android.R.string.cancel istead R.string.Cancel
+	Use "@android:string/cancel" istead "@string/Cancel"
+
     <string name="Cancel">Avbryt</string>
+-->
     <string name="Delete">Slett</string>
     <string name="Save">Lagre</string>
     <string name="Send">Send</string>
@@ -19,8 +23,12 @@
     <string name="UserPass">Bruker Passord (Paranoid Modus)</string>
     <string name="Quit">Avslutt Program</string>
     <string name="Edit">Redigere</string>
+<!-- Use android.R.string.yes istead R.string.Yes
+	Use "@android:string/yes" istead "@string/Yes"
+	
     <string name="Yes">Ja</string>
     <string name="No">Nei</string>
+-->
     <string name="ClearNotifications">Slett Melding</string>
     <string name="VehicleImage">Kjøretøybilde</string>
     <string name="btnAddCar">Legg Til Bil</string>
diff --git a/OpenVehicleApp/res/values/strings.xml b/OpenVehicleApp/res/values/strings.xml
index 9ca9f6bf..d29f8f9b 100644
--- a/OpenVehicleApp/res/values/strings.xml
+++ b/OpenVehicleApp/res/values/strings.xml
@@ -7,7 +7,11 @@
     <string name="LastUpdated" formatted="false">Updated: %1$tD %1$tT</string>
     <string name="SOC">%s%%</string>
     <string name="AddCar">+</string>
+<!-- Use android.R.string.cancel istead R.string.Cancel
+	Use "@android:string/cancel" istead "@string/Cancel"
+
     <string name="Cancel">Cancel</string>
+-->
     <string name="Delete">Delete</string>
     <string name="Save">Save</string>
     <string name="Send">Send</string>
@@ -19,8 +23,12 @@
     <string name="UserPass">User Password (Paranoid Mode)</string>
     <string name="Quit">Exit Application</string>
     <string name="Edit">Edit</string>
+<!-- Use android.R.string.yes istead R.string.Yes
+	Use "@android:string/yes" istead "@string/Yes"
+	
     <string name="Yes">Yes</string>
     <string name="No">No</string>
+-->
     <string name="ClearNotifications">Clear Notifications</string>
     <string name="VehicleImage">Vehicle Image</string>
     <string name="btnAddCar">Add Car</string>
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/CarFragment.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/CarFragment.java
index 786b7688..a1587f6c 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/CarFragment.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/CarFragment.java
@@ -177,7 +177,7 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuIn
 					break; // no wakeup support for Twizy
 				menu.setHeaderTitle(R.string.lb_wakeup_car);
 				menu.add(0, MI_WAKEUP, 0, R.string.Wakeup);
-				menu.add(R.string.Cancel);
+				menu.add(android.R.string.cancel);
 				break;
 
 			case R.id.tabCarImageHomelink:
@@ -192,7 +192,7 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuIn
 				menu.add(0, MI_HL_01, 0, "1");
 				menu.add(0, MI_HL_02, 0, "2");
 				menu.add(0, MI_HL_03, 0, "3");
-				menu.add(R.string.Cancel);
+				menu.add(android.R.string.cancel);
 				break;
 		}
 	}
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/InfoFragment.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/InfoFragment.java
index f27349bc..ea0d3126 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/InfoFragment.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/InfoFragment.java
@@ -263,7 +263,7 @@ public void onAction(SwitcherView pData) {
 		new AlertDialog.Builder(getActivity())
 				.setTitle(R.string.lb_charger_setting)
 				.setView(content)
-				.setNegativeButton(R.string.Cancel, null)
+				.setNegativeButton(android.R.string.cancel, null)
 				.setPositiveButton(android.R.string.ok,
 						new DialogInterface.OnClickListener() {
 							@Override
@@ -329,7 +329,7 @@ private void chargerSettingRenaultTwizy() {
 		new AlertDialog.Builder(getActivity())
 				.setTitle(R.string.lb_charger_setting_twizy)
 				.setView(dialogView)
-				.setNegativeButton(R.string.Cancel, null)
+				.setNegativeButton(android.R.string.cancel, null)
 				.setPositiveButton(android.R.string.ok,
 						new DialogInterface.OnClickListener() {
 							@Override
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/settings/CarEditorFragment.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/settings/CarEditorFragment.java
index d3a806c9..9cf75d29 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/settings/CarEditorFragment.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/settings/CarEditorFragment.java
@@ -96,8 +96,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
 	private void delete() {
 		new AlertDialog.Builder(getActivity())
 			.setMessage(R.string.msg_delete_this_car)
-			.setNegativeButton(R.string.No, null)
-			.setPositiveButton(R.string.Yes, new DialogInterface.OnClickListener() {
+			.setNegativeButton(android.R.string.no, null)
+			.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 					CarsStorage.get().getStoredCars().remove(mEditPosition);
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/settings/LogsFragment.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/settings/LogsFragment.java
index 8c962bfc..4bc1d079 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/settings/LogsFragment.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/settings/LogsFragment.java
@@ -390,7 +390,7 @@ public void onClick(View view) {
 				new AlertDialog.Builder(getActivity())
 						.setTitle(R.string.logs_btn_get)
 						.setView(content)
-						.setNegativeButton(R.string.Cancel, null)
+						.setNegativeButton(android.R.string.cancel, null)
 						.setPositiveButton(android.R.string.ok,
 								new DialogInterface.OnClickListener() {
 									@Override
@@ -457,7 +457,7 @@ public void onClick(DialogInterface pDlg, int pWhich) {
 				new AlertDialog.Builder(getActivity())
 						.setTitle(R.string.logs_btn_reset)
 						.setView(content)
-						.setNegativeButton(R.string.Cancel, null)
+						.setNegativeButton(android.R.string.cancel, null)
 						.setPositiveButton(android.R.string.ok,
 								new DialogInterface.OnClickListener() {
 									@Override
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/utils/Ui.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/utils/Ui.java
index 778e8b23..b931d213 100755
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/utils/Ui.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/utils/Ui.java
@@ -54,7 +54,7 @@ public static void showPinDialog(Context pContext, String pTitle, String pValue,
 		AlertDialog dialog = new AlertDialog.Builder(pContext)
 			.setMessage(pTitle)
 			.setView(view)
-			.setNegativeButton(R.string.Cancel, null)
+			.setNegativeButton(android.R.string.cancel, null)
 			.setPositiveButton(pButtonResId, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
@@ -90,7 +90,7 @@ public static void showEditDialog(Context pContext, String pTitle, String pValue
 		AlertDialog dialog = new AlertDialog.Builder(pContext)
 			.setMessage(pTitle)
 			.setView(view)
-			.setNegativeButton(R.string.Cancel, null)
+			.setNegativeButton(android.R.string.cancel, null)
 			.setPositiveButton(pButtonResId, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {

From 6a99d3fc73044c20dc6296450e97194c25300776 Mon Sep 17 00:00:00 2001
From: anhr <anhr@mail.ru>
Date: Fri, 24 Apr 2015 11:07:11 +0700
Subject: [PATCH 2/6] My location button

I think, good idea to add the My location button into Google map. Camera
moves to the vehicle location instead user's location if user clicks the
My location button on the Google map
---
 .../src/com/openvehicles/OVMS/ui/FragMap.java | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java
index ff0c9bdb..9b8d18d4 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java
@@ -46,7 +46,8 @@
 import com.openvehicles.OVMS.ui.utils.Ui;
 
 public class FragMap extends BaseFragment implements OnInfoWindowClickListener,
-		afterasytask, OnClickListener, Settings.UpdateMap {
+		afterasytask, OnClickListener, Settings.UpdateMap,
+		pl.mg6.android.maps.extensions.GoogleMap.OnMyLocationButtonClickListener {
 	private static final String TAG = "FragMap";
 
 	private GoogleMap map;
@@ -95,6 +96,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 		map.setOnInfoWindowClickListener(this);
     	map.getUiSettings().setRotateGesturesEnabled(false); // Disable two-finger rotation gesture
 		map.moveCamera(CameraUpdateFactory.zoomTo(15));
+        map.setMyLocationEnabled(true);
+        map.setOnMyLocationButtonClickListener(this);
 		// setUpClusteringViews();
 
 		setHasOptionsMenu(true);
@@ -344,9 +347,11 @@ private void dialog(Marker marker) {
 				Configuration.ORIENTATION_UNDEFINED);
 	}
 
+	private static LatLng mlatLng;
 
 	@Override
 	public void update(CarData pCarData) {
+		mlatLng = new LatLng(pCarData.car_latitude, pCarData.car_longitude);
 		mCarData = pCarData;
 		update();
 	}
@@ -462,5 +467,17 @@ public void updateFilter(String connectionList) {
 		// update markers:
 		after(false);
 	}
+	
+    @Override
+    public boolean onMyLocationButtonClick() {
+    	
+		if(mlatLng != null)
+			map.moveCamera(CameraUpdateFactory.newLatLngZoom(mlatLng, 18));
+//		else Toast.makeText(getActivity(), R.string.Undefined_location, Toast.LENGTH_SHORT).show();//Location of a vehicle is not defined
+    	
+        // Return false so that we don't consume the event and the default behavior still occurs
+        // (the camera animates to the user's current position).
+        return true;//false;
+    }
 
 }

From 4ff4140446eb39e66cba2977e0a78502d6f451e6 Mon Sep 17 00:00:00 2001
From: anhr <anhr@mail.ru>
Date: Mon, 27 Apr 2015 12:35:31 +0700
Subject: [PATCH 3/6] My location button

Do not move the camera after moving of vehicle
---
 OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java
index 9b8d18d4..6ebab2c3 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java
@@ -393,10 +393,12 @@ public void update() {
 		if (flag) {
 			map.moveCamera(CameraUpdateFactory.newLatLngZoom(MELBOURNE, 15));
 			flag = false;
-		} else if (autotrack) {
+		}
+/*		
+		else if (autotrack) {
 			map.moveCamera(CameraUpdateFactory.newLatLng(MELBOURNE));
 		}
-
+*/
 		// update range circles:
 
 		Log.i(TAG, "update: adding range circles:"

From e17e3d3801ebe298f9c80113d4f702192849dcc5 Mon Sep 17 00:00:00 2001
From: anhr <anhr@mail.ru>
Date: Tue, 5 May 2015 08:59:17 +0700
Subject: [PATCH 4/6] add the 24 hour logged path of the vehicle into Google
 map.

User can see a track of his vehicle for last 24 hours. Also he can see
the speed and other values for each location of the car for last 24
hours.
---
 LuttuLibrary/src/com/luttu/AppPrefes.java     |   18 +
 .../res/drawable-hdpi/m_path_location.png     |  Bin 0 -> 1348 bytes
 .../res/drawable-mdpi/m_path_location.png     |  Bin 0 -> 620 bytes
 .../res/drawable-xhdpi/m_path_location.png    |  Bin 0 -> 2911 bytes
 OpenVehicleApp/res/layout/marker.xml          |   36 +
 OpenVehicleApp/res/layout/mmap.xml            |   55 +
 OpenVehicleApp/res/layout/setting.xml         |  119 +-
 OpenVehicleApp/res/values-ru/strings.xml      |  414 ++++
 OpenVehicleApp/res/values/strings.xml         |   58 +-
 .../com/jjoe64/graphview/BarGraphView.java    |  129 ++
 .../src/com/jjoe64/graphview/CustomDraw.java  |   44 +
 .../graphview/CustomLabelFormatter.java       |   54 +
 .../src/com/jjoe64/graphview/GraphView.java   | 1094 ++++++++++
 .../graphview/GraphViewDataInterface.java     |   30 +
 .../com/jjoe64/graphview/GraphViewSeries.java |  210 ++
 .../com/jjoe64/graphview/GraphViewStyle.java  |  208 ++
 .../com/jjoe64/graphview/LineGraphView.java   |  177 ++
 .../src/com/jjoe64/graphview/TouchEvent.java  |   67 +
 .../jjoe64/graphview/ValueDependentColor.java |   28 +
 .../compatible/RealScaleGestureDetector.java  |   36 +
 .../compatible/ScaleGestureDetector.java      |   97 +
 .../src/com/openvehicles/OVMS/BaseApp.java    |    1 -
 .../com/openvehicles/OVMS/api/ApiService.java |   88 +-
 .../com/openvehicles/OVMS/api/ApiTask.java    |  388 ++--
 .../com/openvehicles/OVMS/ui/ApiActivity.java |    8 +-
 .../src/com/openvehicles/OVMS/ui/BaseApi.java |  110 +
 .../openvehicles/OVMS/ui/BaseFragment.java    |   38 +-
 .../OVMS/ui/BaseFragmentActivity.java         |    6 +
 .../src/com/openvehicles/OVMS/ui/FragMap.java | 1908 ++++++++++++++++-
 .../openvehicles/OVMS/ui/MainActivity.java    |  166 +-
 .../com/openvehicles/OVMS/ui/Settings.java    |  142 +-
 .../OVMS/ui/settings/CarEditorFragment.java   |    7 +-
 .../OVMS/utils/MyAlertDialog.java             |  111 +
 .../com/openvehicles/OVMS/utils/MyDate.java   |   98 +
 .../openvehicles/OVMS/utils/MyElement.java    |   30 +
 .../openvehicles/OVMS/utils/MyException.java  |   20 +
 .../com/openvehicles/OVMS/utils/MyTimer.java  |  107 +
 .../OVMS/utils/MyTimerTimeout.java            |   12 +
 .../OVMS/utils/OnCancelEvent.java             |   10 +
 .../OVMS/utils/OnClickPositiveButton.java     |   10 +
 .../src/net/sf/geographiclib/Accumulator.java |  113 +
 .../src/net/sf/geographiclib/Constants.java   |   26 +
 .../src/net/sf/geographiclib/GeoMath.java     |  191 ++
 .../src/net/sf/geographiclib/Geodesic.java    | 1562 ++++++++++++++
 .../net/sf/geographiclib/GeodesicData.java    |   78 +
 .../net/sf/geographiclib/GeodesicLine.java    |  632 ++++++
 .../net/sf/geographiclib/GeodesicMask.java    |   77 +
 .../net/sf/geographiclib/GeographicErr.java   |   24 +
 .../src/net/sf/geographiclib/Pair.java        |   32 +
 .../src/net/sf/geographiclib/PolygonArea.java |  383 ++++
 .../net/sf/geographiclib/PolygonResult.java   |   39 +
 .../net/sf/geographiclib/package-info.java    |  182 ++
 52 files changed, 9287 insertions(+), 186 deletions(-)
 create mode 100644 OpenVehicleApp/res/drawable-hdpi/m_path_location.png
 create mode 100644 OpenVehicleApp/res/drawable-mdpi/m_path_location.png
 create mode 100644 OpenVehicleApp/res/drawable-xhdpi/m_path_location.png
 create mode 100644 OpenVehicleApp/res/layout/marker.xml
 create mode 100644 OpenVehicleApp/res/values-ru/strings.xml
 create mode 100644 OpenVehicleApp/src/com/jjoe64/graphview/BarGraphView.java
 create mode 100644 OpenVehicleApp/src/com/jjoe64/graphview/CustomDraw.java
 create mode 100644 OpenVehicleApp/src/com/jjoe64/graphview/CustomLabelFormatter.java
 create mode 100644 OpenVehicleApp/src/com/jjoe64/graphview/GraphView.java
 create mode 100644 OpenVehicleApp/src/com/jjoe64/graphview/GraphViewDataInterface.java
 create mode 100644 OpenVehicleApp/src/com/jjoe64/graphview/GraphViewSeries.java
 create mode 100644 OpenVehicleApp/src/com/jjoe64/graphview/GraphViewStyle.java
 create mode 100644 OpenVehicleApp/src/com/jjoe64/graphview/LineGraphView.java
 create mode 100644 OpenVehicleApp/src/com/jjoe64/graphview/TouchEvent.java
 create mode 100644 OpenVehicleApp/src/com/jjoe64/graphview/ValueDependentColor.java
 create mode 100644 OpenVehicleApp/src/com/jjoe64/graphview/compatible/RealScaleGestureDetector.java
 create mode 100644 OpenVehicleApp/src/com/jjoe64/graphview/compatible/ScaleGestureDetector.java
 create mode 100644 OpenVehicleApp/src/com/openvehicles/OVMS/ui/BaseApi.java
 create mode 100644 OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyAlertDialog.java
 create mode 100644 OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyDate.java
 create mode 100644 OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyElement.java
 create mode 100644 OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyException.java
 create mode 100644 OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyTimer.java
 create mode 100644 OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyTimerTimeout.java
 create mode 100644 OpenVehicleApp/src/com/openvehicles/OVMS/utils/OnCancelEvent.java
 create mode 100644 OpenVehicleApp/src/com/openvehicles/OVMS/utils/OnClickPositiveButton.java
 create mode 100644 OpenVehicleApp/src/net/sf/geographiclib/Accumulator.java
 create mode 100644 OpenVehicleApp/src/net/sf/geographiclib/Constants.java
 create mode 100644 OpenVehicleApp/src/net/sf/geographiclib/GeoMath.java
 create mode 100644 OpenVehicleApp/src/net/sf/geographiclib/Geodesic.java
 create mode 100644 OpenVehicleApp/src/net/sf/geographiclib/GeodesicData.java
 create mode 100644 OpenVehicleApp/src/net/sf/geographiclib/GeodesicLine.java
 create mode 100644 OpenVehicleApp/src/net/sf/geographiclib/GeodesicMask.java
 create mode 100644 OpenVehicleApp/src/net/sf/geographiclib/GeographicErr.java
 create mode 100644 OpenVehicleApp/src/net/sf/geographiclib/Pair.java
 create mode 100644 OpenVehicleApp/src/net/sf/geographiclib/PolygonArea.java
 create mode 100644 OpenVehicleApp/src/net/sf/geographiclib/PolygonResult.java
 create mode 100644 OpenVehicleApp/src/net/sf/geographiclib/package-info.java

diff --git a/LuttuLibrary/src/com/luttu/AppPrefes.java b/LuttuLibrary/src/com/luttu/AppPrefes.java
index 54089f92..9724f42e 100755
--- a/LuttuLibrary/src/com/luttu/AppPrefes.java
+++ b/LuttuLibrary/src/com/luttu/AppPrefes.java
@@ -43,5 +43,23 @@ public void SaveData(String Tag, String text) {
 		prefsEditor.commit();
 	}
 
+	/****
+	 * 
+	 * IsTrue() get the boolean value from the preference
+	 * 
+	 * */
+	public boolean IsTrue(String key, boolean defValue) {
+		boolean res = appSharedPrefs.getBoolean(key, defValue);
+		return res;
+	}
+	/****
+	 * 
+	 * SaveBoolean() save the boolean value to the preference
+	 * 
+	 * */
+	public void SaveBoolean(String key, boolean boValue) {
+		prefsEditor.putBoolean(key, boValue);
+		prefsEditor.commit();
+	}
 	
 }
diff --git a/OpenVehicleApp/res/drawable-hdpi/m_path_location.png b/OpenVehicleApp/res/drawable-hdpi/m_path_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..58e55416c04b4022d2136445b3818ab3f87bc3e8
GIT binary patch
literal 1348
zcmV-K1-tr*P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x1o=rsK~z|Ut(V_#R7DiWKj+?UyGms-u_C`jWHIU{q}|zVO^BhQ5HUsq
zijf3j#D4%me82}IAv`Eiki@`?s4)ogTVhDi1QmU#yK`-nN=#}4sL%uwDgBXc!_M(x
zZ{u>i?QYfcawliL=X}3&GG}J4FbOlp%m7vbD}XsbQ#f@MxCET=JnvX8m+P%Hr_=&U
zr_)Ih*$zAlcvavIIHIasf*|Pr&jQlv^ePeg7?=VKi^w78+%ezxI}3%vUjXrV{7zME
zQPq{eb3g+y0Iajt9{<+@j4>O59U<;;u~^*P+1YtvqL|j!)_Kmk9jdwtaH_f~2!frH
z7LZP-pBIq>luEkETDxl^;;3aZnO9WxZNL+e)%kq>NX-J8o15?Reg7BWwvhatD8?9b
zm#WSM5Rr@4+G`aSu~|gk0){-#doY*F{T{_s+)%#nzZsGrkCL~xwmx8tIRtcz$X*fI
z3v?S}4mCG7FDS<bL9jzaP6D?(=eAbj8Y7^krDZO#78n6uEuYI|GVR4;@mt`#LZL9*
zTAQ)fW(tMEY*qc<_x-ckY<6*3h&tyshPl>dv)MUS1$dsf0`OGzsI~UDQGZ)o+jLbu
z=y~2+YwfPCuC9U6xvs9RfglKWipV<W+-D0HF1)*}3f;hQz*p53RRxI1@^E-d``o;F
za|3W7m&<(>jTyCkKK~_fu&%CdLnP;M0O#CORRyT({BUR^Q!6~r+czG08QDHcC*?mR
zo@c|k`B8kOO*jK!cz8H^oZc6U#eS_Ops}&>JaB)xZ*Xw%ayXn>ivR$oO`8^N(V>x%
zktx*#^!4@K0Ss2jHKBk%0fvT#ZrQP_`h%)2sU|=~mH-{)zTx5Fx#hVh6d)ph0QkP2
zyaniadqiYQGMQ``k35-7Hi*a;RoxR2pA5e>9YkkB@bYqJKA-<wRewq(5(iSLRAV$K
zl}a@x5{UyqXAlG@Ba0f%btW1Yi#kN)w5o0c#<a}TsZ-bY_xJCJ$K&UXF(0UEE{w?n
z>qX>nV`JmyXv)#WsOsr4d{GDB8DqMEc_Okb?Co337?TFp01t((^CGf8pU?jo#irBg
zCq?8G&||G#K<RQDzXFu5(Dy{-UFY2Ez!(A6+5iYD#Evl$c_SR|iju=PZRni)5Eu}V
z#hFZIQ7uH3EW8&U0s4WDDq$)L=<Mvg4r~Wd)xGWQ?UgDup&4W9oOAC3h{!f;ZC}j-
z0P5@OcLEoI)QuZAUYe``;AP-p;6hzp-R|)~6F$kp_uvtr4_Iiey;KWxHk+N}ockF_
zsOqX92#$@1o$!Sl1i?{YKac?SuU@^{uYuol&V33bMC6l+$g2tfh{a+Xfos5`o}Ql9
zs^N_>8-PW?)nc)@u^PUn{{myoW0cxaMC9pwK7VQ)+%n)4;5^TJBA3g3Q!RHbCFRPM
zD;H+YoaqDYz|!f{ryuU^?Y&-(X=`hn?VS4pn5wE<t+f@~E^0MZAT%$XP9GDIXMl6D
zSZq;8N5>5)-2?G>{4CH6oUqoeqQaq5$tKg^uA!mfg^`hwuYuNLv3N3-N-b?_YI6Pk
z{f9&Hj{5rgHMNq%<SGDwG3H)M_x(M<Zb~oSO+c^bd99V+{{O20fJ`RSqN-;p{VxIx
zipZmtE~9Ez(<Y4C<;$0QXU&>*4tN|GP}LW$wN-a~CHor>U+X{K(R&;K0000<MNUMn
GLSTY+!inMl

literal 0
HcmV?d00001

diff --git a/OpenVehicleApp/res/drawable-mdpi/m_path_location.png b/OpenVehicleApp/res/drawable-mdpi/m_path_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..200583f80ff92454b0552e82b085fca9861a2cfc
GIT binary patch
literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000K1000K10T-E<-2eap8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10qIFZK~zYIoz<~x6hRaQ@ZYR=U<!#4@g#x?7>`&5i^yT?AE7ZI
zXz(ux2&R%0b~dpwwIB*Mc1e?npm>6aq6P#Zc4;Fi1R-N_bF!Yhw|hRAV&C_^_r00-
zW;VnaRapoj!+BgxuD95UF&<WOhY5rbnpnYAe8u|&T|gU8a4*LAt29ZBv2bA)UED>Z
z0B<C$i`mjVCCSI|0i7~pF1C|m$3_uY!*W&fT>LWDY6)O6opm<gZ>4^$pf!MHi8DEv
zFDq!vJht-_5<*zQCVr%~nSA{|9%4Ijhc_9kSRAPC6UKAC@#M>LzD2Co*})0y<-R+5
zGrylJY9BiZ>)T%9{$)i1-!YZ@{)oABC-CQf%q6UE(}`Otu#2;~Y7el1^$<ckgwV!1
zHWJpi8GQRETR{&_qC4PgVgWDGT0nCk<{c*L-h-DoGr~QX!B!DgbVTqJOC?y5-NNHS
zq@<#w_)@gxg4mYc$Tn;5AjbF;4{*Ci^>=VTmc6J$Dr@31P7R4Ut@qF!DUGSv{!Jy1
zSi&FT+Rz*o0u8*ur2_1--n3=^EszqOOHDkU^G&4Vo2um3ob&5=mivB=D|NU-|H*j^
zAw0q>z2{{<#(1L^Zv=s3c#W8Pa!^4TO(2O(LyU2^F6TE!@hhJ6h96%50000<MNUMn
GLSTY7xC>AK

literal 0
HcmV?d00001

diff --git a/OpenVehicleApp/res/drawable-xhdpi/m_path_location.png b/OpenVehicleApp/res/drawable-xhdpi/m_path_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bd83202e7a0b045a2f8043805c272e54883b844
GIT binary patch
literal 2911
zcmV-l3!wCgP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x3lvF2K~#90y<2N+9Mu*6&Yj)O!^A0VLS!2Q;hA9U*fX=)xU^tOt3FU8
z2smj$2vEaAKnYO;N~=PlAVe$isGtx85|D~eVG^||EvTwOc$8qz-d)EbJdIOC$r_TD
z+M5J>cV|w2>^PYncIUC)&G&2X*>k>o?%A1p&pr1p;V2*;kGC@OH<(!ma29~Y0FH5~
z9RTnSfVYUqP!#3${{H@d*V{L$7jb)g`?0ZD>~a9B0kl_1GX&rX(=`7uI5_yf+Ie>b
zH4lKMX-xor2H;wJ`B$zMSt8m%ME4tpF<K)|05uFiB9Uk;6bg3%xDG(9R=h6c0Bndv
zBDeMT_m9_tuqFXeRkeeN`T(3>LB#@)1n?R&8$|SWE|)8LzoXG;s}SN$W{xxSH;G6C
zAS&>^2cTC<xof(<Pdfmrs$ND!j{}%h=Ic)YJQRsUo(Vgl#pCf-%d##5a3g@0GAf6N
z=qJf!@{i%YK7wflK-08!0DfDB=W_sejE#*wHat8$Ih{UwdU|GNv)O9_+yUS#uCE!u
zIw|G-)$&&z0A1JDGIP0(pU>y>Hw+C8eO4`ZIV2K^1*T~}!ptk&-!b#rR4VmgHM~^?
zKvmUMM6?N|?`R&tO;XAY)o_OB`vxL<5J1EswgCJ{O4%2dFLVGjO=}16CV<%v@j+(3
zB$Z0N6qc_V=(_%WX6^&f;PgQVkuVHncNnfpvus&(cX!VM(1+5&7l>%((HcAeB$LS(
z0jvU0aEKc$%j)at>6saZE8?$m1i4&pJ%BTuGG@M6O8K`CG(yv~P5`Gca|-|v(I)^t
zlu{0&_&EDQO8HlN5_Z1(i?iA6tpI)<)S1AqKxb#?Ns6Mp1Hc*K=cJUYg4oC7@slmf
zS`T13fCUxQMu}*v5aQl}fq^|icy(Rh?3x(A5JH?`7{<pz>;pdmLWuP!9sIsrE_a=u
zU0YjQY{rZkcUhLT2EYtk`~iRgX8sHSi0C)~2>_=u^EIYvUZH8)g8*)mQs%w*qtWQq
zxm@lX0P}3oEIZIQ1Q}PLC!njVYrYWTBRG;BBKm1EnS9vGPSdn`M6{Wi&q48heHy^;
zDrIo?1iJ>n6#ybc^eQu7ET!D<)sL#GHxtnV4$&b+QBD{b82FFh*aA(0LWs*zn(2MS
z%#V55Boc{60Nd=rj|d?;rIf3^(pM?vE-B?|Aw(yD5!-g#*=L_U$E&aL@$p9iI5W-J
zg+k$Szi|P<SAol1?F~MUCKU>WXHnb+@3JgwS(xR?FpS-nWi12n7J&ANiHT?7@w5&P
z4^J}lqb~8KLHhCyKq8Si9)Ri)6(W(ylU_EuuCD^{0|5I>(_EfTr}qVM#))(~y-!h;
z<pA~pxIk6aUN3!SehPp&)h43&k|j&Z?IB9w8-RR1-{b0NpufNW(@Oe1Jv|X-zRPxE
z{ovr>zx?{B1bZd;h0S$$Pft(9NjsfR??rLPc^HvM<Xpc#g1iC=SNmlz<*~7`a{-(R
z;Ddz=7d{<;-xG7@%y|mHFo4s>$H&j{QFr_1_Wer;5`aa{1`#DIDFT3^C>Pm!oBI0t
zOfTIa*uH&x0l+4^d6AbcGaD|^qOyt(_y&N8PA)MJ;sYO(gl+eCKklG#aC!csLWuWW
zqLa%iI&A{<U$O^}L?Rh4<*D@6vaCRvTo5qx2mlb#@m_jD2)A#?`f&#dKuKY9e0=<X
zkN#HyU~FvczX7-dVPaxpDxvwBm)^mH2eU4bXZ`?$+zkfAegJ4_Xqe}x7!;96WWN2;
zb2*)yoD99a4-$ZqsK#Qkxn9adl(F?r4C_oKM5ED@0DzhIdg;xcJ=^V@Z{;{h0LDrT
zgz$U}0lW?X%zQxr?m%#Gz3!zKiA3DKjg?h&AV>f{bUCxwOW8Ed7i_)W-rim%0KX^f
z<Yy`ie8Eds2yv!M^kG>=r;VQi5xwtfd#<f>=gxfv!21AB+p}lS6@L7F$Y!%wqL^5{
z*Vx$js*ie!Z_Mmo7QcibPe94;jhUBuDR1Aty}-;rw{`FB?Cd-#Kp$nXbm`KC0PeAy
z>+PhdBFgyYdvM|#0Mj&IbGC`-T)#&<l}c@4=FI@+D~hr;kw{dk09Axt2Hy%`K7c+c
z<)6ItHBE~G=yCb#_r&-IAe~OX3&6Ri&)u_UkLG7LIXQVHil@8ng+js5b$zLy%@j0E
zOB4zP1I45Co%wwJDnA<`L>#3#%YG^4d%ku7{ITGge3;pHuf2Qs?gIeMw||9JX5OKy
z>PEZjQx=-0wX3SS5x^S&T5a2J4-E|+^y|+w%^$l&FQ9mG<cUCugQ}_*5z!WhXs?vA
z6#*)^Q#C;%3RDxczn?_0+Ur{r1c2V&US(ut<YNF$Q!*mDFqusL+0Qmm0J^)oXXSFa
zQ2>ooGG_i^DwXnFmYk?pRTuztU0=@3&cTkwVzH(jJ9d2GXB#+mR8{pMBD!&^&CLHu
zrBdGsYVSZz&IO#%G;JGz^Bkgwq?9)Wu?-vmUDvyqIpq*BGq<Husds{M)C2aMvJ;N6
zSeDh9PN#PUu@Af%N+y$Ol%}Et;P#;Qb;Rv(44#=^2|9Qn<Zh6N?s2tO#^dp}FdVf+
zS69~(02e!DZXf*+Dgeo3@+APy*Fad7bzc~cT0&8j`%wDp8&b+pm8h`w0Jbb^txNV@
zUDq!O$un)Js=A7q&v%HJnb(Bnsp^7+rfFMHTA=(Gz#=K-p=$WTqNAguAsUUo3*c~x
zjF~s5QmN2CL{$|bA;dZqla(p7GV?9fa8-k7G<qu>g9k9FD9WwXa8(rm!!SmO=n1Ec
zh}LPEc0x6LVbImpbs~UuP8l;lZWzW$HGEaq1WnVt6UEzLQ#b~|lhff003n2U5~Vj(
zJ}06(t0k<uVlz5AdZ?wP<s$&j_ikZJOUt3Xd-wjcT3#>cx_%3QtDQ1tzABYUxer7F
zW7-!bHBEaCM@m)zFlkv<B1|$81omyz0UX&-0U>UvR6;Et*Xsc|4@+kVAvT4*tmK8Z
zwze1%ZA9tdM-@f6e!AS#4uF($f0_07%xpG$_jI|ZFmvY2I{_?liEj#W1H=#0uG#`X
zCX?CS)YP<yh|Y3|yPKMtc4ab|X>FEtU0)91VU)hE&qyh265yK6*o8u2HGsDrA|j%V
z)7dMis=An&pF!#1cgA9|t1H=rMa=>*G&FQj2(c1?vwYQHS=JW&zECK1baXTj(Q_!R
z^JNu9SsA3z5fn9Dvkk-8&CKq-!s&%V;Sq#faiY=a?@=s@9tIJu9T*t!t@VdNP38b6
zGMP-Oxw*L&rT2<Dnwy(NCX?~JT`~nt({2ZFvrGJhl(OoCrxNOtwdM2qH7HhTocLvs
zU8Ab1D**h;B_7P@^X`Du1a<q@nEmIeB!FgzctQwqzF`<|l(XsT>gpCkY(wdd)K37!
zrIel*Gpa@10stHy(90-IVD<x8CZ#MnxYRW56cn%FJMR@tT9$QQI-TB8FCXi<ae?jl
zwJz~I0DsXm?eJN?{dp@&2M;2;rk;Zb>Kp(7kWxNf=34Dy08iQd3;VPCX#3G*GP$wd
z{)PI#K(%OWY`pQnfdeNp^Y<L$3pGvq4T=G{(5cVNFE%zd2CC~%7j>NjoUl)qwgK=w
zUI*}IEEfA#Et4HD9JK%dhp*kgfg@*tZVX$N_4R7*7FUb9&jC)@16zU8?ei2q1+e01
z4j!mOCg_JuCiB^X1q+@RLL3L66~F|5&8BHynog%{n&t+<{{iUd6UuN<vNHex002ov
JPDHLkV1l(EVPgOQ

literal 0
HcmV?d00001

diff --git a/OpenVehicleApp/res/layout/marker.xml b/OpenVehicleApp/res/layout/marker.xml
new file mode 100644
index 00000000..42f54356
--- /dev/null
+++ b/OpenVehicleApp/res/layout/marker.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	for map marker
+	http://stackoverflow.com/questions/15783227/aligning-the-text-in-google-maps-marker-snippet
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical" >
+<!-- 
+    	<TextView
+	    android:id="@+id/info"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    />
+ -->
+
+  <TextView
+      android:id="@+id/title"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentLeft="true"
+      android:layout_alignParentTop="true"
+      android:singleLine="true"
+      android:text="title"
+      android:textStyle="bold" />
+
+  <TextView
+      android:id="@+id/info"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentLeft="true"
+      android:layout_below="@+id/title"
+      android:text="info" />
+
+ </RelativeLayout>
\ No newline at end of file
diff --git a/OpenVehicleApp/res/layout/mmap.xml b/OpenVehicleApp/res/layout/mmap.xml
index 4f5a6938..9410f26b 100755
--- a/OpenVehicleApp/res/layout/mmap.xml
+++ b/OpenVehicleApp/res/layout/mmap.xml
@@ -1,8 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/graphMap"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
+	<RelativeLayout
+	    android:id="@+id/graphParent"
+	    android:layout_width="match_parent"
+	    android:layout_height="100dp"
+	    android:orientation="vertical" >
+
+		<LinearLayout
+		    android:id="@+id/graph"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:layout_alignParentLeft="true"
+		    android:layout_alignParentStart="true"
+		    android:layout_toLeftOf="@+id/graphButtons"
+		    android:layout_toStartOf="@+id/graphButtons"
+		    android:orientation="horizontal" >
+
+		</LinearLayout>
+
+		<RelativeLayout
+		    android:id="@+id/graphButtons"
+		    android:layout_width="50dp"
+		    android:layout_height="match_parent"
+		    android:layout_alignParentRight="true"
+		    android:layout_alignParentEnd="true"
+		    android:layout_alignParentTop="true"
+		    android:orientation="horizontal" >
+
+			<Button
+			    android:id="@+id/buttonNexpLocation"
+			    android:layout_width="wrap_content"
+			    android:layout_height="50dp"
+			    android:layout_alignParentLeft="true"
+			    android:layout_alignParentRight="true"
+			    android:layout_alignParentStart="true"
+			    android:layout_alignParentEnd="true"
+			    android:enabled="false"
+			    android:onClick="NexpLocation"
+			    android:scaleType="fitXY"
+			    android:text="@string/right_arrow" />
+						
+			<Button
+			    android:id="@+id/ButtonPrevLocation"
+			    android:layout_width="wrap_content"
+			    android:layout_height="50dp"
+			    android:layout_below="@+id/buttonNexpLocation"
+			    android:layout_centerHorizontal="true"
+			    android:scaleType="fitXY"
+			    android:enabled="false"
+			    android:onClick="PrevLocation"
+			    android:text="@string/left_arrow" />
+
+		</RelativeLayout>
+
+	</RelativeLayout>
     <fragment
         android:id="@+id/mmap"
         android:name="pl.mg6.android.maps.extensions.SupportMapFragment"
diff --git a/OpenVehicleApp/res/layout/setting.xml b/OpenVehicleApp/res/layout/setting.xml
index 4187f025..898f2cce 100644
--- a/OpenVehicleApp/res/layout/setting.xml
+++ b/OpenVehicleApp/res/layout/setting.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
               android:orientation="vertical"
@@ -122,6 +122,119 @@
 
         </TableRow>
 
-    </TableLayout>
+    <!-- LOGGED PATH -->
+    
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dip"
+        android:background="#e3e3e3" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="5dp"
+            android:text="@string/LOGGED_PATH"
+            android:textColor="@android:color/black"
+            android:textSize="15sp" />
+    </RelativeLayout>
+
+    <!-- Show logged path CheckBox -->
+    <RelativeLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical"
+      android:paddingLeft="15dp"
+      android:paddingRight="15dp"
+      android:paddingTop="2dp"
+      android:paddingBottom="2dp"
+      android:id="@+id/cluster_views_logged_path" >
+
+        <TextView
+            android:layout_gravity="center_vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/Show_logged_path"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:textColor="@android:color/white" />
+
+        <CheckBox
+            android:id="@+id/checkbox_cluster_logged_path"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:checked="true" />
+        
+    </RelativeLayout>
+
+    <!-- Show logged path EditText -->
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingBottom="2dp"
+        android:paddingTop="2dp" 
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:layout_gravity="center_vertical"
+            android:text="@string/EditText_logged_path"
+            android:textColor="@android:color/white" />
+    </RelativeLayout>
+    
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="2dp"
+        android:paddingTop="2dp" 
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp" >
+        
+        <EditText
+            android:id="@+id/editText_logged_path"
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:inputType="numberDecimal"
+            android:singleLine="true"
+            android:textColor="@android:color/white" >
+
+            <requestFocus />
+        </EditText>
+
+        <SeekBar
+            android:id="@+id/seekbar_cluster_size_logged_path"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:max="120"
+            />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="2dp"
+        android:paddingTop="2dp" 
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp" >
+
+        <Button
+            android:id="@+id/button_Default"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:onClick="defaultSettings"
+            android:text="@string/Default" />
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+
+    </TableLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/OpenVehicleApp/res/values-ru/strings.xml b/OpenVehicleApp/res/values-ru/strings.xml
new file mode 100644
index 00000000..bbd6b1f0
--- /dev/null
+++ b/OpenVehicleApp/res/values-ru/strings.xml
@@ -0,0 +1,414 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Мой автомобиль</string>
+    <string name="Loading">Пожалуйста подождите</string>
+    <string name="Settings">Настройки</string>
+    <string name="Range" formatted="false">Диапазон: %s (%s приблизительно)</string>
+    <string name="LastUpdated" formatted="false">Обновлено: %1$tD %1$tT</string>
+    <string name="SOC">%s%%</string>
+    <string name="AddCar">+</string>
+<!-- Use android.R.string.cancel istead R.string.Cancel
+	Use "@android:string/cancel" istead "@string/Cancel"
+
+    <string name="Cancel">Отменить</string>
+-->
+    <string name="Delete">Удалить</string>
+    <string name="Save">Сохранить</string>
+    <string name="Send">Отправить</string>
+    <string name="Error">Ошибка</string>
+    <string name="Set">Настройка</string>
+    <string name="Control">Управление</string>
+    <string name="ServerNameOrIP">Адрес сервера (Имя или IP)</string>
+    <string name="NetPass">Пароль сервера</string>
+    <string name="UserPass">Пароль пользователя (Режим недоверия)</string>
+    <string name="Quit">Выйти из приожения</string>
+    <string name="Edit">Редактировать</string>
+<!-- Use android.R.string.yes istead R.string.Yes
+	Use "@android:string/yes" istead "@string/Yes"
+	
+    <string name="Yes">Да</string>
+    <string name="No">Нет</string>
+-->
+    <string name="ClearNotifications">Очистить уведомления</string>
+    <string name="VehicleImage">Изображение автомобиля</string>
+    <string name="btnAddCar">Добавить машину</string>
+    <string name="btnCenterMap">Центр карты</string>
+    <string name="ImageParking">Парковка автомобиля</string>
+    <string name="SysWarning">Системное сообщение</string>
+    <string name="LockIdle">Замок автомобиля</string>
+    <string name="SignalStrength">Уровень сигнала</string>
+    <string name="ChargerPlug">Разъем зарядного устройства</string>
+    <string name="DefaultCharging">70A/220V</string>
+    <string name="DefaultSlidetoCharge">SLIDE TO\nCHARGE</string>
+    <string name="DefaultMode">ОБЫЧНЫЙ</string>
+    <string name="ChargingOverlay">Зарядка</string>
+    <string name="BatteryOverlay">Аккумулятор</string>
+    <string name="EstimatedShort">ПРЕДПОЛ. ДАЛЬН.</string>
+    <string name="IdealShort">ИДЕАЛ. ДАЛЬН.</string>
+    <string name="BatteryText">Аккумулятор</string>
+    <string name="Homelink">Главная ссылка</string>
+    <string name="Profile">Профиль</string>
+    <string name="Default">По умолчанию</string>
+    <string name="Wakeup">Пробуждение</string>
+    <string name="Add">Добавить</string>
+    <string name="Battery">Аккумулятор</string>
+    <string name="Car">Автомобиль</string>
+    <string name="Location">Расположение</string>
+    <string name="Messages">Сообщения</string>
+    <string name="Amps">Ампер</string>
+    <string name="Close">Закрыть</string>
+    <string name="Features">Особенности</string>
+    <string name="Parameters">Параметры</string>
+    <string name="CellularStats">Статистика использования сотового телефона</string>
+    <string name="Vehicle">Автомобиль</string>
+    <string name="WIN">VIN</string>
+    <string name="Type">Тип</string>
+    <string name="GMC">GSM</string>
+    <string name="CAC">CAC</string>
+    <string name="Info12V">12В</string>
+    <string name="Server">Сервер</string>
+    <string name="App">Приложение</string>
+    
+    <!-- Map menu items -->
+    <string name="Autotrack">Автотрек</string>
+    <string name="Filtered_stations">Отфильтровать станции</string>
+    <string name="Only_show_stations_in_range">Только cтанции в диапазоне</string>
+    <string name="Track">Маршрут</string>
+    <string name="Start_track">Записать маршрут</string>
+    <string name="Stop_track">Остановить запись маршрута</string>
+    <string name="My_tracks">Мои маршруты</string>
+    <string name="Options">Опции</string>
+<!--     <string name="Turn_logged_path">Показать маршрут %s</string> -->
+    <string name="Turn_logged_path">Показать маршрут</string>
+    
+    <string name="ON">ВКЛ.</string>
+    <string name="OFF">ВЫКЛ.</string>
+    <string name="Invalid_server_C33">Время ожидания ответа сервера истекло. Возможно Ваш OVMS сервер не поддерживает команду C33 \"Retrieve 24-hour log data\". Пожалуйста установите другой сервер в настройках Вашего автомобиля. Вы хотите изменить настройки автомобиля?</string>
+    <string name="Invalid_server_C33_response">Получить маршрут не удалось!\nОшибка: \"%s\".\nВозможно Ваш OVMS сервер не поддерживает команду C33 \"Retrieve 24-hour log data\". Пожалуйста установите другой сервер в настройках Вашего автомобиля. Вы хотите изменить настройки автомобиля?</string>
+    <string name="Last_logged_path_record">Последняя точка маршрута</string>
+    <string name="Logged_path_progress">Получение маршрута</string>
+    <string name="CHARGING_STATIONS">Зарядные станции</string>
+    <string name="Open_Charge_Map">Показать зарядные станции</string>
+    <string name="Clustering">Зона отобр.</string>
+    <string name="LOGGED_PATH">Маршрут</string>
+    <string name="Show_logged_path">Показать маршрут</string>
+    <string name="Clustering_logged_path">Подавл. шума GPS</string>
+    <string name="EditText_logged_path">Минимальное расстояние между точками расположения автомобиля в метрах. Пожалуйста увеличте минимальное расстояние, если вы хотите увидеть маршрут более гладким. Уменьшите минимальное расстояние, если вы хотите увидеть маршрут точнее. Тогда маршрут будет более неровным из за того, что будет заметна неточность GPS.</string>
+    <string name="Meters">метров</string>
+    <string name="Enter_distance">Пожалуйста, введите минимальное расстояние между точками маршрута от 0 до 120 метров</string>
+    <string name="Undefined_location">Расположение автомобиля не определено</string>
+    <string name="Speed">Скорость</string>
+    <string name="Distance">Пройдено</string>
+    <string name="TimeFromStart">Время</string>
+    <string name="Latitude">Широта</string>
+    <string name="Longitude">Долгота</string>
+    <string name="Edit_car_settings">Вы хотите изменить настройки автомобиля?</string>
+    <string name="Login_complete">Успешный вход в OVMS сервер</string>
+    <string name="Retrieve_24_Hour_Log_Data_again">Получить маршрут не удалось!\n\n%s\n\nВозможно соединение с OVMS сервером неустойчиво.\n\nПопробовать еще раз?</string>
+    <string name="Under_constraction">В разработке</string>
+    
+    <!-- Map types -->
+    <string name="None">Не выбран</string>
+    <string name="Normal">Обычный</string>
+    <string name="Hybrid">Гибрид</string>
+    <string name="Satellite">Спутник</string>
+    <string name="Terrain">Ландшафт</string>
+    
+    <string name="lb_wakeup_car">Разбудить автомобиль</string>
+    <string name="lb_lock_car">Закрыть автомобиль</string>
+    <string name="lb_unlock_car">Открыть автомобиль</string>
+    <string name="lb_valet_mode">Режим парковки</string>
+    <string name="lb_valet_mode_on">На парковке</string>
+    <string name="lb_valet_mode_off">Не на парковке</string>
+    
+    <string name="lb_lock_mode_twizy">Ограничение максимальной скорости (км/час):</string>
+    <string name="lb_lock_car_twizy">Установка предела скорости</string>
+    <string name="lb_unlock_car_twizy">Снять предел скорости</string>
+    <string name="lb_valet_mode_twizy">Ограничение длинны поездки (км):</string>
+    <string name="lb_valet_mode_on_twizy">Установить динну поездки</string>
+    <string name="lb_valet_mode_off_twizy">Снять предел динны поездки</string>
+    <string name="lb_valet_mode_extend_twizy">Разрешить +1км</string>
+    <string name="lb_unvalet_unlock_twizy">Отменить ограничения длинны поездки и скорости</string>
+
+    <string name="lb_enter_pin">Введите PIN</string>
+    <string name="lb_enter_passwd">Введите пароль</string>
+    <string name="lb_enter_value">Введите значение</string>
+    <string name="lb_wrning_charger">ВНИМАНИЕ\nНеправильные настройки зарядного устройства могут привести к повреждению электрических систем!</string>
+    <string name="lb_charger_setting">Настройка зарядного устройства</string>
+    <string name="lb_communications_problem">Проблема связи</string>
+    <string name="lb_vehicle_id">Идент. авто</string>
+    <string name="lb_vehicle_label">Марка автомобиля</string>
+    <string name="lb_server_passwd">Пароль OVMS сервера</string>
+    <string name="lb_module_passwd">Пароль OVMS модуля</string>
+    <string name="lb_slide_choice_vehicle">Выберите Ваш автомобиль</string>
+    <string name="lb_mmi_ussd_code">MMI/USSD код</string>
+    <string name="lb_cellular_usage">Использование сотового телефона</string>
+    <string name="lb_reset_ovms_module">Сброс OVMS модуля</string>
+    <string name="lb_center_map">Переместить карту</string>
+    <string name="lb_ft_digital_speedo">#%d: Цифровой спидометр</string>
+    <string name="lb_ft_gps_stream">#%d: GPS данные</string>
+    <string name="lb_ft_minimum_soc">#%d: Минимальный SOC</string>
+    <string name="lb_ft_car_bits">#%d: Автомобильных битов</string>
+    <string name="lb_ft_can_write">#%d: МОЖЕТ записать</string>
+    <string name="lb_ft_rt_kickdown_threshold">#%d: Kickdown порог</string>
+    <string name="lb_ft_rt_kickdown_compzero">#%d: Kickdown компенсация</string>
+    <string name="lb_ft_rt_suffsoc">#%d: Достаточный SOC</string>
+    <string name="lb_ft_rt_suffrange">#%d: Достаточный диапазон</string>
+    <string name="lb_ft_rt_maxrange">#%d: Максимальный идеальный диапазон</string>
+
+    <string name="lb_cp_registered_telephone">#%d: Зарегистрированный телефон</string>
+    <string name="lb_cp_module_password">#%d: Пароль модуля</string>
+    <string name="lb_cp_miles_km">#%d: Мили/Км</string>
+    <string name="lb_cp_notifications">#%d: Уведомления</string>
+    <string name="lb_cp_ovms_server_ip">#%d: IP OVMS сервера</string>
+    <string name="lb_cp_cellular_network_apn">#%d: APN мобильной сети</string>
+    <string name="lb_cp_cellular_network_user">#%d: Польз. моб. сети</string>
+    <string name="lb_cp_cellular_network_password">#%d: Пароль мобильной сети</string>
+    <string name="lb_cp_vehicle_id">#%d: Идентификатор автомобиля</string>
+    <string name="lb_cp_server_password">#%d: Пароль сервера</string>
+    <string name="lb_cp_paranoid_mode">#%d: Режим защиты от слежки</string>
+    <string name="lb_cp_social_group_1">#%d: Социальная группа #1</string>
+    <string name="lb_cp_social_group_2">#%d: Социальная группа #2</string>
+    <string name="lb_cp_gsmlock">#%d: GSM закрыт</string>
+    <string name="lb_cp_vehicle_type">#%d: Тип автомобиля</string>
+    <string name="lb_cp_cooldown">#%d: Охлаждение</string>
+    <string name="lb_cp_timezone">#%d: Часовой пояс</string>
+    <string name="lb_cp_acc1">#%d: ACC #1 (base64)</string>
+    <string name="lb_cp_acc2">#%d: ACC #2 (base64)</string>
+    <string name="lb_cp_acc3">#%d: ACC #3 (base64)</string>
+    <string name="lb_cp_acc4">#%d: ACC #4 (base64)</string>
+
+    <string name="lb_cp_rt_profile">#%d: Активный профиль</string>
+    <string name="lb_cp_rt_profile1">#%d: Профиль #1 (бинарный)</string>
+    <string name="lb_cp_rt_profile2">#%d: Профиль #2 (бинарный)</string>
+    <string name="lb_cp_rt_profile3">#%d: Профиль #3 (бинарный)</string>
+
+    <string name="lb_ovms_firmware">OVMS прошивка:</string>
+    <string name="lb_vehicle_info">Информация об автомобиле</string>
+    
+    <string name="lb_charger_setting_twizy">Оповещения зарядки</string>
+    <string name="lb_charger_setting_twizy_hint">Подсказка: установить на ноль, чтобы отключить сигнализацию.</string>
+    <string name="lb_sufficient_soc">Достаточный SOC (%)</string>
+    <string name="lb_sufficient_range">Достаточный диапазон (%s)</string>
+    <string name="msg_getting_charge_alerts">Получение оповещений зарядки от модуля&#8230;</string>
+    <string name="msg_setting_charge_alerts">Установка оповещений зарядки&#8230;</string>
+
+    <string name="msg_ok">OK</string>
+    <string name="msg_charger_range">Режим диапазона ограничения мощности\nЧастое использование уменьшает срок службы батареи</string>
+    <string name="msg_charger_perform">Частое использование эффективного режима\nуменьшает срок службы батареи.</string>
+    <string name="msg_wakeup_car">Разбудить автомобиль&#8230;</string>
+    <string name="msg_issuing_homelink">Выдать команду Homelink&#8230;</string>
+    <string name="msg_setting_charge_mc">Установка режима зарядки и тока&#8230;</string>
+    <string name="msg_setting_charge_m">Установка режима зарядки&#8230;</string>
+    <string name="msg_setting_charge_c">Установка тока заряда&#8230;</string>
+    <string name="msg_starting_charge">Запуск зарядки&#8230;</string>
+    <string name="msg_stopping_charge">Остановка зарядки&#8230;</string>
+    <string name="msg_rebooting_car_module">Перезапуск автомобильного модуля&#8230;</string>
+    <string name="msg_please_enter_value">Пожалуйста введите правильное значеник</string>
+    <string name="msg_invalid_name">Ваще имя должно быть больше 3 символов и не может содержать специальные символы.</string>
+    <string name="msg_invalid_passwd">Ваш пароль должен быть длинной между %1$d и %2$d символами.</string>
+    <string name="msg_invalid_id_already_registered">Идентификатор автомобиля %s уже зарегистрирован. Пожалуйста введите другой.</string>
+    <string name="msg_delete_this_car">Удалить этот автомобиль?</string>
+    <string name="msg_mmi_ssd_code">Введите MMI/USSD код, нажмите ОТПРАВИТЬ что бы отправить этот код мобильному провайдеру Вашего автомобиля</string>
+    
+    <string name="err_connection_lost">Соединение с сервером OVMS потеряно</string>
+    <string name="err_check_following">Пожалуйста проверьте следующее:\n1. Интернет соединение\n2. Адрес OVMS сервера\n3. Идентификатор и пароль Вашего автомобиля</string>
+    <string name="err_failed">Не удалось: %s</string>
+    <string name="err_unsupported_operation">Операция не поддерживается</string>
+    <string name="err_unimplemented_operation">Операция не реализована</string>
+    <string name="err_param_not_editable">Извините, этот параметр невозможно редактировать!</string>
+
+    <string name="msg_retrieving_data">Получение данных&#8230;</string>
+    <string name="msg_processing_data">Обработка данных&#8230;</string>
+    <string formatted="false" name="cellular_usage_info_car">Автомобиль: %.1f MB/месяц (%d дней)</string>
+    <string formatted="false" name="cellular_usage_info_app">Приложение: %.1f MB/месяц (%d дней)</string>
+    <string name="chart_axis_date">Дата</string>
+    <string name="chart_axis_datavolume">Объем (KB)</string>
+
+    <string formatted="false" name="lb_chargepoint_conn_level">Уровень #%d</string>
+    <string formatted="false" name="lb_chargepoint_conn_type">Тип соединения #%d</string>
+    
+    <string name="live">в прямом эфире</string>
+    <string name="ndays">%d дней</string>
+    <string name="nhours">%d часов</string>
+    <string name="nmins">%d минут</string>
+    <string name="min1">1 мин</string>
+    <string name="justnow">прямо сейчас</string>
+    <string name="mph">миль/час</string>
+    <string name="kph">км/час</string>
+    <string name="miles">миль</string>
+    <string name="kilometers">км</string>
+    <string name="slidetocharge">ВСТАВЬТЕ ДЛЯ\nЗАРЯДКИ</string>
+    <string name="timedcharge">ТАЙМЕР ЗАРЯДКИ</string>
+    <string name="pushnotifications">Push Notifications</string>
+    <string name="pushnotifications_welcome">Здесь заархивированы уведомления, полученные для Ваших зарегистрированных автомобилей.</string>
+    
+<!--    <string formatted="false" name="charging">ЗАРЯДКА\n%s %s</string> -->
+    <string formatted="false" name="state_charging">ЗАРЯДКА\n%s %s</string>
+    <string formatted="false" name="state_topping_off">TOPPING OFF\n%s %s</string>
+    <string formatted="false" name="state_done">ЗАВЕРШЕНО\n%s %s</string>
+    <string formatted="false" name="state_stopped">ОСТАНОВЛЕНО\n%s %s</string>
+
+    <string formatted="false" name="info_etr_full">100%%: ~%s</string>
+    <string formatted="false" name="info_etr_suffsoc">%d%%: ~%s</string>
+    <string formatted="false" name="info_etr_suffrange">%d%s: ~%s</string>
+    
+    <string name="textMOTOR">МОТОР</string>
+    <string name="textPEM">PEM</string>
+    <string name="textBATTERY">БАТАРЕЯ</string>
+    <string name="textHOMELINK">HOMELINK</string>
+    <string name="textPROFILE">ПРОФИЛЬ</string>
+    <string name="textAMBIENT">AMBIENT</string>
+    <string name="text12VBATT">БАТАРЕЯ 12В</string>
+    
+    <string-array name="en_charger">
+    	<item>Стандартное</item>
+        <item>Хранение</item>
+        <item>Диапазон</item>
+        <item>Выполнить</item>
+    </string-array>
+    
+    <string-array name="ocm_options_maxresults">
+        <item>500</item>
+        <item>1000</item>
+        <item>1500</item>
+        <item>2000</item>
+    </string-array>
+
+    <string name="mi_map_options">Опции</string>
+    <string name="mi_map_autotrack">Автом. прослеживание</string>
+    <string name="mi_map_filter_connections">Мои штекеры</string>
+    <string name="mi_map_filter_range">Мой диапазон</string>
+    <string name="mi_map_settings">Настройки</string>
+
+    <string name="cargroup_title">Группы автомобилей</string>
+    <string name="cargroup_name_hint">Название группы</string>
+
+    <!-- OVMS Debug
+    <string name="map_api_key_debug">0QvjonKAPqu1JRrQz3D7Rfl51x5vK8kS5PiLkTQ</string> -->  
+
+    <!-- OVMS Release
+    <string name="map_api_key_debug">0QvjonKAPqu1CvxcEEcnQbdsxUmPTewEqbkMaSg</string> -->
+
+    <!-- OVMS Google Play Release -->
+    <string name="map_api_key_debug">0FCEKIy1Q57W2uMZr_JP_VorwcABtvK-_CF-9dw</string>
+    <string name="connections">Соединения</string>
+
+    <string name="logs_title">Журналы диагностики</string>
+    <string name="logs_btn_get">Получить журналы</string>
+    <string name="logs_btn_reset">Сбросить журналы</string>
+
+    <string name="logs_lb_alerts">Предупреждения</string>
+    <string name="logs_lb_faults">Ошибки</string>
+    <string name="logs_lb_events">События</string>
+    <string name="logs_lb_counter">Счетчик</string>
+    <string name="logs_lb_minmax">МинМакс</string>
+
+    <string name="logs_th_code">Код</string>
+    <string name="logs_th_description">Описание</string>
+    <string name="logs_th_keytime">Ключевой момент (KeyTime)</string>
+    <string name="logs_th_lasttime">Последний момент</string>
+    <string name="logs_th_firsttime">Первый момент</string>
+    <string name="logs_th_count">Количество</string>
+    <string name="logs_th_data" formatted="false">Данные%d</string>
+    <string name="logs_th_sensor">Датчик</string>
+    <string name="logs_th_user">Пользователь</string>
+    <string name="logs_th_sevcon">SEVCON</string>
+
+    <string-array name="logs_th_sensornames">
+        <item>Минимальное напряжение батареи (В)</item>
+        <item>Максимальное напряжение батареи (В)</item>
+        <item>Минимальное напряжение конденсатора (В)</item>
+        <item>Максимальное напряжение конденсатора (В)</item>
+        <item>Минимальный ток двигателя (А)</item>
+        <item>Максимальный ток двигателя (А)</item>
+        <item>Минимальная скорость двигатаеля (об./мин.)</item>
+        <item>Максимальная скорость двигатаеля (об./мин.)</item>
+        <item>Минимальная температура SEVCON (°C)</item>
+        <item>Максимальная температура SEVCON (°C)</item>
+    </string-array>
+
+    <string name="logs_fmt_keytime" formatted="false">%d. %02d:%02d:%02d</string>
+    <string name="logs_fmt_listinfo" formatted="false">Последнее получение %s // key time %s</string>
+
+    <string name="logs_msg_query_alerts">Запрос оповещений&#8230;</string>
+    <string name="logs_msg_query_faults">Запрос ошибок&#8230;</string>
+    <string name="logs_msg_query_events">Запрос событий&#8230;</string>
+    <string name="logs_msg_query_counter">Запрос счетчика&#8230;</string>
+    <string name="logs_msg_query_minmax">Запрос мин./макс.&#8230;</string>
+
+    <string name="logs_msg_fetch_keytime">Получить key time&#8230;</string>
+    <string name="logs_msg_fetch_alerts">Получить оповещения&#8230;</string>
+    <string name="logs_msg_fetch_faults">Получить ошибки&#8230;</string>
+    <string name="logs_msg_fetch_events">Получить события&#8230;</string>
+    <string name="logs_msg_fetch_counter">Получить счетчик&#8230;</string>
+    <string name="logs_msg_fetch_minmax">Получить мин./макс.&#8230;</string>
+
+    <string name="logs_msg_reset_faults">СброситьReset ошибки&#8230;</string>
+    <string name="logs_msg_reset_events">СброситьReset события&#8230;</string>
+    <string name="logs_msg_reset_counter">СброситьReset счетчик&#8230;</string>
+    <string name="logs_msg_reset_minmax">СброситьReset мин./макс.&#8230;</string>
+
+    <string name="hint_sevcon_offline">\n(Подсказка: &#8230;B = SEVCON отсоединен)</string>
+
+    <string name="notifications_hint_cmdinput">SMS / MMI команда</string>
+    <string name="err_failed_smscmd">Ошибка: неизвестная команда / ошибка аутентификации</string>
+
+
+    <string name="battery_title">История батареи</string>
+    <string name="battery_menu">Опции</string>
+    <string name="battery_btn_get_data">Получить данные</string>
+    <string name="battery_btn_reset_view">Сбросить масштаб</string>
+    <string name="battery_btn_help">Информация</string>
+    <string name="battery_chk_volt">Показать напряжение</string>
+    <string name="battery_chk_temp">Показать температуру</string>
+    <string name="battery_msg_loading_data">Загрузка данных&#8230;</string>
+    <string name="battery_msg_get_status">Получение состояния батареи&#8230;</string>
+    <string name="battery_msg_get_battpack">Получение данных пакета батареи&#8230;</string>
+    <string name="battery_msg_get_battcell">Получение данных банки батареи&#8230;</string>
+    <string name="battery_pack_description">Исторя пакета</string>
+    <string name="battery_cell_description">Состояние банки батареи</string>
+    <string name="battery_data_soc">SOC (%)</string>
+    <string name="battery_data_volt">Вольт (В)</string>
+    <string name="battery_data_volt_min">Мин. вольт (В)</string>
+    <string name="battery_data_temp">Температура (°C)</string>
+    <string name="battery_help"><![CDATA[
+ 		<h1>История батареи</h1>
+
+		<h2>Основы</h2>
+		<p> <b> Версия прошивки </b> должна поддерживать функции <b> монитора батареи </b>.
+		Диаграммы на основе типов записей <tt>RT-PWR-BattPack</tt> и <tt>RT-PWR-BattCell</tt>
+		(См. руководство). Сервер будет хранить их в течении <b> 24 час. </b>. </p>
+		<p><b>Точность измерения</b> 5 ​​мВ по напряжению и 1 Â ° C по температуре.
+		Аккумулятор Twizy состоит из 42 банок со схемой (layout) 14S3P, распределенных в 7 модулях.
+		Система поддерживает измерение только 14 3P напряжений и 7 измерений температуры модуля.</p>
+
+		<h2> История пакета </h2>
+		<p>График пакета отображает только время с данными, и исключает неактивное время парковки. </p>
+		<p>Модуль отправляет обновления на сервер каждые <b>~60 секунд</b> во время вождения или зарядки
+		(при наличии сети и соединения с сервером).
+		Экстремумы и максимальные стандартные отклонения собираются постоянно, текущие значения те, которые отправлены во время обновления. </p>
+		<p>При включени <b>переключателя на</b> Twizy и <b>начала зарядки</b>,
+		передыдущие значения сбрасываются, так что в конце интервала использования они показывают общие экстремальные значения,
+		которые произошли во время использования. </p>
+		<p><u><b>Tipp</b></u>: Проследите линию минимального напряжения, нажмите на нее, чтобы выделить запись,
+		а затем используйте панель поиска, чтобы переместить маркер</p>.
+
+		<h2> Состояние банки</h2>
+		<p>
+		&nbsp;&bull; lower end = минимальное значение<br>
+		&nbsp;&bull; upper end = текущее значение (+текст)<br>
+		&nbsp;&bull; filled box = плохо<br>
+		&nbsp;&bull; bigger box = большее отклонение
+		</p>
+		<p> Это подсветка (candle stick) диаграммы. <b>Максимальное значение это</b> текущее значение (<tt>volt_act</tt> / <tt>temp_act</tt>),
+		<b>Минимальное значение</b> это наименьшее измеренное значение (<tt>volt_min</tt> / <tt>temp_min</tt>)
+		в текущем интервале использования.</p>
+		<p>Высота подсветки (candle height) отражает измеренное <b>максимальное отклонение</b>.
+		Заполнение подсветки (filled candle) используется для отображения «плохого» отклонения, т.е. выше <b>напряжения пробоя</b> или
+		<b>повышение температуры выше допустимой</b>.
+		</p>
+		<p><u><b>Tipp</b></u>: Для сравнения напряжений выделите банку и увеличте вертикально,
+		пока вы не можете четко прочитать отклонения других банок от выбранного маркера.</p>
+    ]]></string>
+</resources>
\ No newline at end of file
diff --git a/OpenVehicleApp/res/values/strings.xml b/OpenVehicleApp/res/values/strings.xml
index d29f8f9b..35c7b8d9 100644
--- a/OpenVehicleApp/res/values/strings.xml
+++ b/OpenVehicleApp/res/values/strings.xml
@@ -68,7 +68,51 @@
     <string name="Info12V">12V</string>
     <string name="Server">Server</string>
     <string name="App">App</string>
-
+    
+    <!-- Map menu items -->
+    <string name="Track">Track</string>
+    <string name="Autotrack">Autotrack</string>
+    <string name="Filtered_stations">Filtered Stations</string>
+    <string name="Only_show_stations_in_range">Only show Stations in range</string>
+    <string name="Start_track">Start track</string>
+    <string name="Stop_track">Stop track</string>
+    <string name="My_tracks">My tracks</string>
+    <string name="Options">Options</string>
+    <string name="Turn_logged_path">Logged Path</string>
+    
+    <string name="ON">ON</string>
+    <string name="OFF">OFF</string>
+    <string name="Invalid_server_C33">Server response timeout. Probably your OVMS server is not supports the C33 \"Retrieve 24-hour log data\" command. Please choice another server in the car\'s settings. Do you want to edit the car\'s settings?</string>
+    <string name="Invalid_server_C33_response">Retrieve the logged path failed!\nError: \"%s\".\nProbably your OVMS server is not supports the C33 \"Retrieve 24-hour log data\" command. Please choice another server in the car\'s settings. Do you want to edit the car\'s settings?</string>
+    <string name="Last_logged_path_record">Last record of the logged path</string>
+    <string name="Logged_path_progress">Logged path progress</string>
+    <string name="CHARGING_STATIONS">CHARGING STATIONS</string>
+    <string name="Open_Charge_Map">Open Charge Map</string>
+    <string name="Clustering">Clustering</string>
+    <string name="LOGGED_PATH">LOGGED PATH</string>
+    <string name="Show_logged_path">Show Logged Path</string>
+    <string name="Clustering_logged_path">Clustering</string>
+    <string name="EditText_logged_path">Minimum distance between car\'s location points in meters. Please increase minimum distance if you want see the logged path smoother. Decrease minimum distance if you want see the logged path more accuracy.</string>
+    <string name="Meters">meters</string>
+    <string name="Enter_distance">Please enter minimum distance from 0 to 120 meters</string>
+    <string name="Undefined_location">Location of a vehicle is not defined</string>
+    <string name="Speed">Speed</string>
+    <string name="Distance">Distance</string>
+    <string name="TimeFromStart">Time</string>
+    <string name="Latitude">Latitude</string>
+    <string name="Longitude">Longitude</string>
+    <string name="Edit_car_settings">Do you want to edit the cars settings?</string>
+    <string name="Login_complete">Login to OVMS server completed</string>
+    <string name="Retrieve_24_Hour_Log_Data_again">Retrieve the logged path failed!\n\n%s\n\nProbably connecting to OVMS server is unstable.\n\nTry to retrieve again?</string>
+    <string name="Under_constraction">Under Constraction</string>
+        
+    <!-- Map types -->
+    <string name="None">None</string>
+    <string name="Normal">Normal</string>
+    <string name="Hybrid">Hybrid</string>
+    <string name="Satellite">Satellite</string>
+    <string name="Terrain">Terrain</string>
+    
     <string name="lb_wakeup_car">Wakeup Car</string>
 
     <string name="lb_lock_car">Lock Car</string>
@@ -170,7 +214,7 @@
     <string name="msg_mmi_ssd_code">Enter MMI/USSD Code, then tap SEND to transmit the code to your vehicle\'s cellular provider</string>
     
     <string name="err_connection_lost">OVMS Server Connection Lost</string>
-    <string name="err_check_following">Please check the following:\n1. OVMS Server address\n2. Your vehicle ID and passwords</string>
+    <string name="err_check_following">Please check the following:\n1. Internet connection. \n2. OVMS Server address\n3. Your vehicle ID and passwords</string>
     <string name="err_failed">Failed: %s</string>
     <string name="err_unsupported_operation">Unsupported operation</string>
     <string name="err_unimplemented_operation">Unimplemented operation</string>
@@ -194,6 +238,8 @@
     <string name="justnow">just now</string>
     <string name="mph">mph</string>
     <string name="kph">kph</string>
+    <string name="miles">miles</string>
+    <string name="kilometers">km</string>
     <string name="slidetocharge">SLIDE TO\nCHARGE</string>
     <string name="timedcharge">TIMED CHARGE</string>
     <string name="pushnotifications">Push Notifications</string>
@@ -368,5 +414,11 @@
 		<p><u><b>Tipp</b></u>: to compare voltage details, select a cell and zoom in vertically
 		until you can clearly read the deviations of the other cells from the selection marker.</p>
     ]]></string>
-
+    <!-- Arrows http://www.fileformat.info/info/unicode/char/search.htm?q=arrow&preview=entity -->
+    <string name="left_arrow">\u2190</string>
+    <string name="right_arrow">\u2192</string>
+    
+    <!-- Degree http://www.fileformat.info/info/unicode/char/search.htm?q=degree&preview=entity -->
+    <string name="Degree">\u00B0</string>
+    
 </resources>
\ No newline at end of file
diff --git a/OpenVehicleApp/src/com/jjoe64/graphview/BarGraphView.java b/OpenVehicleApp/src/com/jjoe64/graphview/BarGraphView.java
new file mode 100644
index 00000000..e1656710
--- /dev/null
+++ b/OpenVehicleApp/src/com/jjoe64/graphview/BarGraphView.java
@@ -0,0 +1,129 @@
+/**
+ * This file is part of GraphView.
+ *
+ * GraphView is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GraphView is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GraphView.  If not, see <http://www.gnu.org/licenses/lgpl.html>.
+ *
+ * Copyright Jonas Gehring
+ */
+
+package com.jjoe64.graphview;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint.Align;
+import android.util.AttributeSet;
+
+import com.jjoe64.graphview.GraphViewSeries.GraphViewSeriesStyle;
+
+/**
+ * Draws a Bar Chart
+ * @author Muhammad Shahab Hameed
+ */
+public class BarGraphView extends GraphView {
+	private boolean drawValuesOnTop;
+	private int valuesOnTopColor = Color.WHITE;
+
+	public BarGraphView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	public BarGraphView(Context context, String title) {
+		super(context, title);
+	}
+
+	@Override
+	protected void drawHorizontalLabels(Canvas canvas, float border,
+			float horstart, float height, String[] horlabels, float graphwidth) {
+		// horizontal labels + lines
+		paint.setTextAlign(Align.CENTER);
+
+		int hors = horlabels.length;
+		float barwidth = graphwidth/horlabels.length;
+		float textOffset = barwidth/2;
+		for (int i = 0; i < horlabels.length; i++) {
+			// lines
+			float x = ((graphwidth / hors) * i) + horstart;
+			paint.setColor(graphViewStyle.getGridColor());
+			canvas.drawLine(x, height - border, x, border, paint);
+
+            if(getShowHorizontalLabels()) {
+                // text
+                x = barwidth*i + textOffset + horstart;
+                paint.setColor(graphViewStyle.getHorizontalLabelsColor());
+                canvas.drawText(horlabels[i], x, height - 4, paint);
+            }
+		}
+	}
+
+	@SuppressWarnings("deprecation")
+	@Override
+	public void drawSeries(Canvas canvas, GraphViewDataInterface[] values, float graphwidth, float graphheight,
+			float border, double minX, double minY, double diffX, double diffY,
+			float horstart, GraphViewSeriesStyle style) {
+		float colwidth = graphwidth / (values.length);
+
+		paint.setStrokeWidth(style.thickness);
+
+		float offset = 0;
+
+		// draw data
+		for (int i = 0; i < values.length; i++) {
+			float valY = (float) (values[i].getY() - minY);
+			float ratY = (float) (valY / diffY);
+			float y = graphheight * ratY;
+
+			// hook for value dependent color
+			if (style.getValueDependentColor() != null) {
+				paint.setColor(style.getValueDependentColor().get(values[i]));
+			} else {
+				paint.setColor(style.color);
+			}
+
+			float left = (i * colwidth) + horstart -offset;
+			float top = (border - y) + graphheight;
+			float right = ((i * colwidth) + horstart) + (colwidth - 1) -offset;
+			canvas.drawRect(left, top, right, graphheight + border - 1, paint);
+
+			// -----Set values on top of graph---------
+			if (drawValuesOnTop) {
+				top -= 4;
+				if (top<=border) top+=border+4;
+				paint.setTextAlign(Align.CENTER);
+				paint.setColor(valuesOnTopColor );
+				canvas.drawText(formatLabel(values[i].getY(), false), (left+right)/2, top, paint);
+			}
+		}
+	}
+
+	public boolean getDrawValuesOnTop() {
+		return drawValuesOnTop;
+	}
+
+	public int getValuesOnTopColor() {
+		return valuesOnTopColor;
+	}
+
+	/**
+	 * You can set the flag to let the GraphView draw the values on top of the bars
+	 * @param drawValuesOnTop
+	 */
+	public void setDrawValuesOnTop(boolean drawValuesOnTop) {
+		this.drawValuesOnTop = drawValuesOnTop;
+	}
+
+	public void setValuesOnTopColor(int valuesOnTopColor) {
+		this.valuesOnTopColor = valuesOnTopColor;
+	}
+}
diff --git a/OpenVehicleApp/src/com/jjoe64/graphview/CustomDraw.java b/OpenVehicleApp/src/com/jjoe64/graphview/CustomDraw.java
new file mode 100644
index 00000000..645a8eb3
--- /dev/null
+++ b/OpenVehicleApp/src/com/jjoe64/graphview/CustomDraw.java
@@ -0,0 +1,44 @@
+/**
+ * This file is part of GraphView.
+ *
+ * GraphView is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GraphView is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GraphView.  If not, see <http://www.gnu.org/licenses/lgpl.html>.
+ *
+ * Copyright Jonas Gehring
+ */
+
+package com.jjoe64.graphview;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+
+/**
+ * if you want custom drawing of the graph, you can use this custom draw. 
+ * As Input you get the Canvas
+ * {@code
+ * 		graphView.setCustomDraw(new CustomDraw() {
+			public void onDraw(Canvas canvas, Paint paint, float graphheight, float border) {
+				
+			}
+		});
+ * }
+ */
+public interface CustomDraw {
+
+	/**
+	 * will be called from void GraphViewContentView.onDraw(Canvas canvas)
+	 * @param canvas
+	 * @param paint
+	 */
+	void MyDraw(Canvas canvas, Paint paint, float graphheight, float border);
+}
diff --git a/OpenVehicleApp/src/com/jjoe64/graphview/CustomLabelFormatter.java b/OpenVehicleApp/src/com/jjoe64/graphview/CustomLabelFormatter.java
new file mode 100644
index 00000000..dcb266a6
--- /dev/null
+++ b/OpenVehicleApp/src/com/jjoe64/graphview/CustomLabelFormatter.java
@@ -0,0 +1,54 @@
+/**
+ * This file is part of GraphView.
+ *
+ * GraphView is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GraphView is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GraphView.  If not, see <http://www.gnu.org/licenses/lgpl.html>.
+ *
+ * Copyright Jonas Gehring
+ */
+
+package com.jjoe64.graphview;
+
+/**
+ * if you want to show different labels,
+ * you can use this label formatter.
+ * As Input you get the raw value (x or y) and
+ * you return a String that will be displayed.
+ * {@code
+ * 		graphView.setCustomLabelFormatter(new CustomLabelFormatter() {
+			public String formatLabel(double value, boolean isValueX) {
+				if (isValueX) {
+					if (value < 5) {
+						return "small";
+					} else if (value < 15) {
+						return "middle";
+					} else {
+						return "big";
+					}
+				}
+				return null; // let graphview generate Y-axis label for us
+			}
+		});
+ * }
+ */
+public interface CustomLabelFormatter {
+
+	/**
+	 * will be called when the labels were generated
+	 * @param value the raw input value (x or y)
+	 * @param isValueX true if value is a x-value, false if otherwise
+	 * @return the string that will be displayed. return null if you want graphview to generate the label for you.
+	 */
+	String formatLabel(double value, boolean isValueX);
+
+}
diff --git a/OpenVehicleApp/src/com/jjoe64/graphview/GraphView.java b/OpenVehicleApp/src/com/jjoe64/graphview/GraphView.java
new file mode 100644
index 00000000..ff21b32d
--- /dev/null
+++ b/OpenVehicleApp/src/com/jjoe64/graphview/GraphView.java
@@ -0,0 +1,1094 @@
+/**
+ * This file is part of GraphView.
+ *
+ * GraphView is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GraphView is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GraphView.  If not, see <http://www.gnu.org/licenses/lgpl.html>.
+ *
+ * Copyright Jonas Gehring
+ */
+
+package com.jjoe64.graphview;
+
+import java.nio.charset.Charset;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Paint.Align;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.jjoe64.graphview.GraphViewSeries.GraphViewSeriesStyle;
+import com.jjoe64.graphview.GraphViewStyle.GridStyle;
+import com.jjoe64.graphview.compatible.ScaleGestureDetector;
+
+/**
+ * GraphView is a Android View for creating zoomable and scrollable graphs.
+ * This is the abstract base class for all graphs. Extend this class and implement {@link #drawSeries(android.graphics.Canvas, GraphViewDataInterface[], float, float, float, double, double, double, double, float, com.jjoe64.graphview.GraphViewSeries.GraphViewSeriesStyle)} to display a custom graph.
+ * Use {@link com.jjoe64.graphview.LineGraphView} for creating a line chart.
+ *
+ * @author jjoe64 - jonas gehring - http://www.jjoe64.com
+ *
+ * Copyright (C) 2011 Jonas Gehring
+ * Licensed under the GNU Lesser General Public License (LGPL)
+ * http://www.gnu.org/licenses/lgpl.html
+ */
+abstract public class GraphView extends LinearLayout {
+	static final private class GraphViewConfig {
+		static final float BORDER = 20;
+	}
+
+	private class GraphViewContentView extends View {
+		private float lastTouchEventX;
+		private float graphwidth;
+		private boolean scrollingStarted;
+
+		/**
+		 * @param context
+		 */
+		public GraphViewContentView(Context context) {
+			super(context);
+			setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
+		}
+
+		/**
+		 * @param canvas
+		 */
+		@Override
+		protected void onDraw(Canvas canvas) {
+
+			paint.setAntiAlias(true);
+
+			// normal
+			paint.setStrokeWidth(0);
+
+			float border = GraphViewConfig.BORDER;
+			float horstart = 0;
+			float height = getHeight();
+			float width = getWidth() - 1;
+			double maxY = getMaxY();
+			double minY = getMinY();
+			double maxX = getMaxX(false);
+			double minX = getMinX(false);
+			double diffX = maxX - minX;
+
+			 // measure bottom text
+			if (labelTextHeight == null || horLabelTextWidth == null) {
+				paint.setTextSize(getGraphViewStyle().getTextSize());
+				double testX = ((getMaxX(true)-getMinX(true))*0.783)+getMinX(true);
+				String testLabel = formatLabel(testX, true);
+				paint.getTextBounds(testLabel, 0, testLabel.length(), textBounds);
+                // multiline
+                int lines = 1;
+                for (byte c : testLabel.getBytes()) {
+                    if (c == '\n') lines++;
+                }
+                labelTextHeight = textBounds.height()*lines;
+				horLabelTextWidth = (textBounds.width());
+			}
+            border += labelTextHeight;
+
+			float graphheight = height - (2 * border);
+			graphwidth = width;
+
+			if (horlabels == null) {
+				horlabels = generateHorlabels(graphwidth);
+            } else if (getGraphViewStyle().getNumHorizontalLabels() > 0) {
+                Log.w("GraphView", "when you use static labels (via setHorizontalLabels) the labels will just be shown exactly in that way, that you have set it. setNumHorizontalLabels does not have any effect.");
+			}
+			if (verlabels == null) {
+				verlabels = generateVerlabels(graphheight);
+            } else if (getGraphViewStyle().getNumVerticalLabels() > 0) {
+                Log.w("GraphView", "when you use static labels (via setVerticalLabels) the labels will just be shown exactly in that way, that you have set it. setNumVerticalLabels does not have any effect.");
+			}
+
+			// horizontal lines
+			if (graphViewStyle.getGridStyle().drawHorizontal()) {
+				paint.setTextAlign(Align.LEFT);
+				int vers = verlabels.length - 1;
+				for (int i = 0; i < verlabels.length; i++) {
+					paint.setColor(graphViewStyle.getGridColor());
+					float y = ((graphheight / vers) * i) + border;
+					canvas.drawLine(horstart, y, width, y, paint);
+				}
+			}
+
+			drawHorizontalLabels(canvas, border, horstart, height, horlabels, graphwidth);
+
+            paint.setColor(graphViewStyle.getHorizontalLabelsColor());
+			paint.setTextAlign(Align.CENTER);
+			canvas.drawText(title, (graphwidth / 2) + horstart, border - 4, paint);
+
+			if (maxY == minY) {
+				// if min/max is the same, fake it so that we can render a line
+				if(maxY == 0) {
+					// if both are zero, change the values to prevent division by zero
+					maxY = 1.0d;
+					minY = 0.0d;
+				} else {
+					maxY = maxY*1.05d;
+					minY = minY*0.95d;
+				}
+			}
+
+			double diffY = maxY - minY;
+			paint.setStrokeCap(Paint.Cap.ROUND);
+
+			for (int i=0; i<graphSeries.size(); i++) {
+				drawSeries(canvas, _values(i), graphwidth, graphheight, border, minX, minY, diffX, diffY, horstart, graphSeries.get(i).style);
+			}
+
+			if (showLegend) drawLegend(canvas, height, width);
+			
+			if(customDraw != null)
+				customDraw.MyDraw(canvas, paint, graphheight, border);
+		}
+		
+		private void onMoveGesture(float f) {
+			// view port update
+			if (viewportSize != 0) {
+				viewportStart -= f*viewportSize/graphwidth;
+
+				// minimal and maximal view limit
+				double minX = getMinX(true);
+				double maxX = getMaxX(true);
+				if (viewportStart < minX) {
+					viewportStart = minX;
+				} else if (viewportStart+viewportSize > maxX) {
+					viewportStart = maxX - viewportSize;
+				}
+
+				// labels have to be regenerated
+				if (!staticHorizontalLabels) horlabels = null;
+				if (!staticVerticalLabels) verlabels = null;
+				viewVerLabels.invalidate();
+			}
+			invalidate();
+		}
+
+		private TouchEvent mtouchEvent;
+		
+		/**
+		 * set a touch event
+		 * @param customLabelFormatter
+		 */
+		public void setTouchEvent(TouchEvent touchEvent) {
+			mtouchEvent = touchEvent;
+		}
+
+		/**
+		 * @param event
+		 */
+		@Override
+		public boolean onTouchEvent(MotionEvent event) {
+			
+			if (mtouchEvent != null) {
+				boolean handled = mtouchEvent.onTouchEvent(event);
+				if (handled) {
+					return handled;
+				}
+			}
+			
+			if (!isScrollable() || isDisableTouch()) {
+				return super.onTouchEvent(event);
+			}
+
+			boolean handled = false;
+			// first scale
+			if (scalable && scaleDetector != null) {
+				scaleDetector.onTouchEvent(event);
+				handled = scaleDetector.isInProgress();
+			}
+			if (!handled) {
+				//Log.d("GraphView", "on touch event scale not handled+"+lastTouchEventX);
+				// if not scaled, scroll
+				if ((event.getAction() & MotionEvent.ACTION_DOWN) == MotionEvent.ACTION_DOWN &&
+						(event.getAction() & MotionEvent.ACTION_MOVE) == 0) {
+					scrollingStarted = true;
+					handled = true;
+				}
+				if ((event.getAction() & MotionEvent.ACTION_UP) == MotionEvent.ACTION_UP) {
+					scrollingStarted = false;
+					lastTouchEventX = 0;
+					handled = true;
+				}
+				if ((event.getAction() & MotionEvent.ACTION_MOVE) == MotionEvent.ACTION_MOVE) {
+					if (scrollingStarted) {
+						if (lastTouchEventX != 0) {
+							onMoveGesture(event.getX() - lastTouchEventX);
+						}
+						lastTouchEventX = event.getX();
+						handled = true;
+					}
+				}
+				if (handled)
+					invalidate();
+			} else {
+				// currently scaling
+				scrollingStarted = false;
+				lastTouchEventX = 0;
+			}
+			return handled;
+		}
+	}
+
+	/**
+	 * one data set for a graph series
+	 */
+	static public class GraphViewData implements GraphViewDataInterface {
+		public final double valueX;
+		public final double valueY;
+		public GraphViewData(double valueX, double valueY) {
+			super();
+			this.valueX = valueX;
+			this.valueY = valueY;
+		}
+		@Override
+		public double getX() {
+			return valueX;
+		}
+		@Override
+		public double getY() {
+			return valueY;
+		}
+	}
+
+	public enum LegendAlign {
+		TOP, MIDDLE, BOTTOM
+	}
+
+	private class VerLabelsView extends View {
+		/**
+		 * @param context
+		 */
+		public VerLabelsView(Context context) {
+			super(context);
+			setLayoutParams(new LayoutParams(
+					getGraphViewStyle().getVerticalLabelsWidth()==0?100:getGraphViewStyle().getVerticalLabelsWidth()
+							, LayoutParams.FILL_PARENT));
+		}
+
+		/**
+		 * @param canvas
+		 */
+		@Override
+		protected void onDraw(Canvas canvas) {
+			// normal
+			paint.setStrokeWidth(0);
+
+			 // measure bottom text
+			if (labelTextHeight == null || verLabelTextWidth == null) {
+				paint.setTextSize(getGraphViewStyle().getTextSize());
+				double testY = ((getMaxY()-getMinY())*0.783)+getMinY();
+				String testLabel = formatLabel(testY, false);
+				paint.getTextBounds(testLabel, 0, testLabel.length(), textBounds);
+				labelTextHeight = (textBounds.height());
+				verLabelTextWidth = (textBounds.width());
+			}
+			if (getGraphViewStyle().getVerticalLabelsWidth()==0 && getLayoutParams().width != verLabelTextWidth+GraphViewConfig.BORDER) {
+				setLayoutParams(new LayoutParams(
+						(int) (verLabelTextWidth+GraphViewConfig.BORDER), LayoutParams.FILL_PARENT));
+			} else if (getGraphViewStyle().getVerticalLabelsWidth()!=0 && getGraphViewStyle().getVerticalLabelsWidth() != getLayoutParams().width) {
+				setLayoutParams(new LayoutParams(
+						getGraphViewStyle().getVerticalLabelsWidth(), LayoutParams.FILL_PARENT));
+			}
+
+			float border = GraphViewConfig.BORDER;
+			border += labelTextHeight;
+			float height = getHeight();
+			float graphheight = height - (2 * border);
+
+			if (verlabels == null) {
+				verlabels = generateVerlabels(graphheight);
+			} else if (getGraphViewStyle().getNumVerticalLabels() > 0) {
+                Log.w("GraphView", "when you use static labels (via setVerticalLabels) the labels will just be shown exactly in that way, that you have set it. setNumVerticalLabels does not have any effect.");
+            }
+
+			// vertical labels
+			paint.setTextAlign(getGraphViewStyle().getVerticalLabelsAlign());
+			int labelsWidth = getWidth();
+			int labelsOffset = 0;
+			if (getGraphViewStyle().getVerticalLabelsAlign() == Align.RIGHT) {
+				labelsOffset = labelsWidth;
+			} else if (getGraphViewStyle().getVerticalLabelsAlign() == Align.CENTER) {
+				labelsOffset = labelsWidth / 2;
+			}
+			int vers = verlabels.length - 1;
+			for (int i = 0; i < verlabels.length; i++) {
+				float y = ((graphheight / vers) * i) + border;
+				paint.setColor(graphViewStyle.getVerticalLabelsColor());
+
+                String[] lines = verlabels[i].split("\n");
+                for (int li=0; li<lines.length; li++) {
+                    // for the last line y = height
+                    float y2 = y - (lines.length-li-1)*graphViewStyle.getTextSize()*1.1f;
+                    canvas.drawText(lines[li], labelsOffset, y2, paint);
+                }
+            }
+
+			// reset
+			paint.setTextAlign(Align.LEFT);
+		}
+	}
+
+	protected final Paint paint;
+	private String[] horlabels;
+	private String[] verlabels;
+	private String title;
+	private boolean scrollable;
+	private boolean disableTouch;
+	private double viewportStart;
+	private double viewportSize;
+//	private final View viewVerLabels;
+	private final VerLabelsView viewVerLabels;
+	public float getGraphWidth()
+	{ return graphViewContentView.graphwidth;}
+	private ScaleGestureDetector scaleDetector;
+	private boolean scalable;
+	private final NumberFormat[] numberformatter = new NumberFormat[2];
+	private final List<GraphViewSeries> graphSeries;
+	private boolean showLegend = false;
+	private LegendAlign legendAlign = LegendAlign.MIDDLE;
+	private boolean manualYAxis;
+	private boolean manualMaxY;
+    	private boolean manualMinY;
+	private double manualMaxYValue;
+	private double manualMinYValue;
+	protected GraphViewStyle graphViewStyle;
+	private final GraphViewContentView graphViewContentView;
+	private CustomLabelFormatter customLabelFormatter;
+	private CustomDraw customDraw;
+	private Integer labelTextHeight;
+	private Integer horLabelTextWidth;
+	private Integer verLabelTextWidth;
+	private final Rect textBounds = new Rect();
+	private boolean staticHorizontalLabels;
+	private boolean staticVerticalLabels;
+    private boolean showHorizontalLabels = true;
+    private boolean showVerticalLabels = true;
+
+	public GraphView(Context context, AttributeSet attrs) {
+		this(context, attrs.getAttributeValue(null, "title"));
+
+		int width = attrs.getAttributeIntValue("android", "layout_width", LayoutParams.MATCH_PARENT);
+		int height = attrs.getAttributeIntValue("android", "layout_height", LayoutParams.MATCH_PARENT);
+		setLayoutParams(new LayoutParams(width, height));
+	}
+
+	/**
+	 * @param context
+	 * @param title [optional]
+	 */
+	public GraphView(Context context, String title) {
+		super(context);
+		setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
+
+		if (title == null)
+			this.title = "";
+		else
+			this.title = title;
+
+		graphViewStyle = new GraphViewStyle();
+		graphViewStyle.useTextColorFromTheme(context);
+
+		paint = new Paint();
+		graphSeries = new ArrayList<GraphViewSeries>();
+
+		viewVerLabels = new VerLabelsView(context);
+		addView(viewVerLabels);
+		graphViewContentView = new GraphViewContentView(context);
+		addView(graphViewContentView, new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT, 1));
+	}
+
+	private GraphViewDataInterface[] _values(int idxSeries) {
+		GraphViewDataInterface[] values = graphSeries.get(idxSeries).values;
+		synchronized (values) {
+			if (viewportStart == 0 && viewportSize == 0) {
+				// all data
+				return values;
+			} else {
+				// viewport
+				List<GraphViewDataInterface> listData = new ArrayList<GraphViewDataInterface>();
+				for (int i=0; i<values.length; i++) {
+					if (values[i].getX() >= viewportStart) {
+						if (values[i].getX() > viewportStart+viewportSize) {
+							listData.add(values[i]); // one more for nice scrolling
+							break;
+						} else {
+							listData.add(values[i]);
+						}
+					} else {
+						if (listData.isEmpty()) {
+							listData.add(values[i]);
+						}
+						listData.set(0, values[i]); // one before, for nice scrolling
+					}
+				}
+				return listData.toArray(new GraphViewDataInterface[listData.size()]);
+			}
+		}
+	}
+
+	/**
+	 * add a series of data to the graph
+	 * @param series
+	 */
+	public void addSeries(GraphViewSeries series) {
+		series.addGraphView(this);
+		graphSeries.add(series);
+		redrawAll();
+	}
+
+	protected void drawHorizontalLabels(Canvas canvas, float border,
+			float horstart, float height, String[] horlabels, float graphwidth) {
+		// horizontal labels + lines
+		int hors = horlabels.length - 1;
+		for (int i = 0; i < horlabels.length; i++) {
+			paint.setColor(graphViewStyle.getGridColor());
+			float x = ((graphwidth / hors) * i) + horstart;
+			if(graphViewStyle.getGridStyle().drawVertical()) { // vertical lines
+				canvas.drawLine(x, height - border, x, border, paint);
+			}
+            if(showHorizontalLabels) {
+                paint.setTextAlign(Align.CENTER);
+                if (i==horlabels.length-1)
+                    paint.setTextAlign(Align.RIGHT);
+                if (i==0)
+                    paint.setTextAlign(Align.LEFT);
+                paint.setColor(graphViewStyle.getHorizontalLabelsColor());
+                String[] lines = horlabels[i].split("\n");
+                for (int li=0; li<lines.length; li++) {
+                    // for the last line y = height
+                    float y = (height-4) - (lines.length-li-1)*graphViewStyle.getTextSize()*1.1f;
+                    canvas.drawText(lines[li], x, y, paint);
+                }
+            }
+		}
+	}
+
+	protected void drawLegend(Canvas canvas, float height, float width) {
+		float textSize = paint.getTextSize();
+		int spacing = getGraphViewStyle().getLegendSpacing();
+		int border = getGraphViewStyle().getLegendBorder();
+		int legendWidth = getGraphViewStyle().getLegendWidth();
+
+		int shapeSize = (int) (textSize*0.8d);
+        //Log.d("GraphView", "draw legend size: "+paint.getTextSize());
+
+		// rect
+		paint.setARGB(180, 100, 100, 100);
+		float legendHeight = (shapeSize+spacing)*graphSeries.size() +2*border -spacing;
+		float lLeft = width-legendWidth - border*2;
+		float lTop;
+		switch (legendAlign) {
+		case TOP:
+			lTop = 0;
+			break;
+		case MIDDLE:
+			lTop = height/2 - legendHeight/2;
+			break;
+		default:
+			lTop = height - GraphViewConfig.BORDER - legendHeight - getGraphViewStyle().getLegendMarginBottom();
+		}
+		float lRight = lLeft+legendWidth;
+		float lBottom = lTop+legendHeight;
+		canvas.drawRoundRect(new RectF(lLeft, lTop, lRight, lBottom), 8, 8, paint);
+
+		for (int i=0; i<graphSeries.size(); i++) {
+			paint.setColor(graphSeries.get(i).style.color);
+			canvas.drawRect(new RectF(lLeft+border, lTop+border+(i*(shapeSize+spacing)), lLeft+border+shapeSize, lTop+border+(i*(shapeSize+spacing))+shapeSize), paint);
+			if (graphSeries.get(i).description != null) {
+				paint.setColor(Color.WHITE);
+				paint.setTextAlign(Align.LEFT);
+				canvas.drawText(graphSeries.get(i).description, lLeft+border+shapeSize+spacing, lTop+border+shapeSize+(i*(shapeSize+spacing)), paint);
+			}
+		}
+	}
+
+	abstract protected void drawSeries(Canvas canvas, GraphViewDataInterface[] values, float graphwidth, float graphheight, float border, double minX, double minY, double diffX, double diffY, float horstart, GraphViewSeriesStyle style);
+
+	/**
+	 * formats the label
+	 * use #setCustomLabelFormatter or static labels if you want custom labels
+	 *
+	 * @param value x and y values
+	 * @param isValueX if false, value y wants to be formatted
+	 * @deprecated use {@link #setCustomLabelFormatter(CustomLabelFormatter)}
+	 * @return value to display
+	 */
+	@Deprecated
+	protected String formatLabel(double value, boolean isValueX) {
+		if (customLabelFormatter != null) {
+			String label = customLabelFormatter.formatLabel(value, isValueX);
+			if (label != null) {
+				return label;
+			}
+		}
+		int i = isValueX ? 1 : 0;
+		if (numberformatter[i] == null) {
+			numberformatter[i] = NumberFormat.getNumberInstance();
+			double highestvalue = isValueX ? getMaxX(false) : getMaxY();
+			double lowestvalue = isValueX ? getMinX(false) : getMinY();
+			if (highestvalue - lowestvalue < 0.1) {
+				numberformatter[i].setMaximumFractionDigits(6);
+			} else if (highestvalue - lowestvalue < 1) {
+				numberformatter[i].setMaximumFractionDigits(4);
+			} else if (highestvalue - lowestvalue < 20) {
+				numberformatter[i].setMaximumFractionDigits(3);
+			} else if (highestvalue - lowestvalue < 100) {
+				numberformatter[i].setMaximumFractionDigits(1);
+			} else {
+				numberformatter[i].setMaximumFractionDigits(0);
+			}
+		}
+		return numberformatter[i].format(value);
+	}
+
+	private String[] generateHorlabels(float graphwidth) {
+		int numLabels = getGraphViewStyle().getNumHorizontalLabels()-1;
+		if (numLabels < 0) { // automatic
+			if (graphwidth <= 0) graphwidth = 1f;
+			numLabels = (int) (graphwidth/(horLabelTextWidth*2));
+		}
+
+		String[] labels = new String[numLabels+1];
+		double min = getMinX(false);
+		double max = getMaxX(false);
+		for (int i=0; i<=numLabels; i++) {
+			labels[i] = formatLabel(min + ((max-min)*i/numLabels), true);
+		}
+		return labels;
+	}
+
+	synchronized private String[] generateVerlabels(float graphheight) {
+		int numLabels = getGraphViewStyle().getNumVerticalLabels()-1;
+		if (numLabels < 0) { // automatic
+			if (graphheight <= 0) graphheight = 1f;
+			numLabels = (int) (graphheight/(labelTextHeight*3));
+			if (numLabels == 0) {
+				Log.w("GraphView", "Height of Graph is smaller than the label text height, so no vertical labels were shown!");
+			}
+		}
+		String[] labels = new String[numLabels+1];
+		double min = getMinY();
+		double max = getMaxY();
+		if (max == min) {
+			// if min/max is the same, fake it so that we can render a line
+			if(max == 0) {
+				// if both are zero, change the values to prevent division by zero
+				max = 1.0d;
+				min = 0.0d;
+			} else {
+				max = max*1.05d;
+				min = min*0.95d;
+			}
+		}
+
+		for (int i=0; i<=numLabels; i++) {
+			labels[numLabels-i] = formatLabel(min + ((max-min)*i/numLabels), false);
+		}
+		return labels;
+	}
+
+	/**
+	 * @return the custom label formatter, if there is one. otherwise null
+	 */
+	public CustomLabelFormatter getCustomLabelFormatter() {
+		return customLabelFormatter;
+	}
+
+	/**
+	 * @return the graphview style. it will never be null.
+	 */
+	public GraphViewStyle getGraphViewStyle() {
+		return graphViewStyle;
+	}
+
+	/**
+	 * get the position of the legend
+	 * @return
+	 */
+	public LegendAlign getLegendAlign() {
+		return legendAlign;
+	}
+
+	/**
+	 * @return legend width
+	 * @deprecated use {@link GraphViewStyle#getLegendWidth()}
+	 */
+	@Deprecated
+	public float getLegendWidth() {
+		return getGraphViewStyle().getLegendWidth();
+	}
+
+	/**
+	 * returns the maximal X value of the current viewport (if viewport is set)
+	 * otherwise maximal X value of all data.
+	 * @param ignoreViewport
+	 *
+	 * warning: only override this, if you really know want you're doing!
+	 */
+	protected double getMaxX(boolean ignoreViewport) {
+		// if viewport is set, use this
+		if (!ignoreViewport && viewportSize != 0) {
+			return viewportStart+viewportSize;
+		} else {
+			// otherwise use the max x value
+			// values must be sorted by x, so the last value has the largest X value
+			double highest = 0;
+			if (graphSeries.size() > 0) {
+				GraphViewDataInterface[] values = graphSeries.get(0).values;
+				if (values.length == 0) {
+					highest = 0;
+				} else {
+					highest = values[values.length-1].getX();
+				}
+				for (int i=1; i<graphSeries.size(); i++) {
+					values = graphSeries.get(i).values;
+					if (values.length > 0) {
+						highest = Math.max(highest, values[values.length-1].getX());
+					}
+				}
+			}
+			return highest;
+		}
+	}
+
+	/**
+	 * returns the maximal Y value of all data.
+	 *
+	 * warning: only override this, if you really know want you're doing!
+	 */
+	protected double getMaxY() {
+		double largest;
+		if (manualYAxis || manualMaxY) {
+			largest = manualMaxYValue;
+		} else {
+			largest = Integer.MIN_VALUE;
+			for (int i=0; i<graphSeries.size(); i++) {
+				GraphViewDataInterface[] values = _values(i);
+				for (int ii=0; ii<values.length; ii++)
+				{
+					double dy = values[ii].getY();
+					if (dy > largest)
+						largest = dy;
+				}
+			}
+		}
+		return largest;
+	}
+
+	/**
+	 * returns the minimal X value of the current viewport (if viewport is set)
+	 * otherwise minimal X value of all data.
+	 * @param ignoreViewport
+	 *
+	 * warning: only override this, if you really know want you're doing!
+	 */
+	protected double getMinX(boolean ignoreViewport) {
+		// if viewport is set, use this
+		if (!ignoreViewport && viewportSize != 0) {
+			return viewportStart;
+		} else {
+			// otherwise use the min x value
+			// values must be sorted by x, so the first value has the smallest X value
+			double lowest = 0;
+			if (graphSeries.size() > 0) {
+				GraphViewDataInterface[] values = graphSeries.get(0).values;
+				if (values.length == 0) {
+					lowest = 0;
+				} else {
+					lowest = values[0].getX();
+				}
+				for (int i=1; i<graphSeries.size(); i++) {
+					values = graphSeries.get(i).values;
+					if (values.length > 0) {
+						lowest = Math.min(lowest, values[0].getX());
+					}
+				}
+			}
+			return lowest;
+		}
+	}
+
+	/**
+	 * returns the minimal Y value of all data.
+	 *
+	 * warning: only override this, if you really know want you're doing!
+	 */
+	protected double getMinY() {
+		double smallest;
+		if (manualYAxis || manualMinY) {
+			smallest = manualMinYValue;
+		} else {
+			smallest = Integer.MAX_VALUE;
+			for (int i=0; i<graphSeries.size(); i++) {
+				GraphViewDataInterface[] values = _values(i);
+				for (int ii=0; ii<values.length; ii++)
+					if (values[ii].getY() < smallest)
+						smallest = values[ii].getY();
+			}
+		}
+		return smallest;
+	}
+	
+	/**
+	 * returns the size of the Viewport
+	 * 
+	 */
+	public double getViewportSize(){
+		return viewportSize;
+	}
+
+	public boolean isDisableTouch() {
+		return disableTouch;
+	}
+
+	public boolean isScrollable() {
+		return scrollable;
+	}
+
+	public boolean isShowLegend() {
+		return showLegend;
+	}
+
+	/**
+	 * forces graphview to invalide all views and caches.
+	 * Normally there is no need to call this manually.
+	 */
+	public void redrawAll() {
+		if (!staticVerticalLabels) verlabels = null;
+		if (!staticHorizontalLabels) horlabels = null;
+		numberformatter[0] = null;
+		numberformatter[1] = null;
+		labelTextHeight = null;
+		horLabelTextWidth = null;
+		verLabelTextWidth = null;
+
+		invalidate();
+		viewVerLabels.invalidate();
+		graphViewContentView.invalidate();
+	}
+
+	/**
+	 * removes all series
+	 */
+	public void removeAllSeries() {
+		for (GraphViewSeries s : graphSeries) {
+			s.removeGraphView(this);
+		}
+		while (!graphSeries.isEmpty()) {
+			graphSeries.remove(0);
+		}
+		redrawAll();
+	}
+
+	/**
+	 * removes a series
+	 * @param series series to remove
+	 */
+	public void removeSeries(GraphViewSeries series) {
+		series.removeGraphView(this);
+		graphSeries.remove(series);
+		redrawAll();
+	}
+
+	/**
+	 * removes series
+	 * @param index
+	 */
+	public void removeSeries(int index) {
+		if (index < 0 || index >= graphSeries.size()) {
+			throw new IndexOutOfBoundsException("No series at index " + index);
+		}
+
+		removeSeries(graphSeries.get(index));
+	}
+
+	/**
+	 * scrolls to the last x-value
+	 * @throws IllegalStateException if scrollable == false
+	 */
+	public void scrollToEnd() {
+		if (!scrollable) throw new IllegalStateException("This GraphView is not scrollable.");
+		double max = getMaxX(true);
+		viewportStart = max-viewportSize;
+
+		// don't clear labels width/height cache
+		// so that the display is not flickering
+		if (!staticVerticalLabels) verlabels = null;
+		if (!staticHorizontalLabels) horlabels = null;
+
+		invalidate();
+		viewVerLabels.invalidate();
+		graphViewContentView.invalidate();
+	}
+
+	/**
+	 * set a custom label formatter
+	 * @param customLabelFormatter
+	 */
+	public void setCustomLabelFormatter(CustomLabelFormatter customLabelFormatter) {
+		this.customLabelFormatter = customLabelFormatter;
+	}
+
+	/**
+	 * set a custom draw
+	 * @param customDraw
+	 */
+	public void setCustomDraw(CustomDraw customDraw) {
+		this.customDraw = customDraw;
+	}
+
+	/**
+	 * set a custom TouchEvent
+	 * @param TouchEvent
+	 */
+	public void setTouchEvent(TouchEvent touchEvent) {
+		graphViewContentView.setTouchEvent(touchEvent);
+	}
+	/**
+	 * The user can disable any touch gestures, this is useful if you are using a real time graph, but don't want the user to interact
+	 * @param disableTouch
+	 */
+	public void setDisableTouch(boolean disableTouch) {
+		this.disableTouch = disableTouch;
+	}
+
+	/**
+	 * set custom graphview style
+	 * @param style
+	 */
+	public void setGraphViewStyle(GraphViewStyle style) {
+		graphViewStyle = style;
+		labelTextHeight = null;
+	}
+
+	/**
+	 * set's static horizontal labels (from left to right)
+	 * @param horlabels if null, labels were generated automatically
+	 */
+	public void setHorizontalLabels(String[] horlabels) {
+		staticHorizontalLabels = horlabels != null;
+		this.horlabels = horlabels;
+	}
+
+	/**
+	 * legend position
+	 * @param legendAlign
+	 */
+	public void setLegendAlign(LegendAlign legendAlign) {
+		this.legendAlign = legendAlign;
+	}
+
+	/**
+	 * legend width
+	 * @param legendWidth
+	 * @deprecated use {@link GraphViewStyle#setLegendWidth(int)}
+	 */
+	@Deprecated
+	public void setLegendWidth(float legendWidth) {
+		getGraphViewStyle().setLegendWidth((int)legendWidth);
+	}
+
+	/**
+	 * you have to set the bounds {@link #setManualYAxisBounds(double, double)}. That automatically enables manualYAxis-flag.
+	 * if you want to disable the menual y axis, call this method with false.
+	 * @param manualYAxis
+	 */
+	public void setManualYAxis(boolean manualYAxis) {
+		this.manualYAxis = manualYAxis;
+	}
+	
+	/**
+	 * if you want to disable the menual y axis maximum bound, call this method with false.
+	 */
+	public void setManualMaxY(boolean manualMaxY) {
+        	this.manualMaxY = manualMaxY;
+    	}
+    	
+    	/**
+	 * if you want to disable the menual y axis minimum bound, call this method with false.
+	 */
+    	public void setManualMinY(boolean manualMinY) {
+        	this.manualMinY = manualMinY;
+	 }
+
+	/**
+	 * set manual Y axis limit
+	 * @param max
+	 * @param min
+	 */
+	public void setManualYAxisBounds(double max, double min) {
+		manualMaxYValue = max;
+		manualMinYValue = min;
+		manualYAxis = true;
+	}
+	
+	/*
+	 * set manual Y axis max limit
+	 * @param max
+	 */
+	public void setManualYMaxBound(double max) {
+        	manualMaxYValue = max;
+        	manualMaxY = true;
+    	}
+
+	/*
+	 * set manual Y axis min limit
+	 * @param min
+	 */
+    	public void setManualYMinBound(double min) {
+        	manualMinYValue = min;
+        	manualMinY = true;
+    	}
+
+	/**
+	 * this forces scrollable = true
+	 * @param scalable
+	 */
+	synchronized public void setScalable(boolean scalable) {
+		this.scalable = scalable;
+		if (scalable == true && scaleDetector == null) {
+			scrollable = true; // automatically forces this
+			scaleDetector = new ScaleGestureDetector(getContext(), new ScaleGestureDetector.SimpleOnScaleGestureListener() {
+				@Override
+				public boolean onScale(ScaleGestureDetector detector) {
+					double center = viewportStart + viewportSize / 2;
+					viewportSize /= detector.getScaleFactor();
+					viewportStart = center - viewportSize / 2;
+
+					// viewportStart must not be < minX
+					double minX = getMinX(true);
+					if (viewportStart < minX) {
+						viewportStart = minX;
+					}
+
+					// viewportStart + viewportSize must not be > maxX
+					double maxX = getMaxX(true);
+					if (viewportSize == 0) {
+						viewportSize = maxX;
+					}
+					double overlap = viewportStart + viewportSize - maxX;
+					if (overlap > 0) {
+						// scroll left
+						if (viewportStart-overlap > minX) {
+							viewportStart -= overlap;
+						} else {
+							// maximal scale
+							viewportStart = minX;
+							viewportSize = maxX - viewportStart;
+						}
+					}
+					redrawAll();
+					return true;
+				}
+			});
+		}
+	}
+
+	/**
+	 * the user can scroll (horizontal) the graph. This is only useful if you use a viewport {@link #setViewPort(double, double)} which doesn't displays all data.
+	 * @param scrollable
+	 */
+	public void setScrollable(boolean scrollable) {
+		this.scrollable = scrollable;
+	}
+
+	public void setShowLegend(boolean showLegend) {
+		this.showLegend = showLegend;
+	}
+
+	/**
+	 * sets the title of graphview
+	 * @param title
+	 */
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	/**
+	 * set's static vertical labels (from top to bottom)
+	 * @param verlabels if null, labels were generated automatically
+	 */
+	public void setVerticalLabels(String[] verlabels) {
+		staticVerticalLabels = verlabels != null;
+		this.verlabels = verlabels;
+	}
+
+	/**
+	 * set's the viewport for the graph.
+	 * @see #setManualYAxisBounds(double, double) to limit the y-viewport
+	 * @param start x-value
+	 * @param size
+	 */
+	public void setViewPort(double start, double size) {
+		if (size<0) {
+			throw new IllegalArgumentException("Viewport size must be greater than 0!");
+		}
+		viewportStart = start;
+		viewportSize = size;
+	}
+
+    /**
+     * Sets whether horizontal labels are drawn or not.
+     *
+     * @param showHorizontalLabels
+     */
+    public void setShowHorizontalLabels(boolean showHorizontalLabels) {
+        this.showHorizontalLabels = showHorizontalLabels;
+        redrawAll();
+    }
+
+    /**
+     * Gets are horizontal labels drawn.
+     *
+     * @return {@code True} if horizontal labels are drawn
+     */
+    public boolean getShowHorizontalLabels() {
+        return showHorizontalLabels;
+    }
+
+    /**
+     * Sets whether vertical labels are drawn or not.
+     *
+     * @param showVerticalLabels
+     */
+    public void setShowVerticalLabels(boolean showVerticalLabels) {
+        this.showVerticalLabels = showVerticalLabels;
+        if(this.showVerticalLabels) {
+            addView(viewVerLabels, 0);
+        } else {
+            removeView(viewVerLabels);
+        }
+    }
+
+    /**
+     * Gets are vertical labels are drawn.
+     *
+     * @return {@code True} if vertical labels are drawn
+     */
+    public boolean getShowVerticalLabels() {
+        return showVerticalLabels;
+    }
+
+}
diff --git a/OpenVehicleApp/src/com/jjoe64/graphview/GraphViewDataInterface.java b/OpenVehicleApp/src/com/jjoe64/graphview/GraphViewDataInterface.java
new file mode 100644
index 00000000..e24638c4
--- /dev/null
+++ b/OpenVehicleApp/src/com/jjoe64/graphview/GraphViewDataInterface.java
@@ -0,0 +1,30 @@
+/**
+ * This file is part of GraphView.
+ *
+ * GraphView is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GraphView is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GraphView.  If not, see <http://www.gnu.org/licenses/lgpl.html>.
+ *
+ * Copyright Jonas Gehring
+ */
+
+package com.jjoe64.graphview;
+
+/**
+ * the base interface for the graphview data.
+ * you can use your own data models, when they implement
+ * this interface.
+ */
+public interface GraphViewDataInterface {
+	public double getX();
+	public double getY();
+}
diff --git a/OpenVehicleApp/src/com/jjoe64/graphview/GraphViewSeries.java b/OpenVehicleApp/src/com/jjoe64/graphview/GraphViewSeries.java
new file mode 100644
index 00000000..0cd6678d
--- /dev/null
+++ b/OpenVehicleApp/src/com/jjoe64/graphview/GraphViewSeries.java
@@ -0,0 +1,210 @@
+/**
+ * This file is part of GraphView.
+ *
+ * GraphView is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GraphView is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GraphView.  If not, see <http://www.gnu.org/licenses/lgpl.html>.
+ *
+ * Copyright Jonas Gehring
+ */
+
+package com.jjoe64.graphview;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * a graphview series.
+ * holds the data, description and styles
+ */
+public class GraphViewSeries {
+	/**
+	 * graph series style: color and thickness
+	 */
+	static public class GraphViewSeriesStyle {
+		public int color = 0xff0077cc;
+		public int thickness = 3;
+		private ValueDependentColor valueDependentColor;
+
+		public GraphViewSeriesStyle() {
+			super();
+		}
+		public GraphViewSeriesStyle(int color, int thickness) {
+			super();
+			this.color = color;
+			this.thickness = thickness;
+		}
+		
+		public ValueDependentColor getValueDependentColor() {
+			return valueDependentColor;
+		}
+		
+		/**
+		 * the color depends on the value of the data.
+		 * only possible in BarGraphView
+		 * @param valueDependentColor
+		 */
+		public void setValueDependentColor(ValueDependentColor valueDependentColor) {
+			this.valueDependentColor = valueDependentColor;
+		}
+	}
+
+	final String description;
+	final GraphViewSeriesStyle style;
+	GraphViewDataInterface[] values;
+	public GraphViewDataInterface[] getGraphViewDataInterface()
+	{ return values;}
+	private final List<GraphView> graphViews = new ArrayList<GraphView>();
+
+    /**
+     * create a series with predefined values
+     * @param values the values must be in the correct order! x-value has to be ASC. First the lowest x value and at least the highest x value.
+     */
+	public GraphViewSeries(GraphViewDataInterface[] values) {
+		description = null;
+		style = new GraphViewSeriesStyle();
+		this.values = values;
+        checkValueOrder();
+	}
+
+    /**
+     * create a series with predefined options
+     * @param description the name of the series
+     * @param style custom style. can be null for default styles
+     * @param values the values must be in the correct order! x-value has to be ASC. First the lowest x value and at least the highest x value.
+     */
+	public GraphViewSeries(String description, GraphViewSeriesStyle style, GraphViewDataInterface[] values) {
+		super();
+		this.description = description;
+		if (style == null) {
+			style = new GraphViewSeriesStyle();
+		}
+		this.style = style;
+		this.values = values;
+        checkValueOrder();
+    }
+
+	/**
+	 * this graphview will be redrawn if data changes
+	 * @param graphView
+	 */
+	public void addGraphView(GraphView graphView) {
+		this.graphViews.add(graphView);
+	}
+
+	/**
+	 * add one data to current data
+     * the values must be in the correct order! x-value has to be ASC. First the lowest x value and at least the highest x value.
+	 * @param value the new data to append
+	 * @param scrollToEnd true => graphview will scroll to the end (maxX)
+	 * @deprecated please use {@link #appendData(GraphViewDataInterface, boolean, int)} to avoid memory overflow
+	 */
+	@Deprecated
+	public void appendData(GraphViewDataInterface value, boolean scrollToEnd) {
+        if (values.length > 0 && value.getX() < values[values.length-1].getX()) {
+            throw new IllegalArgumentException("new x-value must be greater then the last value. x-values has to be ordered in ASC.");
+        }
+		GraphViewDataInterface[] newValues = new GraphViewDataInterface[values.length + 1];
+		int offset = values.length;
+		System.arraycopy(values, 0, newValues, 0, offset);
+
+		newValues[values.length] = value;
+		values = newValues;
+		for (GraphView g : graphViews) {
+			if (scrollToEnd) {
+				g.scrollToEnd();
+			}
+		}
+	}
+
+	/**
+	 * add one data to current data
+     * the values must be in the correct order! x-value has to be ASC. First the lowest x value and at least the highest x value.
+     *
+	 * @param value the new data to append. Important: the new value must be higher then the last value (x).
+	 * @param scrollToEnd true => graphview will scroll to the end (maxX)
+	 * @param maxDataCount if max data count is reached, the oldest data value will be lost
+	 */
+	public void appendData(GraphViewDataInterface value, boolean scrollToEnd, int maxDataCount) {
+        if (values.length > 0 && value.getX() < values[values.length-1].getX()) {
+            throw new IllegalArgumentException("new x-value must be greater then the last value. x-values has to be ordered in ASC.");
+        }
+		synchronized (values) {
+			int curDataCount = values.length;
+			GraphViewDataInterface[] newValues;
+			if (curDataCount < maxDataCount) {
+				// enough space
+				newValues = new GraphViewDataInterface[curDataCount + 1];
+				System.arraycopy(values, 0, newValues, 0, curDataCount);
+				// append new data
+				newValues[curDataCount] = value;
+			} else {
+				// we have to trim one data
+				newValues = new GraphViewDataInterface[maxDataCount];
+				System.arraycopy(values, curDataCount-maxDataCount+1, newValues, 0, maxDataCount-1);
+				// append new data
+				newValues[maxDataCount-1] = value;
+			}
+			values = newValues;
+		}
+
+		// update linked graph views
+		for (GraphView g : graphViews) {
+			if (scrollToEnd) {
+				g.scrollToEnd();
+			}
+		}
+	}
+
+	/**
+	 * @return series styles. never null
+	 */
+	public GraphViewSeriesStyle getStyle() {
+		return style;
+	}
+
+	/**
+	 * you should use {@link GraphView#removeSeries(GraphViewSeries)}
+	 * @param graphView
+	 */
+	public void removeGraphView(GraphView graphView) {
+		graphViews.remove(graphView);
+	}
+
+	/**
+	 * clears the current data and set the new.
+     *
+	 * redraws the graphview(s)
+	 * @param values the values must be in the correct order! x-value has to be ASC. First the lowest x value and at least the highest x value.
+	 */
+	public void resetData(GraphViewDataInterface[] values) {
+		this.values = values;
+        checkValueOrder();
+        for (GraphView g : graphViews) {
+			g.redrawAll();
+		}
+	}
+
+    private void checkValueOrder() {
+        if (values.length>1) {
+            double lx = values[0].getX();
+            for (int i=1;i<values.length;i++) {
+                if (values[i].getX() != Double.NaN) {
+                    if (lx > values[i].getX()) {
+                        throw new IllegalArgumentException("The order of the values is not correct. X-Values have to be ordered ASC. First the lowest x value and at least the highest x value.");
+                    }
+                    lx = values[i].getX();
+                }
+            }
+        }
+    }
+}
diff --git a/OpenVehicleApp/src/com/jjoe64/graphview/GraphViewStyle.java b/OpenVehicleApp/src/com/jjoe64/graphview/GraphViewStyle.java
new file mode 100644
index 00000000..cd5bd9af
--- /dev/null
+++ b/OpenVehicleApp/src/com/jjoe64/graphview/GraphViewStyle.java
@@ -0,0 +1,208 @@
+/**
+ * This file is part of GraphView.
+ *
+ * GraphView is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GraphView is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GraphView.  If not, see <http://www.gnu.org/licenses/lgpl.html>.
+ *
+ * Copyright Jonas Gehring
+ */
+
+package com.jjoe64.graphview;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.graphics.Paint.Align;
+import android.view.ContextThemeWrapper;
+
+/**
+ * Styles for the GraphView
+ * Important: Use {@link com.jjoe64.graphview.GraphViewSeries.GraphViewSeriesStyle} for series-specify styling
+ *
+ */
+public class GraphViewStyle {
+	private int verticalLabelsColor;
+	private int horizontalLabelsColor;
+	private int gridColor;
+	private GridStyle gridStyle = GridStyle.BOTH;
+	private float textSize;
+	private int verticalLabelsWidth;
+	private int numVerticalLabels;
+	private int numHorizontalLabels;
+	private int legendWidth;
+	private int legendBorder;
+	private int legendSpacing;
+	private int legendMarginBottom;
+	private Align verticalLabelsAlign;
+
+	public GraphViewStyle() {
+		setDefaults();
+	}
+
+	public GraphViewStyle(int vLabelsColor, int hLabelsColor, int gridColor) {
+		setDefaults();
+		this.verticalLabelsColor = vLabelsColor;
+		this.horizontalLabelsColor = hLabelsColor;
+		this.gridColor = gridColor;
+	}
+
+	public int getGridColor() {
+		return gridColor;
+	}
+	
+	public GridStyle getGridStyle() {
+		return gridStyle;
+	}
+
+	public int getHorizontalLabelsColor() {
+		return horizontalLabelsColor;
+	}
+
+	public int getLegendBorder() {
+		return legendBorder;
+	}
+
+	public int getLegendSpacing() {
+		return legendSpacing;
+	}
+
+	public int getLegendWidth() {
+		return legendWidth;
+	}
+
+	public int getLegendMarginBottom() {
+		return legendMarginBottom;
+	}
+
+	public int getNumHorizontalLabels() {
+		return numHorizontalLabels;
+	}
+
+	public int getNumVerticalLabels() {
+		return numVerticalLabels;
+	}
+
+	public float getTextSize() {
+		return textSize;
+	}
+
+	public Align getVerticalLabelsAlign() {
+		return verticalLabelsAlign;
+	}
+
+	public int getVerticalLabelsColor() {
+		return verticalLabelsColor;
+	}
+
+	public int getVerticalLabelsWidth() {
+		return verticalLabelsWidth;
+	}
+
+	private void setDefaults() {
+		verticalLabelsColor = Color.WHITE;
+		horizontalLabelsColor = Color.WHITE;
+		gridColor = Color.DKGRAY;
+		textSize = 30f;
+		legendWidth = 120;
+		legendBorder = 10;
+		legendSpacing = 10;
+		legendMarginBottom = 0;
+		verticalLabelsAlign = Align.LEFT;
+	}
+
+	public void setGridStyle(GridStyle style) {
+		gridStyle = style;
+	}
+	
+	public void setGridColor(int c) {
+		gridColor = c;
+	}
+
+	public void setHorizontalLabelsColor(int c) {
+		horizontalLabelsColor = c;
+	}
+
+	public void setLegendBorder(int legendBorder) {
+		this.legendBorder = legendBorder;
+	}
+
+	public void setLegendSpacing(int legendSpacing) {
+		this.legendSpacing = legendSpacing;
+	}
+
+	public void setLegendWidth(int legendWidth) {
+		this.legendWidth = legendWidth;
+	}
+
+	public void setLegendMarginBottom(int legendMarginBottom) {
+		this.legendMarginBottom = legendMarginBottom;
+	}
+
+	/**
+	 * @param numHorizontalLabels 0 = auto
+	 */
+	public void setNumHorizontalLabels(int numHorizontalLabels) {
+		this.numHorizontalLabels = numHorizontalLabels;
+	}
+
+	/**
+	 * @param numVerticalLabels 0 = auto
+	 */
+	public void setNumVerticalLabels(int numVerticalLabels) {
+		this.numVerticalLabels = numVerticalLabels;
+	}
+
+	public void setTextSize(float textSize) {
+		this.textSize = textSize;
+	}
+
+	public void setVerticalLabelsAlign(Align verticalLabelsAlign) {
+		this.verticalLabelsAlign = verticalLabelsAlign;
+	}
+
+	public void setVerticalLabelsColor(int c) {
+		verticalLabelsColor = c;
+	}
+
+	/**
+	 * @param verticalLabelsWidth 0 = auto
+	 */
+	public void setVerticalLabelsWidth(int verticalLabelsWidth) {
+		this.verticalLabelsWidth = verticalLabelsWidth;
+	}
+
+	/**
+	 * tries to get the theme's font color and use it for labels
+	 * @param context must be instance of ContextThemeWrapper
+	 */
+	public void useTextColorFromTheme(Context context) {
+		if (context instanceof ContextThemeWrapper) {
+			TypedArray array = ((ContextThemeWrapper) context).getTheme().obtainStyledAttributes(new int[] {android.R.attr.textColorPrimary});
+			int color = array.getColor(0, getVerticalLabelsColor());
+			array.recycle();
+
+			setVerticalLabelsColor(color);
+			setHorizontalLabelsColor(color);
+		}
+	}
+
+    /**
+     * Definition which lines will be drawn in the background
+     */
+	public enum GridStyle {
+		BOTH, VERTICAL, HORIZONTAL, NONE;
+
+        public boolean drawVertical() { return this == BOTH || this == VERTICAL && this != NONE; }
+        public boolean drawHorizontal() { return this == BOTH || this == HORIZONTAL && this != NONE; }
+	}
+}
diff --git a/OpenVehicleApp/src/com/jjoe64/graphview/LineGraphView.java b/OpenVehicleApp/src/com/jjoe64/graphview/LineGraphView.java
new file mode 100644
index 00000000..1fce017f
--- /dev/null
+++ b/OpenVehicleApp/src/com/jjoe64/graphview/LineGraphView.java
@@ -0,0 +1,177 @@
+/**
+ * This file is part of GraphView.
+ *
+ * GraphView is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GraphView is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GraphView.  If not, see <http://www.gnu.org/licenses/lgpl.html>.
+ *
+ * Copyright Jonas Gehring
+ */
+
+package com.jjoe64.graphview;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.util.AttributeSet;
+
+import com.jjoe64.graphview.GraphViewSeries.GraphViewSeriesStyle;
+
+/**
+ * Line Graph View. This draws a line chart.
+ */
+public class LineGraphView extends GraphView {
+	private final Paint paintBackground;
+	private boolean drawBackground;
+	private boolean drawDataPoints;
+	private float dataPointsRadius = 10f;
+
+	public LineGraphView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+
+		paintBackground = new Paint();
+		paintBackground.setColor(Color.rgb(20, 40, 60));
+		paintBackground.setStrokeWidth(4);
+		paintBackground.setAlpha(128);
+	}
+
+	public LineGraphView(Context context, String title) {
+		super(context, title);
+
+		paintBackground = new Paint();
+		paintBackground.setColor(Color.rgb(20, 40, 60));
+		paintBackground.setStrokeWidth(4);
+		paintBackground.setAlpha(128);
+	}
+
+	@Override
+	public void drawSeries(Canvas canvas, GraphViewDataInterface[] values, float graphwidth, float graphheight, float border, double minX, double minY, double diffX, double diffY, float horstart, GraphViewSeriesStyle style) {
+		// draw background
+		double lastEndY = 0;
+		double lastEndX = 0;
+
+		// draw data
+		paint.setStrokeWidth(style.thickness);
+		paint.setColor(style.color);
+
+
+		Path bgPath = null;
+		if (drawBackground) {
+			bgPath = new Path();
+		}
+
+		lastEndY = 0;
+		lastEndX = 0;
+		float firstX = 0;
+		for (int i = 0; i < values.length; i++) {
+			double valY = values[i].getY() - minY;
+			double ratY = valY / diffY;
+			double y = graphheight * ratY;
+
+			double valX = values[i].getX() - minX;
+			double ratX = valX / diffX;
+			double x = graphwidth * ratX;
+
+			if (i > 0) {
+				float startX = (float) lastEndX + (horstart + 1);
+				float startY = (float) (border - lastEndY) + graphheight;
+				float endX = (float) x + (horstart + 1);
+				float endY = (float) (border - y) + graphheight;
+
+				// draw data point
+				if (drawDataPoints) {
+					//fix: last value was not drawn. Draw here now the end values
+					canvas.drawCircle(endX, endY, dataPointsRadius, paint);
+				}
+
+				canvas.drawLine(startX, startY, endX, endY, paint);
+				if (bgPath != null) {
+					if (i==1) {
+						firstX = startX;
+						bgPath.moveTo(startX, startY);
+					}
+					bgPath.lineTo(endX, endY);
+				}
+			} else if (drawDataPoints) {
+				//fix: last value not drawn as datapoint. Draw first point here, and then on every step the end values (above)
+				float first_X = (float) x + (horstart + 1);
+				float first_Y = (float) (border - y) + graphheight;
+				canvas.drawCircle(first_X, first_Y, dataPointsRadius, paint);
+			}
+			lastEndY = y;
+			lastEndX = x;
+		}
+
+		if (bgPath != null) {
+			// end / close path
+			bgPath.lineTo((float) lastEndX, graphheight + border);
+			bgPath.lineTo(firstX, graphheight + border);
+			bgPath.close();
+			canvas.drawPath(bgPath, paintBackground);
+		}
+	}
+
+	public int getBackgroundColor() {
+		return paintBackground.getColor();
+	}
+
+	public float getDataPointsRadius() {
+		return dataPointsRadius;
+	}
+
+	public boolean getDrawBackground() {
+		return drawBackground;
+	}
+
+	public boolean getDrawDataPoints() {
+		return drawDataPoints;
+	}
+
+	/**
+	 * sets the background color for the series.
+	 * This is not the background color of the whole graph.
+	 * @see #setDrawBackground(boolean)
+	 */
+	@Override
+	public void setBackgroundColor(int color) {
+		paintBackground.setColor(color);
+	}
+
+	/**
+	 * sets the radius of the circles at the data points.
+	 * @see #setDrawDataPoints(boolean)
+	 * @param dataPointsRadius
+	 */
+	public void setDataPointsRadius(float dataPointsRadius) {
+		this.dataPointsRadius = dataPointsRadius;
+	}
+
+	/**
+	 * @param drawBackground true for a light blue background under the graph line
+	 * @see #setBackgroundColor(int)
+	 */
+	public void setDrawBackground(boolean drawBackground) {
+		this.drawBackground = drawBackground;
+	}
+
+	/**
+	 * You can set the flag to let the GraphView draw circles at the data points
+	 * @see #setDataPointsRadius(float)
+	 * @param drawDataPoints
+	 */
+	public void setDrawDataPoints(boolean drawDataPoints) {
+		this.drawDataPoints = drawDataPoints;
+	}
+
+}
diff --git a/OpenVehicleApp/src/com/jjoe64/graphview/TouchEvent.java b/OpenVehicleApp/src/com/jjoe64/graphview/TouchEvent.java
new file mode 100644
index 00000000..cf300cb1
--- /dev/null
+++ b/OpenVehicleApp/src/com/jjoe64/graphview/TouchEvent.java
@@ -0,0 +1,67 @@
+/**
+ * This file is part of GraphView.
+ *
+ * GraphView is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GraphView is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GraphView.  If not, see <http://www.gnu.org/licenses/lgpl.html>.
+ *
+ * Copyright Jonas Gehring
+ */
+
+package com.jjoe64.graphview;
+
+import android.view.MotionEvent;
+
+/**
+ * if you want to handle a touch event in the graph view, you can use this touch event.
+ * {@code
+ * 		graphView.setTouchEvent(new TouchEvent() {
+			public boolean onTouchEvent(MotionEvent event) {
+			
+				//http://startandroid.ru/ru/uroki/vse-uroki-spiskom/167-urok-102-touch-obrabotka-kasanija.html
+				
+				float x;
+				float y;
+				
+				x = event.getX();
+				y = event.getY();
+			    
+			    switch (event.getAction()) {
+			    case MotionEvent.ACTION_DOWN:
+			    	//TO DO
+			    	return true;
+			    case MotionEvent.ACTION_MOVE:
+			    	//TO DO
+			    	return true;
+			    case MotionEvent.ACTION_UP:
+			    	//TO DO
+			    	return true;
+			    case MotionEvent.ACTION_CANCEL:  
+			    	//TO DO
+			    	return false;
+			    }
+			    
+				return false; // let graphview to handle a touch event
+			}
+		});
+ * }
+ */
+public interface TouchEvent {
+
+    /**
+     * To handle GraphView touch screen motion events.
+     *
+     * @param event The motion event.
+     * @return True if the event was handled, false otherwise.
+     */
+	boolean onTouchEvent(MotionEvent event);
+}
diff --git a/OpenVehicleApp/src/com/jjoe64/graphview/ValueDependentColor.java b/OpenVehicleApp/src/com/jjoe64/graphview/ValueDependentColor.java
new file mode 100644
index 00000000..7b406cee
--- /dev/null
+++ b/OpenVehicleApp/src/com/jjoe64/graphview/ValueDependentColor.java
@@ -0,0 +1,28 @@
+/**
+ * This file is part of GraphView.
+ *
+ * GraphView is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GraphView is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GraphView.  If not, see <http://www.gnu.org/licenses/lgpl.html>.
+ *
+ * Copyright Jonas Gehring
+ */
+
+package com.jjoe64.graphview;
+
+/**
+ * you can change the color depending on the value.
+ * takes only effect in BarGraphView
+ */
+public interface ValueDependentColor {
+	public int get(GraphViewDataInterface data);
+}
diff --git a/OpenVehicleApp/src/com/jjoe64/graphview/compatible/RealScaleGestureDetector.java b/OpenVehicleApp/src/com/jjoe64/graphview/compatible/RealScaleGestureDetector.java
new file mode 100644
index 00000000..a9143b03
--- /dev/null
+++ b/OpenVehicleApp/src/com/jjoe64/graphview/compatible/RealScaleGestureDetector.java
@@ -0,0 +1,36 @@
+/**
+ * This file is part of GraphView.
+ *
+ * GraphView is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GraphView is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GraphView.  If not, see <http://www.gnu.org/licenses/lgpl.html>.
+ *
+ * Copyright Jonas Gehring
+ */
+
+package com.jjoe64.graphview.compatible;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.ScaleGestureDetector;
+
+@SuppressLint("NewApi")
+public class RealScaleGestureDetector extends ScaleGestureDetector {
+	public RealScaleGestureDetector(Context context, final com.jjoe64.graphview.compatible.ScaleGestureDetector fakeScaleGestureDetector, final com.jjoe64.graphview.compatible.ScaleGestureDetector.SimpleOnScaleGestureListener fakeListener) {
+		super(context, new android.view.ScaleGestureDetector.SimpleOnScaleGestureListener() {
+			@Override
+			public boolean onScale(ScaleGestureDetector detector) {
+				return fakeListener.onScale(fakeScaleGestureDetector);
+			}
+		});
+	}
+}
diff --git a/OpenVehicleApp/src/com/jjoe64/graphview/compatible/ScaleGestureDetector.java b/OpenVehicleApp/src/com/jjoe64/graphview/compatible/ScaleGestureDetector.java
new file mode 100644
index 00000000..3a29d4bd
--- /dev/null
+++ b/OpenVehicleApp/src/com/jjoe64/graphview/compatible/ScaleGestureDetector.java
@@ -0,0 +1,97 @@
+/**
+ * This file is part of GraphView.
+ *
+ * GraphView is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GraphView is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GraphView.  If not, see <http://www.gnu.org/licenses/lgpl.html>.
+ *
+ * Copyright Jonas Gehring
+ */
+
+package com.jjoe64.graphview.compatible;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+import android.content.Context;
+import android.util.Log;
+import android.view.MotionEvent;
+
+public class ScaleGestureDetector {
+	public interface SimpleOnScaleGestureListener {
+		boolean onScale(ScaleGestureDetector detector);
+	}
+
+	private Object realScaleGestureDetector;
+	private Method method_getScaleFactor;
+	private Method method_isInProgress;
+	private Method method_onTouchEvent;
+
+	/**
+	 * @param context
+	 * @param simpleOnScaleGestureListener
+	 */
+	public ScaleGestureDetector(Context context, SimpleOnScaleGestureListener simpleOnScaleGestureListener) {
+		try {
+			// check if class is available
+			Class.forName("android.view.ScaleGestureDetector");
+
+			// load class and methods
+			Class<?> classRealScaleGestureDetector = Class.forName("com.jjoe64.graphview.compatible.RealScaleGestureDetector");
+			method_getScaleFactor = classRealScaleGestureDetector.getMethod("getScaleFactor");
+			method_isInProgress = classRealScaleGestureDetector.getMethod("isInProgress");
+			method_onTouchEvent = classRealScaleGestureDetector.getMethod("onTouchEvent", MotionEvent.class);
+
+			// create real ScaleGestureDetector
+			Constructor<?> constructor = classRealScaleGestureDetector.getConstructor(Context.class, getClass(), SimpleOnScaleGestureListener.class);
+			realScaleGestureDetector = constructor.newInstance(context, this, simpleOnScaleGestureListener);
+		} catch (Exception e) {
+			// not available
+			Log.w("com.jjoe64.graphview", "*** WARNING *** No scaling available for graphs. Exception:");
+			e.printStackTrace();
+		}
+	}
+
+	public double getScaleFactor() {
+		if (method_getScaleFactor != null) {
+			try {
+				return (Float) method_getScaleFactor.invoke(realScaleGestureDetector);
+			} catch (Exception e) {
+				e.printStackTrace();
+				return 1.0;
+			}
+		}
+		return 1.0;
+	}
+
+	public boolean isInProgress() {
+		if (method_getScaleFactor != null) {
+			try {
+				return (Boolean) method_isInProgress.invoke(realScaleGestureDetector);
+			} catch (Exception e) {
+				e.printStackTrace();
+				return false;
+			}
+		}
+		return false;
+	}
+
+	public void onTouchEvent(MotionEvent event) {
+		if (method_onTouchEvent != null) {
+			try {
+				method_onTouchEvent.invoke(realScaleGestureDetector, event);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+	}
+}
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/BaseApp.java b/OpenVehicleApp/src/com/openvehicles/OVMS/BaseApp.java
index 7072b7f6..ed8f579e 100755
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/BaseApp.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/BaseApp.java
@@ -3,7 +3,6 @@
 import android.app.Application;
 
 public class BaseApp extends Application {
-//	private static final String TAG = "BaseApp";
 	private static BaseApp sInstance = null;
 	
 	@Override
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/api/ApiService.java b/OpenVehicleApp/src/com/openvehicles/OVMS/api/ApiService.java
index fd8e403e..6003f968 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/api/ApiService.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/api/ApiService.java
@@ -1,5 +1,7 @@
 package com.openvehicles.OVMS.api;
 
+import java.io.IOException;
+
 import android.app.Service;
 import android.content.Intent;
 import android.os.Binder;
@@ -8,17 +10,21 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import com.openvehicles.OVMS.BuildConfig;
 import com.openvehicles.OVMS.R;
 import com.openvehicles.OVMS.api.ApiTask.OnUpdateStatusListener;
 import com.openvehicles.OVMS.entities.CarData;
 import com.openvehicles.OVMS.utils.CarsStorage;
+import com.openvehicles.OVMS.utils.MyElement;
+import com.openvehicles.OVMS.utils.MyException;
 
 public class ApiService extends Service implements OnUpdateStatusListener {
-	private static final String TAG = "ApiService";
+	private static final String TAG = "MainActivity";
     private final IBinder mBinder = new ApiBinder();
 	private volatile CarData mCarData;
     private ApiTask mApiTask;
 	private OnResultCommandListener mOnResultCommandListener;
+	private static OnResultCommandListener mOnResultCommandListenerRetrieve24hourLogData;
 	
 	@Override
 	public IBinder onBind(Intent intent) {
@@ -30,9 +36,15 @@ public void onCreate() {
 		super.onCreate();
 		changeCar(CarsStorage.get().getSelectedCarData());
 	}
-	
+		
 	@Override
+
 	public void onDestroy() {
+/*		
+*	Attantion!!! Do not remove this comments
+* because receiving of logged path is broke
+* if user rotates device from portrait to landscape orientation.
+* Currently service is not disconnected never, because I do not know where to do it
 		try {
 			if (mApiTask != null) {
 				Log.v(TAG, "Shutting down TCP connection");
@@ -43,20 +55,25 @@ public void onDestroy() {
 		} catch (Exception e) {
 			Log.e(TAG, "ERROR stop ApiTask", e);
 		}
+*/		
 		super.onDestroy();
 	}
-	
+
 	public void changeCar(CarData pCarData) {
-		Log.i(TAG, "Changed car to: " + pCarData.sel_vehicleid);
+		Log.d(TAG, "Changed car to: " + pCarData.sel_vehicleid);
 		mCarData = pCarData;
-
+		reconnectToServer();
+	}
+	
+	public void reconnectToServer()
+	{
 		// kill previous connection
 		if (mApiTask != null) {
 			Log.v("TCP", "Shutting down previous TCP connection (ChangeCar())");
 			mApiTask.connClose();
 			mApiTask.cancel(true);
 		}
-
+		
 		// start new connection
 		// reset the paranoid mode flag in car data
 		// it will be set again when the TCP task detects paranoid mode messages
@@ -66,7 +83,11 @@ public void changeCar(CarData pCarData) {
 		Log.v(TAG, "Starting TCP Connection (changeCar())");
 		mApiTask.execute();
 	}
-	
+		
+	//For debugging
+	public void socketClose() throws IOException
+	{ mApiTask.socketClose();}
+
 	public void sendCommand(int pResIdMessage, String pCommand, OnResultCommandListener pOnResultCommandListener) {
 		sendCommand(getString(pResIdMessage), pCommand, pOnResultCommandListener);
 	}
@@ -79,6 +100,18 @@ public void sendCommand(String pMessage, String pCommand, OnResultCommandListene
 		Toast.makeText(this, pMessage, Toast.LENGTH_SHORT).show();
 	}
 	
+	public void sendCommandRetrieve24hourLogData(int pResIdMessage, String pCommand, OnResultCommandListener pOnResultCommandListener) {
+		sendCommandRetrieve24hourLogData(getString(pResIdMessage), pCommand, pOnResultCommandListener);
+	}
+
+	public void sendCommandRetrieve24hourLogData(String pMessage, String pCommand, OnResultCommandListener pOnResultCommandListener) {
+		if (mApiTask == null) return;
+
+		mOnResultCommandListenerRetrieve24hourLogData = pOnResultCommandListener;
+		mApiTask.sendCommand(String.format("MP-0 C%s", pCommand));
+		Toast.makeText(this, pMessage, Toast.LENGTH_SHORT).show();
+	}
+	
 	public boolean sendCommand(String pCommand, OnResultCommandListener pOnResultCommandListener) {
 		if (mApiTask == null || TextUtils.isEmpty(pCommand)) return false;
 		
@@ -87,7 +120,7 @@ public boolean sendCommand(String pCommand, OnResultCommandListener pOnResultCom
 	}
 	
 	public void cancelCommand() {
-		mOnResultCommandListener = null;
+		//mOnResultCommandListener = null;
 	}
 
 	@Override
@@ -103,18 +136,38 @@ public void onServerSocketError(Throwable e) {
 				R.string.err_connection_lost : R.string.err_check_following));
 		sendBroadcast(intent);
 	}
-
+	@Override
+	public void onServerSocketErrorToast(Throwable e) {
+		Intent intent = new Intent(getPackageName() + ".ApiEvent");
+		intent.putExtra("onServerSocketErrorToast", e.getMessage());
+		sendBroadcast(intent);
+	}
+	
 	@Override
 	public void onResultCommand(String pCmd) {
 		if (TextUtils.isEmpty(pCmd)) return;
 		String[] data = pCmd.split(",\\s*");
 		
+//Log.d("MyLine", MyElement.getName() + " mOnResultCommandListener = " + mOnResultCommandListener);
 		if (mOnResultCommandListener != null) {
 			mOnResultCommandListener.onResultCommand(data);
 			return;
 		}
 	}
-
+	
+	@Override
+	public void onResultCommandRetrieve24hourLogData(String pCmd) {
+		if (TextUtils.isEmpty(pCmd)) return;
+		String[] data = pCmd.split(",\\s*");
+		
+//Log.d("MyLine", MyElement.getName() + " mOnResultCommandListenerRetrieve24hourLogData = " + mOnResultCommandListenerRetrieve24hourLogData);
+		if (mOnResultCommandListenerRetrieve24hourLogData != null) {
+			mOnResultCommandListenerRetrieve24hourLogData.onResultCommand(data);
+			return;
+		}
+		else throw new MyException(MyElement.getName() + " mOnResultCommandListenerRetrieve24hourLogData == null");
+	}
+	
 	@Override
 	public void onLoginBegin() {
 		Log.d(TAG, "onLoginBegin");
@@ -128,9 +181,9 @@ public void onLoginBegin() {
 	public void onLoginComplete() {
 		Log.d(TAG, "onLoginComplete");
 		
-		//Intent intent = new Intent(getPackageName() + ".ApiEvent");
-		//intent.putExtra("onLoginComplete", true);
-		//sendBroadcast(intent);
+		Intent intent = new Intent(getPackageName() + ".ApiEvent");
+		intent.putExtra("onLoginComplete", true);
+		sendBroadcast(intent);
 	}
 	
 	public boolean isLoggedIn() {
@@ -138,11 +191,16 @@ public boolean isLoggedIn() {
 	}
 	
 	public CarData getCarData() {
+		if(BuildConfig.DEBUG && mCarData == null)
+			Log.e("MyLine", MyElement.getName() + " mCarData == null");
 		return mCarData;
 	}
 	
-	public CarData getLoggedInCarData() {
-		return mApiTask.isLoggedIn() ? mCarData : null;
+	public CarData getLogginedCarData() {
+		if(mApiTask.isLoggedIn())
+			return  mCarData;
+		Log.e("MyLine", MyElement.getName() + " return  null");
+		return  null;
 	}
 	
     public class ApiBinder extends Binder {
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/api/ApiTask.java b/OpenVehicleApp/src/com/openvehicles/OVMS/api/ApiTask.java
index 179c3374..27d27ffe 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/api/ApiTask.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/api/ApiTask.java
@@ -21,11 +21,14 @@
 import android.os.AsyncTask;
 import android.util.Base64;
 import android.util.Log;
+import android.widget.Toast;
 
 import com.openvehicles.OVMS.BaseApp;
 import com.openvehicles.OVMS.R;
 import com.openvehicles.OVMS.entities.CarData;
 import com.openvehicles.OVMS.entities.CarData.DataStale;
+import com.openvehicles.OVMS.utils.MyElement;
+import com.openvehicles.OVMS.utils.MyException;
 
 public class ApiTask extends AsyncTask<Void, Object, Void> {
 	private static final String TAG = "ApiTask";
@@ -35,13 +38,20 @@ public class ApiTask extends AsyncTask<Void, Object, Void> {
 	private PrintWriter mOutputstream;
 	private BufferedReader mInputstream;
 	private boolean isLoggedIn = false;
+	
+	//for debugging
+	private int mnRetrieve24hourLogData = 0;
+	
 	private final CarData mCarData;
 	private final OnUpdateStatusListener mListener;
 	private final Random sRnd = new Random();
-	private boolean isShuttingDown = false;
+	
+	//I think, I can use AsyncTask.isCancelled() function instead isShuttingDown. I need to test it.
+	//Andrej
+	private boolean isShuttingDown = true;
 
 	private enum MsgType {
-		msgUpdate, msgError, msgCommand, msgLoginBegin, msgLoginComplete
+		msgUpdate, msgError, msgErrorToast, msgCommand, msgCommandRetrieve24hourLogData, msgLoginBegin, msgLoginComplete
 	}
 	
 	public ApiTask(CarData pCarData, OnUpdateStatusListener pListener) {
@@ -56,9 +66,11 @@ public boolean isLoggedIn() {
 	
 	@Override
 	protected void onProgressUpdate(Object... pParam) {
+//Log.d("MyLine", MyElement.getName() + " mListener = " + mListener + " state = " + (MsgType) pParam[0]);
 		if (mListener == null) return;
 		
 		MsgType state = (MsgType) pParam[0];
+//Log.d("MyLine", MyElement.getName() + " state = " + state);
 		switch (state) {
 		case msgUpdate:
 			mListener.onUpdateStatus();
@@ -72,70 +84,98 @@ protected void onProgressUpdate(Object... pParam) {
 		case msgError:
 			mListener.onServerSocketError((Throwable)pParam[1]);
 			break;
+		case msgErrorToast:
+			mListener.onServerSocketErrorToast((Throwable)pParam[1]);
+			break;
 		case msgCommand:
 			mListener.onResultCommand((String)pParam[1]);
+			break;
+		case msgCommandRetrieve24hourLogData:
+			mListener.onResultCommandRetrieve24hourLogData((String)pParam[1]);
+			
+			mnRetrieve24hourLogData--;
+//Log.d("MyLine", MyElement.getName() + " mnRetrieve24hourLogData = " + mnRetrieve24hourLogData);
+			
 			break;
 		}
 	}
 
 	@Override
 	protected Void doInBackground(Void... params) {
-		String rx, msg;
-
-		while (!isShuttingDown) {
+		boolean boToast = false;
+		while(true)
+		{
 			try {
-				// (re-)open socket connection
-				connInit();
-
+				connInit(boToast);
+				if(mSocket == null)
+					return null;
+	
+				String rx, msg;
 				while (mSocket.isConnected()) {
-					// read & decrypt message
+					if (!mInputstream.ready()) {
+						String strError = "Read from " + mCarData.sel_server + " faled! Input stream is not ready."; 
+						Log.e(TAG, MyElement.getName() + " " + strError);
+						publishProgress(MsgType.msgError, new Exception(strError));
+						mSocket.close();
+						mSocket = null;
+						return null;
+					}
 					rx = mInputstream.readLine().trim();
 					msg = new String(mRxCipher.update(Base64.decode(rx, 0))).trim();
 					Log.d(TAG, String.format("RX: %s (%s)", msg, rx));
-
-					if (msg.substring(0, 5).equals("MP-0 ")) {
-						// is valid message (for protocol version 0):
-						handleMessage(msg.substring(5));
+	//if(msg.contains("c33,"))
+	//	Log.d("MyLine", String.format("RX: %s (%s)", msg, rx));
+					
+					int start = 5;//the offset of the first character of the command
+					if(msg.length() <= start)
+					{
+						String strError = " msg.length() <= " + start + " msg:" + msg + "\n\nProbably connection to server was lost. Ignore this response.";
+						Log.e("MyLine", MyElement.getName() + strError);
+					}
+					if (msg.substring(0, start).equals("MP-0 ")) {
+						
+						handleMessage(msg.substring(start));
 					} else {
 						Log.d(TAG, "Unknown protection scheme");
-						// sleep for 100 ms to prevent DoS by invalid data
-						try {
-							Thread.sleep(100);
-						} catch (InterruptedException e) {
-							// ignore
-						}
 					}
+					// short pause after receiving message
+					try {
+						Thread.sleep(100, 0);
+					} catch (InterruptedException e) {}
 				}
-
-				// reconnect if not shutting down:
-				continue;
-
 			} catch (SocketException e) {
 				// connection lost, attempt to reconnect
+				Log.e("MyLine", MyElement.getName() + " SocketException: " + e.getMessage());
 				try {
+if(mnRetrieve24hourLogData != 0)
+{
+	//throw new MyException(MyElement.getName() + " mnRetrieve24hourLogData != 0");
+	Log.d("MyLine", MyElement.getName() + " mnRetrieve24hourLogData = " + mnRetrieve24hourLogData);
+}
 					mSocket.close();
 					mSocket = null;
 				} catch (Exception ex) {
-					// ignore
 				}
-				continue;
-
+				if (!isShuttingDown)
+				{
+					publishProgress(MsgType.msgErrorToast, e);
+//					connInit();
+				}
+				else break;
 			} catch (IOException e) {
-				// reader closed or I/O error
+				Log.e("MyLine", MyElement.getName() + " IOException: " + e.getMessage());
 				e.printStackTrace();
 				publishProgress(MsgType.msgError, e);
 				break;
-
 			} catch (Exception e) {
-				// other error
+				Log.e("MyLine", MyElement.getName() + " Exception: " + e.getMessage());
 				e.printStackTrace();
-				publishProgress(MsgType.msgError, e);
-				break;
-
+//				break;
 			}
+			boToast = true;
 		}
 
-		Log.d(TAG, "Terminating AsyncTask");
+		Log.d("MyLine", MyElement.getName() + " exit.");
 		return null;
 	}
 	
@@ -145,6 +185,12 @@ public void ping() {
 		Log.d(TAG, msg);
 	}
 
+	//For debugging
+	public void socketClose() throws IOException
+	{
+		mSocket.close();
+	}
+	
 	public void connClose() {
 		try {
 			Log.d(TAG, "connClose() requested");
@@ -164,15 +210,33 @@ public boolean sendCommand(String command) {
 			return false;
 		}
 
-		try {
-			mOutputstream.println(Base64.encodeToString(mTxCipher.update(command.getBytes()), Base64.NO_WRAP));
-		} catch (Exception e) {
-			publishProgress(MsgType.msgError, e);
+		AsyncTask.Status status = getStatus();
+		String strError;
+		switch(status)
+		{
+		case PENDING://Indicates that the task has not been executed yet.
+			strError = "task has not been executed yet";
+			break;
+		case RUNNING://Indicates that the task is running.
+			try {
+				mOutputstream.println(Base64.encodeToString(mTxCipher.update(command.getBytes()), Base64.NO_WRAP));
+			} catch (Exception e) {
+				publishProgress(MsgType.msgError, e);
+			}
+			return true;
+		case FINISHED://Indicates that {@link AsyncTask#onPostExecute} has finished.
+			strError = "task has finished";
+			break;
+		default:
+			strError = "unknown task status: " + status;
+			break;
 		}
-		return true;
+		throw new MyException(MyElement.getName() + " Invalid status of ApiTask: " + strError);
+//		return true;
 	}
 	
-	private void connInit() {
+	private void connInit(boolean boToast)
+	{
 		isLoggedIn = false;
 		publishProgress(MsgType.msgLoginBegin);
 		
@@ -191,89 +255,136 @@ private void connInit() {
 		}
 
 		byte[] client_token = client_tokenString.getBytes();
-		try {
-			Mac client_hmac = Mac.getInstance("HmacMD5");
-			javax.crypto.spec.SecretKeySpec sk = new javax.crypto.spec.SecretKeySpec(
-					shared_secret.getBytes(), "HmacMD5");
-			client_hmac.init(sk);
-			byte[] hashedBytes = client_hmac.doFinal(client_token);
-			String client_digest = Base64.encodeToString(hashedBytes, Base64.NO_WRAP);
-
-			mSocket = new Socket(mCarData.sel_server, 6867);
-
-			mOutputstream = new PrintWriter(new BufferedWriter(new OutputStreamWriter(mSocket.getOutputStream())), true);
-			Log.d(TAG, String.format("TX: MP-A 0 %s %s %s", client_tokenString, client_digest, vehicleID));
-
-			mOutputstream.println(String.format("MP-A 0 %s %s %s", client_tokenString, client_digest, vehicleID));
-
-			mInputstream = new BufferedReader(new InputStreamReader(mSocket.getInputStream()));
-
-			// get server welcome message
-			String[] serverWelcomeMsg = null;
+		while(true)
+		{
+			String strError;
 			try {
-				serverWelcomeMsg = mInputstream.readLine().trim().split("[ ]+");
-			} catch (Exception e) {
-				Log.e(TAG, "ERROR response server welcome message", e);
-				publishProgress(MsgType.msgError, e);
+				if(isCancelled())
+					return;
+				Mac client_hmac = Mac.getInstance("HmacMD5");
+				javax.crypto.spec.SecretKeySpec sk = new javax.crypto.spec.SecretKeySpec(
+						shared_secret.getBytes(), "HmacMD5");
+				client_hmac.init(sk);
+				byte[] hashedBytes = client_hmac.doFinal(client_token);
+				String client_digest = Base64.encodeToString(hashedBytes, Base64.NO_WRAP);
+	
+				mSocket = new Socket(mCarData.sel_server, 6867);
+	
+				mOutputstream = new PrintWriter(new BufferedWriter(new OutputStreamWriter(mSocket.getOutputStream())), true);
+				Log.d(TAG, String.format("TX: MP-A 0 %s %s %s", client_tokenString, client_digest, vehicleID));
+	
+				mOutputstream.println(String.format("MP-A 0 %s %s %s", client_tokenString, client_digest, vehicleID));
+	
+				mInputstream = new BufferedReader(new InputStreamReader(mSocket.getInputStream()));
+	
+				// get server welcome message
+/*				
+				if (!mInputstream.ready()) {
+					strError = "Open " + mCarData.sel_server + " faled! Input stream is not ready."; 
+					Log.e("MyLine", MyElement.getName() + " " + strError);
+					publishProgress(MsgType.msgError, new Exception(strError));
+					mSocket.close();
+					mSocket = null;
+					return;
+				}
+*/				
+				String[] serverWelcomeMsg = null;
+				try {
+					String strLine = mInputstream.readLine();
+					if(strLine == null)
+					{
+						strError = "ERROR response server welcome message. Inputstream.readLine() == null";
+						Log.e("MyLine", MyElement.getName() + strError);
+						publishProgress(MsgType.msgError, new Exception(strError));
+						mSocket.close();
+						mSocket = null;
+						return;
+						
+					}
+					serverWelcomeMsg = strLine.trim().split("[ ]+");
+				} catch (Exception e) {
+					Log.e("MyLine", MyElement.getName() + "ERROR response server welcome message", e);
+					publishProgress(MsgType.msgError, e);
+					mSocket.close();
+					mSocket = null;
+					return;
+				}
+				Log.d(TAG, String.format("RX: %s %s %s %s", serverWelcomeMsg[0], serverWelcomeMsg[1],
+						serverWelcomeMsg[2], serverWelcomeMsg[3]));
+	//Log.d("MyLine", String.format("RX: %s %s %s %s", serverWelcomeMsg[0], serverWelcomeMsg[1], serverWelcomeMsg[2], serverWelcomeMsg[3]));
+	
+				String server_tokenString = serverWelcomeMsg[2];
+				byte[] server_token = server_tokenString.getBytes();
+				byte[] server_digest = Base64.decode(serverWelcomeMsg[3], 0);
+	
+				if (!Arrays.equals(client_hmac.doFinal(server_token), server_digest)) {
+					// server hash failed
+					Log.d(TAG, String.format(
+							"Server authentication failed. Expected %s Got %s",
+							Base64.encodeToString(client_hmac
+									.doFinal(serverWelcomeMsg[2].getBytes()),
+									Base64.NO_WRAP), serverWelcomeMsg[3]));
+				} else {
+					Log.d(TAG, "Server authentication OK.");
+				}
+	
+				// generate client_key
+				String server_client_token = server_tokenString + client_tokenString;
+				byte[] client_key = client_hmac.doFinal(server_client_token.getBytes());
+	
+				Log.d(TAG, String.format("Client version of the shared key is %s - (%s) %s",
+						server_client_token, toHex(client_key).toLowerCase(),
+						Base64.encodeToString(client_key, Base64.NO_WRAP)));
+	
+				// generate ciphers
+				mRxCipher = Cipher.getInstance("RC4");
+				mRxCipher.init(Cipher.DECRYPT_MODE, new javax.crypto.spec.SecretKeySpec(client_key, "RC4"));
+	
+				mTxCipher = Cipher.getInstance("RC4");
+				mTxCipher.init(Cipher.ENCRYPT_MODE, new javax.crypto.spec.SecretKeySpec(client_key, "RC4"));
+	
+				// prime ciphers
+				String primeData = "";
+				for (int cnt = 0; cnt < 1024; cnt++) primeData += "0";
+	
+				mRxCipher.update(primeData.getBytes());
+				mTxCipher.update(primeData.getBytes());
+	
+				Log.i(TAG, String.format("Connected to %s. Ciphers initialized. Listening...", mCarData.sel_server));
+	
+				//OLD loginComplete();
+				isLoggedIn = true;
+				if(boToast)
+					publishProgress(MsgType.msgLoginComplete);
 				return;
+			} catch (UnknownHostException e) {
+				e.printStackTrace();
+//				publishProgress(boToast ? MsgType.msgErrorToast : MsgType.msgError, e);
+				strError = e.getMessage();
+			} catch (IOException e) {
+				e.printStackTrace();
+//				publishProgress(boToast ? MsgType.msgErrorToast : MsgType.msgError, e);
+				strError = e.getMessage();
+			} catch (NullPointerException e) {
+				// notifyServerSocketError(e);
+				e.printStackTrace();
+				strError = e.getMessage();
+			} catch (Exception e) {
+				e.printStackTrace();
+				strError = e.getMessage();
 			}
-			Log.d(TAG, String.format("RX: %s %s %s %s", serverWelcomeMsg[0], serverWelcomeMsg[1],
-					serverWelcomeMsg[2], serverWelcomeMsg[3]));
-
-			String server_tokenString = serverWelcomeMsg[2];
-			byte[] server_token = server_tokenString.getBytes();
-			byte[] server_digest = Base64.decode(serverWelcomeMsg[3], 0);
-
-			if (!Arrays.equals(client_hmac.doFinal(server_token), server_digest)) {
-				// server hash failed
-				Log.d(TAG, String.format(
-						"Server authentication failed. Expected %s Got %s",
-						Base64.encodeToString(client_hmac
-								.doFinal(serverWelcomeMsg[2].getBytes()),
-								Base64.NO_WRAP), serverWelcomeMsg[3]));
-			} else {
-				Log.d(TAG, "Server authentication OK.");
+			publishProgress(boToast ? MsgType.msgErrorToast : MsgType.msgError, new Exception(strError));
+			boToast = true;
+//			mSocket.close();
+			mSocket = null;
+			Log.e("MyLine", MyElement.getName() + strError);
+			try {
+				Thread.sleep(10000, 0);//Wait ten seconds and try to connect again
+			} catch (InterruptedException e)
+			{
+				Log.e("MyLine", MyElement.getName() + e.getMessage());
 			}
-
-			// generate client_key
-			String server_client_token = server_tokenString + client_tokenString;
-			byte[] client_key = client_hmac.doFinal(server_client_token.getBytes());
-
-			Log.d(TAG, String.format("Client version of the shared key is %s - (%s) %s",
-					server_client_token, toHex(client_key).toLowerCase(),
-					Base64.encodeToString(client_key, Base64.NO_WRAP)));
-
-			// generate ciphers
-			mRxCipher = Cipher.getInstance("RC4");
-			mRxCipher.init(Cipher.DECRYPT_MODE, new javax.crypto.spec.SecretKeySpec(client_key, "RC4"));
-
-			mTxCipher = Cipher.getInstance("RC4");
-			mTxCipher.init(Cipher.ENCRYPT_MODE, new javax.crypto.spec.SecretKeySpec(client_key, "RC4"));
-
-			// prime ciphers
-			String primeData = "";
-			for (int cnt = 0; cnt < 1024; cnt++) primeData += "0";
-
-			mRxCipher.update(primeData.getBytes());
-			mTxCipher.update(primeData.getBytes());
-
-			Log.i(TAG, String.format("Connected to %s. Ciphers initialized. Listening...", mCarData.sel_server));
-
-			//OLD loginComplete();
-			isLoggedIn = true;
-			publishProgress(MsgType.msgLoginComplete);
-		} catch (UnknownHostException e) {
-			e.printStackTrace();
-			publishProgress(MsgType.msgError, e);
-		} catch (IOException e) {
-			e.printStackTrace();
-			publishProgress(MsgType.msgError, e);
-		} catch (NullPointerException e) {
-			// notifyServerSocketError(e);
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		} 
+		}
 	}
 	
 	private void handleMessage(String msg) {
@@ -405,25 +516,6 @@ else if (mCarData.car_stale_chargetimer_raw == 0)
 			if (dataParts.length >= 19) {
 				mCarData.car_CAC = Double.parseDouble(dataParts[18]);
 			}
-			if (dataParts.length >= 27) {
-				mCarData.car_chargefull_minsremaining = Integer.parseInt(dataParts[19]);
-				mCarData.car_chargelimit_minsremaining = Integer.parseInt(dataParts[20]);
-				mCarData.car_chargelimit_rangelimit_raw = Integer.parseInt(dataParts[21]);
-				mCarData.car_chargelimit_rangelimit = String.format("%d%s",
-						mCarData.car_chargelimit_rangelimit_raw, mCarData.car_distance_units);
-				mCarData.car_chargelimit_soclimit = Integer.parseInt(dataParts[22]);
-				mCarData.car_coolingdown = Integer.parseInt(dataParts[23]);
-				mCarData.car_cooldown_tbattery = Integer.parseInt(dataParts[24]);
-				mCarData.car_cooldown_timelimit = Integer.parseInt(dataParts[25]);
-				mCarData.car_chargeestimate = Integer.parseInt(dataParts[26]);
-			}
-			if (dataParts.length >= 30) {
-				mCarData.car_chargelimit_minsremaining_range = Integer.parseInt(dataParts[27]);
-				mCarData.car_chargelimit_minsremaining_soc = Integer.parseInt(dataParts[28]);
-				mCarData.car_max_idealrange_raw = Integer.parseInt(dataParts[29]);
-				mCarData.car_max_idealrange = String.format("%d%s",
-						mCarData.car_max_idealrange_raw, mCarData.car_distance_units);
-			}
 
 			Log.v(TAG, "Notify Vehicle Status Update: " + mCarData.sel_vehicleid);
 			
@@ -508,9 +600,9 @@ else if (mCarData.car_stale_gps_raw == 0)
 					}
 				
 				mCarData.car_tripmeter_raw = Integer.parseInt(dataParts[6]);
-				mCarData.car_tripmeter = String.format("%.1f%s",(float)mCarData.car_tripmeter_raw/10,mCarData.car_distance_units);
+				mCarData.car_tripmeter = String.format("%d%s",mCarData.car_tripmeter_raw,mCarData.car_distance_units);
 				mCarData.car_odometer_raw = Integer.parseInt(dataParts[7]);
-				mCarData.car_odometer = String.format("%.1f%s",(float)mCarData.car_odometer_raw/10,mCarData.car_distance_units);
+				mCarData.car_odometer = String.format("%d%s",mCarData.car_odometer_raw,mCarData.car_distance_units);
 				mCarData.car_speed_raw = Integer.parseInt(dataParts[8]);
 				mCarData.car_speed = String.format("%d%s", mCarData.car_speed_raw,mCarData.car_speed_units);
 				
@@ -552,12 +644,6 @@ else if (mCarData.car_stale_ambient_temp_raw == 0)
 					mCarData.car_doors4_raw = dataField;
 					mCarData.car_alarm_sounding = ((dataField & 0x02) == 0x02);
 				}
-				if (dataParts.length >= 18) {
-					mCarData.car_12vline_ref = Double.parseDouble(dataParts[16]);
-					dataField = Integer.parseInt(dataParts[17]);
-					mCarData.car_doors5_raw = dataField;
-					mCarData.car_charging_12v = ((dataField & 0x10) == 0x10);
-				}
 
 				publishProgress(MsgType.msgUpdate);
 			}
@@ -661,7 +747,15 @@ else if (mCarData.car_stale_tpms_raw == 0)
 		}
 		case 'c': {
 			Log.i(TAG, "c MSG Validated");
-			publishProgress(MsgType.msgCommand, cmd);
+			MsgType msgType = MsgType.msgCommand;
+			if(cmd.indexOf("33,") == 0)
+				//cmd = "33,0,58,223,L,2014-11-13 03:35:52,47.288552,-123.054592,165,25,1,120"
+				msgType = MsgType.msgCommandRetrieve24hourLogData;
+			
+			mnRetrieve24hourLogData++;
+//Log.d("MyLine", MyElement.getName() + " mnRetrieve24hourLogData = " + mnRetrieve24hourLogData);
+
+			publishProgress(msgType, cmd);
 			break;
 		}
 		
@@ -676,7 +770,9 @@ private String toHex(byte[] bytes) {
 	public interface OnUpdateStatusListener {
 		public void onUpdateStatus();
 		public void onServerSocketError(Throwable e);
+		public void onServerSocketErrorToast(Throwable e);
 		public void onResultCommand(String pCmd);
+		public void onResultCommandRetrieve24hourLogData(String pCmd);
 		public void onLoginBegin();
 		public void onLoginComplete();
 	}
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/ApiActivity.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/ApiActivity.java
index 9dda2935..d2d0fe07 100755
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/ApiActivity.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/ApiActivity.java
@@ -12,20 +12,24 @@
 import com.openvehicles.OVMS.api.ApiService.ApiBinder;
 
 public class ApiActivity extends SherlockFragmentActivity {
-	private ApiService mApiService;
+	private static ApiService mApiService;
 	
 	@Override
 	protected void onStart() {
 		super.onStart();
-        bindService(new Intent(this, ApiService.class), mConnection, Context.BIND_AUTO_CREATE);
+		if(mApiService == null)
+			bindService(new Intent(this, ApiService.class), mConnection, Context.BIND_AUTO_CREATE);
 	}
 	
 	@Override
 	protected void onStop() {
+/*
+		 * Currently service is not disconnected never, because I do not know where to do it		
 		if (mApiService != null) {
         	unbindService(mConnection);
         	mApiService = null;
         }
+*/        
 		super.onStop();
 	}
 	
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/BaseApi.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/BaseApi.java
new file mode 100644
index 00000000..ee34a7d9
--- /dev/null
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/BaseApi.java
@@ -0,0 +1,110 @@
+package com.openvehicles.OVMS.ui;
+
+import com.openvehicles.OVMS.api.ApiService;
+import com.openvehicles.OVMS.api.OnResultCommandListener;
+import com.openvehicles.OVMS.utils.MyElement;
+import com.openvehicles.OVMS.utils.MyException;
+
+import android.app.Activity;
+class BaseApi
+{
+	private static Activity mMainActivity;
+	
+	public static String mKeyChargingStations = "check";
+	public static String mKeyProgress = "progress";
+	public static String mKeyTurnLoggedPath = "TurnLoggedPath";
+	public static String mKeyAveragedPointsCircleRadius = "AveragedPointsCircleRadius";
+	
+	
+	public static void SetMainActivity(Activity activity)
+	{
+		if (activity instanceof ApiActivity)
+		{
+			mMainActivity = activity;
+			return;
+		}
+        throw new MyException(MyElement.getName() + " failed! " + activity.getLocalClassName() + " activity is not instanceof ApiActivity");
+	}
+	public static Activity getActivity()
+	{
+		if(mMainActivity == null)
+			throw new MyException(MyElement.getName() + " mMainActivity == null");
+		return mMainActivity;
+	}
+	
+	// Commands and expected responses for message types "C" and "c".
+	// See "Commands and Expected Responses" header of the
+	// https://github.com/openvehicles/Open-Vehicle-Monitoring-System/blob/master/docs/OVMS_Protocol.docx
+	// for details.
+	//
+	// See "commands and responses.txt" document also
+	
+	protected static final int mnCR_Retrieve_24_Hour_Log_Data = 33;//Retrieve 24-hour log data
+	//For details see email:
+	//Date: Tue, 30 Sep 2014 14:14:01 -0700
+	//From: Lee Howard <lee.howard@mainpine.com>
+	//Subject: Re: Samsung Galaxy S5
+
+	protected static final int mnCR_My_Tracks = 50;//Get car's track list
+	protected static final int mnCR_My_Track = 51;//Get a track, saved before
+
+	protected void sendCommand(int pResIdMessage, String pCommand,
+			OnResultCommandListener pOnResultCommandListener) {
+		ApiService service = getService();
+		if (service == null)
+		{
+//			throw new IllegalStateException(MyElement.getName() + " failed!");
+			return;
+		}
+		
+		//////////////////////////////////////////////
+		// server's response simulator. For debugging
+		
+		String[] arrayCommand = pCommand.split(",\\s*");
+		switch(Integer.parseInt(arrayCommand[0]))
+		{
+		case mnCR_My_Tracks://50
+//String[] data = "111,222,\"333\"".split(",\\s*");
+			{
+				String[] data = "Track 1".split(",\\s*");
+				pOnResultCommandListener.onResultCommand(data);
+			}
+			{
+				String[] data = "Track 2".split(",\\s*");
+				pOnResultCommandListener.onResultCommand(data);
+			}
+			return;
+		}
+		
+		// server's response simulator
+		/////////////////////////////////////////////////
+		
+		service.sendCommand(pResIdMessage, pCommand, pOnResultCommandListener);
+	}
+	
+	protected void sendCommandRetrieve24hourLogData(int pResIdMessage, String pCommand,
+			OnResultCommandListener pOnResultCommandListener) {
+		ApiService service = getService();
+		if (service == null)
+			return;
+		service.sendCommandRetrieve24hourLogData(pResIdMessage, pCommand, pOnResultCommandListener);
+	}
+	
+	protected void cancelCommand() {
+		ApiService service = getService();
+		if (service == null)
+			return;
+		service.cancelCommand();
+	}
+	
+	private ApiService getService() {
+		Activity activity = getActivity();
+		if (activity instanceof ApiActivity) {
+			ApiService apiService = ((ApiActivity) activity).getService();
+			if(apiService == null)
+		        throw new MyException(MyElement.getName() + " failed! apiService == null");
+			return apiService;
+		}
+        throw new MyException(MyElement.getName() + ".getService() failed!");
+	}
+}
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/BaseFragment.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/BaseFragment.java
index b3227970..1203c601 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/BaseFragment.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/BaseFragment.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.view.LayoutInflater;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -12,6 +13,7 @@
 import com.openvehicles.OVMS.api.OnResultCommandListener;
 import com.openvehicles.OVMS.entities.CarData;
 import com.openvehicles.OVMS.ui.utils.ProgressOverlay;
+import com.openvehicles.OVMS.utils.MyElement;
 
 import java.util.HashMap;
 
@@ -80,6 +82,9 @@ public void hideProgressOverlay() {
 			mProgressOverlay.hide();
 	}
 
+	private static final String TAG = "OVMS";
+	
+	private BaseApi mBaseApi;
 
 	@Override
 	public void onStart() {
@@ -132,9 +137,38 @@ public View findViewById(int pResId) {
 		return getView().findViewById(pResId);
 	}
 
+	// Commands and expected responses for message types "C" and "c".
+	// See "Commands and Expected Responses" header of the
+	// https://github.com/openvehicles/Open-Vehicle-Monitoring-System/blob/master/docs/OVMS_Protocol.docx
+	// for details. 
 	public void sendCommand(int pResIdMessage, String pCommand,
 							OnResultCommandListener pOnResultCommandListener) {
 		sendCommand(getString(pResIdMessage), pCommand, pOnResultCommandListener);
+		try
+		{
+			if(mBaseApi == null)
+				mBaseApi = new BaseApi();
+			mBaseApi.sendCommand(pResIdMessage, pCommand, pOnResultCommandListener);
+		}
+		catch (Exception e)
+		{
+			Log.e(TAG, MyElement.getName() + " " + e);
+		}
+	}
+	
+	// Commands and expected responses for retrieve 24 hour log data
+	public void sendCommandRetrieve24hourLogData(int pResIdMessage, String pCommand,
+			OnResultCommandListener pOnResultCommandListener) {
+		try
+		{
+			if(mBaseApi == null)
+				mBaseApi = new BaseApi();
+			mBaseApi.sendCommandRetrieve24hourLogData(pResIdMessage, pCommand, pOnResultCommandListener);
+		}
+		catch (Exception e)
+		{
+			Log.e(TAG, MyElement.getName() + " " + e);
+		}
 	}
 
 	public void sendCommand(String pMessage, String pCommand,
@@ -172,10 +206,12 @@ public void changeCar(CarData pCarData) {
 	}
 
 	public ApiService getService() {
-		Activity activity = getActivity();
+//		Activity activity = getActivity();
+		Activity activity = BaseApi.getActivity();
 		if (activity instanceof ApiActivity) {
 			return ((ApiActivity) activity).getService();
 		}
+		Log.e("MyLine", MyElement.getName() + " return null");
 		return null;
 	}
 
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/BaseFragmentActivity.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/BaseFragmentActivity.java
index 8de2c039..16b4d9f5 100755
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/BaseFragmentActivity.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/BaseFragmentActivity.java
@@ -8,6 +8,7 @@
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.text.TextUtils;
+import android.view.View;
 import android.widget.FrameLayout;
 
 import com.openvehicles.OVMS.R;
@@ -17,6 +18,11 @@ public class BaseFragmentActivity extends ApiActivity {
 	private static final String EXT_ONLY_ORIENTATION = "ext_only_orientation";
 	private static final String EXT_FOR_RESULT = "ext_for_result";
 	
+	// Called when the user clicks the Default button in the map Settings fragment
+	public void defaultSettings(View view) {
+		((Settings)getCurrentFragment()).Default();
+	}
+	
 	public static void show(Context pContext, Class<? extends Fragment> pClazz,
 			Bundle pArgs, int pOnlyOrientation) {
 		Intent intent = new Intent(pContext, BaseFragmentActivity.class);
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java
index ff0c9bdb..e18e9da8 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java
@@ -1,7 +1,13 @@
 package com.openvehicles.OVMS.ui;
 
 import java.text.DecimalFormat;
-import java.util.List;
+import java.util.*;
+
+import net.sf.geographiclib.Geodesic;
+import net.sf.geographiclib.GeodesicData;
+import pl.mg6.android.maps.extensions.GoogleMap.InfoWindowAdapter;
+import pl.mg6.android.maps.extensions.Polyline;
+import pl.mg6.android.maps.extensions.PolylineOptions;
 
 import pl.mg6.android.maps.extensions.CircleOptions;
 import pl.mg6.android.maps.extensions.ClusterGroup;
@@ -12,11 +18,17 @@
 import pl.mg6.android.maps.extensions.MarkerOptions;
 import pl.mg6.android.maps.extensions.SupportMapFragment;
 
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.app.Dialog;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.database.Cursor;
 import android.graphics.Bitmap;
+import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Paint;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
@@ -24,32 +36,60 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
 
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
+import com.actionbarsherlock.view.SubMenu;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.LatLngBounds;
+import com.jjoe64.graphview.CustomDraw;
+import com.jjoe64.graphview.CustomLabelFormatter;
+import com.jjoe64.graphview.GraphViewDataInterface;
+import com.jjoe64.graphview.GraphViewSeries;
+import com.jjoe64.graphview.LineGraphView;
+import com.jjoe64.graphview.TouchEvent;
 import com.luttu.AppPrefes;
 import com.openvehicles.OVMS.R;
 import com.openvehicles.OVMS.entities.CarData;
 import com.openvehicles.OVMS.ui.GetMapDetails.afterasytask;
+//import com.openvehicles.OVMS.ui.Settings.Updateclust;
+import com.openvehicles.OVMS.ui.Settings.UpdateclustLoggedPath;
 import com.openvehicles.OVMS.ui.utils.Database;
 import com.openvehicles.OVMS.ui.utils.DemoClusterOptionsProvider;
 import com.openvehicles.OVMS.ui.utils.MarkerGenerator;
 import com.openvehicles.OVMS.ui.utils.Ui;
+import com.openvehicles.OVMS.utils.MyAlertDialog;
+import com.openvehicles.OVMS.utils.MyDate;
+import com.openvehicles.OVMS.utils.MyElement;
+import com.openvehicles.OVMS.utils.MyException;
+import com.openvehicles.OVMS.utils.MyTimer;
+import com.openvehicles.OVMS.utils.MyTimerTimeout;
+import com.openvehicles.OVMS.utils.OnClickPositiveButton;
 
 public class FragMap extends BaseFragment implements OnInfoWindowClickListener,
-		afterasytask, OnClickListener, Settings.UpdateMap {
+		afterasytask, OnClickListener, Settings.UpdateMap
+		, UpdateclustLoggedPath
+		, pl.mg6.android.maps.extensions.GoogleMap.OnMyLocationButtonClickListener
+		, pl.mg6.android.maps.extensions.GoogleMap.OnMapClickListener
+{
 	private static final String TAG = "FragMap";
 
-	private GoogleMap map;
+	private String mstrError;
+	private static GoogleMap map;//http://developer.android.com/reference/com/google/android/gms/maps/GoogleMap.html
 	Database database;
 	String slat, slng;
 	AppPrefes appPrefes;
@@ -58,6 +98,7 @@ public class FragMap extends BaseFragment implements OnInfoWindowClickListener,
 	private static final double[] CLUSTER_SIZES = new double[] { 360, 180, 90, 45, 22 };
 	View rootView;
 	Menu optionsMenu;
+	private ViewGroup mcontainer;
 	boolean autotrack = true;
 	static Settings.UpdateMap updateMap;
 
@@ -66,14 +107,911 @@ public class FragMap extends BaseFragment implements OnInfoWindowClickListener,
 	static int maxrange = 160;
 	static String distance_units = "KM";
 
+	protected static UpdateclustLoggedPath updateclustLoggedPath;
+	private static MyTimer mmyTimer;
+	private enum Retrieve_24_Hour_Log_Data_State {
+		NoRetrieve// = 0;
+		, Retrieving// = 1;
+		, LastPoint// = 2;
+		, Error// = 3;
+		}
+	private static Retrieve_24_Hour_Log_Data_State mRetrieve_24_Hour_Log_Data_State = Retrieve_24_Hour_Log_Data_State.NoRetrieve;
+	
+	public void onServerSocketError(String strError)
+	{
+		mstrError = strError;
+		switch(mRetrieve_24_Hour_Log_Data_State)
+		{
+		case Retrieving:
+			mRetrieve_24_Hour_Log_Data_State = Retrieve_24_Hour_Log_Data_State.Error;
+		case Error:
+			lastPoint();
+			break;
+		case NoRetrieve:
+		case LastPoint:
+			break;
+		}
+	}
+	
+	public void onLoginComplete()
+	{
+		switch(mRetrieve_24_Hour_Log_Data_State)
+		{
+		case Error://Retrieve of 24 hour log data failed.
+        	new MyAlertDialog(getActivity()
+        			, String.format(getString(R.string.Retrieve_24_Hour_Log_Data_again, mstrError))//Retrieve the logged path failed!\n\n%s\n\nProbably connecting to OVMS server is unstable.\n\nTry to retrieve again?
+        			, new OnClickPositiveButton()
+            	{
+	            @Override
+	            public void onClick()
+	            	{//Try to retrieve of 24 hour log data again
+		    			HideLoggedPath();
+		    			ShowLoggedPath();
+	            	}
+            	}
+        	);
+			break;
+		case Retrieving:
+		case NoRetrieve:
+		case LastPoint:
+			break;
+		}
+	}
+	
+	class GraphViewData implements GraphViewDataInterface
+	{
+		public GraphViewData(MyDate date, LatLng latLng)
+		{
+			mlatLng = latLng;
+			
+			if(date == null)
+				return;//Unknown timestamp of the current car location
+			
+			GraphViewDataInterface[] graphViewDataInterface = FragMap.mloggedPath.mgraphViewSeries.getGraphViewDataInterface();
+			int nIndex = graphViewDataInterface.length;
+			if(nIndex >= 1)
+			{//not first point 
+				Date datePrev = getPrevPointWithDateNotNull().getDate();//Timestamp of the previous point of the logged path
+				if(datePrev == null)
+					throw new MyException(MyElement.getName() + " datePrev == null");
+				if(date.getTime() <= datePrev.getTime())
+				{
+	//				throw new MyException(MyElement.getName() + " current timestamp = " + date.toString() + " <= previous timestamp = " + datePrev.toString());
+					Log.e("MyLine", MyElement.getName() + " current timestamp = " + date.toString() + " <= previous timestamp = " + datePrev.toString());
+					return;
+				}
+			}
+			mdate = date;
+		}
+		
+		//X - time
+		private MyDate mdate;//Timestamp of the current point of the logged path
+		private MyDate getDate()
+		{ return mdate;}
+		
+		// Sometimes mdate == null because timestamp is incorrect for current car location.
+		// I am waiting from Lee new version of the "Car location message 0x4C "L"" command with timestamp of the car location. See:
+		//
+		//My plan for near future.
+		//From:	Andrej Hristoliubov <anhr@mail.ru> 
+		//To:	Lee Howard
+		//19 February 2015, 7:37
+		//
+		// email for details
+		//
+		// I find a previous path point with date not equal null
+		private GraphViewData getPrevPointWithDateNotNull()
+		{
+			GraphViewDataInterface[] graphViewDataInterface = FragMap.mloggedPath.mgraphViewSeries.getGraphViewDataInterface();
+			for(int nIndex = graphViewDataInterface.length - 1; nIndex >= 0; nIndex--)
+			{
+				GraphViewData graphViewData = ((GraphViewData)(graphViewDataInterface[nIndex])); 
+				if(graphViewData.getDate() != null)
+					return graphViewData; 
+			}
+			throw new MyException(MyElement.getName() + " failed!");
+		}
+		
+		public double getX()
+		{
+			if(mdate != null)
+				return mdate.getTime();
+			
+			return getPrevPointWithDateNotNull().getDate().getTime();
+		}
+		public long//time between point and current point of the logged path in milliseconds. 
+			getTimeToPoint(
+					long ltime//time of point
+				)
+		{
+			if(mdate == null)
+				throw new MyException(MyElement.getName() + " mdate == null");
+			return mdate.getTime() - ltime;
+		}
+		
+		//Y - speed
+		private LatLng mlatLng;
+		private double mdDistance;//Distance between start point and current point of the logged path.
+		public LatLng getLatLng()
+		{ return mlatLng;}
+		
+		private double//speed in km or miles per hour
+			getSpeed(
+					GraphViewData point//previous car location
+				)
+		{
+			if(point.getDate() == null)
+			{
+				Log.e(TAG, MyElement.getName() + " point.getDate() == null");
+				return 0d;
+			}
+			if(mdate == null)
+			{
+//				throw new MyException(MyElement.getName() + " mdate == null");
+				Log.e(TAG, MyElement.getName() + " mdate == null");
+				return 0d;
+			}
+			long ltime = mdate.getTime() - point.getDate().getTime();//milliseconds
+			if(ltime == 0)
+				throw new MyException(MyElement.getName() + " time == 0. nIndex = " + getIndex());
+			if(ltime < 0)
+				ltime = - ltime;
+			double time = ((double)ltime)/(1000d * 60d * 60d);//hours
+			
+			double dspeed = (GetDistance(point.mlatLng, mlatLng) / time);//km or miles per hour 
+			//Log.d("MyLine", MyElement.getName() + " ddistance = " + ddistance + ", time = " + time + ", speed = " + dspeed);
+			//		+ ", g.s12 = " + g.s12 + ", mdate.getTime() = " + mdate.getTime() + ", mdatePrev.getTime() = " + mdatePrev.getTime());
+			return dspeed;
+		}
+		
+		private double//speed in km per hour
+			getSpeedKmPerHour(
+					GraphViewData point//previous car location
+				)
+		{
+			return getSpeed(point) / (carDistanceUnitsIsMiles() ? mmilesInKm : 1);
+		}
+		
+		private int getIndex()
+		{
+			GraphViewDataInterface[] graphViewDataInterface = FragMap.mloggedPath.mgraphViewSeries.getGraphViewDataInterface();
+			for(int nIndex = 0; nIndex < graphViewDataInterface.length; nIndex++)
+			{
+				if(graphViewDataInterface[nIndex].equals(this))
+					return nIndex;
+			}
+			throw new MyException(MyElement.getName() + " failed!");
+//			return -1;//error
+		}
+			
+		public double getY()
+		{
+			try
+			{
+				GraphViewDataInterface[] graphViewDataInterface = FragMap.mloggedPath.mgraphViewSeries.getGraphViewDataInterface();
+				int nIndex = getIndex();
+				int nLoggedPathPointsCount = graphViewDataInterface.length;
+				if(nIndex == 0)
+				{//first point
+					if(nLoggedPathPointsCount == 1)
+						return 0d;
+					return getSpeed((GraphViewData)(graphViewDataInterface[nIndex + 1]));
+				}
+				if(nIndex == (nLoggedPathPointsCount - 1))
+				{//last point
+					return getSpeed((GraphViewData)(graphViewDataInterface[nIndex - 1]));
+				}
+				return (
+							getSpeed((GraphViewData)(graphViewDataInterface[nIndex + 1]))
+							+ 
+							getSpeed((GraphViewData)(graphViewDataInterface[nIndex - 1]))
+						)
+						/ 2;
+			}
+			catch (MyException e)
+			{
+				Log.e(TAG, MyElement.getName() + " " + e);
+			}
+			return 0d;//error
+		}
+		public double//Distance between first and current point of the logged path
+			setDistance
+				(
+					double dDistance//Distance between previous and current point of the logged path
+				)
+		{
+			int nIndex = getIndex();
+			if(nIndex > 0)
+			{//not first point
+				mdDistance = dDistance + GetDistance
+					(
+							mlatLng
+						, ((GraphViewData)(FragMap.mloggedPath.mgraphViewSeries.getGraphViewDataInterface()[nIndex - 1])).mlatLng
+					);
+			}
+			return mdDistance;
+		}
+		
+		public double//Distance between start point and current point of the logged path. 
+			getDistanceFromStart()
+		{ return mdDistance;}
+		
+		private double//Distance between two map locations in meters
+			GetDistanceInMeters
+				(
+					LatLng latLngFirst//first map location
+					, LatLng latLngSecond//second map location
+				)
+		{
+			//http://geographiclib.sourceforge.net/html/java/
+			GeodesicData g;
+			g = Geodesic.WGS84.Inverse(latLngFirst.latitude, latLngFirst.longitude, latLngSecond.latitude, latLngSecond.longitude);
+			return g.s12;//meters
+		}
+		
+		final double mmilesInKm = 0.621371192;
+		
+		boolean carDistanceUnitsIsMiles()
+		{
+			//I can not use the getService().getLogginedCarData() function because it returns null if Internet connection was broken
+			//return getService().getLogginedCarData().car_distance_units == "m";
+			return getService().getCarData().car_distance_units == "m";
+		}
+		
+		private double//Distance between two map locations in current units
+			GetDistance
+				(
+					LatLng latLngFirst//first map location
+					, LatLng latLngSecond//second map location
+				)
+		{
+			double ddistance = GetDistanceInMeters(latLngFirst, latLngSecond);
+			
+			ddistance /= 1000;//kilometers
+			 
+			//Units convertor
+			try
+			{
+				if(carDistanceUnitsIsMiles())
+				{//miles
+					ddistance = mmilesInKm * ddistance;
+				}
+			}
+			catch (Exception e)
+			{
+				Log.e("MyLine", MyElement.getName() + " " + e.getMessage());
+			}
+			return ddistance;
+		}
+		
+		private double//Distance between pointer on the map locations and current pointer of the logged path 
+			GetDistance
+				(
+					LatLng point//pointer on the map location
+				)
+		{
+			return GetDistanceInMeters(point, mlatLng);
+		}
+	}//class GraphViewData
+	
+	class LoggedPath
+	{
+		private LoggedPath()
+		{
+			mgraphViewSeries = new MyGraphViewSeries(new GraphViewData[] {});
+			mnMapPointerIndex = -1;
+		}
+		
+		public void MyDraw(Canvas canvas, Paint paint, float graphheight, float border)
+		{
+			if(mnMapPointerIndex < 0)
+				return;
+			
+			// draw data
+			paint.setStrokeWidth(1f);
+			paint.setColor(Color.YELLOW);
+			
+			//draw vertical line 
+			canvas.drawLine(mfSelectedPointX, border, mfSelectedPointX, border + graphheight, paint);
+		}
+		
+		private boolean addPolyline()
+		{
+			if(mPolylineOptionsTrack == null)
+				return false;
+			
+			FragMap.map.addPolyline(mPolylineOptionsTrack);
+			return true;
+		}
+		private PolylineOptions getPolylineOptionsTrack()
+		{
+			if(mPolylineOptionsTrack == null)
+			{//first point
+				mPolylineOptionsTrack = new PolylineOptions().width(3).color(Color.BLUE);
+				
+				mnIncorrectLocationsCount = 0;
+			}
+	        return mPolylineOptionsTrack;
+		}
+		private List<LatLng> getPoints()
+		{
+	        return getPolylineOptionsTrack().getPoints();
+		}
+		private void appendData(GraphViewData graphViewData)
+		{
+			LatLng latLng = graphViewData.getLatLng();
+			
+			//test of time
+			
+			MyDate date = graphViewData.getDate();
+			// Sometimes date == null because timestamp is incorrect for current car location.
+			// I am waiting from Lee new version of the "Car location message 0x4C "L"" command with timestamp of the car location. See:
+			//
+			//My plan for near future.
+			//From:	Andrej Hristoliubov <anhr@mail.ru> 
+			//To:	Lee Howard
+			//19 February 2015, 7:37
+			//
+			// email for details
+			
+			GraphViewDataInterface[] graphViewDataInterface = FragMap.mloggedPath.mgraphViewSeries.getGraphViewDataInterface();
+			if(graphViewDataInterface.length > 0)
+			{//not first point
+				GraphViewData graphViewDataPrev = ((GraphViewData)graphViewDataInterface[graphViewDataInterface.length - 1]);
+				Date datePrev = graphViewDataPrev.getDate();//Timestamp of the previous point of the logged path
+				
+				if(date != null)
+				{
+					if((datePrev != null) && (date.getTime() <= datePrev.getTime()))
+						throw new MyException(MyElement.getName() + " current timestamp = " + graphViewData.getDate().getTime() + " <= previous timestamp = " + datePrev.getTime());
+					double dspeed = graphViewData.getSpeedKmPerHour(graphViewDataPrev);
+					if(dspeed > 300)
+					{
+						Log.e(TAG, MyElement.getName() 
+							+ "The vehicle speed " + dspeed + " is more than 300 kilometers per hour. I think, it is not possible. I discarded this logged path point");
+						return;
+					}
+				}
+			}
+			
+			Log.d(TAG, MyElement.getName() + " latitude = "  + latLng.latitude + ", longitude = " + latLng.longitude + ", " + ((date == null) ? "" : new MyDate(date).toString()));
+			getPolylineOptionsTrack().add(latLng);
+			
+	    	mgraphViewSeries.appendData(graphViewData);
+	    	if(mDateStart == null)
+	    		mDateStart = new MyDate(date);//first point
+			
+	    	mdDistance = graphViewData.setDistance(mdDistance);
+	    	setGraphViewTitle();
+		}
+		
+		private void setGraphViewTitle()
+		{
+		    if(mgraphView == null)
+		    	return;
+		    if(mgraphViewSeries.getGraphViewDataInterface().length <= 0)
+		    	return;
+		    int nLoggedPathPointerIndex = mgraphViewSeries.getGraphViewDataInterface().length - 1;
+		    MyDate time = null;
+		    if(((GraphViewData)mgraphViewSeries.getGraphViewDataInterface()[nLoggedPathPointerIndex]).getDate() != null)
+		    	time = new MyDate(mgraphViewSeries.getLoggedPathPointerTime(nLoggedPathPointerIndex, mDateStart.getTime()));
+	    	if((getActivity() == null) || (((MainActivity)getActivity()).getService() == null))
+	    		throw new MyException(MyElement.getName() + " (getActivity() == null) || (((MainActivity)getActivity()).getService() == null)");
+		    mgraphView.setTitle(getActivity().getString(R.string.Speed)
+			      	+ " (" + ((MainActivity)getActivity()).getService().getCarData().car_speed_units + ")."
+			      	
+			      	//Distance
+            		+ String.format(" %.2f", mdDistance)
+        			+ " " + ((MainActivity)getActivity()).getService().getCarData().car_distance_units + "."
+        			
+        			//Time
+        			+ " " +
+        				(
+        					(time == null) ?
+        						getString(R.string.Under_constraction)
+        						: (time.getMyHours() + ":" + time.getMinutes() + ":" + time.getSeconds())
+        				)
+ 
+		    	);
+		}
+		
+	    /**
+	     * Sets the marker on the map with information about current point on the drawn path
+	     */
+		private void SetLocationMarker
+			(
+				int nMapPointerIndex//mPolylineOptionsTrack index. Index of the current point on the drawn path
+			)
+		{
+			if(nMapPointerIndex >= mgraphViewSeries.getGraphViewDataInterface().length)
+				return;//Next point impossible
+		    if(mnMapPointerIndex == nMapPointerIndex)
+		    	return;
+		    mnMapPointerIndex = nMapPointerIndex;
+		    
+		    boolean boEnable;
+		    
+		    //Enable of next location button
+		    if(mnMapPointerIndex >= (mgraphViewSeries.getGraphViewDataInterface().length - 1))
+		    	boEnable = false;
+		    else boEnable = true;
+		    rootView.findViewById(R.id.buttonNexpLocation).setEnabled(boEnable);
+		    
+		    //Enable of previous location button
+		    if(mnMapPointerIndex <= 0)
+		    	boEnable = false;
+		    else boEnable = true;
+		    rootView.findViewById(R.id.ButtonPrevLocation).setEnabled(boEnable);
+		    
+		    if(mFragMap == null)
+		    	throw new MyException(MyElement.getName() + " mFragMap == null");
+		    mFragMap.mgraphView.redrawAll();
+		    
+		    LatLng latLng = mPolylineOptionsTrack.getPoints().get(nMapPointerIndex);
+		    
+		    if(mmarker != null)
+		    	mmarker.remove();
+		    
+		    GraphViewData graphViewData = ((GraphViewData)mgraphViewSeries.getGraphViewDataInterface()[nMapPointerIndex]);
+		    
+//////////////////////////////////////////////////////////////
+//For debugging
+/*		    
+MyDate date1 = new MyDate(
+		2014//int year
+		, 10//int month
+		, 25//int day
+		, 4//int hour
+		, 36//int minute
+		, 45//int second
+		);
+MyDate date2 = new MyDate(
+		2014 + 1//int year
+		, 10 + 2//int month
+		, 25 + 3//int day
+		, 4 + 4//int hour
+		, 36 + 5//int minute
+		, 45 + 6//int second
+		);
+MyDate time = new MyDate(date2.getTime() - date1.getTime());
+//int hours = time.getHours();
+*/
+//Time time = new Time(4, 3, 2);//4:03:02
+/*
+Calendar calendar = new Calendar();
+calendar.get(Calendar.HOUR_OF_DAY);
+*/
+//////////////////////////////////////////////////////////////
+		    
+		    MyDate date = graphViewData.getDate();
+		    MyDate time = null;
+		    String strSpeed = "";
+		    if(date != null)
+		    {
+		    	time = new MyDate(mgraphViewSeries.getLoggedPathPointerTime(nMapPointerIndex, mDateStart.getTime()));
+		    	strSpeed = String.format("%.1f " + ((MainActivity)getActivity()).getService().getLogginedCarData().car_speed_units + "."//http://developer.android.com/reference/java/util/Formatter.html
+        				, graphViewData.getY());
+		    }
+		    else
+		    	strSpeed = getString(R.string.Under_constraction);
+		    
+		    mmarker = FragMap.map.addMarker(new MarkerOptions()
+            .position(latLng)
+            .title(nMapPointerIndex + ". " + ((date == null) ? getString(R.string.Under_constraction) : date.toString()))
+            .snippet
+            	(
+            		//Distance
+            		String.format("%s: %.2f"//http://developer.android.com/reference/java/util/Formatter.html
+            				, getActivity().getString(R.string.Distance)
+            				, mgraphViewSeries.getLoggedPathPointerDistance(nMapPointerIndex)
+            			)
+        			+ " " + ((MainActivity)getActivity()).getService().getLogginedCarData().car_distance_units + "."
+        			
+        			//Time
+        			+ "\n" + getActivity().getString(R.string.TimeFromStart) + ": " + 
+        				(
+        					(time == null) ?
+        						getString(R.string.Under_constraction)
+        						: time.getMyHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+        				)
+        			
+            		//speed
+        			+ "\n" + getActivity().getString(R.string.Speed) + ": " + strSpeed 
+           			
+            		//latitude
+            		+ String.format("\n%s: %f"//http://developer.android.com/reference/java/util/Formatter.html
+            				, getActivity().getString(R.string.Latitude)
+            				, latLng.latitude
+            			)
+           			+ " " + getActivity().getString(R.string.Degree) + "."
+           			
+            		//longitude
+            		+ String.format("\n%s: %f"//http://developer.android.com/reference/java/util/Formatter.html
+            				, getActivity().getString(R.string.Longitude)
+            				, latLng.longitude
+            			)
+           			+ " " + getActivity().getString(R.string.Degree) + "."
+            	)
+            .icon(BitmapDescriptorFactory.fromResource(R.drawable.m_path_location))
+            .infoWindowAnchor(0.5f, 0.5f));
+	    	mmarker.showInfoWindow();
+	    	
+			map.moveCamera(CameraUpdateFactory.newLatLng(latLng));
+		}
+		
+		// Called when user clicks the Next button in the FragMap fragment
+		public void NexpLocation()
+		{
+			if(mPolylineOptionsTrack == null)
+				return;//Logged path is empty
+			if(mnMapPointerIndex < 0)
+				mnMapPointerIndex = 0;//Map pointer was not selected before. Selects the first pointer of the logged path
+			if(mnMapPointerIndex >= (mPolylineOptionsTrack.getPoints().size() - 1))
+				return;
+			SetLocationMarker(mnMapPointerIndex + 1);
+		    if(mFragMap == null)
+		    	throw new MyException(MyElement.getName() + " mFragMap == null");
+		    mFragMap.mgraphView.getSelectedPointX();  
+		}
+		
+		// Called when user clicks the Previous button in the FragMap fragment
+		public void PrevLocation()
+		{
+			if(mnMapPointerIndex < 1)
+				return;
+			SetLocationMarker(mnMapPointerIndex -1);
+		    if(mFragMap == null)
+		    	throw new MyException(MyElement.getName() + " mFragMap == null");
+		    mFragMap.mgraphView.getSelectedPointX();  
+		}
+		private void Clear()
+		{
+			List<Polyline> listPolylines = FragMap.map.getPolylines();
+			for(int location = 0; location < listPolylines.size(); location++)
+			{
+				Polyline polyline = listPolylines.get(location);
+				polyline.remove();
+			}
+			if(mPolylineOptionsTrack != null)
+			{
+				List<LatLng> listLatLng = mPolylineOptionsTrack.getPoints();
+				listLatLng.clear();
+				mPolylineOptionsTrack = null;
+			}
+			
+			if(mgraphViewSeries != null)
+			{
+				mgraphViewSeries.resetData(new GraphViewData[] {});
+				mgraphViewSeries = null;
+				mgraphView.clear();
+				mgraphView = null;
+			}
+		}
+		
+		//http://jjoe64.github.io/GraphView/
+		class MyGraphViewSeries extends GraphViewSeries
+		{
+			public MyGraphViewSeries(GraphViewDataInterface[] values) {
+				super(values);
+			}
+			public double getLoggedPathPointerDistance(int nLoggedPathPointerIndex)
+			{
+			    return ((GraphViewData)getGraphViewDataInterface()[nLoggedPathPointerIndex]).getDistanceFromStart();
+			}
+			public long getLoggedPathPointerTime(int nLoggedPathPointerIndex, long ltime)
+			{
+			    return ((GraphViewData)getGraphViewDataInterface()[nLoggedPathPointerIndex]).getTimeToPoint(ltime);
+			}
+			public int//returns index of nearest pointer of the logged path
+				onMapClick(
+						LatLng point//User touched this point on the map
+					) 
+			{
+				double dMinDistance = -1d;
+				int nMapPointerIndex = -1;
+
+				GraphViewDataInterface[] values = getGraphViewDataInterface();
+				for (int i = 0; i < values.length; i++)
+				{
+					GraphViewData graphViewData = (GraphViewData)values[i];
+					double ddistance = graphViewData.GetDistance(point);
+					if((dMinDistance == -1) || (dMinDistance > ddistance))
+					{
+						dMinDistance = ddistance;
+						nMapPointerIndex = i;
+					}
+				}//for (int i = 0; i < values.length; i++)
+				if(dMinDistance == -1d)
+					throw new MyException(MyElement.getName() + " index of nearest pointer of the logged path was not found");
+				
+				double dMapClickMaxDistance = getMapClickMaxDistance();
+				
+				/////////////////////////////////////
+				//For debugging
+				/*
+				CircleOptions options = new CircleOptions().strokeWidth(2)//strokeWidth)
+				.strokeColor(Color.GREEN);
+				map.addCircle(options.center(point)
+				.radius(dMapClickMaxDistance));
+				*/
+				/////////////////////////////////////
+
+				if(dMinDistance > dMapClickMaxDistance)
+					return -1;//I displays an information about point on the drawn path only if distance between logged path pointer and click of the user in the map is less mdMapClickMaxDistance
+				return nMapPointerIndex;
+			}
+			
+			//Maximal distance between logged path pointer and click of the user in the map (user's touch) in meters.
+			//I displays an information about point on the drawn path only if distance between logged path pointer and click of the user in the map is less getMapClickMaxDistance()
+			public double getMapClickMaxDistance()
+			{
+				float fzoom = FragMap.map.getCameraPosition().zoom;
+				/////////////////////////////////////
+				//For debugging
+/*				
+				//http://econom.misis.ru/s/Hel/Matem/Para_3t.htm
+				double x1 = 21;        double y1 = 1;
+				double x2 = 18;        double y2 = 10;
+				double x3 = 12.441224; double y3 = 300;
+//				double x3 = 2;         double y3 = 400000;
+				double a = (y3 - ((x3*(y2-y1)+x2*y1-x1*y2)/(x2-x1)))/(x3*(x3-x1-x2)+x1*x2);
+				double b = (y2-y1)/(x2-x1)-a*(x1+x2);
+				double c = ((x2*y1-x1*y2)/(x2-x1)) + a*x1*x2;
+*/				
+/*				//first series
+				if(fzoom == 21)
+					return 1;
+				if(fzoom == 20)
+					return 2;
+				if(fzoom == 19)
+					return 4;
+				if(fzoom == 18)
+					return 10;
+				if(fzoom == 17)
+					return 20;
+				
+				//second series
+				if(fzoom == 11)
+					return 1000;
+				if(fzoom == 10)
+					return 2000;
+				if(fzoom == 9)
+					return 4000;
+				if(fzoom == 8)
+					return 8000;
+				if(fzoom == 7)
+					return 16000;
+				return 400000;
+*/				
+				/////////////////////////////////////
+/*				
+				//zoom = 13.14 distance = 300
+				//zoom = 18    distance = 10
+				double dMapClickMaxDistance = -59.67 * fzoom + 1084;
+*/
+				
+				//http://mathhelpplanet.com/static.php?p=onlayn-mnk-i-regressionniy-analiz
+				double a;
+				double b;
+				double c;
+				double d;
+				if(fzoom > 11)
+				{
+					//X: 12.44 17 18 19 20 21
+					//Y: 300 20 10 4 2 1
+					a = -0.748;
+					b = 44.2882;
+					c = -874.9445;
+					d = 5770.5247;
+				}
+				else
+				{
+					//X: 7 8 9 10 11
+					//Y: 16000 8000 4000 2000 1000
+					a = -250;
+					b = 7892.8571;
+					c = -84071.4286;
+					d = 303485.7143;
+				}
+				double dMapClickMaxDistance = a * fzoom * fzoom * fzoom + b * fzoom * fzoom + c * fzoom + d;
+				if(dMapClickMaxDistance < 1)
+				{
+					Log.e(TAG, MyElement.getName() + " dMapClickMaxDistance < 1");
+					dMapClickMaxDistance = 1;
+				}
+				return dMapClickMaxDistance;
+			}
+			public void appendData(GraphViewData value) {
+				///////////////////////////////////////////////////////
+				//for debugging
+				/*
+				if(getGraphViewDataInterface().length > 2)
+					return;
+				*/
+				///////////////////////////////////////////////////////
+				appendData(value, false, getGraphViewDataInterface().length + 1);
+			}
+		}
+		
+		private MyGraphViewSeries mgraphViewSeries;
+		
+		public void onMapClick(LatLng point) 
+		{
+			int nMapPointerIndex = mgraphViewSeries.onMapClick(point);
+			if(nMapPointerIndex < 0)
+				return;//index of nearest pointer of the logged path was not found
+			
+			SetLocationMarker(nMapPointerIndex);
+			mnMapPointerIndex = nMapPointerIndex;
+		    if(mFragMap == null)
+		    	throw new MyException(MyElement.getName() + " mFragMap == null");
+		    mFragMap.mgraphView.getSelectedPointX();  
+		}
+		
+		private Marker mmarker;
+		private int mnMapPointerIndex;
+		private float mfSelectedPointX;
+		private PolylineOptions mPolylineOptionsTrack;
+		private int mnIncorrectLocationsCount;//for debugging
+		private double mdDistance;//Distance between start point and end point of the logged path.
+		private MyDate mDateStart;//time of start (of the first point) of the logged path
+		private FragMap mFragMap;
+		public double//Maximal distance between logged path pointer and click of the user in the map (user's touch) in meters.
+			getMapClickMaxDistance()
+		{ return mgraphViewSeries.getMapClickMaxDistance();}
+		
+	}
+	private static LoggedPath mloggedPath;
+	
+	class MyLineGraphView extends LineGraphView//https://github.com/jjoe64/GraphView
+	{
+		public MyLineGraphView(Context context)
+		{
+			super(context, getString(R.string.Speed)
+			      	+ " (" + ((MainActivity)getActivity()).getService().getCarData().car_speed_units + ")");
+			
+			//GraphView font size
+			//http://developer.android.com/reference/android/util/DisplayMetrics.html
+			DisplayMetrics metrics = new DisplayMetrics();
+			getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
+			getGraphViewStyle().setTextSize
+				(
+					10f
+					* metrics.density
+					* android.provider.Settings.System.getFloat//get font scale
+					(//User can change font scale from System Settings/Display/Font Size
+							getActivity().getContentResolver()
+							, android.provider.Settings.System.FONT_SCALE
+							, 1f
+					)
+				);
+			
+			setCustomLabelFormatter(new CustomLabelFormatter()
+			{
+				public String formatLabel(double value, boolean isValueX)
+				{
+					if (isValueX)
+					{
+						Date date = new Date((long)value);
+						return String.format("%d:%d", date.getHours(), date.getMinutes());
+					}
+					return null; // let graphview generate Y-axis label for us
+				}
+			});
+			
+			setTouchEvent(new TouchEvent()
+			{
+			     // To handle GraphView touch screen motion events.
+			     //
+			     // @param event The motion event.
+			     // @return True if the event was handled, false otherwise.
+				public boolean onTouchEvent(MotionEvent event) {
+					
+					//http://startandroid.ru/ru/uroki/vse-uroki-spiskom/167-urok-102-touch-obrabotka-kasanija.html
+					
+					float x;
+					x = event.getX();
+					FragMap.mloggedPath.SetLocationMarker(getMapPointerIndex(FragMap.mloggedPath.mgraphViewSeries.getGraphViewDataInterface(), x));
+				    return false;
+				}
+			});
+			
+			setCustomDraw(new CustomDraw()
+			{
+				public void MyDraw(Canvas canvas, Paint paint, float graphheight, float border)
+				{
+					FragMap.mloggedPath.MyDraw(canvas, paint, graphheight, border);
+				}
+			});
+			
+			setDrawDataPoints(true);
+			setDataPointsRadius(5f);
+			addSeries(FragMap.mloggedPath.mgraphViewSeries);
+			enableDisableOfNextAndPreviousLocationButtonsOfTheGraph();
+			((LinearLayout) rootView.findViewById(R.id.graph)).addView(this);
+			
+		}
+		
+		private void clear()
+		{
+			((LinearLayout) rootView.findViewById(R.id.graph)).removeAllViews();
+		}
+		
+		public int//index of the map pointer, what was touched by the user on the graph
+			getMapPointerIndex( 
+				GraphViewDataInterface[] values//array of the graph coodrinates
+				, float fTouchEventX//The X coordinate of the graph in pixels, what was touched by the user 
+				)
+		{
+			float graphwidth = getGraphWidth();
+			double minX = getMinX(false);
+			double diffX = getMaxX(false) - minX;
+			float horstart = 0f;
+			
+			// draw background
+			double lastEndX = 0;
+			lastEndX = 0;
+			for (int i = 0; i < values.length; i++)
+			{
+				double valX = values[i].getX() - minX;
+				double ratX = valX / diffX;
+				double x = graphwidth * ratX;
+
+				if (i > 0) {
+					float startX = (float) lastEndX + (horstart + 1);
+					float endX = (float) x + (horstart + 1);
+					if((fTouchEventX >= startX) && (fTouchEventX < endX))
+					{
+						if(((startX + endX) / 2) > fTouchEventX)
+						{
+							FragMap.mloggedPath.mfSelectedPointX = startX; 
+							return i - 1;
+						}
+						FragMap.mloggedPath.mfSelectedPointX = endX; 
+						return i;
+					}
+				}
+				lastEndX = x;
+			}//for (int i = 0; i < values.length; i++)
+	    	throw new MyException(MyElement.getName() + " failed!");
+		}
+		
+		public void getSelectedPointX()
+		{
+			GraphViewDataInterface[] values = FragMap.mloggedPath.mgraphViewSeries.getGraphViewDataInterface();
+			int i = FragMap.mloggedPath.mnMapPointerIndex;
+			float graphwidth = getGraphWidth();
+			double minX = getMinX(false);
+			double diffX = getMaxX(false) - minX;
+			float horstart = 0f;
+			
+			// draw background
+			double lastEndX = 0;
+			
+			double valX = values[i].getX() - minX;
+			double ratX = valX / diffX;
+			double x = graphwidth * ratX;
+			lastEndX = x;
+
+			float startX = (float) lastEndX + (horstart + 1);
+			FragMap.mloggedPath.mfSelectedPointX = startX; 
+		}
+	}
+	private MyLineGraphView mgraphView;//https://github.com/jjoe64/GraphView
+
 	public interface UpdateLocation {
 		public void updatelocation();
 	}
 
-
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
+		
+		mcontainer = container;
+		
+		mmyTimer = new MyTimer(getActivity());
+		mpd = null;
+		
 		rootView = inflater.inflate(R.layout.mmap, null);
 		appPrefes = new AppPrefes(getActivity(), "ovms");
 		updateMap = this;
@@ -83,6 +1021,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 		maxrange = 285;
 		distance_units = "KM";
 
+		updateclustLoggedPath = this;
+		
 		database = new Database(getActivity());
 
 		FragmentManager fm = getActivity().getSupportFragmentManager();
@@ -94,7 +1034,44 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 				.addMarkersDynamically(true));
 		map.setOnInfoWindowClickListener(this);
     	map.getUiSettings().setRotateGesturesEnabled(false); // Disable two-finger rotation gesture
+        map.setMyLocationEnabled(true);
+        map.setOnMyLocationButtonClickListener(this);
 		map.moveCamera(CameraUpdateFactory.zoomTo(15));
+        map.setOnMapClickListener(this);
+        
+        //I see
+        //
+        //The method setOnMapLoadedCallback(FragMap) is undefined for the type GoogleMap
+        //
+		// It is not possible because current GoogleMap version is not support it.
+		// I do not see same problem on maps application. I do not know how to change GoogleMap version.
+        //
+        //map.setOnMapLoadedCallback(this);
+        
+        //map marker
+        //http://stackoverflow.com/questions/15783227/aligning-the-text-in-google-maps-marker-snippet
+        map.setInfoWindowAdapter(new InfoWindowAdapter() {
+
+            @Override
+            public View getInfoWindow(Marker arg0) {
+                return null;
+            }
+
+            @Override
+            public View getInfoContents(Marker marker) {
+
+                View v = getActivity().getLayoutInflater().inflate(R.layout.marker, mcontainer, false);
+                
+                TextView title= (TextView) v.findViewById(R.id.title);
+                title.setText(marker.getTitle());
+
+                TextView info= (TextView) v.findViewById(R.id.info);
+                info.setText(marker.getSnippet());
+
+                return v;
+            }
+        });
+        
 		// setUpClusteringViews();
 
 		setHasOptionsMenu(true);
@@ -106,6 +1083,37 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 		return rootView;
 	}
 
+	// Called when the user clicks the Next button in the FragMap fragment
+	public void NexpLocation()
+	{
+		mloggedPath.NexpLocation();
+	}
+		
+	// Called when the user clicks the Previous button in the FragMap fragment
+	public void PrevLocation()
+	{
+		mloggedPath.PrevLocation();
+	}
+	
+    @Override
+    public void onStart() {
+        super.onStart();
+		
+		((MainActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(false);
+		
+		if(appPrefes.IsTrue(BaseApi.mKeyTurnLoggedPath, false))//"TurnLoggedPath"
+			ShowLoggedPath();
+		else
+		{
+			HideLoggedPath();
+		}
+    }
+    
+	void updateClusteringLoggedPath(int clusterSizeIndex, boolean enabled) {
+		HideLoggedPath();
+		ShowLoggedPath();
+	}
+	
 	@Override
 	public void updateClustering(int clusterSizeIndex, boolean enabled) {
 		ClusteringSettings clusteringSettings = new ClusteringSettings();
@@ -198,10 +1206,800 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		return false;
 	}
 
+	private void StartTrack() {
+Log.d(TAG, MyElement.getName() + " enter");
+Log.d(TAG, MyElement.getName() + " exit");
+	}
+	private void StopTrack() {
+Log.d(TAG, MyElement.getName() + " enter");
+Log.d(TAG, MyElement.getName() + " exit");
+	}
+			
+	//http://startandroid.ru/en/uroki/vse-uroki-spiskom/128-urok-67-dialogi-progressdialog
+	private ProgressDialog mpd;
+	
+	//Show or hide the logged path (24-hour log data)
+	private void TurnLoggedPath(
+				boolean boTurnLoggedPath//true  - show logged path
+										//false - hide logged path
+			)
+	{
+		if (boTurnLoggedPath) {
+			ShowLoggedPath();
+		} else {
+			HideLoggedPath();
+		}
+		appPrefes.SaveBoolean(BaseApi.mKeyTurnLoggedPath, boTurnLoggedPath);
+	}
+	
+	//for map scale
+	private static LatLngBounds mlatLngBounds;
+	private void MapScale()
+	{
+		try
+		{
+			map.moveCamera(CameraUpdateFactory.newLatLngBounds(mlatLngBounds, 10));
+		}
+		catch (Exception e)
+		{
+			Log.e(TAG, MyElement.getName() + " " + e);
+		}
+	}
+	
+	private void lastPoint()
+	{
+		((MainActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(false);
+		
+		try
+		{
+			if(mpd != null)
+				mpd.dismiss();//.cancel();
+		}
+		catch (Exception e)
+		{
+			Log.e(TAG, MyElement.getName() + " " + e);
+		}
+		cancelCommand();
+		
+		MapScale();
+		
+		AddGraphView();
+		
+	}
+	
+	private void AddGraphView()
+	{
+		if(mgraphView != null)
+		{
+			mgraphView.clear();
+			mgraphView = null;
+		}
+		
+		Activity activity = getActivity();
+		mgraphView = new MyLineGraphView(activity);
+		mloggedPath.setGraphViewTitle();
+		mloggedPath.mFragMap = this; 
+	}
+	
+	private boolean//true - next point of the car location inside of circle
+		IsNextPointInsideCircle(
+				double azimuth//azimuth from current car location to circle center (degrees)
+				, LatLng latLngCurrent//Current car location
+				, LatLng latLngNext//Next car location
+				)
+	{
+		final double dCarMinTurningRadius = 5;//meters
+	
+		//http://geographiclib.sourceforge.net/html/java/
+		//get azimuth from previous car location to current car location
+		GeodesicData g;
+		
+		//go to circle center of the car's minimum turning
+		g = Geodesic.WGS84.Direct(latLngCurrent.latitude// - latitude of point 1 (degrees).
+				, latLngCurrent.longitude// - longitude of point 1 (degrees).
+				, azimuth// - azimuth at point 1 (degrees).
+				, dCarMinTurningRadius// - distance between point 1 and point 2 (meters); it can be negative.
+		        );
+		LatLng latLngCircleCenterOfCarMinTurning  = new LatLng(g.lat2, g.lon2);
+		//Log.d(TAG, MyElement.getName() + " latLngCircleCenterOfCarMinTurning.latitude = " + latLngCircleCenterOfCarMinTurning.latitude + ", latLngCircleCenterOfCarMinTurning.longitude = "  + latLngCircleCenterOfCarMinTurning.longitude);
+		/*		
+		CircleOptions options = new CircleOptions().strokeWidth(2)//strokeWidth)
+				.strokeColor(Color.GREEN);
+		map.addCircle(options.center(latLngCircleCenterOfCarMinTurning)//.data("Circle center of car minimum turning")
+				.radius(dCarMinTurningRadius));
+		*/
+		//draw radius
+		//AppendNewPointToTrack(latLngCurrent);//return to point 2
+		//AppendNewPointToTrack(latLngCircleCenterOfCarMinTurning);
+		
+		//get distance between circle center of the car's minimum turning and next car location
+		// I can use map.getMyLocation().distanceBetween(startLatitude, startLongitude, endLatitude, endLongitude, results)
+		g = Geodesic.WGS84.Inverse(latLngCircleCenterOfCarMinTurning.latitude, latLngCircleCenterOfCarMinTurning.longitude, latLngNext.latitude, latLngNext.longitude);
+		if(g.s12 < dCarMinTurningRadius)
+		{//Next car location inside of circle of the car's minimum turning
+			mloggedPath.mnIncorrectLocationsCount++;
+			Log.e(TAG, MyElement.getName() + " Car location inside of circle of the car's minimum turning was detected. mnIncorrectLocationsCount = " + mloggedPath.mnIncorrectLocationsCount);
+			return true;
+		}
+		return false;
+	}
+	
+	//Detecting of the error point of the car location
+	private boolean//false - Next car location is correct
+		IsGPS_Noise(
+				LatLng latLngPrevious//Previous car location
+				, LatLng latLngCurrent//Current car location
+				, LatLng latLngNext//Next car location
+				, MyDate date//Time of the car location
+				)
+	{
+		//http://geographiclib.sourceforge.net/html/java/
+		//get azimuth from previous car location to current car location
+		GeodesicData g;
+		g = Geodesic.WGS84.Inverse(latLngPrevious.latitude, latLngPrevious.longitude, latLngCurrent.latitude, latLngCurrent.longitude);
+		if
+			(
+				//Test for the right turn of the car
+				IsNextPointInsideCircle(
+					g.azi1 + 90//azimuth from current car location to circle center (degrees)
+					, latLngCurrent//Current car location
+					, latLngNext//Next car location
+					)
+				//Test for the left turn of the car
+				|| IsNextPointInsideCircle(
+					g.azi1 - 90//azimuth from current car location to circle center (degrees)
+					, latLngCurrent//Current car location
+					, latLngNext//Next car location
+					)
+			)
+			return true;//Next car location is incorrect
+		
+		return IsIntegratePointToAveragedPoint(latLngCurrent, latLngNext, date);
+	}
+	
+	//Integrate points that are within of averaged points circle radius (meters) of each other to be one averaged point.
+	private ArrayList<LatLng> mlistIntegratePoints = new ArrayList<LatLng>();//All points of the current averaged point.
+											//I use it for calculating of the averaged point.
+											//This list is empty if current point is correct.
+											//In another words this list is empty if current point is not within of the circle
+											//with center in previous point (or averaged point)
+											//and averaged points circle radius
+	private boolean//false - Not added of the next point to the averaged point
+		IsIntegratePointToAveragedPoint(
+				LatLng latLngCurrent//Current car location or averaged point
+			, LatLng latLngNext//Next car location
+			, MyDate date//Time of the car location
+		)
+	{
+		GeodesicData g;
+		g = Geodesic.WGS84.Inverse(latLngCurrent.latitude, latLngCurrent.longitude, latLngNext.latitude, latLngNext.longitude);
+		if(g.s12 < Settings.GetAveragedPointsCircleRadius(appPrefes))//radius of circle of averaged points
+		{//Next car location inside of circle of the averaged points
+			mloggedPath.mnIncorrectLocationsCount++;
+			Log.e(TAG, MyElement.getName() + " Car location inside of the circle of averaged points was detected. mnIncorrectLocationsCount = " + mloggedPath.mnIncorrectLocationsCount);
+			if(mlistIntegratePoints.isEmpty())
+				mlistIntegratePoints.add(latLngCurrent);//add first point into list of the integrate points 
+			mlistIntegratePoints.add(latLngNext);
+			return true;
+		}
+		
+		//Next car location is correct
+		
+		if(mlistIntegratePoints.isEmpty())
+			return false;
+		
+		//Stop adding of the new points into listIntegratePoints. Calculating of the averaged point
+		double dLatitude = 0;
+		double dLongitude = 0;
+		int nIntegratePointsSize = mlistIntegratePoints.size();
+		for(int i = 0; i < nIntegratePointsSize; i++)
+		{
+			LatLng latLngIndex = mlistIntegratePoints.get(i);
+			dLatitude += latLngIndex.latitude;  
+			dLongitude += latLngIndex.longitude;  
+		}
+		mlistIntegratePoints.clear();
+		LatLng latLngAveragedPoint = new LatLng(dLatitude /= nIntegratePointsSize, dLongitude /= nIntegratePointsSize);
+		Log.d(TAG, MyElement.getName() + " new averaged point was calculated. Latitude = "  + latLngAveragedPoint.latitude + ", longitude = " + latLngAveragedPoint.longitude);
+		mloggedPath.appendData(new GraphViewData(date, latLngAveragedPoint));
+		return true;
+	}
+	
+	private boolean IsAppendNewPointToTrack(LatLng latLng, boolean boLastPoint
+			, MyDate date//Time of the car location
+			)
+	{
+		if(!appPrefes.IsTrue(BaseApi.mKeyTurnLoggedPath, false))
+			return false;
+		
+		List<LatLng> points =  mloggedPath.getPoints();
+        int nPointsSize = points.size();
+        
+        if((nPointsSize > 0) && points.get(nPointsSize - 1).equals(latLng))
+        	return false;//Add new point only if car is moving to another location
+        
+        if((nPointsSize == 1) && IsIntegratePointToAveragedPoint(
+        		points.get(nPointsSize - 1)//First car location
+        		, latLng//second car location
+    			, date//Time of the car location
+        		)
+        	)
+        	return false;//second car location inside of circle with averaged points circle radius  
+        
+        if	(        	
+        		!boLastPoint
+        		&&
+        		(nPointsSize > 1)//two or more points
+        		&& IsGPS_Noise
+        				(
+        					  points.get(nPointsSize - 2)//Previous car location
+			        		, points.get(nPointsSize - 1)//Current car location
+			        		, latLng//Next car location
+			    			, date//Time of the car location
+			        	)
+			 )
+        	return false;//GPS noise was detected
+        return true;
+	}
 
+	private boolean//true - success
+		AppendNewPointToTrack(GraphViewData graphViewData, boolean boLastPoint)
+	{
+		try
+		{
+			if(!IsAppendNewPointToTrack(graphViewData.getLatLng(), boLastPoint, graphViewData.getDate()))
+				return false;
+	    	mloggedPath.appendData(graphViewData);
+		}
+		catch (Exception e)
+		{
+			Log.e(TAG, MyElement.getName() + " " + e);
+			return false;
+		}
+		return true;
+	}
+	
+	private boolean//true - success
+		AppendNewPointToTrack(GraphViewData graphViewData)
+	{ return AppendNewPointToTrack(graphViewData, false);}
+	
+	public class OnResultCommandListenerStatic
+		implements com.openvehicles.OVMS.api.OnResultCommandListener
+	{
+//		private MainActivity mmainActivity;
+		private MainActivity getMainActivity()
+		{
+			MainActivity mainActivity = (MainActivity)getActivity();
+	    	if(mainActivity == null)
+	    		throw new MyException(MyElement.getName() + " mainActivity == null");
+	    	return mainActivity;
+		}
+		
+	    @Override
+		public void onResultCommand(String[] result)
+		{
+/*	    	
+	    	if(mmainActivity == null)
+	    		mmainActivity = (MainActivity)getActivity();
+	    	if(mmainActivity == null)
+	    		throw new MyException(MyElement.getName() + " mmainActivity == null");
+*/	    		
+			switch(Integer.parseInt(result[0]))
+			{
+			case BaseApi.mnCR_Retrieve_24_Hour_Log_Data://33
+				
+				mmyTimer.Stop();
+				
+				//Retrieve 24-hour log data
+				//
+				//For details see email:
+				//Date: Tue, 30 Sep 2014 14:14:01 -0700
+				//From: Lee Howard <lee.howard@mainpine.com>
+				//Subject: Re: Samsung Galaxy S5
+				//
+				//Example:
+				//
+				//10-02 18:12:14.008: I/ApiTask(2144): TX: MP-0 C33,L
+				//10-02 18:12:14.298: D/ApiTask(2144): RX: MP-0 c33,0,1,119,L,2014-10-01 21:58:49,47.288244,-123.054592,7,96,1,120 (Z5YhEtaokGO4255igaWatfTjp1Sch1igvcbnsA/YlpIl9zSM6UcmGM+IbpGfqYx274qn/rNgZOYYVZxvdy+LGjBL5UXhOp0=)
+				//
+				//result[0]	"33" (id=831943927496)					command ID - Retrieve 24-hour log data
+				//result[1]	"0" (id=831943927592)					result (0=ok, 1=failed, 2=unsupported, 3=unimplemented). See "Command response 0x63 "c"" header of "OVMS_Protocol.docx" fro details
+				//result[2]	"1" (id=831943927624) 					response record number	
+				//result[3]	"126" (id=831943887176) 				maximum number of response records	
+				//result[4]	"L" (id=831943887208)					data code type
+				//result[5]	"2014-10-02 00:18:01" (id=831943887240)	data record timestamp
+				//result[6]	"47.288012"   (id=831943887272)			Latitude	
+				//result[7]	"-123.054400" (id=831943939664)			Longitude	
+				//result[8]	"191"         (id=831943939696)			Car direction	
+				//result[9]	"59"          (id=831943939728)			Car altitude	
+				//result[10]"1"           (id=831943939760)			Car GPS lock (0=nogps, 1=goodgps)	
+				//result[11]"120"         (id=831943939792)			Stale GPS indicator (-1=none, 0=stale, >0 ok)
+				
+				//result (0=ok, 1=failed, 2=unsupported, 3=unimplemented). See "Command response 0x63 "c"" header of "OVMS_Protocol.docx" for details
+				String strResult = "";
+				switch(Integer.parseInt(result[1]))
+				{
+				case 0://ok
+					break;
+				case 1://failed
+					Toast.makeText(getMainActivity(), result[2], Toast.LENGTH_SHORT).show(); 
+					return;
+				case 2://unsupported
+					strResult = "unsupported";
+					break;
+					
+				case 3://unimplemented
+					strResult = "unimplemented. " + result[2];
+					break;
+			
+				default:
+					strResult = "Unknown result: " + result[1];
+				}
+				if(!strResult.isEmpty())
+				{
+					Log.e(TAG, MyElement.getName() + " failed! " + strResult);
+					
+					/*
+					 * I have temporary commented this code because currently the OVMS server returns the
+					 * "unimplemented. Command unimplemented" error message if send the "C33,L" command.
+					 * 
+					 * Example:
+					 * 
+					04-27 22:26:40.687: I/ApiTask(3995): TX: MP-0 C33,L
+					04-27 22:26:40.877: D/ApiTask(3995): RX: MP-0 c33,3,Command unimplemented
+					
+					 * Instead I simulate the correct response from the server.
+					 * I will remove this comment after changing of code of OVMS server.
+					 * 
+
+	//				((MainActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(false);
+					mmainActivity.setSupportProgressBarIndeterminateVisibility(false);
+					
+					TurnLoggedPath(false);
+					
+	            	new MyAlertDialog((Activity)mmainActivity//getActivity()
+	            			, String.format(mmainActivity.getString(R.string.Invalid_server_C33_response)
+	            					, strResult)//Retrieve the logged path failed! %s. Probably your OVMS server is not supports the C33 \"Retrieve 24-hour log data\" command. Please choice another server in the car\'s settings. Do you want to edit the car\'s settings?
+	            			, new OnClickPositiveButton()
+		            	{
+			            @Override
+			            public void onClick()
+			            	{
+			            		//Open the Settings fragment
+			            		mmainActivity.ChangePagerAdapterItem(MainActivity.PagerAdapterItems.settings);
+			            	}
+		            	}
+		        	);
+					return;
+					*/
+					
+					/////////////////////////////////////////////////////////////////////
+					//for debugging
+					C33CommandResponseSimulator();
+					return;
+					//for debugging
+					/////////////////////////////////////////////////////////////////////
+				}
+				if(onResultC33Command(result))
+					return;
+			}//switch(Integer.parseInt(result[0]))
+			cancelCommand();
+		}
+	    
+		/////////////////////////////////////////////////////////////////////
+		//for debugging
+		//
+		// Simulate the correct C33,L command response from the server
+		//
+		//Example:
+		//
+		//04-27 22:26:40.687: I/ApiTask(3995): TX: MP-0 C33,L
+		//10-02 18:12:14.298: D/ApiTask(2144): RX: MP-0 c33,0,1,119,L,2014-10-01 21:58:49,47.288244,-123.054592,7,96,1,120
+		
+	    private void C33CommandResponseSimulator()
+	    {
+			String[] result =
+				{
+					"33",//					command ID - Retrieve 24-hour log data
+					"0",//					result (0=ok, 1=failed, 2=unsupported, 3=unimplemented). See "Command response 0x63 "c"" header of "OVMS_Protocol.docx" fro details
+					"1",// 					response record number	
+					"3",// 					maximum number of response records	
+					"L",//					data code type
+					"2014-10-02 00:18:01",//data record timestamp
+					"37.3772583",//			Latitude
+					"-121.9233856",//		Longitude
+					"191",//				Car direction	
+					"59",//					Car altitude
+					"1",//					Car GPS lock (0=nogps, 1=goodgps)
+					"120"//					Stale GPS indicator (-1=none, 0=stale, >0 ok)
+				};
+//			result = data;
+			if(!onResultC33Command(result))
+				return;
+			result[2] = "2";					//response record number
+			result[5] = "2014-10-02 00:19:01";	//data record timestamp
+			result[6] = "37.3782583";			//Latitude	
+			result[7] = "-121.9243856";			//Longitude
+			if(!onResultC33Command(result))
+				return;
+			result[2] = "3";					//response record number
+			result[5] = "2014-10-02 00:21:01";	//data record timestamp
+			result[6] = "37.3792583";			//Latitude	
+			result[7] = "-121.9243856";			//Longitude
+			if(!onResultC33Command(result))
+				return;
+			return;
+	    	
+	    }
+		
+		//for debugging
+		/////////////////////////////////////////////////////////////////////
+	    
+		private int mnResponseRecordNumber = 0;
+	   
+		private boolean//true - success 
+			onResultC33Command(String[] result)
+		{
+			String strDataCodeType = result[4]; 
+			if(strDataCodeType.contentEquals("L"))//Car location message result[4] == "L". See "OVMS_Protocol.pdf" page 21
+			{
+	//				mmainActivity.setSupportProgressBarIndeterminateVisibility(true);
+	
+				
+				//result[6]	"47.288012"   (id=831943887272)	Latitude	
+				//result[7]	"-123.054400" (id=831943939664)	Longitude	
+				//result[8]	"191"         (id=831943939696)	Car direction	
+				//result[9]	"59"          (id=831943939728)	Car altitude	
+				//result[10]"1"           (id=831943939760)	Car GPS lock (0=nogps, 1=goodgps)	
+				//result[11]"120"         (id=831943939792)	Stale GPS indicator (-1=none, 0=stale, >0 ok)
+				
+				final LatLng latLng = new LatLng(Double.parseDouble(result[6]), Double.parseDouble(result[7]));
+				
+				Log.d(TAG, MyElement.getName() + " Next point. Response record number: " + result[2] + " latitude = "  + latLng.latitude + " and longitude = " + latLng.longitude + " to the track");
+				
+				int nResponseRecordNumber = Integer.parseInt(result[2]);
+				if((mnResponseRecordNumber + 1) != nResponseRecordNumber)
+					throw new MyException(MyElement.getName() + " nResponseRecordNumber != " + (mnResponseRecordNumber + 1));
+				mnResponseRecordNumber = nResponseRecordNumber;
+				int nResponseRecordNumberMax = Integer.parseInt(result[3]);//maximum number of response records
+				if(nResponseRecordNumber > nResponseRecordNumberMax)
+					throw new MyException(MyElement.getName() + " nResponseRecordNumber > nResponseRecordNumberMax");
+				
+	//////////////////////////////////////////////////////////
+	//For debugging
+	//Simulating of unexpected disconnecting from Internet during receiving of the logged path
+	/*					
+	if(nResponseRecordNumber == 10)
+	{
+	Log.d("MyLine", MyElement.getName() + " disconnect from server");
+	try
+	{
+		mmainActivity.getService().socketClose();
+	} catch (Exception e) {}
+	}
+	*/
+	//////////////////////////////////////////////////////////
+				
+				//Progress dialog
+				if(mpd == null)
+				{
+					//http://startandroid.ru/en/uroki/vse-uroki-spiskom/128-urok-67-dialogi-progressdialog
+					mpd = new ProgressDialog(getMainActivity());
+					mpd.setTitle(R.string.Logged_path_progress);//Logged path progress
+					mpd.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+					mpd.setMax(Integer.parseInt(result[3]));//maximum number of response records
+				}
+				if(mpd.isShowing() != true)
+					mpd.show();
+				
+				if(nResponseRecordNumber == 1)
+				{//first point
+					//for map scale
+					mlatLngBounds = new LatLngBounds(latLng, latLng);
+					
+					mloggedPath = new LoggedPath();
+				}
+				else
+				{
+					//for map scale
+					mlatLngBounds = mlatLngBounds.including(latLng);
+				}
+				if(mpd != null)
+					mpd.setProgress(nResponseRecordNumber);
+				
+				boolean boLastPoint = false;
+				if(nResponseRecordNumber == nResponseRecordNumberMax)
+		        {//Last point
+					Log.d(TAG, MyElement.getName() + " last point. mnIncorrectLocationsCount = " + mloggedPath.mnIncorrectLocationsCount);
+					/*					
+					///////////////////////////////////////
+					//for debugging
+					CircleOptions options = new CircleOptions().strokeWidth(2)//strokeWidth)
+							.strokeColor(Color.GREEN);
+					
+					//drawing of radius of circle of averaged points
+					map.addCircle(options.center(latLng).radius(Settings.GetAveragedPointsCircleRadius(appPrefes)));
+					///////////////////////////////////////
+					*/					
+					boLastPoint = true;
+					
+					mRetrieve_24_Hour_Log_Data_State = Retrieve_24_Hour_Log_Data_State.LastPoint;
+					
+					lastPoint();
+	/////////////////////////////////////////////////////////////////
+	//For debugging
+	/*					
+	//LatLng latLng2 = new LatLng(latLng.latitude - 0.001, latLng.longitude);//to the south
+	LatLng latLng2 = new LatLng(latLng.latitude - 0.001, latLng.longitude - 0.001);//to the south east
+	//LatLng latLng2 = new LatLng(latLng.latitude, latLng.longitude - 1);//to the east
+	//LatLng latLng3 = new LatLng(latLng2.latitude, latLng2.longitude - 0.001);//GPS noise
+	//LatLng latLng3 = new LatLng(latLng2.latitude, latLng2.longitude - 0.002);//correct
+	//LatLng latLng3 = new LatLng(latLng2.latitude, latLng2.longitude + 0.001);//GPS noise
+	LatLng latLng3 = new LatLng(latLng2.latitude, latLng2.longitude + 0.003);//correct
+	if(IsGPS_Noise(
+				latLng//Previous car location
+				, latLng2//Current car location
+				, latLng3//Next car location
+			)
+		)
+		Log.e(TAG, MyElement.getName() + " GPS Noise was detected");
+	
+	//LatLng latLng4 = new LatLng(latLng3.latitude - 0.0005, latLng3.longitude);//GPS noise
+	//LatLng latLng4 = new LatLng(latLng3.latitude - 0.0005, latLng3.longitude - 0.0005);//GPS noise
+	//LatLng latLng4 = new LatLng(latLng3.latitude - 0.001, latLng3.longitude - 0.001);//correct
+	//LatLng latLng4 = new LatLng(latLng3.latitude - 0.001, latLng3.longitude + 0.001);//correct
+	//LatLng latLng4 = new LatLng(latLng3.latitude - 0.0005, latLng3.longitude + 0.0005);//GPS noise
+	//LatLng latLng4 = new LatLng(latLng3.latitude, latLng3.longitude + 0.001);//correct
+	//LatLng latLng4 = new LatLng(latLng3.latitude + 0.001, latLng3.longitude + 0.001);//correct
+	//LatLng latLng4 = new LatLng(latLng3.latitude + 0.0005, latLng3.longitude + 0.0005);//GPS noise
+	//LatLng latLng4 = new LatLng(latLng3.latitude + 0.0005, latLng3.longitude);//GPS noise
+	//LatLng latLng4 = new LatLng(latLng3.latitude + 0.001, latLng3.longitude);//correct
+	//LatLng latLng4 = new LatLng(latLng3.latitude + 0.001, latLng3.longitude - 0.001);//correct
+	//LatLng latLng4 = new LatLng(latLng3.latitude + 0.0005, latLng3.longitude - 0.0005);//GPS noise
+	//LatLng latLng4 = new LatLng(latLng3.latitude + 0.002, latLng3.longitude + 0.002);//correct
+	LatLng latLng4 = new LatLng(latLng3.latitude + 0.002, latLng3.longitude);//correct
+	if(IsGPS_Noise(
+			latLng2//Previous car location
+			, latLng3//Current car location
+			, latLng4//Next car location
+		)
+	)
+		Log.e(TAG, MyElement.getName() + " GPS Noise was detected");
+	
+	//LatLng latLng5 = new LatLng(latLng4.latitude, latLng4.longitude + 0.001);//GPS noise
+	//LatLng latLng5 = new LatLng(latLng4.latitude, latLng4.longitude + 0.002);//correct
+	//LatLng latLng5 = new LatLng(latLng4.latitude, latLng4.longitude - 0.001);//GPS noise
+	//LatLng latLng5 = new LatLng(latLng4.latitude, latLng4.longitude - 0.002);//correct
+	//LatLng latLng5 = new LatLng(latLng4.latitude + 0.0005, latLng4.longitude);//correct
+	//LatLng latLng5 = new LatLng(latLng4.latitude + 0.0005, latLng4.longitude + 0.0005);//correct
+	//LatLng latLng5 = new LatLng(latLng4.latitude + 0.00025, latLng4.longitude + 0.00025);//GPS noise
+	//LatLng latLng5 = new LatLng(latLng4.latitude + 0.00025, latLng4.longitude - 0.00025);//GPS noise
+	//LatLng latLng5 = new LatLng(latLng4.latitude + 0.00025, latLng4.longitude - 0.001);//GPS noise
+	LatLng latLng5 = new LatLng(latLng4.latitude + 0.00025, latLng4.longitude - 0.002);//
+	if(IsGPS_Noise(
+			latLng3//Previous car location
+			, latLng4//Current car location
+			, latLng5//Next car location
+		)
+	)
+		Log.e(TAG, MyElement.getName() + " GPS Noise was detected");
+	*/	
+	/////////////////////////////////////////////////////////////////
+		        }//last point
+		        
+				if(Integer.parseInt(result[10]) != 1)//Car GPS lock (0=nogps, 1=goodgps)
+				{
+					Log.e(TAG, MyElement.getName() + " failed! Car GPS lock " + result[10] + " is not 1=goodgps");
+					
+					if(boLastPoint)
+					{
+				        mloggedPath.addPolyline();
+					}
+					
+					return false;
+				}
+				int nStaleGPS_Indicator = Integer.parseInt(result[11]); 
+				if((nStaleGPS_Indicator == -1) || (nStaleGPS_Indicator == 0))//Stale GPS indicator (-1=none, 0=stale, >0 ok)
+				{
+					Log.e(TAG, MyElement.getName() + " failed! Stale GPS indicator " + result[11] + " is not ok");
+					
+					if(boLastPoint)
+				        mloggedPath.addPolyline();
+					
+					return false;
+				}
+				if(getService().isLoggedIn() && (mRetrieve_24_Hour_Log_Data_State != Retrieve_24_Hour_Log_Data_State.Error))
+				{
+					try
+					{
+						GraphViewData graphViewData = new GraphViewData
+						(
+							new MyDate
+							(
+								"yyyy-MM-dd HH:mm:ss"//See http://www.tutorialspoint.com/java/java_date_time.htm for details
+								, result[5]//"2014-10-02 00:18:01" (id=831943887240)	data record timestamp
+							)
+							, latLng
+						);
+						if(graphViewData.getDate() != null)
+						{
+							//Sometimes I have receiving similar lines from OVMS server:
+	
+							//03-10 22:05:12.541: D/ApiTask(3640): RX: MP-0 c33,0,92,226,L,2015-03-10 11:26:25,47.288412,-123.054400,0,59,1,120 
+							//03-10 22:05:12.651: D/ApiTask(3640): RX: MP-0 c33,0,93,226,L,2015-03-10 11:26:25,47.288588,-123.054328,0,18,1,120 
+	
+							//I can not calculate speed of the car here because delta time equal zero.
+							//Now I discard the second data point (graphViewData.getDate() == null) for resolving of the problem.
+	
+							AppendNewPointToTrack(graphViewData, boLastPoint);
+						}
+					}
+					catch (MyException e)
+					{
+						Log.e("MyLine", MyElement.getName() + " " + e);
+					}
+				}
+				else
+				{
+					if(mRetrieve_24_Hour_Log_Data_State != Retrieve_24_Hour_Log_Data_State.Error)
+					{
+						Log.e("MyLine", MyElement.getName() + " Unexpected disconnect from server");
+						mRetrieve_24_Hour_Log_Data_State = Retrieve_24_Hour_Log_Data_State.Error;
+					}
+					boLastPoint = true;
+				}
+				
+				if(boLastPoint)
+			        mloggedPath.addPolyline();
+				
+				return true;
+			}//if(strDataCodeType.contentEquals("L"))
+			Log.e(TAG, MyElement.getName() + " failed! unknown data code type: " + strDataCodeType);
+			return false;
+		}//public void onResultC33Command(String[] result)
+	}//class OnResultCommandListenerStatic
+	
+	private static OnResultCommandListenerStatic mOnResultCommandListenerRetrieve24hourLogData;
+
+	private void enableDisableOfNextAndPreviousLocationButtonsOfTheGraph() 
+	{
+		boolean boEnableButtonNexpLocation,  boEnableButtonPrevLocation;
+		if
+			(
+				(mloggedPath.mPolylineOptionsTrack != null)//logged path is not empty
+				&& (mloggedPath.mgraphViewSeries.getGraphViewDataInterface().length > 1)//two or more points in the logged path
+			)
+		{
+			boEnableButtonNexpLocation = true;
+			if(mloggedPath.mnMapPointerIndex < 0)
+				boEnableButtonPrevLocation = false;//Map pointer was not selected before.
+			else boEnableButtonPrevLocation = true;
+		}
+		else
+		{//logged path is empty or one point only
+			boEnableButtonNexpLocation = false;
+			boEnableButtonPrevLocation = false;
+		}
+	    rootView.findViewById(R.id.buttonNexpLocation).setEnabled(boEnableButtonNexpLocation);
+		rootView.findViewById(R.id.ButtonPrevLocation).setEnabled(boEnableButtonPrevLocation);
+	}
+
+	private void ShowLoggedPath() {
+		
+		//Show graph 
+		View graphParent = rootView.findViewById(R.id.graphParent);
+		LinearLayout.LayoutParams layoutParamsGraph = (LinearLayout.LayoutParams)graphParent.getLayoutParams();
+		int height = (int)(100f * rootView.getContext().getResources().getDisplayMetrics().density);//http://developer.alexanderklimov.ru/android/theory/scales.php
+		if(getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT)//http://developer.alexanderklimov.ru/android/orientation.php
+			layoutParamsGraph.height = height;
+		else
+		{
+			Activity activity = getActivity();
+			/*
+			 * Call requires API level 13 (current min is 9): android.view.Display#getSize
+			Point outSize = new Point();
+			activity.getWindowManager().getDefaultDisplay().getSize(outSize);
+			*/
+			//http://developer.alexanderklimov.ru/android/orientation.php
+		    DisplayMetrics outMetrics = new DisplayMetrics();
+		    activity.getWindowManager().getDefaultDisplay().getMetrics(outMetrics);
+		    if((outMetrics.heightPixels / outMetrics.ydpi) > 3)//inches
+		    	layoutParamsGraph.height = height;
+		    else layoutParamsGraph.height = 0;//I do not want see the graph of speed if screen orientation is landscape and screen height is less 3 inches
+		}
+		graphParent.setLayoutParams(layoutParamsGraph);
+		LinearLayout graph = (LinearLayout)(rootView.findViewById(R.id.graph));
+		if((mgraphView != null) && (graph.getChildCount() == 0) && (layoutParamsGraph.height != 0))
+		{
+			try
+			{
+				LinearLayout parent = (LinearLayout)(mgraphView.getParent());
+				parent.removeView(mgraphView);
+				graph.addView(mgraphView);
+			}
+			catch (Exception e)
+			{
+				Log.e(TAG, MyElement.getName() + " " + e);
+			}
+		}
+		
+		if((mloggedPath != null) && mloggedPath.addPolyline())
+		{
+			enableDisableOfNextAndPreviousLocationButtonsOfTheGraph();
+			return;
+		}
+		
+		//http://startandroid.ru/en/uroki/vse-uroki-spiskom/128-urok-67-dialogi-progressdialog
+		mmyTimer.Start(10000, R.string.Invalid_server_C33//Server response timeout. Probably your OVMS server is not supports the C33 \"Retrieve 24-hour log data\" command. Please choice another server in the car\'s settings. Do you want to edit the car\'s settings?
+				, new MyTimerTimeout()
+	            	{
+			            @Override
+			            public void onTimeout()
+		            	{
+			            	((MainActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(false);
+							/////////////////////////////////////////////////////////////////////
+							//for debugging
+			            	((MainActivity)getActivity()).getFragMap().mOnResultCommandListenerRetrieve24hourLogData.C33CommandResponseSimulator();
+							//for debugging
+							/////////////////////////////////////////////////////////////////////
+		            	}
+	            	}				
+				, new OnClickPositiveButton()
+	            	{
+			            @Override
+			            public void onClick()
+			            	{
+			            		//Open the Settings fragment
+			            		((MainActivity)getActivity()).ChangePagerAdapterItem(MainActivity.PagerAdapterItems.settings);
+			            	}
+	            	}				
+				
+				);
+		
+		if(mOnResultCommandListenerRetrieve24hourLogData == null)
+			mOnResultCommandListenerRetrieve24hourLogData = new OnResultCommandListenerStatic();
+		
+		sendCommandRetrieve24hourLogData(R.string.msg_setting_charge_c, String.format(
+			"%d,%s"
+			, BaseApi.mnCR_Retrieve_24_Hour_Log_Data// -­ Retrieve 24-hour log data. See "Re: Samsung Galaxy S5" email from Lee Howard dated October 1 2014
+				//10-02 18:12:14.008: I/ApiTask(2144): TX: MP-0 C33,L
+				//10-02 18:12:14.298: D/ApiTask(2144): RX: MP-0 c33,0,1,119,L,2014-10-01 21:58:49,47.288244,-123.054592,7,96,1,120 (Z5YhEtaokGO4255igaWatfTjp1Sch1igvcbnsA/YlpIl9zSM6UcmGM+IbpGfqYx274qn/rNgZOYYVZxvdy+LGjBL5UXhOp0=)
+				//etc...
+			, "L"//Car location message 0x4C. See "OVMS_Protocol.pdf" page 21
+		), mOnResultCommandListenerRetrieve24hourLogData);//this);
+		
+		mRetrieve_24_Hour_Log_Data_State = Retrieve_24_Hour_Log_Data_State.Retrieving;
+		
+	}
+	
+	private void HideLoggedPath() {
+		
+		if(mRetrieve_24_Hour_Log_Data_State == Retrieve_24_Hour_Log_Data_State.Retrieving)
+		{
+			((MainActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(false);
+			cancelCommand();
+		}
+		
+		mRetrieve_24_Hour_Log_Data_State = Retrieve_24_Hour_Log_Data_State.NoRetrieve;
+		
+		//Hide  graph.  
+		View graphParent = rootView.findViewById(R.id.graphParent);
+		LinearLayout.LayoutParams layoutParamsGraph = (LinearLayout.LayoutParams)graphParent.getLayoutParams();
+		layoutParamsGraph.height = 0;
+		graphParent.setLayoutParams(layoutParamsGraph);
+		
+		if(mloggedPath != null)
+			mloggedPath.Clear();
+	}
+	
 	@Override
 	public void onDestroyView() {
 		try {
+			if(mpd != null)
+			{
+				mpd.dismiss();
+				mpd = null;
+			}
 			flag = true;
 			SupportMapFragment fragment = ((SupportMapFragment) getFragmentManager()
 					.findFragmentById(R.id.mmap));
@@ -215,6 +2013,24 @@ public void onDestroyView() {
 		super.onDestroyView();
 	}
 
+	//For resolving of problem of rotation of screen.
+	//
+	//http://habrahabr.ru/post/131560/
+	//
+	//For testing:
+	//	1. Check the Show Logged Path in the Settings window
+	//	2. Rotate screen from portrait to landscape and rotate back
+	//	3. Uncheck the Show Logged Path in the Settings window
+	//	4. Check the Show Logged Path in the Settings window again
+	@Override
+	public void onActivityCreated(Bundle savedInstanceState) {
+		super.onActivityCreated(savedInstanceState);
+			
+		// this is really important in order to save the state across screen
+		// configuration changes for example
+		setRetainInstance(true); 
+	}
+
 	private void direction() {
 		// TODO Auto-generated method stub
 		String directions = "https://maps.google.com/maps?saddr=Kanyakumari,+Tamil+Nadu,+India&daddr=Trivandrum,+Kerala,+India";
@@ -248,6 +2064,8 @@ public void after(boolean clearmap) {
 
 		if (clearmap) {
 			map.clear();
+			if(mloggedPath != null)
+				mloggedPath.addPolyline();
 		} else {
 			lis = map.getMarkers();
 			for (int i = 0; i < lis.size(); i++) {
@@ -344,9 +2162,14 @@ private void dialog(Marker marker) {
 				Configuration.ORIENTATION_UNDEFINED);
 	}
 
+	private static LatLng mlatLng;
 
 	@Override
 	public void update(CarData pCarData) {
+		Log.d(TAG, "Car on map: " + pCarData.car_latitude + " lng"
+				+ pCarData.car_longitude);
+		
+		mlatLng = new LatLng(pCarData.car_latitude, pCarData.car_longitude);
 		mCarData = pCarData;
 		update();
 	}
@@ -388,10 +2211,12 @@ public void update() {
 		if (flag) {
 			map.moveCamera(CameraUpdateFactory.newLatLngZoom(MELBOURNE, 15));
 			flag = false;
-		} else if (autotrack) {
+		}
+/*		
+		else if (autotrack) {
 			map.moveCamera(CameraUpdateFactory.newLatLng(MELBOURNE));
 		}
-
+*/
 		// update range circles:
 
 		Log.i(TAG, "update: adding range circles:"
@@ -408,6 +2233,50 @@ public void update() {
 
 		MainActivity.updateLocation.updatelocation();
 
+		if
+		(
+			(mRetrieve_24_Hour_Log_Data_State == Retrieve_24_Hour_Log_Data_State.LastPoint)//Append of the current LatLng point only if retrieving 24-hour log data was completed
+			&&
+			(
+/*					
+					appPrefes.IsTrue(mKeyStartTrack, false)
+					||
+*/					
+					appPrefes.IsTrue(BaseApi.mKeyTurnLoggedPath, false)//Retrieving of 24-hour log data was ended (last point was received).
+															//Now is adding current car location to the end of 24-hour log data.
+			)
+		)
+		{
+			try
+			{
+				if(!AppendNewPointToTrack(new GraphViewData
+						(
+							// I can not use pCarData.car_lastupdated if my car and my smartphone have different time zones.
+							// In another words pCarData.car_lastupdated is incorrect if the clock of the car is not equal the clock of the smartphone.
+							// I waiting from Lee new version of the "Car location message 0x4C "L"" with timestamp of the car location for resolving of problem.
+							// Currently I am pass null instead of timestamp of the car location.
+							// As result, I can not calculate speed of the car for current location.
+							null//new MyDate(pCarData.car_lastupdated)
+							
+							, mlatLng)
+						)
+					)
+					return;
+				mloggedPath.addPolyline();
+				try
+				{
+					AddGraphView();
+				}
+				catch (Exception e)
+				{
+					Log.e(TAG, MyElement.getName() + " " + e);
+				}
+			}
+			catch (MyException e)
+			{
+				Log.e(TAG, MyElement.getName() + " " + e);
+			}
+		}
 	}
 
 	// draw circle in a map
@@ -462,5 +2331,30 @@ public void updateFilter(String connectionList) {
 		// update markers:
 		after(false);
 	}
-
+	
+	@Override
+	public void updateclustLoggedPath(int clusterSizeIndex, boolean enabled) {
+		updateClusteringLoggedPath(clusterSizeIndex, enabled);
+	}
+	
+    @Override
+    public boolean onMyLocationButtonClick() {
+    	
+		if(mlatLng != null)
+		{
+//			map.moveCamera(CameraUpdateFactory.newLatLngZoom(mlatLng, 18));
+			map.moveCamera(CameraUpdateFactory.newLatLng(mlatLng));
+		}
+		else Toast.makeText(getActivity(), R.string.Undefined_location, Toast.LENGTH_SHORT).show();//Location of a vehicle is not defined
+		
+        // Return false so that we don't consume the event and the default behavior still occurs
+        // (the camera animates to the user's current position).
+        return true;//false;
+    }
+
+    @Override
+    public void onMapClick(LatLng point) {
+//    	Log.d(TAG, MyElement.getName());
+    	mloggedPath.onMapClick(point);
+    }
 }
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/MainActivity.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/MainActivity.java
index c8ce5642..dfdac1e7 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/MainActivity.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/MainActivity.java
@@ -3,6 +3,7 @@
 import java.util.UUID;
 import android.app.AlertDialog;
 import android.app.NotificationManager;
+import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -23,6 +24,7 @@
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.view.Window;
@@ -36,7 +38,12 @@
 import com.openvehicles.OVMS.ui.GetMapDetails.afterasytask;
 import com.openvehicles.OVMS.ui.utils.Database;
 import com.openvehicles.OVMS.utils.ConnectionList;
+import com.openvehicles.OVMS.utils.MyAlertDialog;
+import com.openvehicles.OVMS.utils.MyElement;
+import com.openvehicles.OVMS.utils.OnCancelEvent;
+import com.openvehicles.OVMS.utils.OnClickPositiveButton;
 import com.openvehicles.OVMS.utils.ConnectionList.Con;
+import com.openvehicles.OVMS.utils.MyException;
 
 public class MainActivity extends ApiActivity implements
 		ActionBar.OnNavigationListener, afterasytask, Con, UpdateLocation {
@@ -49,6 +56,83 @@ public class MainActivity extends ApiActivity implements
 	Database database;
 	public static UpdateLocation updateLocation;
 	public GetMapDetails getMapDetails;
+	private MyAlertDialog malertDialogServerSocketError = null;
+	
+	//Fragment identifier
+	public enum PagerAdapterItems
+	{
+		battery
+		, car
+		, location_map
+		, email
+		, settings
+	}
+	
+	private Fragment getFragment(String strFragmentName)
+	{
+    	for(int location = 0; location < getSupportFragmentManager().getFragments().size(); location++)
+    	{
+    		Fragment fragment = getSupportFragmentManager().getFragments().get(location);
+    		if(fragment.getClass().getSimpleName().contains(strFragmentName))
+    			return fragment;
+    	}
+    	return null;
+	}
+	
+	public FragMap getFragMap()
+	{
+		return (FragMap)getFragment("FragMap");
+	}
+	
+	// Called when the user clicks the Next button in the FragMap fragment
+	public void NexpLocation(View view) {
+		getFragMap().NexpLocation();
+	}
+		
+	
+	// Called when the user clicks the Previous button in the FragMap fragment
+	public void PrevLocation(View view) {
+		getFragMap().PrevLocation();
+	}
+	
+	//Call this function if you want to change fragment from program
+	public void ChangePagerAdapterItem(
+			PagerAdapterItems pagerAdapterItem//Fragment identifier
+			)
+	{
+		String strClassName = "";
+		switch(pagerAdapterItem)
+		{
+		case battery:
+			strClassName = "InfoFragment";
+			break;
+		case car:
+			strClassName = "CarFragment";
+			break;
+		case location_map:
+			strClassName = "FragMap";
+			break;
+		case email:
+			strClassName = "NotificationsFragment";
+			break;
+		case settings:
+			strClassName = "SettingsFragment";
+			break;
+		default: throw new MyException(MyElement.getName() + " failed! Unknown pagerAdapterItem");
+		}
+		int position = -1;
+		for(int i = 0; i < 5; i++)
+		{
+			if(strClassName.contentEquals(mPagerAdapter.getItem(i).getClass().getSimpleName()))
+			{
+				position = i;
+				break;
+			}
+		}
+		if(position == -1)
+			throw new MyException(MyElement.getName() + " failed! position == -1");		
+		getSupportActionBar().setSelectedNavigationItem(position);
+	}
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -144,6 +228,8 @@ public void onPageSelected(int position) {
 			mC2dmHandler.postDelayed(mC2DMRegistrationID, 2000);
 		}
 		onNewIntent(getIntent());
+		
+		BaseApi.SetMainActivity(this);
 	}
 
 	@Override
@@ -163,6 +249,20 @@ protected void onDestroy() {
 		super.onDestroy();
 	}
 
+	private boolean mboPause = true;
+	
+	@Override
+	protected void onResume() {
+		mboPause = false;
+		super.onResume();
+	}
+	
+	@Override
+	protected void onPause() {
+		mboPause = true;
+		super.onPause();
+	}
+	
 	@Override
 	public boolean onNavigationItemSelected(int itemPosition, long itemId) {
 		TabInfo ti = mPagerAdapter.getTabInfoItems()[itemPosition];
@@ -221,7 +321,7 @@ public void run() {
 	private final BroadcastReceiver mApiEventReceiver = new BroadcastReceiver() {
 		@Override
 		public void onReceive(Context context, Intent intent) {
-
+/*
 			if (intent.getSerializableExtra("onServerSocketError") != null) {
 
 				setSupportProgressBarIndeterminateVisibility(false);
@@ -241,7 +341,68 @@ public void onReceive(Context context, Intent intent) {
 					mApiErrorMessage = message;
 				}
 			}
-
+*/
+			String strServerSocketError = "onServerSocketError";
+			if (intent.getSerializableExtra(strServerSocketError) != null) {
+				setSupportProgressBarIndeterminateVisibility(false);
+				Throwable e = (Throwable)(intent.getSerializableExtra(strServerSocketError));
+				malertDialogServerSocketError = new MyAlertDialog(MainActivity.this
+            			, e.getMessage()//error
+							+ "\n\n" + intent.getStringExtra("message")
+							+ "\n\n" + getString(R.string.Edit_car_settings) //Do you want to edit the car\'s settings?
+            			, new OnClickPositiveButton()
+			            	{
+					            @Override
+					            public void onClick()
+					            	{
+					            		//Open the Settings fragment
+					            		MainActivity.this.ChangePagerAdapterItem(MainActivity.PagerAdapterItems.settings);
+					            	}
+			            	}
+		    			, new OnCancelEvent()
+			            	{
+					            @Override
+					            public void OnCancel()
+					            	{
+					            		malertDialogServerSocketError = null;
+					            	}
+			            	}
+	        	);
+			}
+			String strServerSocketErrorToast = "onServerSocketErrorToast";
+			if (intent.getSerializableExtra(strServerSocketErrorToast) != null) {
+				Log.e("MyLine", MyElement.getName() + (String)(intent.getStringExtra(strServerSocketErrorToast)));
+				setSupportProgressBarIndeterminateVisibility(false);
+				String strError = intent.getStringExtra(strServerSocketErrorToast);
+				
+				if((malertDialogServerSocketError == null) && (!mboPause))
+					Toast.makeText(MainActivity.this, strError, Toast.LENGTH_SHORT).show();
+				
+				FragMap fragMap = getFragMap();
+				if(fragMap != null)
+				{
+					fragMap.onServerSocketError(strError);
+				}
+			}
+			String strLoginComplete = "onLoginComplete";
+			if (intent.getSerializableExtra(strLoginComplete) != null) {
+				String strMessage = getString(R.string.Login_complete);//Login to OVMS server completed
+				Log.d("MyLine", MyElement.getName() + " " + strMessage);
+				Toast.makeText(MainActivity.this, strMessage, Toast.LENGTH_SHORT).show();
+				
+				FragMap fragMap = getFragMap();
+				if(fragMap != null)
+				{
+					fragMap.onLoginComplete();
+				}
+				
+				if(malertDialogServerSocketError != null)
+				{
+					malertDialogServerSocketError.cancel();
+					malertDialogServerSocketError = null;
+				}
+			}
+			
 			if (intent.getBooleanExtra("onLoginBegin", false)) {
 
 				setSupportProgressBarIndeterminateVisibility(true);
@@ -469,7 +630,6 @@ else if (cursor.moveToFirst()) {
 			} else {
 				getMapDetails.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 			}
-
 		}
 
 	}
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/Settings.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/Settings.java
index 7bbf49db..94d70df5 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/Settings.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/Settings.java
@@ -3,21 +3,28 @@
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.Button;
+import android.view.inputmethod.EditorInfo;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.TextView;
 import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.EditText;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.Spinner;
+import android.widget.TextView.OnEditorActionListener;
 
 import com.luttu.AppPrefes;
 import com.openvehicles.OVMS.R;
 import com.openvehicles.OVMS.utils.ConnectionList;
+import com.openvehicles.OVMS.utils.MyElement;
+import com.openvehicles.OVMS.utils.MyException;
 
 public class Settings extends Fragment implements ConnectionList.Con {
 	private static final String TAG = "Settings(OCM)";
@@ -37,6 +44,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 		connectionList = new ConnectionList(getActivity(), this, url,false);
 
 		setUpClusteringViews();
+		setUpLoggedPathViews();
+		SetEnabled();
 
 		return view;
 	}
@@ -64,12 +73,13 @@ private void setUpClusteringViews() {
 				.findViewById(R.id.btn_connections);
 
 
-		if (appPrefes.getData("check").equals("false")) {
+		if (appPrefes.getData(BaseApi.mKeyChargingStations).equals("false")) {
 			clusterCheckbox.setChecked(false);
 		}
+		else clusterCheckbox.setChecked(true);
 		try {
 			clusterSizeSeekbar.setProgress(Integer.parseInt(appPrefes
-					.getData("progress")));
+					.getData(BaseApi.mKeyProgress)));
 		} catch (Exception e) {
 			// TODO: handle exception
 		}
@@ -98,7 +108,8 @@ private void setUpClusteringViews() {
 					public void onCheckedChanged(CompoundButton buttonView,
 												 boolean isChecked) {
 						clusterSizeSeekbar.setEnabled(isChecked);
-						appPrefes.SaveData("check", "" + isChecked);
+						appPrefes.SaveData(BaseApi.mKeyChargingStations, "" + isChecked);
+						SetEnabled();
 						FragMap.updateMap.updateClustering(
 								clusterSizeSeekbar.getProgress(), isChecked);
 					}
@@ -114,7 +125,7 @@ public void onStartTrackingTouch(SeekBar seekBar) {
 					@Override
 					public void onProgressChanged(SeekBar seekBar,
 												  int progress, boolean fromUser) {
-						appPrefes.SaveData("progress", "" + progress);
+						appPrefes.SaveData(BaseApi.mKeyProgress, "" + progress);
 						FragMap.updateMap.updateClustering(progress, true);
 					}
 
@@ -150,4 +161,127 @@ public void onClick(View view) {
 				});
 
 	}
+	public interface UpdateclustLoggedPath {
+		public void updateclustLoggedPath(int clusterSizeIndex, boolean enabled);
+	}
+	
+	private static String mstrAveragedPointsCircleRadiusDefault = "60";
+	
+	static double GetAveragedPointsCircleRadius(AppPrefes appPrefes)
+	{
+		String strAveragedPointsCircleRadius = appPrefes.getData(BaseApi.mKeyAveragedPointsCircleRadius);
+		if(strAveragedPointsCircleRadius.isEmpty())
+			strAveragedPointsCircleRadius = mstrAveragedPointsCircleRadiusDefault;//60
+		return Double.parseDouble(strAveragedPointsCircleRadius);
+	}
+	
+	private boolean mboOnEditorAction = false;
+	
+	private void SetEnabled()
+	{
+		boolean isChecked;
+		
+		//CHARGING STATIONS
+		isChecked = !appPrefes.getData(BaseApi.mKeyChargingStations).equals("false");
+		((SeekBar)view.findViewById(R.id.seekbar_cluster_size)).setEnabled(isChecked);
+		
+		//Logged path
+		isChecked = appPrefes.IsTrue(BaseApi.mKeyTurnLoggedPath, false);
+		((SeekBar)view.findViewById(R.id.seekbar_cluster_size_logged_path)).setEnabled(isChecked);
+		((EditText)view.findViewById(R.id.editText_logged_path)).setEnabled(isChecked);
+	}
+	
+	private void setUpLoggedPathViews() {
+		CheckBox clusterCheckbox = (CheckBox) view.findViewById(R.id.checkbox_cluster_logged_path);
+		clusterCheckbox.setChecked(appPrefes.IsTrue(BaseApi.mKeyTurnLoggedPath, false));
+		final SeekBar clusterSizeSeekbar = (SeekBar) view.findViewById(R.id.seekbar_cluster_size_logged_path);
+		final EditText editTextAveragedPointsCircleRadius = (EditText) view.findViewById(R.id.editText_logged_path);
+		double dAveragedPointsCircleRadius = GetAveragedPointsCircleRadius(appPrefes);
+		clusterSizeSeekbar.setProgress((int)dAveragedPointsCircleRadius);
+		clusterCheckbox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+
+					@Override
+					public void onCheckedChanged(CompoundButton buttonView,
+							boolean isChecked) {
+						appPrefes.SaveBoolean(BaseApi.mKeyTurnLoggedPath, isChecked);
+						SetEnabled();
+					}
+				});
+		clusterSizeSeekbar.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {
+
+					@Override
+					public void onStartTrackingTouch(SeekBar seekBar) {
+					}
+
+					@Override
+					public void onProgressChanged(SeekBar seekBar,
+							int progress, boolean fromUser) {
+						if(mboOnEditorAction)
+							mboOnEditorAction = false;
+						else
+						{
+							appPrefes.SaveData(BaseApi.mKeyAveragedPointsCircleRadius, "" + progress);
+							editTextAveragedPointsCircleRadius.setText(String.format("%d", progress));
+						}
+					}
+
+					@Override
+					public void onStopTrackingTouch(SeekBar seekBar) {
+					}
+				});
+		editTextAveragedPointsCircleRadius.setText(String.format("%.1f"//http://developer.android.com/reference/java/util/Formatter.html
+				, dAveragedPointsCircleRadius));
+		
+		//http://www.seostella.com/ru/article/2012/10/10/poluchenie-sobytiya-nazhatiya-enter-v-komponente-edittext-na-platforme-android.html
+		//http://developer.alexanderklimov.ru/android/keyboard.php
+		editTextAveragedPointsCircleRadius.setOnEditorActionListener(new OnEditorActionListener()
+		{
+			@Override
+	        public boolean onEditorAction(TextView v, int actionId, KeyEvent event)
+			{
+				double dAveragedPointsCircleRadius = -1;
+				if(
+						(event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)//enter from hardware keyboard 
+						||
+						(actionId == EditorInfo.IME_ACTION_DONE)//enter from virtual keyboard
+					)
+				{
+					String strAveragedPointsCircleRadius = v.getText().toString();
+					if(strAveragedPointsCircleRadius.isEmpty())
+					{
+						v.setError(getString(R.string.Enter_distance));//Please enter minimum distance from 0 to 120 meters
+						return true;
+					}
+					dAveragedPointsCircleRadius = Double.parseDouble(strAveragedPointsCircleRadius);
+					if((dAveragedPointsCircleRadius < 0) || (dAveragedPointsCircleRadius > 120))
+					{
+						v.setError(getString(R.string.Enter_distance));//Please enter minimum distance from 0 to 120 meters
+						return true;
+					}
+				}
+				if(dAveragedPointsCircleRadius == -1)
+			        throw new MyException(MyElement.getName() + " failed!");
+				
+				//new averaged points circle radius is correct
+				mboOnEditorAction = true;
+				clusterSizeSeekbar.setProgress((int)dAveragedPointsCircleRadius);
+				appPrefes.SaveData(BaseApi.mKeyAveragedPointsCircleRadius, "" + dAveragedPointsCircleRadius);
+				return false;
+			}
+		});
+	}
+	public void Default()
+	{
+		//CHARGING STATIONS
+		
+		appPrefes.SaveData(BaseApi.mKeyChargingStations, "true");
+		appPrefes.SaveData(BaseApi.mKeyProgress, "0");
+		setUpClusteringViews();
+		
+		//LOGGED PATH
+		
+		appPrefes.SaveBoolean(BaseApi.mKeyTurnLoggedPath, false);
+		appPrefes.SaveData(BaseApi.mKeyAveragedPointsCircleRadius, mstrAveragedPointsCircleRadiusDefault);//60
+		setUpLoggedPathViews();
+	}
 }
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/settings/CarEditorFragment.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/settings/CarEditorFragment.java
index 9cf75d29..72fb2a96 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/settings/CarEditorFragment.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/settings/CarEditorFragment.java
@@ -22,6 +22,7 @@
 import com.luttu.AppPrefes;
 import com.openvehicles.OVMS.R;
 import com.openvehicles.OVMS.entities.CarData;
+import com.openvehicles.OVMS.ui.BaseFragment;
 import com.openvehicles.OVMS.ui.BaseFragmentActivity;
 import com.openvehicles.OVMS.ui.utils.Ui;
 import com.openvehicles.OVMS.ui.validators.PasswdValidator;
@@ -29,7 +30,9 @@
 import com.openvehicles.OVMS.ui.validators.ValidationException;
 import com.openvehicles.OVMS.utils.CarsStorage;
 
-public class CarEditorFragment extends SherlockFragment {
+//I use BaseFragment instead SherlockFragment because I need to access to ApiService for reconnecting to server after editing of the car
+public class CarEditorFragment extends BaseFragment//SherlockFragment
+{
 	private CarData mCarData;
 	private boolean isSelectedCar;
 	private int mEditPosition;
@@ -138,6 +141,8 @@ public boolean valid(EditText pEditText, Object pValue) {
 			mCarData.sel_server = Ui.getValidValue(rootView, R.id.txt_server_address, new StringValidator());
 			mCarData.sel_vehicle_image = sAvailableColors[mGalleryCar.getSelectedItemPosition()];
 
+			getService().reconnectToServer();
+
 		} catch (ValidationException e) {
 			Log.e("Validation", e.getMessage(), e);
 			return;
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyAlertDialog.java b/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyAlertDialog.java
new file mode 100644
index 00000000..239d1458
--- /dev/null
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyAlertDialog.java
@@ -0,0 +1,111 @@
+/**
+ * 
+ */
+package com.openvehicles.OVMS.utils;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.util.Log;
+
+import com.openvehicles.OVMS.R;
+
+/**
+ * @author Andrej
+ *
+ */
+public class MyAlertDialog {
+
+	private static String TAG = "Common";
+	private OnClickPositiveButton monClickPositiveButton;//The onClick() function of this interface is called if user clicks the positive button
+	private OnCancelEvent monCancelEvent;//The OnCancel() function of this interface is called if user closes the alert dialog
+	private AlertDialog mAlert;
+	
+	public MyAlertDialog(Activity activity, String strMessage
+			, OnClickPositiveButton onClickPositiveButton//The onClick() function of this interface is called if user clicks the positive button
+			)
+	{
+		MyAlertDialog(activity, strMessage, onClickPositiveButton, null);
+	}
+	public MyAlertDialog(Activity activity, String strMessage
+			, OnClickPositiveButton onClickPositiveButton//The onClick() function of this interface is called if user clicks the positive button
+			, OnCancelEvent onCancelEvent//The OnCancel() function of this interface is called if user closes the alert dialog
+			)
+	{
+		MyAlertDialog(activity, strMessage, onClickPositiveButton, onCancelEvent);
+	}
+	private void MyAlertDialog(Activity activity, String strMessage,
+			OnClickPositiveButton onClickPositiveButton,
+			OnCancelEvent onCancelEvent)
+	{
+		monClickPositiveButton = onClickPositiveButton;
+		monCancelEvent = onCancelEvent;
+		try
+		{
+			//http://developer.android.com/reference/android/app/AlertDialog.html
+			//http://developer.android.com/reference/android/app/AlertDialog.Builder.html
+			//http://developer.alexanderklimov.ru/android/alertdialog.php
+			AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+			builder.setTitle(R.string.Error)
+					.setMessage(strMessage)
+					.setIcon(android.R.drawable.ic_dialog_alert)//.stat_notify_error)
+//									.setCancelable(false)
+					.setNegativeButton(android.R.string.no,//.ok,
+							new DialogInterface.OnClickListener() {
+								public void onClick(DialogInterface dialog, int id) {
+									dialog.cancel();
+								}
+						})
+					.setPositiveButton(android.R.string.yes,//.ok,
+							new DialogInterface.OnClickListener() {
+								public void onClick(DialogInterface dialog, int id) {
+									dialog.cancel();
+									monClickPositiveButton.onClick();
+							}
+						})
+						
+					//http://stackoverflow.com/questions/18267916/setoncancellistener-and-setondismisslistener-is-not-called-for-alertdialog-for-b
+					.setOnCancelListener(new DialogInterface.OnCancelListener() {
+
+			            @Override
+			            public void onCancel(DialogInterface dialog) {
+			            	if(monCancelEvent != null)
+			            		monCancelEvent.OnCancel();
+			            }
+			        })
+/*	
+Call requires API level 17 (current min is 9)
+					
+					//http://stackoverflow.com/questions/18267916/setoncancellistener-and-setondismisslistener-is-not-called-for-alertdialog-for-b
+					.setOnDismissListener(new DialogInterface.OnDismissListener() {
+
+			            @Override
+			            public void onDismiss(DialogInterface dialog) {
+			                int i = 0;
+			            }
+			        })
+*/			        
+//					.show()
+					;
+			mAlert = builder.create();
+			mAlert.show();
+						
+			/*
+			Toast toast = Toast.makeText(getMainActivity(), 
+					mstrMessage, Toast.LENGTH_LONG); 
+			toast.show();
+			*/
+		}
+		catch (Exception e)
+		{
+			Log.e(TAG, MyElement.getName() + " failed! " + e);
+		}
+	}
+	public void cancel()
+	{
+		if(mAlert == null)
+			return;
+		mAlert.cancel();
+		mAlert = null;
+	}
+}
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyDate.java b/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyDate.java
new file mode 100644
index 00000000..d7dab4b2
--- /dev/null
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyDate.java
@@ -0,0 +1,98 @@
+package com.openvehicles.OVMS.utils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+
+public class MyDate extends Date {
+	
+	public MyDate(Date date)
+	{ setTime(date.getTime()); }
+	public MyDate(long milliseconds)
+	{ setTime(milliseconds); }
+	
+    /*
+	* Parses a date from the specified string using the rules of this date
+    * format.
+    */
+	public MyDate(
+			String strFormat//See http://www.tutorialspoint.com/java/java_date_time.htm for details
+							// Example: "yyyy-MM-dd"
+			, String input //the string to parse. Example: "2014-10-02 00:18:01" 
+		)
+	{
+		//http://www.tutorialspoint.com/java/java_date_time.htm
+		
+		SimpleDateFormat ft;
+		try { 
+			ft = new SimpleDateFormat (strFormat); 
+		} catch (IllegalArgumentException e) { 
+			throw new MyException(MyElement.getName() + " Illegal argument exception: " + e.getLocalizedMessage());
+//			return;
+		}
+		
+//		System.out.print(input + " Parses as "); 
+		
+//		Date t; 
+		
+		try { 
+			setTime(ft.parse(input).getTime()); 
+//			System.out.println(t); 
+		} catch (ParseException e) { 
+//			System.out.println("Unparseable using " + ft); 
+			throw new MyException(MyElement.getName() + " Unparseable using " + ft + ". " + e.getLocalizedMessage());
+		}
+	}
+	
+	public MyDate(int year, int month, int day, int hour, int minute, int second)
+	{
+		super(year, month, day, hour, minute, second);
+	}
+	
+	//I have detected very strange problem:
+	//
+	//new Date(0).getHours() = 19
+	//
+	//I have added this method for resolving this problem
+//	@Override
+	public int getMyHours()
+	{
+		//http://www.mkyong.com/java/java-time-elapsed-in-days-hours-minutes-seconds/
+		
+		//1 minute = 60 seconds
+		//1 hour = 60 x 60 = 3600
+		//1 day = 3600 x 24 = 86400
+	 
+		//milliseconds
+		long different = getTime();
+/* 
+		System.out.println("startDate : " + startDate);
+		System.out.println("endDate : "+ endDate);
+*/		
+//		System.out.println("different : " + different);
+ 
+		long secondsInMilli = 1000;
+		long minutesInMilli = secondsInMilli * 60;
+		long hoursInMilli = minutesInMilli * 60;
+		long daysInMilli = hoursInMilli * 24;
+ 
+		long elapsedDays = different / daysInMilli;
+		different = different % daysInMilli;
+ 
+		long elapsedHours = different / hoursInMilli;
+		different = different % hoursInMilli;
+/* 
+		long elapsedMinutes = different / minutesInMilli;
+		different = different % minutesInMilli;
+ 
+		long elapsedSeconds = different / secondsInMilli;
+ 
+		System.out.printf(
+		    "%d days, %d hours, %d minutes, %d seconds%n", 
+		    elapsedDays,
+		    elapsedHours, elapsedMinutes, elapsedSeconds);
+*/		    
+		return (int)(elapsedHours + elapsedDays * 24);
+	}
+}
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyElement.java b/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyElement.java
new file mode 100644
index 00000000..225e2594
--- /dev/null
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyElement.java
@@ -0,0 +1,30 @@
+/**
+ * 
+ */
+package com.openvehicles.OVMS.utils;
+
+/**
+ * @author Andrej
+ *
+ */
+
+public class MyElement {
+
+	//http://www.nikisoft.ru/blog/java/kak-poluchit-imya-tekushhego-metodaklassa/
+	//Get current class name, method name and line number
+	public static String getName()
+	{
+		Throwable t = new Throwable();
+		StackTraceElement trace[] = t.getStackTrace();
+		 
+		// ������� ����� ������ ���� ������ 1-��, ��������� ������������
+		// ��� ������� ����� ��������� ��� �������� 1 ������� ���������
+		// ������� � �������� 0 - ��� ������� �����, �.�. log
+		if (trace.length > 1)
+		{
+			StackTraceElement element = trace[1];
+			return String.format("%s.%s(...), line %d.", element.getClassName(), element.getMethodName(), element.getLineNumber());
+		}
+		return "[no info]";
+	}
+}
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyException.java b/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyException.java
new file mode 100644
index 00000000..44906d77
--- /dev/null
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyException.java
@@ -0,0 +1,20 @@
+/**
+ * 
+ */
+package com.openvehicles.OVMS.utils;
+
+import android.util.Log;
+
+/**
+ * @author Andrej
+ *
+ */
+public class MyException extends IllegalStateException {
+	public MyException(String detailMessage)
+	{
+		super(detailMessage);
+		Log.e("MyLine", MyElement.getName() + detailMessage);
+//		assert false : detailMessage;
+	}
+
+}
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyTimer.java b/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyTimer.java
new file mode 100644
index 00000000..fbd26049
--- /dev/null
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyTimer.java
@@ -0,0 +1,107 @@
+/**
+ * 
+ */
+package com.openvehicles.OVMS.utils;
+
+//import java.util.List;
+import java.util.TimerTask;
+
+import android.app.Activity;
+//import android.content.Intent;
+import android.util.Log;
+
+/**
+ * @author Andrej
+ * Use Start(...) for start timer and Stop() for stop
+ */
+public class MyTimer {
+	
+	public MyTimer(Activity activity)
+	{
+		if(activity == null)
+			throw new MyException(MyElement.getName() + " failed! activity == null");
+		mactivity = activity;
+	}
+
+	private static String TAG = "Common";
+	private String mstrMessage;//Displays after timeout
+	private java.util.Timer mtimer;
+	private MyTimerTimeout mMyTimerTimeout;//The onTimeout() function of this interface is called after timeout
+	private OnClickPositiveButton monClickPositiveButton;//The onClick() function of this interface is called if user clicks the positive button of the MyAlertDialog
+	private MyAlertDialog mMyAlertDialog;
+	
+	private Activity mactivity;
+	private Activity getActivity()
+	{
+		if(mactivity == null)
+			throw new MyException(MyElement.getName() + " failed! mactivity == null");
+		return mactivity;
+	}
+	
+	public void Stop()
+	{
+		
+		if(mtimer == null)
+			return;
+		mtimer.cancel();
+		mtimer = null;
+		if(mMyAlertDialog != null)
+			mMyAlertDialog.cancel();
+	}
+	
+	//Start the mtimer and display the alert dialog after timeout
+	//Please call Stop() for stop of the mtimer
+	public void Start
+		(
+				long delay//amount of time in milliseconds before displaying of the timeout message
+				, int MessageID//ID of message string, displays after timeout
+				, MyTimerTimeout myTimerTimeout//The onTimeout() function of this interface is called after timeout
+				, OnClickPositiveButton onClickPositiveButton//The onClick() function of this interface is called if user clicks the positive button
+		)
+	{
+		try
+		{
+			mMyTimerTimeout = myTimerTimeout;
+			monClickPositiveButton = onClickPositiveButton;
+			mstrMessage = getActivity().getString(MessageID);
+			
+			if(mtimer != null)
+			{
+				Log.e(TAG,  MyElement.getName() + " failed! mtimer != null");
+				return;
+			}
+			mtimer = new java.util.Timer();
+			
+			//http://stackoverflow.com/questions/18656813/android-only-the-original-thread-that-created-a-view-hierarchy-can-touch-its-vi
+			mtimer.schedule(new TimerTask() {
+			    @Override
+			    public void run() {
+			        // Your logic here...
+	
+			        // When you need to modify a UI element, do so on the UI thread. 
+			        // 'getActivity()' is required as this is being ran from a Fragment.
+			        getActivity().runOnUiThread(new Runnable() {
+			            @Override
+			            public void run() {
+			                // This code will always run on the UI thread, therefore is safe to modify UI elements.
+	//Log.d(TAG, "BaseApi.Wait.TimerTask().run().Runnable().run()");
+			            	
+//							((MainActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(false);
+			            	mMyTimerTimeout.onTimeout();
+	
+			            	mMyAlertDialog = new MyAlertDialog((Activity)getActivity(), mstrMessage, monClickPositiveButton);
+			            }
+			        });
+			    }
+			}, delay); // End of your timer code.
+			
+//			((MainActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(true);
+		}
+		catch (Exception e)
+		{
+			String strMessage = MyElement.getName() + " " + e;
+			Log.e(TAG,  strMessage);
+			throw new MyException(strMessage);
+		}
+	}
+}
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyTimerTimeout.java b/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyTimerTimeout.java
new file mode 100644
index 00000000..147ebac0
--- /dev/null
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/utils/MyTimerTimeout.java
@@ -0,0 +1,12 @@
+/**
+ * 
+ */
+package com.openvehicles.OVMS.utils;
+
+/**
+ * @author Andrej
+ * For MyTimer class
+ */
+public interface MyTimerTimeout {
+    public void onTimeout();
+}
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/utils/OnCancelEvent.java b/OpenVehicleApp/src/com/openvehicles/OVMS/utils/OnCancelEvent.java
new file mode 100644
index 00000000..ff9dab87
--- /dev/null
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/utils/OnCancelEvent.java
@@ -0,0 +1,10 @@
+package com.openvehicles.OVMS.utils;
+
+/**
+ * @author Andrej
+ * For MyAlertDialog class
+ * The OnCancel() function of this interface is called if user closes the alert dialog
+ */
+public interface OnCancelEvent {
+	    public void OnCancel();
+}
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/utils/OnClickPositiveButton.java b/OpenVehicleApp/src/com/openvehicles/OVMS/utils/OnClickPositiveButton.java
new file mode 100644
index 00000000..0bfea255
--- /dev/null
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/utils/OnClickPositiveButton.java
@@ -0,0 +1,10 @@
+package com.openvehicles.OVMS.utils;
+
+/**
+ * @author Andrej
+ * For MyAlertDialog class
+ * The onClick() function of this interface is called if user clicks the positive button of the MyAlertDialog
+ */
+public interface OnClickPositiveButton {
+	    public void onClick();
+}
diff --git a/OpenVehicleApp/src/net/sf/geographiclib/Accumulator.java b/OpenVehicleApp/src/net/sf/geographiclib/Accumulator.java
new file mode 100644
index 00000000..bcba4b7d
--- /dev/null
+++ b/OpenVehicleApp/src/net/sf/geographiclib/Accumulator.java
@@ -0,0 +1,113 @@
+/**
+ * Implementation of the net.sf.geographiclib.Accumulator class
+ *
+ * Copyright (c) Charles Karney (2013) <charles@karney.com> and licensed
+ * under the MIT/X11 License.  For more information, see
+ * http://geographiclib.sourceforge.net/
+ **********************************************************************/
+package net.sf.geographiclib;
+
+/**
+ * An accumulator for sums.
+ * <p>
+ * This allow many double precision numbers to be added together with twice the
+ * normal precision.  Thus the effective precision of the sum is 106 bits or
+ * about 32 decimal places.
+ * <p>
+ * The implementation follows J. R. Shewchuk,
+ * <a href="http://dx.doi.org/10.1007/PL00009321"> Adaptive Precision
+ * Floating-Point Arithmetic and Fast Robust Geometric Predicates</a>,
+ * Discrete & Computational Geometry 18(3) 305&ndash;363 (1997).
+ * <p>
+ * In the documentation of the member functions, <i>sum</i> stands for the value
+ * currently held in the accumulator.
+ ***********************************************************************/
+public  class Accumulator {
+  // _s + _t accumulators for the sum.
+  private double _s, _t;
+  /**
+   * Construct from a double.
+   * <p>
+   * @param y set <i>sum</i> = <i>y</i>.
+   **********************************************************************/
+  public Accumulator(double y) { _s = y; _t = 0; }
+  /**
+   * Construct from another Accumulator.
+   * <p>
+   * @param a set <i>sum</i> = <i>a</i>.
+   **********************************************************************/
+  public Accumulator(Accumulator a) { _s = a._s; _t = a._t; }
+  /**
+   * Set the value to a double.
+   * <p>
+   * @param y set <i>sum</i> = <i>y</i>.
+   **********************************************************************/
+  public void Set(double y) { _s = y; _t = 0; }
+  /**
+   * Return the value held in the accumulator.
+   * <p>
+   * @return <i>sum</i>.
+   **********************************************************************/
+  public double Sum() { return _s; }
+  /**
+   * Return the result of adding a number to <i>sum</i> (but don't change
+   * <i>sum</i>).
+   * <p>
+   * @param y the number to be added to the sum.
+   * @return <i>sum</i> + <i>y</i>.
+   **********************************************************************/
+  public double Sum(double y) {
+    Accumulator a = new Accumulator(this);
+    a.Add(y);
+    return a._s;
+  }
+  /**
+   * Add a number to the accumulator.
+   * <p>
+   * @param y set <i>sum</i> += <i>y</i>.
+   **********************************************************************/
+  public void Add(double y) {
+    // Here's Shewchuk's solution...
+    double u;                       // hold exact sum as [s, t, u]
+    // Accumulate starting at least significant end
+    { Pair r = GeoMath.sum(y, _t); y = r.first; u = r.second; }
+    { Pair r = GeoMath.sum(y, _s); _s = r.first; _t = r.second; }
+    // Start is _s, _t decreasing and non-adjacent.  Sum is now (s + t + u)
+    // exactly with s, t, u non-adjacent and in decreasing order (except for
+    // possible zeros).  The following code tries to normalize the result.
+    // Ideally, we want _s = round(s+t+u) and _u = round(s+t+u - _s).  The
+    // following does an approximate job (and maintains the decreasing
+    // non-adjacent property).  Here are two "failures" using 3-bit floats:
+    //
+    // Case 1: _s is not equal to round(s+t+u) -- off by 1 ulp
+    // [12, -1] - 8 -> [4, 0, -1] -> [4, -1] = 3 should be [3, 0] = 3
+    //
+    // Case 2: _s+_t is not as close to s+t+u as it shold be
+    // [64, 5] + 4 -> [64, 8, 1] -> [64,  8] = 72 (off by 1)
+    //                    should be [80, -7] = 73 (exact)
+    //
+    // "Fixing" these problems is probably not worth the expense.  The
+    // representation inevitably leads to small errors in the accumulated
+    // values.  The additional errors illustrated here amount to 1 ulp of the
+    // less significant word during each addition to the Accumulator and an
+    // additional possible error of 1 ulp in the reported sum.
+    //
+    // Incidentally, the "ideal" representation described above is not
+    // canonical, because _s = round(_s + _t) may not be true.  For example,
+    // with 3-bit floats:
+    //
+    // [128, 16] + 1 -> [160, -16] -- 160 = round(145).
+    // But [160, 0] - 16 -> [128, 16] -- 128 = round(144).
+    //
+    if (_s == 0)              // This implies t == 0,
+      _s = u;                 // so result is u
+    else
+      _t += u;                // otherwise just accumulate u to t.
+  }
+  /**
+   * Negate an accumulator.
+   * <p>
+   * Set <i>sum</i> = &minus;<i>sum</i>.
+   **********************************************************************/
+  public void Negate() { _s = -_s; _t = -_t; }
+}
diff --git a/OpenVehicleApp/src/net/sf/geographiclib/Constants.java b/OpenVehicleApp/src/net/sf/geographiclib/Constants.java
new file mode 100644
index 00000000..04766784
--- /dev/null
+++ b/OpenVehicleApp/src/net/sf/geographiclib/Constants.java
@@ -0,0 +1,26 @@
+/**
+ * Implementation of the net.sf.geographiclib.Constants class
+ *
+ * Copyright (c) Charles Karney (2013) <charles@karney.com> and licensed
+ * under the MIT/X11 License.  For more information, see
+ * http://geographiclib.sourceforge.net/
+ **********************************************************************/
+package net.sf.geographiclib;
+
+/**
+ * Constants needed by GeographicLib.
+ * <p>
+ * Define constants specifying the WGS84 ellipsoid.
+ ***********************************************************************/
+public class Constants {
+  /**
+   * The equatorial radius of WGS84 ellipsoid (6378137 m).
+   **********************************************************************/
+  public static final double WGS84_a = 6378137;
+  /**
+   * The flattening of WGS84 ellipsoid (1/298.257223563).
+   **********************************************************************/
+  public static final double WGS84_f = 1/298.257223563;
+
+  private Constants() {}
+}
diff --git a/OpenVehicleApp/src/net/sf/geographiclib/GeoMath.java b/OpenVehicleApp/src/net/sf/geographiclib/GeoMath.java
new file mode 100644
index 00000000..80631eb9
--- /dev/null
+++ b/OpenVehicleApp/src/net/sf/geographiclib/GeoMath.java
@@ -0,0 +1,191 @@
+/**
+ * Implementation of the net.sf.geographiclib.GeoMath class
+ *
+ * Copyright (c) Charles Karney (2013) <charles@karney.com> and licensed
+ * under the MIT/X11 License.  For more information, see
+ * http://geographiclib.sourceforge.net/
+ **********************************************************************/
+package net.sf.geographiclib;
+
+/**
+ * Mathematical functions needed by GeographicLib.
+ * <p>
+ * Define mathematical functions and constants so that any version of Java
+ * can be used.
+ **********************************************************************/
+public class GeoMath {
+  /**
+   * The number of binary digits in the fraction of a double precision
+   * number (equivalent to C++'s {@code numeric_limits<double>::digits}).
+   **********************************************************************/
+  public static final int digits = 53;
+  /**
+   * Equivalent to C++'s {@code numeric_limits<double>::epsilon()}.  In Java
+   * version 1.5 and later, Math.ulp(1.0) can be used.
+   **********************************************************************/
+  public static final double epsilon = Math.pow(0.5, digits - 1);
+  /**
+   * Equivalent to C++'s {@code numeric_limits<double>::min()}.  In Java
+   * version 1.6 and later, Double.MIN_NORMAL can be used.
+   **********************************************************************/
+  public static final double min = Math.pow(0.5, 1022);
+  /**
+   * The number of radians in a degree.  In Java version 1.2 and later,
+   * Math.toRadians and Math.toDegrees can be used.
+   **********************************************************************/
+  public static final double degree = Math.PI / 180;
+
+  /**
+   * Square a number.
+   * <p>
+   * @param x the argument.
+   * @return <i>x</i><sup>2</sup>.
+   **********************************************************************/
+  public static double sq(double x) { return x * x; }
+
+  /**
+   * The hypotenuse function avoiding underflow and overflow.  In Java version
+   * 1.5 and later, Math.hypot can be used.
+   * <p>
+   * @param x the first argument.
+   * @param y the second argument.
+   * @return sqrt(<i>x</i><sup>2</sup> + <i>y</i><sup>2</sup>).
+   **********************************************************************/
+  public static double hypot(double x, double y) {
+    x = Math.abs(x); y = Math.abs(y);
+    double a = Math.max(x, y), b = Math.min(x, y) / (a != 0 ? a : 1);
+    return a * Math.sqrt(1 + b * b);
+    // For an alternative method see
+    // C. Moler and D. Morrision (1983) http://dx.doi.org/10.1147/rd.276.0577
+    // and A. A. Dubrulle (1983) http://dx.doi.org/10.1147/rd.276.0582
+  }
+
+  /**
+   * log(1 + <i>x</i>) accurate near <i>x</i> = 0.  In Java version 1.5 and
+   * later, Math.log1p can be used.
+   * <p>
+   * This is taken from D. Goldberg,
+   * <a href="http://dx.doi.org/10.1145/103162.103163">What every computer
+   * scientist should know about floating-point arithmetic</a> (1991),
+   * Theorem 4.  See also, N. J. Higham, Accuracy and Stability of Numerical
+   * Algorithms, 2nd Edition (SIAM, 2002), Answer to Problem 1.5, p 528.
+   * <p>
+   * @param x the argument.
+   * @return log(1 + <i>x</i>).
+   **********************************************************************/
+  public static double log1p(double x) {
+    double
+      y = 1 + x,
+      z = y - 1;
+    // Here's the explanation for this magic: y = 1 + z, exactly, and z
+    // approx x, thus log(y)/z (which is nearly constant near z = 0) returns
+    // a good approximation to the true log(1 + x)/x.  The multiplication x *
+    // (log(y)/z) introduces little additional error.
+    return z == 0 ? x : x * Math.log(y) / z;
+  }
+
+  /**
+   * The inverse hyperbolic tangent function.  This is defined in terms of
+   * GeoMath.log1p(<i>x</i>) in order to maintain accuracy near <i>x</i> = 0.
+   * In addition, the odd parity of the function is enforced.
+   * <p>
+   * @param x the argument.
+   * @return atanh(<i>x</i>).
+   **********************************************************************/
+  public static double atanh(double x)  {
+    double y = Math.abs(x);     // Enforce odd parity
+    y = Math.log1p(2 * y/(1 - y))/2;
+    return x < 0 ? -y : y;
+  }
+
+  /**
+   * The cube root function.  In Java version 1.5 and later, Math.cbrt can be
+   * used.
+   * <p>
+   * @param x the argument.
+   * @return the real cube root of <i>x</i>.
+   **********************************************************************/
+  public static double cbrt(double x) {
+    double y = Math.pow(Math.abs(x), 1/3.0); // Return the real cube root
+    return x < 0 ? -y : y;
+  }
+
+  /**
+   * The error-free sum of two numbers.
+   * <p>
+   * @param u the first number in the sum.
+   * @param v the second number in the sum.
+   * @return Pair(<i>s</i>, <i>t</i>) with <i>s</i> = round(<i>u</i> +
+   *   <i>v</i>) and <i>t</i> = <i>u</i> + <i>v</i> - <i>s</i>.
+   * <p>
+   * See D. E. Knuth, TAOCP, Vol 2, 4.2.2, Theorem B.
+   **********************************************************************/
+  public static Pair sum(double u, double v) {
+    double s = u + v;
+    double up = s - v;
+    double vpp = s - up;
+    up -= u;
+    vpp -= v;
+    double t = -(up + vpp);
+    // u + v =       s      + t
+    //       = round(u + v) + t
+    return new Pair(s, t);
+  }
+
+  /**
+   * Normalize an angle (restricted input range).
+   * <p>
+   * @param x the angle in degrees.
+   * @return the angle reduced to the range [&minus;180&deg;, 180&deg;).
+   * <p>
+   * <i>x</i> must lie in [&minus;540&deg;, 540&deg;).
+   **********************************************************************/
+  public static double AngNormalize(double x)
+  { return x >= 180 ? x - 360 : (x < -180 ? x + 360 : x); }
+
+  /**
+   * Normalize an arbitrary angle.
+   * <p>
+   * @param x the angle in degrees.
+   * @return the angle reduced to the range [&minus;180&deg;, 180&deg;).
+   * <p>
+   * The range of <i>x</i> is unrestricted.
+   **********************************************************************/
+  public static double AngNormalize2(double x)
+  { return AngNormalize(x % 360.0); }
+
+  /**
+   * Difference of two angles reduced to [&minus;180&deg;, 180&deg;]
+   * <p>
+   * @param x the first angle in degrees.
+   * @param y the second angle in degrees.
+   * @return <i>y</i> &minus; <i>x</i>, reduced to the range [&minus;180&deg;,
+   *   180&deg;].
+   * <p>
+   * <i>x</i> and <i>y</i> must both lie in [&minus;180&deg;, 180&deg;].  The
+   * result is equivalent to computing the difference exactly, reducing it to
+   * (&minus;180&deg;, 180&deg;] and rounding the result.  Note that this
+   * prescription allows &minus;180&deg; to be returned (e.g., if <i>x</i> is
+   * tiny and negative and <i>y</i> = 180&deg;).
+   **********************************************************************/
+  public static double AngDiff(double x, double y) {
+    double d, t;
+    { Pair r = sum(-x, y); d = r.first; t = r.second; }
+    if ((d - 180.0) + t > 0.0) // y - x > 180
+      d -= 360.0;            // exact
+    else if ((d + 180.0) + t <= 0.0) // y - x <= -180
+      d += 360.0;            // exact
+    return d + t;
+  }
+  /**
+   * Test for finiteness.
+   * <p>
+   * @param x the argument.
+   * @return true if number is finite, false if NaN or infinite.
+   **********************************************************************/
+  public static boolean isfinite(double x) {
+    return Math.abs(x) <= Double.MAX_VALUE;
+  }
+
+  private GeoMath() {}
+}
diff --git a/OpenVehicleApp/src/net/sf/geographiclib/Geodesic.java b/OpenVehicleApp/src/net/sf/geographiclib/Geodesic.java
new file mode 100644
index 00000000..a3ba048a
--- /dev/null
+++ b/OpenVehicleApp/src/net/sf/geographiclib/Geodesic.java
@@ -0,0 +1,1562 @@
+/**
+ * Implementation of the net.sf.geographiclib.Geodesic class
+ *
+ * Copyright (c) Charles Karney (2013) <charles@karney.com> and licensed
+ * under the MIT/X11 License.  For more information, see
+ * http://geographiclib.sourceforge.net/
+ **********************************************************************/
+package net.sf.geographiclib;
+
+/**
+ * Geodesic calculations.
+ * <p>
+ * The shortest path between two points on a ellipsoid at (<i>lat1</i>,
+ * <i>lon1</i>) and (<i>lat2</i>, <i>lon2</i>) is called the geodesic.  Its
+ * length is <i>s12</i> and the geodesic from point 1 to point 2 has azimuths
+ * <i>azi1</i> and <i>azi2</i> at the two end points.  (The azimuth is the
+ * heading measured clockwise from north.  <i>azi2</i> is the "forward"
+ * azimuth, i.e., the heading that takes you beyond point 2 not back to point
+ * 1.)
+ * <p>
+ * Given <i>lat1</i>, <i>lon1</i>, <i>azi1</i>, and <i>s12</i>, we can
+ * determine <i>lat2</i>, <i>lon2</i>, and <i>azi2</i>.  This is the
+ * <i>direct</i> geodesic problem and its solution is given by the function
+ * {@link #Direct Direct}.  (If <i>s12</i> is sufficiently large that the
+ * geodesic wraps more than halfway around the earth, there will be another
+ * geodesic between the points with a smaller <i>s12</i>.)
+ * <p>
+ * Given <i>lat1</i>, <i>lon1</i>, <i>lat2</i>, and <i>lon2</i>, we can
+ * determine <i>azi1</i>, <i>azi2</i>, and <i>s12</i>.  This is the
+ * <i>inverse</i> geodesic problem, whose solution is given by {@link #Inverse
+ * Inverse}.  Usually, the solution to the inverse problem is unique.  In cases
+ * where there are multiple solutions (all with the same <i>s12</i>, of
+ * course), all the solutions can be easily generated once a particular
+ * solution is provided.
+ * <p>
+ * The standard way of specifying the direct problem is the specify the
+ * distance <i>s12</i> to the second point.  However it is sometimes useful
+ * instead to specify the arc length <i>a12</i> (in degrees) on the auxiliary
+ * sphere.  This is a mathematical construct used in solving the geodesic
+ * problems.  The solution of the direct problem in this form is provided by
+ * {@link #ArcDirect ArcDirect}.  An arc length in excess of 180&deg; indicates
+ * that the geodesic is not a shortest path.  In addition, the arc length
+ * between an equatorial crossing and the next extremum of latitude for a
+ * geodesic is 90&deg;.
+ * <p>
+ * This class can also calculate several other quantities related to
+ * geodesics.  These are:
+ * <ul>
+ * <li>
+ *   <i>reduced length</i>.  If we fix the first point and increase
+ *   <i>azi1</i> by <i>dazi1</i> (radians), the second point is displaced
+ *   <i>m12</i> <i>dazi1</i> in the direction <i>azi2</i> + 90&deg;.  The
+ *   quantity <i>m12</i> is called the "reduced length" and is symmetric under
+ *   interchange of the two points.  On a curved surface the reduced length
+ *   obeys a symmetry relation, <i>m12</i> + <i>m21</i> = 0.  On a flat
+ *   surface, we have <i>m12</i> = <i>s12</i>.  The ratio <i>s12</i>/<i>m12</i>
+ *   gives the azimuthal scale for an azimuthal equidistant projection.
+ * <li>
+ *   <i>geodesic scale</i>.  Consider a reference geodesic and a second
+ *   geodesic parallel to this one at point 1 and separated by a small distance
+ *   <i>dt</i>.  The separation of the two geodesics at point 2 is <i>M12</i>
+ *   <i>dt</i> where <i>M12</i> is called the "geodesic scale".  <i>M21</i> is
+ *   defined similarly (with the geodesics being parallel at point 2).  On a
+ *   flat surface, we have <i>M12</i> = <i>M21</i> = 1.  The quantity
+ *   1/<i>M12</i> gives the scale of the Cassini-Soldner projection.
+ * <li>
+ *   <i>area</i>.  The area between the geodesic from point 1 to point 2 and
+ *   the equation is represented by <i>S12</i>; it is the area, measured
+ *   counter-clockwise, of the geodesic quadrilateral with corners
+ *   (<i>lat1</i>,<i>lon1</i>), (0,<i>lon1</i>), (0,<i>lon2</i>), and
+ *   (<i>lat2</i>,<i>lon2</i>).  It can be used to compute the area of any
+ *   simple geodesic polygon.
+ * </ul>
+ * <p>
+ * The quantities <i>m12</i>, <i>M12</i>, <i>M21</i> which all specify the
+ * behavior of nearby geodesics obey addition rules.  If points 1, 2, and 3 all
+ * lie on a single geodesic, then the following rules hold:
+ * <ul>
+ * <li>
+ *   <i>s13</i> = <i>s12</i> + <i>s23</i>
+ * <li>
+ *   <i>a13</i> = <i>a12</i> + <i>a23</i>
+ * <li>
+ *   <i>S13</i> = <i>S12</i> + <i>S23</i>
+ * <li>
+ *   <i>m13</i> = <i>m12</i> <i>M23</i> + <i>m23</i> <i>M21</i>
+ * <li>
+ *   <i>M13</i> = <i>M12</i> <i>M23</i> &minus; (1 &minus; <i>M12</i>
+ *   <i>M21</i>) <i>m23</i> / <i>m12</i>
+ * <li>
+ *   <i>M31</i> = <i>M32</i> <i>M21</i> &minus; (1 &minus; <i>M23</i>
+ *   <i>M32</i>) <i>m12</i> / <i>m23</i>
+ * </ul>
+ * <p>
+ * The results of the geodesic calculations are bundled up into a {@link
+ * GeodesicData} object which includes the input parameters and all the
+ * computed results, i.e., <i>lat1</i>, <i>lon1</i>, <i>azi1</i>, <i>lat2</i>,
+ * <i>lon2</i>, <i>azi2</i>, <i>s12</i>, <i>a12</i>, <i>m12</i>, <i>M12</i>,
+ * <i>M21</i>, <i>S12</i>.
+ * <p>
+ * The functions {@link #Direct(double, double, double, double, int) Direct},
+ * {@link #ArcDirect(double, double, double, double, int) ArcDirect}, and
+ * {@link #Inverse(double, double, double, double, int) Inverse} include an
+ * optional final argument <i>outmask</i> which allows you specify which
+ * results should be computed and returned.  If you omit <i>outmask</i>, then
+ * the "standard" geodesic results are computed (latitudes, longitudes,
+ * azimuths, and distance).  <i>outmask</i> is bitor'ed combination of {@link
+ * GeodesicMask} values.  For example, if you wish just to compute the distance
+ * between two points you would call, e.g.,
+ * <pre>
+ * {@code
+ *  GeodesicData g = Geodesic.WGS84.Inverse(lat1, lon1, lat2, lon2,
+ *                      GeodesicMask.DISTANCE); }</pre>
+ * <p>
+ * Additional functionality is provided by the {@link GeodesicLine} class,
+ * which allows a sequence of points along a geodesic to be computed.
+ * <p>
+ * The shortest distance returned by the solution of the inverse problem is
+ * (obviously) uniquely defined.  However, in a few special cases there are
+ * multiple azimuths which yield the same shortest distance.  Here is a
+ * catalog of those cases:
+ * <ul>
+ * <li>
+ *   <i>lat1</i> = &minus;<i>lat2</i> (with neither at a pole).  If <i>azi1</i>
+ *   = <i>azi2</i>, the geodesic is unique.  Otherwise there are two geodesics
+ *   and the second one is obtained by setting [<i>azi1</i>, <i>azi2</i>] =
+ *   [<i>azi2</i>, <i>azi1</i>], [<i>M12</i>, <i>M21</i>] = [<i>M21</i>,
+ *   <i>M12</i>], <i>S12</i> = &minus;<i>S12</i>.  (This occurs when the
+ *   longitude difference is near &plusmn;180&deg; for oblate ellipsoids.)
+ * <li>
+ *   <i>lon2</i> = <i>lon1</i> &plusmn; 180&deg; (with neither at a pole).  If
+ *   <i>azi1</i> = 0&deg; or &plusmn;180&deg;, the geodesic is unique.
+ *   Otherwise there are two geodesics and the second one is obtained by
+ *   setting [ <i>azi1</i>, <i>azi2</i>] = [&minus;<i>azi1</i>,
+ *   &minus;<i>azi2</i>], <i>S12</i> = &minus; <i>S12</i>.  (This occurs when
+ *   the <i>lat2</i> is near &minus;<i>lat1</i> for prolate ellipsoids.)
+ * <li>
+ *   Points 1 and 2 at opposite poles.  There are infinitely many geodesics
+ *   which can be generated by setting [<i>azi1</i>, <i>azi2</i>] =
+ *   [<i>azi1</i>, <i>azi2</i>] + [<i>d</i>, &minus;<i>d</i>], for arbitrary
+ *   <i>d</i>.  (For spheres, this prescription applies when points 1 and 2 are
+ *   antipodal.)
+ * <li>
+ *   s12 = 0 (coincident points).  There are infinitely many geodesics which
+ *   can be generated by setting [<i>azi1</i>, <i>azi2</i>] = [<i>azi1</i>,
+ *   <i>azi2</i>] + [<i>d</i>, <i>d</i>], for arbitrary <i>d</i>.
+ * </ul>
+ * <p>
+ * The calculations are accurate to better than 15 nm (15 nanometers) for the
+ * WGS84 ellipsoid.  See Sec. 9 of
+ * <a href="http://arxiv.org/abs/1102.1215v1">arXiv:1102.1215v1</a> for
+ * details.  The algorithms used by this class are based on series expansions
+ * using the flattening <i>f</i> as a small parameter.  These are only accurate
+ * for |<i>f</i>| &lt; 0.02; however reasonably accurate results will be
+ * obtained for |<i>f</i>| &lt; 0.2.  Here is a table of the approximate
+ * maximum error (expressed as a distance) for an ellipsoid with the same
+ * major radius as the WGS84 ellipsoid and different values of the
+ * flattening.<pre>
+ *     |f|      error
+ *     0.01     25 nm
+ *     0.02     30 nm
+ *     0.05     10 um
+ *     0.1     1.5 mm
+ *     0.2     300 mm </pre>
+ * <p>
+ * The algorithms are described in
+ * <ul>
+ * <li>C. F. F. Karney,
+ *   <a href="http://dx.doi.org/10.1007/s00190-012-0578-z">
+ *   Algorithms for geodesics</a>,
+ *   J. Geodesy <b>87</b>, 43&ndash;55 (2013);
+ *   DOI: <a href="http://dx.doi.org/10.1007/s00190-012-0578-z">
+ *   10.1007/s00190-012-0578-z</a>;
+ *   addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ *   geod-addenda.html</a>.
+ * </ul>
+ * <p>
+ * Example of use:
+ * <pre>
+ * {@code
+ * // Solve the direct geodesic problem.
+ *
+ * // This program reads in lines with lat1, lon1, azi1, s12 and prints
+ * // out lines with lat2, lon2, azi2 (for the WGS84 ellipsoid).
+ *
+ * import java.util.*;
+ * import net.sf.geographiclib.*;
+ * public class Direct {
+ *   public static void main(String[] args) {
+ *     try {
+ *       Scanner in = new Scanner(System.in);
+ *       double lat1, lon1, azi1, s12;
+ *       while (true) {
+ *         lat1 = in.nextDouble(); lon1 = in.nextDouble();
+ *         azi1 = in.nextDouble(); s12 = in.nextDouble();
+ *         GeodesicData g = Geodesic.WGS84.Direct(lat1, lon1, azi1, s12);
+ *         System.out.println(g.lat2 + " " + g.lon2 + " " + g.azi2);
+ *       }
+ *     }
+ *     catch (Exception e) {}
+ *   }
+ * }}</pre>
+ **********************************************************************/
+public class Geodesic {
+
+  /**
+   * The order of the expansions used by Geodesic.
+   **********************************************************************/
+  protected static final int GEOGRAPHICLIB_GEODESIC_ORDER = 6;
+
+  protected static final int nA1_ = GEOGRAPHICLIB_GEODESIC_ORDER;
+  protected static final int nC1_ = GEOGRAPHICLIB_GEODESIC_ORDER;
+  protected static final int nC1p_ = GEOGRAPHICLIB_GEODESIC_ORDER;
+  protected static final int nA2_ = GEOGRAPHICLIB_GEODESIC_ORDER;
+  protected static final int nC2_ = GEOGRAPHICLIB_GEODESIC_ORDER;
+  protected static final int nA3_ = GEOGRAPHICLIB_GEODESIC_ORDER;
+  protected static final int nA3x_ = nA3_;
+  protected static final int nC3_ = GEOGRAPHICLIB_GEODESIC_ORDER;
+  protected static final int nC3x_ = (nC3_ * (nC3_ - 1)) / 2;
+  protected static final int nC4_ = GEOGRAPHICLIB_GEODESIC_ORDER;
+  protected static final int nC4x_ = (nC4_ * (nC4_ + 1)) / 2;
+  private static final int maxit1_ = 20;
+  private static final int maxit2_ = maxit1_ + GeoMath.digits + 10;
+
+  // Underflow guard.  We require
+  //   tiny_ * epsilon() > 0
+  //   tiny_ + epsilon() == epsilon()
+  protected static final double tiny_ = Math.sqrt(GeoMath.min);
+  private static final double tol0_ = GeoMath.epsilon;
+  // Increase multiplier in defn of tol1_ from 100 to 200 to fix inverse case
+  // 52.784459512564 0 -52.784459512563990912 179.634407464943777557
+  // which otherwise failed for Visual Studio 10 (Release and Debug)
+  private static final double tol1_ = 200 * tol0_;
+  private static final double tol2_ = Math.sqrt(tol0_);
+  // Check on bisection interval
+  private static final double tolb_ = tol0_ * tol2_;
+  private static final double xthresh_ = 1000 * tol2_;
+
+  protected static double AngRound(double x) {
+    // The makes the smallest gap in x = 1/16 - nextafter(1/16, 0) = 1/2^57
+    // for reals = 0.7 pm on the earth if x is an angle in degrees.  (This
+    // is about 1000 times more resolution than we get with angles around 90
+    // degrees.)  We use this to avoid having to deal with near singular
+    // cases when x is non-zero but tiny (e.g., 1.0e-200).
+    final double z = 1/16.0;
+    double y = Math.abs(x);
+    // The compiler mustn't "simplify" z - (z - y) to y
+    y = y < z ? z - (z - y) : y;
+    return x < 0 ? -y : y;
+  }
+
+  protected static Pair SinCosNorm(double sinx, double cosx) {
+    double r = GeoMath.hypot(sinx, cosx);
+    return new Pair(sinx/r, cosx/r);
+  }
+
+  protected double _a, _f, _f1, _e2, _ep2, _b, _c2;
+  private double _n, _etol2;
+  private double _A3x[], _C3x[], _C4x[];
+
+  /**
+   * Constructor for a ellipsoid with
+   * <p>
+   * @param a equatorial radius (meters).
+   * @param f flattening of ellipsoid.  Setting <i>f</i> = 0 gives a sphere.
+   *   Negative <i>f</i> gives a prolate ellipsoid.  If <i>f</i> > 1, set
+   *   flattening to 1/<i>f</i>.
+   * @exception GeographicErr if <i>a</i> or (1 &minus; <i>f</i> ) <i>a</i> is
+   *   not positive.
+   **********************************************************************/
+  public Geodesic(double a, double f) {
+    _a = a;
+    _f = f <= 1 ? f : 1/f;
+    _f1 = 1 - _f;
+    _e2 = _f * (2 - _f);
+    _ep2 = _e2 / GeoMath.sq(_f1);       // e2 / (1 - e2)
+    _n = _f / ( 2 - _f);
+    _b = _a * _f1;
+    _c2 = (GeoMath.sq(_a) + GeoMath.sq(_b) *
+           (_e2 == 0 ? 1 :
+            (_e2 > 0 ? GeoMath.atanh(Math.sqrt(_e2)) :
+             Math.atan(Math.sqrt(-_e2))) /
+            Math.sqrt(Math.abs(_e2))))/2; // authalic radius squared
+    // The sig12 threshold for "really short".  Using the auxiliary sphere
+    // solution with dnm computed at (bet1 + bet2) / 2, the relative error in
+    // the azimuth consistency check is sig12^2 * abs(f) * min(1, 1-f/2) / 2.
+    // (Error measured for 1/100 < b/a < 100 and abs(f) >= 1/1000.  For a
+    // given f and sig12, the max error occurs for lines near the pole.  If
+    // the old rule for computing dnm = (dn1 + dn2)/2 is used, then the error
+    // increases by a factor of 2.)  Setting this equal to epsilon gives
+    // sig12 = etol2.  Here 0.1 is a safety factor (error decreased by 100)
+    // and max(0.001, abs(f)) stops etol2 getting too large in the nearly
+    // spherical case.
+    _etol2 = 0.1 * tol2_ /
+              Math.sqrt( Math.max(0.001, Math.abs(_f)) *
+                         Math.min(1.0, 1 - _f/2) / 2 );
+    if (!(GeoMath.isfinite(_a) && _a > 0))
+      throw new GeographicErr("Major radius is not positive");
+    if (!(GeoMath.isfinite(_b) && _b > 0))
+      throw new GeographicErr("Minor radius is not positive");
+    _A3x = new double[nA3x_];
+    _C3x = new double[nC3x_];
+    _C4x = new double[nC4x_];
+
+    A3coeff();
+    C3coeff();
+    C4coeff();
+  }
+
+  /**
+   * Solve the direct geodesic problem where the length of the geodesic
+   * is specified in terms of distance.
+   * <p>
+   * @param lat1 latitude of point 1 (degrees).
+   * @param lon1 longitude of point 1 (degrees).
+   * @param azi1 azimuth at point 1 (degrees).
+   * @param s12 distance between point 1 and point 2 (meters); it can be
+   *   negative.
+   * @return a {@link GeodesicData} object with the following fields:
+   *   <i>lat1</i>, <i>lon1</i>, <i>azi1</i>, <i>lat2</i>, <i>lon2</i>,
+   *   <i>azi2</i>, <i>s12</i>, <i>a12</i>.
+   * <p>
+   * <i>lat1</i> should be in the range [&minus;90&deg;, 90&deg;]; <i>lon1</i>
+   * and <i>azi1</i> should be in the range [&minus;540&deg;, 540&deg;).  The
+   * values of <i>lon2</i> and <i>azi2</i> returned are in the range
+   * [&minus;180&deg;, 180&deg;).
+   * <p>
+   * If either point is at a pole, the azimuth is defined by keeping the
+   * longitude fixed, writing <i>lat</i> = &plusmn;(90&deg; &minus; &epsilon;),
+   * and taking the limit &epsilon; &rarr; 0+.  An arc length greater that
+   * 180&deg; signifies a geodesic which is not a shortest path.  (For a
+   * prolate ellipsoid, an additional condition is necessary for a shortest
+   * path: the longitudinal extent must not exceed of 180&deg;.)
+   **********************************************************************/
+  public GeodesicData Direct(double lat1, double lon1,
+                             double azi1, double s12) {
+    return Direct(lat1, lon1, azi1, false, s12,
+                  GeodesicMask.LATITUDE | GeodesicMask.LONGITUDE |
+                  GeodesicMask.AZIMUTH);
+  }
+  /**
+   * Solve the direct geodesic problem where the length of the geodesic is
+   * specified in terms of distance and with a subset of the geodesic results
+   * returned.
+   * <p>
+   * @param lat1 latitude of point 1 (degrees).
+   * @param lon1 longitude of point 1 (degrees).
+   * @param azi1 azimuth at point 1 (degrees).
+   * @param s12 distance between point 1 and point 2 (meters); it can be
+   *   negative.
+   * @param outmask a bitor'ed combination of {@link GeodesicMask} values
+   *   specifying which results should be returned.
+   * @return a {@link GeodesicData} object with the fields specified by
+   *   <i>outmask</i> computed.
+   * <p>
+   * <i>lat1</i>, <i>lon1</i>, <i>azi1</i>, <i>s12</i>, and <i>a12</i> are
+   * always included in the returned result.
+   **********************************************************************/
+  public GeodesicData Direct(double lat1, double lon1,
+                             double azi1, double s12, int outmask) {
+    return Direct(lat1, lon1, azi1, false, s12, outmask);
+  }
+
+  /**
+   * Solve the direct geodesic problem where the length of the geodesic
+   * is specified in terms of arc length.
+   * <p>
+   * @param lat1 latitude of point 1 (degrees).
+   * @param lon1 longitude of point 1 (degrees).
+   * @param azi1 azimuth at point 1 (degrees).
+   * @param a12 arc length between point 1 and point 2 (degrees); it can
+   *   be negative.
+   * @return a {@link GeodesicData} object with the following fields:
+   *   <i>lat1</i>, <i>lon1</i>, <i>azi1</i>, <i>lat2</i>, <i>lon2</i>,
+   *   <i>azi2</i>, <i>s12</i>, <i>a12</i>.
+   * <p>
+   * <i>lat1</i> should be in the range [&minus;90&deg;, 90&deg;]; <i>lon1</i>
+   * and <i>azi1</i> should be in the range [&minus;540&deg;, 540&deg;).  The
+   * values of <i>lon2</i> and <i>azi2</i> returned are in the range
+   * [&minus;180&deg;, 180&deg;).
+   * <p>
+   * If either point is at a pole, the azimuth is defined by keeping the
+   * longitude fixed, writing <i>lat</i> = &plusmn;(90&deg; &minus; &epsilon;),
+   * and taking the limit &epsilon; &rarr; 0+.  An arc length greater that
+   * 180&deg; signifies a geodesic which is not a shortest path.  (For a
+   * prolate ellipsoid, an additional condition is necessary for a shortest
+   * path: the longitudinal extent must not exceed of 180&deg;.)
+   **********************************************************************/
+  public GeodesicData ArcDirect(double lat1, double lon1,
+                                double azi1, double a12) {
+    return Direct(lat1, lon1, azi1, true, a12,
+                  GeodesicMask.LATITUDE | GeodesicMask.LONGITUDE |
+                  GeodesicMask.AZIMUTH | GeodesicMask.DISTANCE);
+  }
+
+  /**
+   * Solve the direct geodesic problem where the length of the geodesic is
+   * specified in terms of arc length and with a subset of the geodesic results
+   * returned.
+   * <p>
+   * @param lat1 latitude of point 1 (degrees).
+   * @param lon1 longitude of point 1 (degrees).
+   * @param azi1 azimuth at point 1 (degrees).
+   * @param a12 arc length between point 1 and point 2 (degrees); it can
+   *   be negative.
+   * @param outmask a bitor'ed combination of {@link GeodesicMask} values
+   *   specifying which results should be returned.
+   * @return a {@link GeodesicData} object with the fields specified by
+   *   <i>outmask</i> computed.
+   * <p>
+   * <i>lat1</i>, <i>lon1</i>, <i>azi1</i>, and <i>a12</i> are always included
+   * in the returned result.
+   **********************************************************************/
+  public GeodesicData ArcDirect(double lat1, double lon1,
+                                double azi1, double a12, int outmask) {
+    return Direct(lat1, lon1, azi1, true, a12, outmask);
+  }
+
+  /**
+   * The general direct geodesic problem.  {@link #Direct Direct} and
+   * {@link #ArcDirect ArcDirect} are defined in terms of this function.
+   * <p>
+   * @param lat1 latitude of point 1 (degrees).
+   * @param lon1 longitude of point 1 (degrees).
+   * @param azi1 azimuth at point 1 (degrees).
+   * @param arcmode boolean flag determining the meaning of the
+   *   <i>s12_a12</i>.
+   * @param s12_a12 if <i>arcmode</i> is false, this is the distance between
+   *   point 1 and point 2 (meters); otherwise it is the arc length between
+   *   point 1 and point 2 (degrees); it can be negative.
+   * @param outmask a bitor'ed combination of {@link GeodesicMask} values
+   *   specifying which results should be returned.
+   * @return a {@link GeodesicData} object with the fields specified by
+   *   <i>outmask</i> computed.
+   * <p>
+   * The {@link GeodesicMask} values possible for <i>outmask</i> are
+   * <ul>
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.LATITUDE for the latitude <i>lat2</i>;
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.LONGITUDE for the latitude <i>lon2</i>;
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.AZIMUTH for the latitude <i>azi2</i>;
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.DISTANCE for the distance <i>s12</i>;
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.REDUCEDLENGTH for the reduced length
+   *   <i>m12</i>;
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.GEODESICSCALE for the geodesic scales
+   *   <i>M12</i> and <i>M21</i>;
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.AREA for the area <i>S12</i>;
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.ALL for all of the above.
+   * </ul>
+   * <p>
+   * The function value <i>a12</i> is always computed and returned and this
+   * equals <i>s12_a12</i> is <i>arcmode</i> is true.  If <i>outmask</i>
+   * includes {@link GeodesicMask#DISTANCE} and <i>arcmode</i> is false, then
+   * <i>s12</i> = <i>s12_a12</i>.  It is not necessary to include {@link
+   * GeodesicMask#DISTANCE_IN} in <i>outmask</i>; this is automatically
+   * included is <i>arcmode</i> is false.
+   **********************************************************************/
+  public GeodesicData Direct(double lat1, double lon1, double azi1,
+                             boolean arcmode, double s12_a12, int outmask) {
+    return new GeodesicLine(this, lat1, lon1, azi1,
+                            // Automatically supply DISTANCE_IN if necessary
+                            outmask | (arcmode ? GeodesicMask.NONE :
+                                       GeodesicMask.DISTANCE_IN))
+      .                         // Note the dot!
+      Position(arcmode, s12_a12, outmask);
+  }
+
+  /**
+   * Solve the inverse geodesic problem.
+   * <p>
+   * @param lat1 latitude of point 1 (degrees).
+   * @param lon1 longitude of point 1 (degrees).
+   * @param lat2 latitude of point 2 (degrees).
+   * @param lon2 longitude of point 2 (degrees).
+   * @return a {@link GeodesicData} object with the following fields:
+   *   <i>lat1</i>, <i>lon1</i>, <i>azi1</i>, <i>lat2</i>, <i>lon2</i>,
+   *   <i>azi2</i>, <i>s12</i>, <i>a12</i>.
+   * <p>
+   * <i>lat1</i> and <i>lat2</i> should be in the range [&minus;90&deg;,
+   * 90&deg;]; <i>lon1</i> and <i>lon2</i> should be in the range
+   * [&minus;540&deg;, 540&deg;).  The values of <i>azi1</i> and <i>azi2</i>
+   * returned are in the range [&minus;180&deg;, 180&deg;).
+   * <p>
+   * If either point is at a pole, the azimuth is defined by keeping the
+   * longitude fixed, writing <i>lat</i> = &plusmn;(90&deg; &minus; &epsilon;),
+   * taking the limit &epsilon; &rarr; 0+.
+   * <p>
+   * The solution to the inverse problem is found using Newton's method.  If
+   * this fails to converge (this is very unlikely in geodetic applications
+   * but does occur for very eccentric ellipsoids), then the bisection method
+   * is used to refine the solution.
+   **********************************************************************/
+  public GeodesicData Inverse(double lat1, double lon1,
+                              double lat2, double lon2) {
+    return Inverse(lat1, lon1, lat2, lon2,
+                   GeodesicMask.DISTANCE | GeodesicMask.AZIMUTH);
+  }
+
+  /**
+   * Solve the inverse geodesic problem with a subset of the geodesic results
+   * returned.
+   * <p>
+   * @param lat1 latitude of point 1 (degrees).
+   * @param lon1 longitude of point 1 (degrees).
+   * @param lat2 latitude of point 2 (degrees).
+   * @param lon2 longitude of point 2 (degrees).
+   * @param outmask a bitor'ed combination of {@link GeodesicMask} values
+   *   specifying which results should be returned.
+   * @return a {@link GeodesicData} object with the fields specified by
+   *   <i>outmask</i> computed.
+   * <p>
+   * The {@link GeodesicMask} values possible for <i>outmask</i> are
+   * <ul>
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.DISTANCE for the distance <i>s12</i>;
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.AZIMUTH for the latitude <i>azi2</i>;
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.REDUCEDLENGTH for the reduced length
+   *   <i>m12</i>;
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.GEODESICSCALE for the geodesic scales
+   *   <i>M12</i> and <i>M21</i>;
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.AREA for the area <i>S12</i>;
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.ALL for all of the above.
+   * </ul>
+   * <p>
+   * <i>lat1</i>, <i>lon1</i>, <i>lat2</i>, <i>lon2</i>, and <i>a12</i> are
+   * always included in the returned result.
+   **********************************************************************/
+  public GeodesicData Inverse(double lat1, double lon1,
+                              double lat2, double lon2, int outmask) {
+    outmask &= GeodesicMask.OUT_ALL;
+    GeodesicData r = new GeodesicData();
+    lon1 = GeoMath.AngNormalize(lon1);
+    lon2 = GeoMath.AngNormalize(lon2);
+    // Compute longitude difference (AngDiff does this carefully).  Result is
+    // in [-180, 180] but -180 is only for west-going geodesics.  180 is for
+    // east-going and meridional geodesics.
+    double lon12 = GeoMath.AngDiff(lon1, lon2);
+    // If very close to being on the same half-meridian, then make it so.
+    lon12 = AngRound(lon12);
+    // Make longitude difference positive.
+    int lonsign = lon12 >= 0 ? 1 : -1;
+    lon12 *= lonsign;
+    // If really close to the equator, treat as on equator.
+    lat1 = AngRound(lat1);
+    lat2 = AngRound(lat2);
+    // Save input parameters post normalization
+    r.lat1 = lat1; r.lon1 = lon1; r.lat2 = lat2; r.lon2 = lon2;
+    // Swap points so that point with higher (abs) latitude is point 1
+    int swapp = Math.abs(lat1) >= Math.abs(lat2) ? 1 : -1;
+    if (swapp < 0) {
+      lonsign *= -1;
+      { double t = lat1; lat1 = lat2; lat2 = t; }
+    }
+    // Make lat1 <= 0
+    int latsign = lat1 < 0 ? 1 : -1;
+    lat1 *= latsign;
+    lat2 *= latsign;
+    // Now we have
+    //
+    //     0 <= lon12 <= 180
+    //     -90 <= lat1 <= 0
+    //     lat1 <= lat2 <= -lat1
+    //
+    // longsign, swapp, latsign register the transformation to bring the
+    // coordinates to this canonical form.  In all cases, 1 means no change was
+    // made.  We make these transformations so that there are few cases to
+    // check, e.g., on verifying quadrants in atan2.  In addition, this
+    // enforces some symmetries in the results returned.
+
+    double phi, sbet1, cbet1, sbet2, cbet2, s12x, m12x;
+    s12x = m12x = Double.NaN;
+
+    phi = lat1 * GeoMath.degree;
+    // Ensure cbet1 = +epsilon at poles
+    sbet1 = _f1 * Math.sin(phi);
+    cbet1 = lat1 == -90 ? tiny_ : Math.cos(phi);
+    { Pair p = SinCosNorm(sbet1, cbet1);
+      sbet1 = p.first; cbet1 = p.second; }
+
+    phi = lat2 * GeoMath.degree;
+    // Ensure cbet2 = +epsilon at poles
+    sbet2 = _f1 * Math.sin(phi);
+    cbet2 = Math.abs(lat2) == 90 ? tiny_ : Math.cos(phi);
+    { Pair p = SinCosNorm(sbet2, cbet2);
+      sbet2 = p.first; cbet2 = p.second; }
+
+    // If cbet1 < -sbet1, then cbet2 - cbet1 is a sensitive measure of the
+    // |bet1| - |bet2|.  Alternatively (cbet1 >= -sbet1), abs(sbet2) + sbet1 is
+    // a better measure.  This logic is used in assigning calp2 in Lambda12.
+    // Sometimes these quantities vanish and in that case we force bet2 = +/-
+    // bet1 exactly.  An example where is is necessary is the inverse problem
+    // 48.522876735459 0 -48.52287673545898293 179.599720456223079643
+    // which failed with Visual Studio 10 (Release and Debug)
+
+    if (cbet1 < -sbet1) {
+      if (cbet2 == cbet1)
+        sbet2 = sbet2 < 0 ? sbet1 : -sbet1;
+    } else {
+      if (Math.abs(sbet2) == -sbet1)
+        cbet2 = cbet1;
+    }
+
+    double
+      dn1 = Math.sqrt(1 + _ep2 * GeoMath.sq(sbet1)),
+      dn2 = Math.sqrt(1 + _ep2 * GeoMath.sq(sbet2));
+
+    double
+      lam12 = lon12 * GeoMath.degree,
+      slam12 = Math.abs(lon12) == 180 ? 0 : Math.sin(lam12),
+      clam12 = Math.cos(lam12);      // lon12 == 90 isn't interesting
+
+    double a12, sig12, calp1, salp1, calp2, salp2;
+    a12 = sig12 = calp1 = salp1 = calp2 = salp2 = Double.NaN;
+    // index zero elements of these arrays are unused
+    double C1a[] = new double[nC1_ + 1];
+    double C2a[] = new double[nC2_ + 1];
+    double C3a[] = new double[nC3_];
+
+    boolean meridian = lat1 == -90 || slam12 == 0;
+
+    if (meridian) {
+
+      // Endpoints are on a single full meridian, so the geodesic might lie on
+      // a meridian.
+
+      calp1 = clam12; salp1 = slam12; // Head to the target longitude
+      calp2 = 1; salp2 = 0;           // At the target we're heading north
+
+      double
+        // tan(bet) = tan(sig) * cos(alp)
+        ssig1 = sbet1, csig1 = calp1 * cbet1,
+        ssig2 = sbet2, csig2 = calp2 * cbet2;
+
+      // sig12 = sig2 - sig1
+      sig12 = Math.atan2(Math.max(csig1 * ssig2 - ssig1 * csig2, 0.0),
+                    csig1 * csig2 + ssig1 * ssig2);
+      {
+        LengthsV v =
+          Lengths(_n, sig12, ssig1, csig1, dn1, ssig2, csig2, dn2,
+                  cbet1, cbet2,
+                  (outmask & GeodesicMask.GEODESICSCALE) != 0, C1a, C2a);
+        s12x = v.s12b; m12x = v.m12b;
+        if ((outmask & GeodesicMask.GEODESICSCALE) != 0) {
+          r.M12 = v.M12; r.M21 = v.M21;
+        }
+      }
+      // Add the check for sig12 since zero length geodesics might yield m12 <
+      // 0.  Test case was
+      //
+      //    echo 20.001 0 20.001 0 | Geod -i
+      //
+      // In fact, we will have sig12 > pi/2 for meridional geodesic which is
+      // not a shortest path.
+      if (sig12 < 1 || m12x >= 0) {
+        m12x *= _b;
+        s12x *= _b;
+        a12 = sig12 / GeoMath.degree;
+      } else
+        // m12 < 0, i.e., prolate and too close to anti-podal
+        meridian = false;
+    }
+
+    double omg12 = Double.NaN;
+    if (!meridian &&
+        sbet1 == 0 &&   // and sbet2 == 0
+        // Mimic the way Lambda12 works with calp1 = 0
+        (_f <= 0 || lam12 <= Math.PI - _f * Math.PI)) {
+
+      // Geodesic runs along equator
+      calp1 = calp2 = 0; salp1 = salp2 = 1;
+      s12x = _a * lam12;
+      sig12 = omg12 = lam12 / _f1;
+      m12x = _b * Math.sin(sig12);
+      if ((outmask & GeodesicMask.GEODESICSCALE) != 0)
+        r.M12 = r.M21 = Math.cos(sig12);
+      a12 = lon12 / _f1;
+
+    } else if (!meridian) {
+
+      // Now point1 and point2 belong within a hemisphere bounded by a
+      // meridian and geodesic is neither meridional or equatorial.
+
+      // Figure a starting point for Newton's method
+      double dnm;
+      {
+        InverseStartV v =
+          InverseStart(sbet1, cbet1, dn1, sbet2, cbet2, dn2,
+                       lam12,
+                       C1a, C2a);
+        sig12 = v.sig12;
+        salp1 = v.salp1; calp1 = v.calp1;
+        salp2 = v.salp2; calp2 = v.calp2;
+        dnm = v.dnm;
+      }
+
+      if (sig12 >= 0) {
+        // Short lines (InverseStart sets salp2, calp2, dnm)
+        s12x = sig12 * _b * dnm;
+        m12x = GeoMath.sq(dnm) * _b * Math.sin(sig12 / dnm);
+        if ((outmask & GeodesicMask.GEODESICSCALE) != 0)
+          r.M12 = r.M21 = Math.cos(sig12 / dnm);
+        a12 = sig12 / GeoMath.degree;
+        omg12 = lam12 / (_f1 * dnm);
+      } else {
+
+        // Newton's method.  This is a straightforward solution of f(alp1) =
+        // lambda12(alp1) - lam12 = 0 with one wrinkle.  f(alp) has exactly one
+        // root in the interval (0, pi) and its derivative is positive at the
+        // root.  Thus f(alp) is positive for alp > alp1 and negative for alp <
+        // alp1.  During the course of the iteration, a range (alp1a, alp1b) is
+        // maintained which brackets the root and with each evaluation of
+        // f(alp) the range is shrunk, if possible.  Newton's method is
+        // restarted whenever the derivative of f is negative (because the new
+        // value of alp1 is then further from the solution) or if the new
+        // estimate of alp1 lies outside (0,pi); in this case, the new starting
+        // guess is taken to be (alp1a + alp1b) / 2.
+        double ssig1, csig1, ssig2, csig2, eps;
+        ssig1 = csig1 = ssig2 = csig2 = eps = Double.NaN;
+        int numit = 0;
+        // Bracketing range
+        double salp1a = tiny_, calp1a = 1, salp1b = tiny_, calp1b = -1;
+        for (boolean tripn = false, tripb = false; numit < maxit2_; ++numit) {
+          // the WGS84 test set: mean = 1.47, sd = 1.25, max = 16
+          // WGS84 and random input: mean = 2.85, sd = 0.60
+          double v, dv;
+          {
+            Lambda12V w =
+              Lambda12(sbet1, cbet1, dn1, sbet2, cbet2, dn2, salp1, calp1,
+                       numit < maxit1_, C1a, C2a, C3a);
+            v = w.lam12 - lam12;
+            salp2 = w.salp2; calp2 = w.calp2;
+            sig12 = w.sig12;
+            ssig1 = w.ssig1; csig1 = w.csig1;
+            ssig2 = w.ssig2; csig2 = w.csig2;
+            eps = w.eps; omg12 = w.domg12;
+            dv = w.dlam12;
+          }
+          // 2 * tol0 is approximately 1 ulp for a number in [0, pi].
+          // Reversed test to allow escape with NaNs
+          if (tripb || !(Math.abs(v) >= (tripn ? 8 : 2) * tol0_)) break;
+          // Update bracketing values
+          if (v > 0 && (numit > maxit1_ || calp1/salp1 > calp1b/salp1b))
+            { salp1b = salp1; calp1b = calp1; }
+          else if (v < 0 && (numit > maxit1_ || calp1/salp1 < calp1a/salp1a))
+            { salp1a = salp1; calp1a = calp1; }
+          if (numit < maxit1_ && dv > 0) {
+            double
+              dalp1 = -v/dv;
+            double
+              sdalp1 = Math.sin(dalp1), cdalp1 = Math.cos(dalp1),
+              nsalp1 = salp1 * cdalp1 + calp1 * sdalp1;
+            if (nsalp1 > 0 && Math.abs(dalp1) < Math.PI) {
+              calp1 = calp1 * cdalp1 - salp1 * sdalp1;
+              salp1 = nsalp1;
+              { Pair p = SinCosNorm(salp1, calp1);
+                salp1 = p.first; calp1 = p.second; }
+              // In some regimes we don't get quadratic convergence because
+              // slope -> 0.  So use convergence conditions based on epsilon
+              // instead of sqrt(epsilon).
+              tripn = Math.abs(v) <= 16 * tol0_;
+              continue;
+            }
+          }
+          // Either dv was not postive or updated value was outside legal
+          // range.  Use the midpoint of the bracket as the next estimate.
+          // This mechanism is not needed for the WGS84 ellipsoid, but it does
+          // catch problems with more eccentric ellipsoids.  Its efficacy is
+          // such for the WGS84 test set with the starting guess set to alp1 =
+          // 90deg:
+          // the WGS84 test set: mean = 5.21, sd = 3.93, max = 24
+          // WGS84 and random input: mean = 4.74, sd = 0.99
+          salp1 = (salp1a + salp1b)/2;
+          calp1 = (calp1a + calp1b)/2;
+          { Pair p = SinCosNorm(salp1, calp1);
+            salp1 = p.first; calp1 = p.second; }
+          tripn = false;
+          tripb = (Math.abs(salp1a - salp1) + (calp1a - calp1) < tolb_ ||
+                   Math.abs(salp1 - salp1b) + (calp1 - calp1b) < tolb_);
+        }
+        {
+          LengthsV v =
+            Lengths(eps, sig12, ssig1, csig1, dn1, ssig2, csig2, dn2,
+                    cbet1, cbet2,
+                    (outmask & GeodesicMask.GEODESICSCALE) != 0, C1a, C2a);
+          s12x = v.s12b; m12x = v.m12b;
+          if ((outmask & GeodesicMask.GEODESICSCALE) != 0) {
+            r.M12 = v.M12; r.M21 = v.M21;
+          }
+        }
+        m12x *= _b;
+        s12x *= _b;
+        a12 = sig12 / GeoMath.degree;
+        omg12 = lam12 - omg12;
+      }
+    }
+
+    if ((outmask & GeodesicMask.DISTANCE) != 0)
+      r.s12 = 0 + s12x;           // Convert -0 to 0
+
+    if ((outmask & GeodesicMask.REDUCEDLENGTH) != 0)
+      r.m12 = 0 + m12x;           // Convert -0 to 0
+
+    if ((outmask & GeodesicMask.AREA) != 0) {
+      double
+        // From Lambda12: sin(alp1) * cos(bet1) = sin(alp0)
+        salp0 = salp1 * cbet1,
+        calp0 = GeoMath.hypot(calp1, salp1 * sbet1); // calp0 > 0
+      double alp12;
+      if (calp0 != 0 && salp0 != 0) {
+        double
+          // From Lambda12: tan(bet) = tan(sig) * cos(alp)
+          ssig1 = sbet1, csig1 = calp1 * cbet1,
+          ssig2 = sbet2, csig2 = calp2 * cbet2,
+          k2 = GeoMath.sq(calp0) * _ep2,
+          eps = k2 / (2 * (1 + Math.sqrt(1 + k2)) + k2),
+          // Multiplier = a^2 * e^2 * cos(alpha0) * sin(alpha0).
+          A4 = GeoMath.sq(_a) * calp0 * salp0 * _e2;
+        { Pair p = SinCosNorm(ssig1, csig1);
+          ssig1 = p.first; csig1 = p.second; }
+        { Pair p = SinCosNorm(ssig2, csig2);
+          ssig2 = p.first; csig2 = p.second; }
+        double C4a[] = new double[nC4_];
+        C4f(eps, C4a);
+        double
+          B41 = SinCosSeries(false, ssig1, csig1, C4a),
+          B42 = SinCosSeries(false, ssig2, csig2, C4a);
+        r.S12 = A4 * (B42 - B41);
+      } else
+        // Avoid problems with indeterminate sig1, sig2 on equator
+        r.S12 = 0;
+
+      if (!meridian &&
+          omg12 < 0.75 * Math.PI && // Long difference too big
+          sbet2 - sbet1 < 1.75) {            // Lat difference too big
+        // Use tan(Gamma/2) = tan(omg12/2)
+        // * (tan(bet1/2)+tan(bet2/2))/(1+tan(bet1/2)*tan(bet2/2))
+        // with tan(x/2) = sin(x)/(1+cos(x))
+        double
+          somg12 = Math.sin(omg12), domg12 = 1 + Math.cos(omg12),
+          dbet1 = 1 + cbet1, dbet2 = 1 + cbet2;
+        alp12 = 2 * Math.atan2( somg12 * ( sbet1 * dbet2 + sbet2 * dbet1 ),
+                           domg12 * ( sbet1 * sbet2 + dbet1 * dbet2 ) );
+      } else {
+        // alp12 = alp2 - alp1, used in atan2 so no need to normalize
+        double
+          salp12 = salp2 * calp1 - calp2 * salp1,
+          calp12 = calp2 * calp1 + salp2 * salp1;
+        // The right thing appears to happen if alp1 = +/-180 and alp2 = 0, viz
+        // salp12 = -0 and alp12 = -180.  However this depends on the sign
+        // being attached to 0 correctly.  The following ensures the correct
+        // behavior.
+        if (salp12 == 0 && calp12 < 0) {
+          salp12 = tiny_ * calp1;
+          calp12 = -1;
+        }
+        alp12 = Math.atan2(salp12, calp12);
+      }
+      r.S12 += _c2 * alp12;
+      r.S12 *= swapp * lonsign * latsign;
+      // Convert -0 to 0
+      r.S12 += 0;
+    }
+
+    // Convert calp, salp to azimuth accounting for lonsign, swapp, latsign.
+    if (swapp < 0) {
+      { double t = salp1; salp1 = salp2; salp2 = t; }
+      { double t = calp1; calp1 = calp2; calp2 = t; }
+      if ((outmask & GeodesicMask.GEODESICSCALE) != 0)
+        { double t = r.M12; r.M12 = r.M21; r.M21 = t; }
+    }
+
+    salp1 *= swapp * lonsign; calp1 *= swapp * latsign;
+    salp2 *= swapp * lonsign; calp2 *= swapp * latsign;
+
+    if ((outmask & GeodesicMask.AZIMUTH) != 0) {
+      // minus signs give range [-180, 180). 0- converts -0 to +0.
+      r.azi1 = 0 - Math.atan2(-salp1, calp1) / GeoMath.degree;
+      r.azi2 = 0 - Math.atan2(-salp2, calp2) / GeoMath.degree;
+    }
+    // Returned value in [0, 180]
+    r.a12 = a12;
+    return r;
+  }
+
+  /**
+   * Set up to compute several points on a single geodesic.
+   * <p>
+   * @param lat1 latitude of point 1 (degrees).
+   * @param lon1 longitude of point 1 (degrees).
+   * @param azi1 azimuth at point 1 (degrees).
+   * @return a {@link GeodesicLine} object.
+   * <p>
+   * <i>lat1</i> should be in the range [&minus;90&deg;, 90&deg;]; <i>lon1</i>
+   * and <i>azi1</i> should be in the range [&minus;540&deg;, 540&deg;).  The
+   * full set of capabilities is included.
+   * <p>
+   * If the point is at a pole, the azimuth is defined by keeping the
+   * <i>lon1</i> fixed, writing <i>lat1</i> = &plusmn;(90 &minus; &epsilon;),
+   * taking the limit &epsilon; &rarr; 0+.
+   **********************************************************************/
+  public GeodesicLine Line(double lat1, double lon1, double azi1) {
+    return Line(lat1, lon1, azi1, GeodesicMask.ALL);
+  }
+  /**
+   * Set up to compute several points on a single geodesic with a subset of the
+   * capabilities included.
+   * <p>
+   * @param lat1 latitude of point 1 (degrees).
+   * @param lon1 longitude of point 1 (degrees).
+   * @param azi1 azimuth at point 1 (degrees).
+   * @param caps bitor'ed combination of {@link GeodesicMask} values specifying
+   *   the capabilities the {@link GeodesicLine} object should possess, i.e.,
+   *   which quantities can be returned in calls to {@link
+   *   GeodesicLine#Position GeodesicLine.Position}.
+   * @return a {@link GeodesicLine} object.
+   * <p>
+   * The {@link GeodesicMask} values are
+   * <ul>
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.LATITUDE for the latitude <i>lat2</i>; this
+   *   is added automatically;
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.LONGITUDE for the latitude <i>lon2</i>;
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.AZIMUTH for the azimuth <i>azi2</i>; this is
+   *   added automatically;
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.DISTANCE for the distance <i>s12</i>;
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.REDUCEDLENGTH for the reduced length
+   *   <i>m12</i>;
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.GEODESICSCALE for the geodesic scales
+   *   <i>M12</i> and <i>M21</i>;
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.AREA for the area <i>S12</i>;
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.DISTANCE_IN permits the length of the
+   *   geodesic to be given in terms of <i>s12</i>; without this capability the
+   *   length can only be specified in terms of arc length;
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.ALL for all of the above.
+   * </ul>
+   * <p>
+   * If the point is at a pole, the azimuth is defined by keeping <i>lon1</i>
+   * fixed, writing <i>lat1</i> = &plusmn;(90 &minus; &epsilon;), and taking
+   * the limit &epsilon; &rarr; 0+.
+   **********************************************************************/
+  public GeodesicLine Line(double lat1, double lon1, double azi1, int caps) {
+    return new GeodesicLine(this, lat1, lon1, azi1, caps);
+  }
+
+  /**
+   * @return <i>a</i> the equatorial radius of the ellipsoid (meters).  This is
+   *   the value used in the constructor.
+   **********************************************************************/
+  public double MajorRadius() { return _a; }
+
+  /**
+   * @return <i>f</i> the  flattening of the ellipsoid.  This is the
+   *   value used in the constructor.
+   **********************************************************************/
+  public double Flattening() { return _f; }
+
+  /**
+   * @return total area of ellipsoid in meters<sup>2</sup>.  The area of a
+   *   polygon encircling a pole can be found by adding EllipsoidArea()/2 to
+   *   the sum of <i>S12</i> for each side of the polygon.
+   **********************************************************************/
+  public double EllipsoidArea() { return 4 * Math.PI * _c2; }
+
+  /**
+   * A global instantiation of Geodesic with the parameters for the WGS84
+   * ellipsoid.
+   **********************************************************************/
+  public static final Geodesic WGS84 =
+      new Geodesic(Constants.WGS84_a, Constants.WGS84_f);
+
+  // This is a reformulation of the geodesic problem.  The notation is as
+  // follows:
+  // - at a general point (no suffix or 1 or 2 as suffix)
+  //   - phi = latitude
+  //   - beta = latitude on auxiliary sphere
+  //   - omega = longitude on auxiliary sphere
+  //   - lambda = longitude
+  //   - alpha = azimuth of great circle
+  //   - sigma = arc length along great circle
+  //   - s = distance
+  //   - tau = scaled distance (= sigma at multiples of pi/2)
+  // - at northwards equator crossing
+  //   - beta = phi = 0
+  //   - omega = lambda = 0
+  //   - alpha = alpha0
+  //   - sigma = s = 0
+  // - a 12 suffix means a difference, e.g., s12 = s2 - s1.
+  // - s and c prefixes mean sin and cos
+
+  protected static double SinCosSeries(boolean sinp,
+                                       double sinx, double cosx,
+                                       double c[]) {
+    // Evaluate
+    // y = sinp ? sum(c[i] * sin( 2*i    * x), i, 1, n) :
+    //            sum(c[i] * cos((2*i+1) * x), i, 0, n-1)
+    // using Clenshaw summation.  N.B. c[0] is unused for sin series
+    // Approx operation count = (n + 5) mult and (2 * n + 2) add
+    int k = c.length, n = k - (sinp ? 1 : 0);
+    double
+      ar = 2 * (cosx - sinx) * (cosx + sinx), // 2 * cos(2 * x)
+      y0 = (n & 1) != 0 ? c[--k] : 0, y1 = 0;        // accumulators for sum
+    // Now n is even
+    n /= 2;
+    while (n-- != 0) {
+      // Unroll loop x 2, so accumulators return to their original role
+      y1 = ar * y0 - y1 + c[--k];
+      y0 = ar * y1 - y0 + c[--k];
+    }
+    return sinp
+      ? 2 * sinx * cosx * y0    // sin(2 * x) * y0
+      : cosx * (y0 - y1);       // cos(x) * (y0 - y1)
+  }
+
+  private class LengthsV {
+    private double s12b, m12b, m0, M12, M21;
+    private LengthsV() {
+      s12b = m12b = m0 = M12 = M21 = Double.NaN;
+    }
+  }
+
+  private LengthsV Lengths(double eps, double sig12,
+                           double ssig1, double csig1, double dn1,
+                           double ssig2, double csig2, double dn2,
+                           double cbet1, double cbet2,
+                           boolean scalep,
+                           // Scratch areas of the right size
+                           double C1a[], double C2a[]) {
+    // Return m12b = (reduced length)/_b; also calculate s12b = distance/_b,
+    // and m0 = coefficient of secular term in expression for reduced length.
+    LengthsV v = new LengthsV(); // To hold s12b, m12b, m0, M12, M21;
+    C1f(eps, C1a);
+    C2f(eps, C2a);
+    double
+      A1m1 = A1m1f(eps),
+      AB1 = (1 + A1m1) * (SinCosSeries(true, ssig2, csig2, C1a) -
+                          SinCosSeries(true, ssig1, csig1, C1a)),
+      A2m1 = A2m1f(eps),
+      AB2 = (1 + A2m1) * (SinCosSeries(true, ssig2, csig2, C2a) -
+                          SinCosSeries(true, ssig1, csig1, C2a));
+    v.m0 = A1m1 - A2m1;
+    double J12 = v.m0 * sig12 + (AB1 - AB2);
+    // Missing a factor of _b.
+    // Add parens around (csig1 * ssig2) and (ssig1 * csig2) to ensure accurate
+    // cancellation in the case of coincident points.
+    v.m12b = dn2 * (csig1 * ssig2) - dn1 * (ssig1 * csig2) -
+      csig1 * csig2 * J12;
+    // Missing a factor of _b
+    v.s12b = (1 + A1m1) * sig12 + AB1;
+    if (scalep) {
+      double csig12 = csig1 * csig2 + ssig1 * ssig2;
+      double t = _ep2 * (cbet1 - cbet2) * (cbet1 + cbet2) / (dn1 + dn2);
+      v.M12 = csig12 + (t * ssig2 - csig2 * J12) * ssig1 / dn1;
+      v.M21 = csig12 - (t * ssig1 - csig1 * J12) * ssig2 / dn2;
+    }
+    return v;
+  }
+
+  private static double Astroid(double x, double y) {
+    // Solve k^4+2*k^3-(x^2+y^2-1)*k^2-2*y^2*k-y^2 = 0 for positive root k.
+    // This solution is adapted from Geocentric::Reverse.
+    double k;
+    double
+      p = GeoMath.sq(x),
+      q = GeoMath.sq(y),
+      r = (p + q - 1) / 6;
+    if ( !(q == 0 && r <= 0) ) {
+      double
+        // Avoid possible division by zero when r = 0 by multiplying equations
+        // for s and t by r^3 and r, resp.
+        S = p * q / 4,            // S = r^3 * s
+        r2 = GeoMath.sq(r),
+        r3 = r * r2,
+        // The discrimant of the quadratic equation for T3.  This is zero on
+        // the evolute curve p^(1/3)+q^(1/3) = 1
+        disc = S * (S + 2 * r3);
+      double u = r;
+      if (disc >= 0) {
+        double T3 = S + r3;
+        // Pick the sign on the sqrt to maximize abs(T3).  This minimizes loss
+        // of precision due to cancellation.  The result is unchanged because
+        // of the way the T is used in definition of u.
+        T3 += T3 < 0 ? -Math.sqrt(disc) : Math.sqrt(disc); // T3 = (r * t)^3
+        // N.B. cbrt always returns the double root.  cbrt(-8) = -2.
+        double T = GeoMath.cbrt(T3); // T = r * t
+        // T can be zero; but then r2 / T -> 0.
+        u += T + (T != 0 ? r2 / T : 0);
+      } else {
+        // T is complex, but the way u is defined the result is double.
+        double ang = Math.atan2(Math.sqrt(-disc), -(S + r3));
+        // There are three possible cube roots.  We choose the root which
+        // avoids cancellation.  Note that disc < 0 implies that r < 0.
+        u += 2 * r * Math.cos(ang / 3);
+      }
+      double
+        v = Math.sqrt(GeoMath.sq(u) + q),    // guaranteed positive
+        // Avoid loss of accuracy when u < 0.
+        uv = u < 0 ? q / (v - u) : u + v, // u+v, guaranteed positive
+        w = (uv - q) / (2 * v);           // positive?
+      // Rearrange expression for k to avoid loss of accuracy due to
+      // subtraction.  Division by 0 not possible because uv > 0, w >= 0.
+      k = uv / (Math.sqrt(uv + GeoMath.sq(w)) + w);   // guaranteed positive
+    } else {               // q == 0 && r <= 0
+      // y = 0 with |x| <= 1.  Handle this case directly.
+      // for y small, positive root is k = abs(y)/sqrt(1-x^2)
+      k = 0;
+    }
+    return k;
+  }
+
+  private class InverseStartV {
+    private double sig12, salp1, calp1,
+    // Only updated if return val >= 0
+      salp2, calp2,
+    // Only updated for short lines
+      dnm;
+    private InverseStartV() {
+      sig12 = salp1 = calp1 = salp2 = calp2 = dnm = Double.NaN;
+    }
+  }
+
+  private InverseStartV InverseStart(double sbet1, double cbet1, double dn1,
+                                     double sbet2, double cbet2, double dn2,
+                                     double lam12,
+                                     // Scratch areas of the right size
+                                     double C1a[], double C2a[]) {
+    // Return a starting point for Newton's method in salp1 and calp1 (function
+    // value is -1).  If Newton's method doesn't need to be used, return also
+    // salp2 and calp2 and function value is sig12.
+
+    // To hold sig12, salp1, calp1, salp2, calp2, dnm.
+    InverseStartV w = new InverseStartV();
+    w.sig12 = -1;               // Return value
+    double
+      // bet12 = bet2 - bet1 in [0, pi); bet12a = bet2 + bet1 in (-pi, 0]
+      sbet12 = sbet2 * cbet1 - cbet2 * sbet1,
+      cbet12 = cbet2 * cbet1 + sbet2 * sbet1;
+    double sbet12a = sbet2 * cbet1 + cbet2 * sbet1;
+    boolean shortline = cbet12 >= 0 && sbet12 < 0.5 &&
+      cbet2 * lam12 < 0.5;
+    double omg12 = lam12;
+    if (shortline) {
+      double sbetm2 = GeoMath.sq(sbet1 + sbet2);
+      // sin((bet1+bet2)/2)^2
+      // =  (sbet1 + sbet2)^2 / ((sbet1 + sbet2)^2 + (cbet1 + cbet2)^2)
+      sbetm2 /= sbetm2 + GeoMath.sq(cbet1 + cbet2);
+      w.dnm = Math.sqrt(1 + _ep2 * sbetm2);
+      omg12 /= _f1 * w.dnm;
+    }
+    double somg12 = Math.sin(omg12), comg12 = Math.cos(omg12);
+
+    w.salp1 = cbet2 * somg12;
+    w.calp1 = comg12 >= 0 ?
+      sbet12 + cbet2 * sbet1 * GeoMath.sq(somg12) / (1 + comg12) :
+      sbet12a - cbet2 * sbet1 * GeoMath.sq(somg12) / (1 - comg12);
+
+    double
+      ssig12 = GeoMath.hypot(w.salp1, w.calp1),
+      csig12 = sbet1 * sbet2 + cbet1 * cbet2 * comg12;
+
+    if (shortline && ssig12 < _etol2) {
+      // really short lines
+      w.salp2 = cbet1 * somg12;
+      w.calp2 = sbet12 - cbet1 * sbet2 *
+        (comg12 >= 0 ? GeoMath.sq(somg12) / (1 + comg12) : 1 - comg12);
+      { Pair p = SinCosNorm(w.salp2, w.calp2);
+        w.salp2 = p.first; w.calp2 = p.second; }
+      // Set return value
+      w.sig12 = Math.atan2(ssig12, csig12);
+    } else if (Math.abs(_n) > 0.1 || // Skip astroid calc if too eccentric
+               csig12 >= 0 ||
+               ssig12 >= 6 * Math.abs(_n) * Math.PI * GeoMath.sq(cbet1)) {
+      // Nothing to do, zeroth order spherical approximation is OK
+    } else {
+      // Scale lam12 and bet2 to x, y coordinate system where antipodal point
+      // is at origin and singular point is at y = 0, x = -1.
+      double y, lamscale, betscale;
+      // In C++ volatile declaration needed to fix inverse case
+      // 56.320923501171 0 -56.320923501171 179.664747671772880215
+      // which otherwise fails with g++ 4.4.4 x86 -O3
+      double x;
+      if (_f >= 0) {            // In fact f == 0 does not get here
+        // x = dlong, y = dlat
+        {
+          double
+            k2 = GeoMath.sq(sbet1) * _ep2,
+            eps = k2 / (2 * (1 + Math.sqrt(1 + k2)) + k2);
+          lamscale = _f * cbet1 * A3f(eps) * Math.PI;
+        }
+        betscale = lamscale * cbet1;
+
+        x = (lam12 - Math.PI) / lamscale;
+        y = sbet12a / betscale;
+      } else {                  // _f < 0
+        // x = dlat, y = dlong
+        double
+          cbet12a = cbet2 * cbet1 - sbet2 * sbet1,
+          bet12a = Math.atan2(sbet12a, cbet12a);
+        double m12b, m0;
+        // In the case of lon12 = 180, this repeats a calculation made in
+        // Inverse.
+        LengthsV v =
+          Lengths(_n, Math.PI + bet12a,
+                  sbet1, -cbet1, dn1, sbet2, cbet2, dn2,
+                  cbet1, cbet2, false, C1a, C2a);
+        m12b = v.m12b; m0 = v.m0;
+
+        x = -1 + m12b / (cbet1 * cbet2 * m0 * Math.PI);
+        betscale = x < -0.01 ? sbet12a / x :
+          -_f * GeoMath.sq(cbet1) * Math.PI;
+        lamscale = betscale / cbet1;
+        y = (lam12 - Math.PI) / lamscale;
+      }
+
+      if (y > -tol1_ && x > -1 - xthresh_) {
+        // strip near cut
+        if (_f >= 0) {
+          w.salp1 = Math.min(1.0, -x);
+          w.calp1 = - Math.sqrt(1 - GeoMath.sq(w.salp1));
+        } else {
+          w.calp1 = Math.max(x > -tol1_ ? 0.0 : -1.0, x);
+          w.salp1 = Math.sqrt(1 - GeoMath.sq(w.calp1));
+        }
+      } else {
+        // Estimate alp1, by solving the astroid problem.
+        //
+        // Could estimate alpha1 = theta + pi/2, directly, i.e.,
+        //   calp1 = y/k; salp1 = -x/(1+k);  for _f >= 0
+        //   calp1 = x/(1+k); salp1 = -y/k;  for _f < 0 (need to check)
+        //
+        // However, it's better to estimate omg12 from astroid and use
+        // spherical formula to compute alp1.  This reduces the mean number of
+        // Newton iterations for astroid cases from 2.24 (min 0, max 6) to 2.12
+        // (min 0 max 5).  The changes in the number of iterations are as
+        // follows:
+        //
+        // change percent
+        //    1       5
+        //    0      78
+        //   -1      16
+        //   -2       0.6
+        //   -3       0.04
+        //   -4       0.002
+        //
+        // The histogram of iterations is (m = number of iterations estimating
+        // alp1 directly, n = number of iterations estimating via omg12, total
+        // number of trials = 148605):
+        //
+        //  iter    m      n
+        //    0   148    186
+        //    1 13046  13845
+        //    2 93315 102225
+        //    3 36189  32341
+        //    4  5396      7
+        //    5   455      1
+        //    6    56      0
+        //
+        // Because omg12 is near pi, estimate work with omg12a = pi - omg12
+        double k = Astroid(x, y);
+        double
+          omg12a = lamscale * ( _f >= 0 ? -x * k/(1 + k) : -y * (1 + k)/k );
+        somg12 = Math.sin(omg12a); comg12 = -Math.cos(omg12a);
+        // Update spherical estimate of alp1 using omg12 instead of lam12
+        w.salp1 = cbet2 * somg12;
+        w.calp1 = sbet12a - cbet2 * sbet1 * GeoMath.sq(somg12) / (1 - comg12);
+      }
+    }
+    if (w.salp1 > 0)              // Sanity check on starting guess
+      { Pair p = SinCosNorm(w.salp1, w.calp1);
+        w.salp1 = p.first; w.calp1 = p.second; }
+    else {
+      w.salp1 = 1; w.calp1 = 0;
+    }
+    return w;
+  }
+
+  private class Lambda12V {
+    private double lam12, salp2, calp2, sig12, ssig1, csig1, ssig2, csig2,
+      eps, domg12, dlam12;
+    private Lambda12V() {
+      lam12 = salp2 = calp2 = sig12 = ssig1 = csig1 = ssig2 = csig2
+        = eps = domg12 = dlam12 = Double.NaN;
+    }
+  }
+
+  private Lambda12V Lambda12(double sbet1, double cbet1, double dn1,
+                             double sbet2, double cbet2, double dn2,
+                             double salp1, double calp1,
+                             boolean diffp,
+                             // Scratch areas of the right size
+                             double C1a[], double C2a[], double C3a[]) {
+    // Object to hold lam12, salp2, calp2, sig12, ssig1, csig1, ssig2, csig2,
+    // eps, domg12, dlam12;
+
+    Lambda12V w = new Lambda12V();
+
+    if (sbet1 == 0 && calp1 == 0)
+      // Break degeneracy of equatorial line.  This case has already been
+      // handled.
+      calp1 = -tiny_;
+
+    double
+      // sin(alp1) * cos(bet1) = sin(alp0)
+      salp0 = salp1 * cbet1,
+      calp0 = GeoMath.hypot(calp1, salp1 * sbet1); // calp0 > 0
+
+    double somg1, comg1, somg2, comg2, omg12;
+    // tan(bet1) = tan(sig1) * cos(alp1)
+    // tan(omg1) = sin(alp0) * tan(sig1) = tan(omg1)=tan(alp1)*sin(bet1)
+    w.ssig1 = sbet1; somg1 = salp0 * sbet1;
+    w.csig1 = comg1 = calp1 * cbet1;
+    { Pair p = SinCosNorm(w.ssig1, w.csig1);
+      w.ssig1 = p.first; w.csig1 = p.second; }
+    // SinCosNorm(somg1, comg1); -- don't need to normalize!
+
+    // Enforce symmetries in the case abs(bet2) = -bet1.  Need to be careful
+    // about this case, since this can yield singularities in the Newton
+    // iteration.
+    // sin(alp2) * cos(bet2) = sin(alp0)
+    w.salp2 = cbet2 != cbet1 ? salp0 / cbet2 : salp1;
+    // calp2 = sqrt(1 - sq(salp2))
+    //       = sqrt(sq(calp0) - sq(sbet2)) / cbet2
+    // and subst for calp0 and rearrange to give (choose positive sqrt
+    // to give alp2 in [0, pi/2]).
+    w.calp2 = cbet2 != cbet1 || Math.abs(sbet2) != -sbet1 ?
+      Math.sqrt(GeoMath.sq(calp1 * cbet1) +
+           (cbet1 < -sbet1 ?
+            (cbet2 - cbet1) * (cbet1 + cbet2) :
+            (sbet1 - sbet2) * (sbet1 + sbet2))) / cbet2 :
+      Math.abs(calp1);
+    // tan(bet2) = tan(sig2) * cos(alp2)
+    // tan(omg2) = sin(alp0) * tan(sig2).
+    w.ssig2 = sbet2; somg2 = salp0 * sbet2;
+    w.csig2 = comg2 = w.calp2 * cbet2;
+    { Pair p = SinCosNorm(w.ssig2, w.csig2);
+      w.ssig2 = p.first; w.csig2 = p.second; }
+    // SinCosNorm(somg2, comg2); -- don't need to normalize!
+
+    // sig12 = sig2 - sig1, limit to [0, pi]
+    w.sig12 = Math.atan2(Math.max(w.csig1 * w.ssig2 - w.ssig1 * w.csig2, 0.0),
+                  w.csig1 * w.csig2 + w.ssig1 * w.ssig2);
+
+    // omg12 = omg2 - omg1, limit to [0, pi]
+    omg12 = Math.atan2(Math.max(comg1 * somg2 - somg1 * comg2, 0.0),
+                  comg1 * comg2 + somg1 * somg2);
+    double B312, h0;
+    double k2 = GeoMath.sq(calp0) * _ep2;
+    w.eps = k2 / (2 * (1 + Math.sqrt(1 + k2)) + k2);
+    C3f(w.eps, C3a);
+    B312 = (SinCosSeries(true, w.ssig2, w.csig2, C3a) -
+            SinCosSeries(true, w.ssig1, w.csig1, C3a));
+    h0 = -_f * A3f(w.eps);
+    w.domg12 = salp0 * h0 * (w.sig12 + B312);
+    w.lam12 = omg12 + w.domg12;
+
+    if (diffp) {
+      if (w.calp2 == 0)
+        w.dlam12 = - 2 * _f1 * dn1 / sbet1;
+      else {
+        double dummy;
+        LengthsV v =
+          Lengths(w.eps, w.sig12, w.ssig1, w.csig1, dn1, w.ssig2, w.csig2, dn2,
+                  cbet1, cbet2, false, C1a, C2a);
+        w.dlam12 = v.m12b;
+        w.dlam12 *= _f1 / (w.calp2 * cbet2);
+      }
+    }
+
+    return w;
+  }
+
+  protected double A3f(double eps) {
+    // Evaluate sum(_A3x[k] * eps^k, k, 0, nA3x_-1) by Horner's method
+    double v = 0;
+    for (int i = nA3x_; i > 0; )
+      v = eps * v + _A3x[--i];
+    return v;
+  }
+
+  protected void C3f(double eps, double c[]) {
+    // Evaluate C3 coeffs by Horner's method
+    // Elements c[1] thru c[nC3_ - 1] are set
+    for (int j = nC3x_, k = nC3_ - 1; k > 0; ) {
+      double t = 0;
+      for (int i = nC3_ - k; i > 0; --i)
+        t = eps * t + _C3x[--j];
+      c[k--] = t;
+    }
+
+    double mult = 1;
+    for (int k = 1; k < nC3_; ) {
+      mult *= eps;
+      c[k++] *= mult;
+    }
+  }
+
+  protected void C4f(double eps, double c[]) {
+    // Evaluate C4 coeffs by Horner's method
+    // Elements c[0] thru c[nC4_ - 1] are set
+    for (int j = nC4x_, k = nC4_; k > 0; ) {
+      double t = 0;
+      for (int i = nC4_ - k + 1; i > 0; --i)
+        t = eps * t + _C4x[--j];
+      c[--k] = t;
+    }
+
+    double mult = 1;
+    for (int k = 1; k < nC4_; ) {
+      mult *= eps;
+      c[k++] *= mult;
+    }
+  }
+
+  // Generated by Maxima on 2010-09-04 10:26:17-04:00
+
+  // The scale factor A1-1 = mean value of (d/dsigma)I1 - 1
+  protected static double A1m1f(double eps) {
+    double
+      eps2 = GeoMath.sq(eps),
+      t;
+    t = eps2*(eps2*(eps2+4)+64)/256;
+    return (t + eps) / (1 - eps);
+  }
+
+  // The coefficients C1[l] in the Fourier expansion of B1
+  protected static void C1f(double eps, double c[]) {
+    double
+      eps2 = GeoMath.sq(eps),
+      d = eps;
+    c[1] = d*((6-eps2)*eps2-16)/32;
+    d *= eps;
+    c[2] = d*((64-9*eps2)*eps2-128)/2048;
+    d *= eps;
+    c[3] = d*(9*eps2-16)/768;
+    d *= eps;
+    c[4] = d*(3*eps2-5)/512;
+    d *= eps;
+    c[5] = -7*d/1280;
+    d *= eps;
+    c[6] = -7*d/2048;
+  }
+
+  // The coefficients C1p[l] in the Fourier expansion of B1p
+  protected static void C1pf(double eps, double c[]) {
+    double
+      eps2 = GeoMath.sq(eps),
+      d = eps;
+    c[1] = d*(eps2*(205*eps2-432)+768)/1536;
+    d *= eps;
+    c[2] = d*(eps2*(4005*eps2-4736)+3840)/12288;
+    d *= eps;
+    c[3] = d*(116-225*eps2)/384;
+    d *= eps;
+    c[4] = d*(2695-7173*eps2)/7680;
+    d *= eps;
+    c[5] = 3467*d/7680;
+    d *= eps;
+    c[6] = 38081*d/61440;
+  }
+
+  // The scale factor A2-1 = mean value of (d/dsigma)I2 - 1
+  protected static double A2m1f(double eps) {
+    double
+      eps2 = GeoMath.sq(eps),
+      t;
+    t = eps2*(eps2*(25*eps2+36)+64)/256;
+    return t * (1 - eps) - eps;
+  }
+
+  // The coefficients C2[l] in the Fourier expansion of B2
+  protected static void C2f(double eps, double c[]) {
+    double
+      eps2 = GeoMath.sq(eps),
+      d = eps;
+    c[1] = d*(eps2*(eps2+2)+16)/32;
+    d *= eps;
+    c[2] = d*(eps2*(35*eps2+64)+384)/2048;
+    d *= eps;
+    c[3] = d*(15*eps2+80)/768;
+    d *= eps;
+    c[4] = d*(7*eps2+35)/512;
+    d *= eps;
+    c[5] = 63*d/1280;
+    d *= eps;
+    c[6] = 77*d/2048;
+  }
+
+  // The scale factor A3 = mean value of (d/dsigma)I3
+  protected void A3coeff() {
+    _A3x[0] = 1;
+    _A3x[1] = (_n-1)/2;
+    _A3x[2] = (_n*(3*_n-1)-2)/8;
+    _A3x[3] = ((-_n-3)*_n-1)/16;
+    _A3x[4] = (-2*_n-3)/64;
+    _A3x[5] = -3/128.0;
+  }
+
+  // The coefficients C3[l] in the Fourier expansion of B3
+  protected void C3coeff() {
+    _C3x[0] = (1-_n)/4;
+    _C3x[1] = (1-_n*_n)/8;
+    _C3x[2] = ((3-_n)*_n+3)/64;
+    _C3x[3] = (2*_n+5)/128;
+    _C3x[4] = 3/128.0;
+    _C3x[5] = ((_n-3)*_n+2)/32;
+    _C3x[6] = ((-3*_n-2)*_n+3)/64;
+    _C3x[7] = (_n+3)/128;
+    _C3x[8] = 5/256.0;
+    _C3x[9] = (_n*(5*_n-9)+5)/192;
+    _C3x[10] = (9-10*_n)/384;
+    _C3x[11] = 7/512.0;
+    _C3x[12] = (7-14*_n)/512;
+    _C3x[13] = 7/512.0;
+    _C3x[14] = 21/2560.0;
+  }
+
+  // Generated by Maxima on 2012-10-19 08:02:34-04:00
+
+  // The coefficients C4[l] in the Fourier expansion of I4
+  protected void C4coeff() {
+    _C4x[0] = (_n*(_n*(_n*(_n*(100*_n+208)+572)+3432)-12012)+30030)/45045;
+    _C4x[1] = (_n*(_n*(_n*(64*_n+624)-4576)+6864)-3003)/15015;
+    _C4x[2] = (_n*((14144-10656*_n)*_n-4576)-858)/45045;
+    _C4x[3] = ((-224*_n-4784)*_n+1573)/45045;
+    _C4x[4] = (1088*_n+156)/45045;
+    _C4x[5] = 97/15015.0;
+    _C4x[6] = (_n*(_n*((-64*_n-624)*_n+4576)-6864)+3003)/135135;
+    _C4x[7] = (_n*(_n*(5952*_n-11648)+9152)-2574)/135135;
+    _C4x[8] = (_n*(5792*_n+1040)-1287)/135135;
+    _C4x[9] = (468-2944*_n)/135135;
+    _C4x[10] = 1/9009.0;
+    _C4x[11] = (_n*((4160-1440*_n)*_n-4576)+1716)/225225;
+    _C4x[12] = ((4992-8448*_n)*_n-1144)/225225;
+    _C4x[13] = (1856*_n-936)/225225;
+    _C4x[14] = 8/10725.0;
+    _C4x[15] = (_n*(3584*_n-3328)+1144)/315315;
+    _C4x[16] = (1024*_n-208)/105105;
+    _C4x[17] = -136/63063.0;
+    _C4x[18] = (832-2560*_n)/405405;
+    _C4x[19] = -128/135135.0;
+    _C4x[20] = 128/99099.0;
+  }
+}
diff --git a/OpenVehicleApp/src/net/sf/geographiclib/GeodesicData.java b/OpenVehicleApp/src/net/sf/geographiclib/GeodesicData.java
new file mode 100644
index 00000000..1a667a5e
--- /dev/null
+++ b/OpenVehicleApp/src/net/sf/geographiclib/GeodesicData.java
@@ -0,0 +1,78 @@
+/**
+ * Implementation of the net.sf.geographiclib.GeodesicData class
+ *
+ * Copyright (c) Charles Karney (2013) <charles@karney.com> and licensed
+ * under the MIT/X11 License.  For more information, see
+ * http://geographiclib.sourceforge.net/
+ **********************************************************************/
+package net.sf.geographiclib;
+
+/**
+ * The results of geodesic calculations.
+ *
+ * This is used to return the results for a geodesic between point 1
+ * (<i>lat1</i>, <i>lon1</i>) and point 2 (<i>lat2</i>, <i>lon2</i>).  Fields
+ * that have not been set will be filled with Double.NaN.  The returned
+ * GeodesicData objects always include the parameters provided to {@link
+ * Geodesic#Direct(double, double, double, double) Geodesic.Direct} and {@link
+ * Geodesic#Inverse(double, double, double, double) Geodesic.Inverse} and it
+ * always includes the field <i>a12</i>.
+ **********************************************************************/
+public class GeodesicData {
+  /**
+   * latitude of point 1 (degrees).
+   **********************************************************************/
+  public double lat1;
+  /**
+   * longitude of point 1 (degrees).
+   **********************************************************************/
+  public double lon1;
+  /**
+   * azimuth at point 1 (degrees).
+   **********************************************************************/
+  public double azi1;
+  /**
+   * latitude of point 2 (degrees).
+   **********************************************************************/
+  public double lat2;
+  /**
+   * longitude of point 2 (degrees).
+   **********************************************************************/
+  public double lon2;
+  /**
+   * azimuth at point 2 (degrees).
+   **********************************************************************/
+  public double azi2;
+  /**
+   * distance between point 1 and point 2 (meters).
+   **********************************************************************/
+  public double s12;
+  /**
+   * arc length on the auxiliary sphere between point 1 and point 2
+   *   (degrees).
+   **********************************************************************/
+  public double a12;
+  /**
+   * reduced length of geodesic (meters).
+   **********************************************************************/
+  public double m12;
+  /**
+   * geodesic scale of point 2 relative to point 1 (dimensionless).
+   **********************************************************************/
+  public double M12;
+  /**
+   * geodesic scale of point 1 relative to point 2 (dimensionless).
+   **********************************************************************/
+  public double M21;
+  /**
+   * area under the geodesic (meters<sup>2</sup>).
+   **********************************************************************/
+  public double S12;
+  /**
+   * Initialize all the fields to Double.NaN.
+   **********************************************************************/
+  public GeodesicData() {
+    lat1 = lon1 = azi1 = lat2 = lon2 = azi2 =
+      s12 = a12 = m12 = M12 = M21 = S12 = Double.NaN;
+  }
+}
diff --git a/OpenVehicleApp/src/net/sf/geographiclib/GeodesicLine.java b/OpenVehicleApp/src/net/sf/geographiclib/GeodesicLine.java
new file mode 100644
index 00000000..61d29de6
--- /dev/null
+++ b/OpenVehicleApp/src/net/sf/geographiclib/GeodesicLine.java
@@ -0,0 +1,632 @@
+/**
+ * Implementation of the net.sf.geographiclib.GeodesicLine class
+ *
+ * Copyright (c) Charles Karney (2013) <charles@karney.com> and licensed
+ * under the MIT/X11 License.  For more information, see
+ * http://geographiclib.sourceforge.net/
+ **********************************************************************/
+package net.sf.geographiclib;
+
+/**
+ * A geodesic line.
+ * <p>
+ * GeodesicLine facilitates the determination of a series of points on a single
+ * geodesic.  The starting point (<i>lat1</i>, <i>lon1</i>) and the azimuth
+ * <i>azi1</i> are specified in the constructor.  {@link #Position Position}
+ * returns the location of point 2 a distance <i>s12</i> along the geodesic.
+ * Alternatively {@link #ArcPosition ArcPosition} gives the position of point 2
+ * an arc length <i>a12</i> along the geodesic.
+ * <p>
+ * The calculations are accurate to better than 15 nm (15 nanometers).  See
+ * Sec. 9 of
+ * <a href="http://arxiv.org/abs/1102.1215v1">arXiv:1102.1215v1</a> for
+ * details.  The algorithms used by this class are based on series expansions
+ * using the flattening <i>f</i> as a small parameter.  These are only accurate
+ * for |<i>f</i>| &lt; 0.02; however reasonably accurate results will be
+ * obtained for |<i>f</i>| &lt; 0.2.
+ * <p>
+ * The algorithms are described in
+ * <ul>
+ * <li>
+ *   C. F. F. Karney,
+ *   <a href="http://dx.doi.org/10.1007/s00190-012-0578-z">
+ *   Algorithms for geodesics</a>,
+ *   J. Geodesy <b>87</b>, 43&ndash;55 (2013);
+ *   DOI: <a href="http://dx.doi.org/10.1007/s00190-012-0578-z">
+ *   10.1007/s00190-012-0578-z</a>;
+ *   addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ *   geod-addenda.html</a>.
+ * </ul>
+ * <p>
+ * Here's an example of using this class
+ * <pre>
+ * {@code
+ * import net.sf.geographiclib.*;
+ * public class GeodesicLineTest {
+ *   public static void main(String[] args) {
+ *     // Print waypoints between JFK and SIN
+ *     Geodesic geod = Geodesic.WGS84;
+ *     double
+ *       lat1 = 40.640, lon1 = -73.779, // JFK
+ *       lat2 =  1.359, lon2 = 103.989; // SIN
+ *     GeodesicData g = geod.Inverse(lat1, lon1, lat2, lon2,
+ *                  GeodesicMask.DISTANCE | GeodesicMask.AZIMUTH);
+ *     GeodesicLine line = new GeodesicLine(geod, lat1, lon1, g.azi1,
+ *                  GeodesicMask.DISTANCE_IN | GeodesicMask.LONGITUDE);
+ *     double
+ *       s12 = g.s12,
+ *       a12 = g.a12,
+ *       ds0 = 500e3;        // Nominal distance between points = 500 km
+ *     int num = (int)(Math.ceil(s12 / ds0)); // The number of intervals
+ *     {
+ *       // Use intervals of equal length
+ *       double ds = s12 / num;
+ *       for (int i = 0; i <= num; ++i) {
+ *         g = line.Position(i * ds,
+ *                  GeodesicMask.LATITUDE | GeodesicMask.LONGITUDE);
+ *         System.out.println(i + " " + g.lat2 + " " + g.lon2);
+ *       }
+ *     }
+ *     {
+ *       // Slightly faster, use intervals of equal arc length
+ *       double da = a12 / num;
+ *       for (int i = 0; i <= num; ++i) {
+ *         g = line.ArcPosition(i * da,
+ *                  GeodesicMask.LATITUDE | GeodesicMask.LONGITUDE);
+ *         System.out.println(i + " " + g.lat2 + " " + g.lon2);
+ *       }
+ *     }
+ *   }
+ * }}</pre>
+ **********************************************************************/
+public class GeodesicLine {
+
+  private static final int nC1_ = Geodesic.nC1_;
+  private static final int nC1p_ = Geodesic.nC1p_;
+  private static final int nC2_ = Geodesic.nC2_;
+  private static final int nC3_ = Geodesic.nC3_;
+  private static final int nC4_ = Geodesic.nC4_;
+
+  private double _lat1, _lon1, _azi1;
+  private double _a, _f, _b, _c2, _f1, _salp0, _calp0, _k2,
+    _salp1, _calp1, _ssig1, _csig1, _dn1, _stau1, _ctau1, _somg1, _comg1,
+    _A1m1, _A2m1, _A3c, _B11, _B21, _B31, _A4, _B41;
+  // index zero elements of _C1a, _C1pa, _C2a, _C3a are unused
+  private double _C1a[], _C1pa[], _C2a[], _C3a[],
+    _C4a[];    // all the elements of _C4a are used
+  private int _caps;
+
+  /**
+   * Constructor for a geodesic line staring at latitude <i>lat1</i>, longitude
+   * <i>lon1</i>, and azimuth <i>azi1</i> (all in degrees).
+   * <p>
+   * @param g A {@link Geodesic} object used to compute the necessary
+   *   information about the GeodesicLine.
+   * @param lat1 latitude of point 1 (degrees).
+   * @param lon1 longitude of point 1 (degrees).
+   * @param azi1 azimuth at point 1 (degrees).
+   * <p>
+   * <i>lat1</i> should be in the range [&minus;90&deg;, 90&deg;]; <i>lon1</i>
+   * and <i>azi1</i> should be in the range [&minus;540&deg;, 540&deg;).
+   * <p>
+   * If the point is at a pole, the azimuth is defined by keeping <i>lon1</i>
+   * fixed, writing <i>lat1</i> = &plusmn;(90&deg; &minus; &epsilon;), and
+   * taking the limit &epsilon; &rarr; 0+.
+   **********************************************************************/
+  public GeodesicLine(Geodesic g,
+                      double lat1, double lon1, double azi1) {
+    this(g, lat1, lon1, azi1, GeodesicMask.ALL);
+  }
+
+  /**
+   * Constructor for a geodesic line staring at latitude <i>lat1</i>, longitude
+   * <i>lon1</i>, and azimuth <i>azi1</i> (all in degrees) with a subset of the
+   * capabilities included.
+   * <p>
+   * @param g A {@link Geodesic} object used to compute the necessary
+   *   information about the GeodesicLine.
+   * @param lat1 latitude of point 1 (degrees).
+   * @param lon1 longitude of point 1 (degrees).
+   * @param azi1 azimuth at point 1 (degrees).
+   * @param caps bitor'ed combination of {@link GeodesicMask} values
+   *   specifying the capabilities the GeodesicLine object should possess,
+   *   i.e., which quantities can be returned in calls to {@link #Position
+   *   Position}.
+   * <p>
+   * The {@link GeodesicMask} values are
+   * <ul>
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.LATITUDE for the latitude <i>lat2</i>; this
+   *   is added automatically;
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.LONGITUDE for the latitude <i>lon2</i>;
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.AZIMUTH for the latitude <i>azi2</i>; this
+   *   is added automatically;
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.DISTANCE for the distance <i>s12</i>;
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.REDUCEDLENGTH for the reduced length
+   *   <i>m12</i>;
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.GEODESICSCALE for the geodesic scales
+   *   <i>M12</i> and <i>M21</i>;
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.AREA for the area <i>S12</i>;
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.DISTANCE_IN permits the length of the
+   *   geodesic to be given in terms of <i>s12</i>; without this capability the
+   *   length can only be specified in terms of arc length;
+   * <li>
+   *   <i>caps</i> |= GeodesicMask.ALL for all of the above;
+   * </ul>
+   **********************************************************************/
+  public GeodesicLine(Geodesic g,
+                      double lat1, double lon1, double azi1,
+                      int caps) {
+    _a = g._a;
+    _f = g._f;
+    _b = g._b;
+    _c2 = g._c2;
+    _f1 = g._f1;
+    // Always allow latitude and azimuth
+    _caps = caps | GeodesicMask.LATITUDE | GeodesicMask.AZIMUTH;
+
+    // Guard against underflow in salp0
+    azi1 = Geodesic.AngRound(GeoMath.AngNormalize(azi1));
+    lon1 = GeoMath.AngNormalize(lon1);
+    _lat1 = lat1;
+    _lon1 = lon1;
+    _azi1 = azi1;
+    // alp1 is in [0, pi]
+    double alp1 = azi1 * GeoMath.degree;
+    // Enforce sin(pi) == 0 and cos(pi/2) == 0.  Better to face the ensuing
+    // problems directly than to skirt them.
+    _salp1 =          azi1  == -180 ? 0 : Math.sin(alp1);
+    _calp1 = Math.abs(azi1) ==   90 ? 0 : Math.cos(alp1);
+    double cbet1, sbet1, phi;
+    phi = lat1 * GeoMath.degree;
+    // Ensure cbet1 = +epsilon at poles
+    sbet1 = _f1 * Math.sin(phi);
+    cbet1 = Math.abs(lat1) == 90 ? Geodesic.tiny_ : Math.cos(phi);
+    { Pair p = Geodesic.SinCosNorm(sbet1, cbet1);
+      sbet1 = p.first; cbet1 = p.second; }
+    _dn1 = Math.sqrt(1 + g._ep2 * GeoMath.sq(sbet1));
+
+    // Evaluate alp0 from sin(alp1) * cos(bet1) = sin(alp0),
+    _salp0 = _salp1 * cbet1; // alp0 in [0, pi/2 - |bet1|]
+    // Alt: calp0 = hypot(sbet1, calp1 * cbet1).  The following
+    // is slightly better (consider the case salp1 = 0).
+    _calp0 = GeoMath.hypot(_calp1, _salp1 * sbet1);
+    // Evaluate sig with tan(bet1) = tan(sig1) * cos(alp1).
+    // sig = 0 is nearest northward crossing of equator.
+    // With bet1 = 0, alp1 = pi/2, we have sig1 = 0 (equatorial line).
+    // With bet1 =  pi/2, alp1 = -pi, sig1 =  pi/2
+    // With bet1 = -pi/2, alp1 =  0 , sig1 = -pi/2
+    // Evaluate omg1 with tan(omg1) = sin(alp0) * tan(sig1).
+    // With alp0 in (0, pi/2], quadrants for sig and omg coincide.
+    // No atan2(0,0) ambiguity at poles since cbet1 = +epsilon.
+    // With alp0 = 0, omg1 = 0 for alp1 = 0, omg1 = pi for alp1 = pi.
+    _ssig1 = sbet1; _somg1 = _salp0 * sbet1;
+    _csig1 = _comg1 = sbet1 != 0 || _calp1 != 0 ? cbet1 * _calp1 : 1;
+    { Pair p = Geodesic.SinCosNorm(_ssig1, _csig1);
+      _ssig1 = p.first; _csig1 = p.second; } // sig1 in (-pi, pi]
+    // Geodesic.SinCosNorm(_somg1, _comg1); -- don't need to normalize!
+
+    _k2 = GeoMath.sq(_calp0) * g._ep2;
+    double eps = _k2 / (2 * (1 + Math.sqrt(1 + _k2)) + _k2);
+
+    if ((_caps & GeodesicMask.CAP_C1) != 0) {
+      _A1m1 = Geodesic.A1m1f(eps);
+      _C1a = new double[nC1_ + 1];
+      Geodesic.C1f(eps, _C1a);
+      _B11 = Geodesic.SinCosSeries(true, _ssig1, _csig1, _C1a);
+      double s = Math.sin(_B11), c = Math.cos(_B11);
+      // tau1 = sig1 + B11
+      _stau1 = _ssig1 * c + _csig1 * s;
+      _ctau1 = _csig1 * c - _ssig1 * s;
+      // Not necessary because C1pa reverts C1a
+      //    _B11 = -SinCosSeries(true, _stau1, _ctau1, _C1pa, nC1p_);
+    }
+
+    if ((_caps & GeodesicMask.CAP_C1p) != 0) {
+      _C1pa = new double[nC1p_ + 1];
+      Geodesic.C1pf(eps, _C1pa);
+    }
+
+    if ((_caps & GeodesicMask.CAP_C2) != 0) {
+      _C2a = new double[nC2_ + 1];
+      _A2m1 = Geodesic.A2m1f(eps);
+      Geodesic.C2f(eps, _C2a);
+      _B21 = Geodesic.SinCosSeries(true, _ssig1, _csig1, _C2a);
+    }
+
+    if ((_caps & GeodesicMask.CAP_C3) != 0) {
+      _C3a = new double[nC3_];
+      g.C3f(eps, _C3a);
+      _A3c = -_f * _salp0 * g.A3f(eps);
+      _B31 = Geodesic.SinCosSeries(true, _ssig1, _csig1, _C3a);
+    }
+
+    if ((_caps & GeodesicMask.CAP_C4) != 0) {
+      _C4a = new double[nC4_];
+      g.C4f(eps, _C4a);
+      // Multiplier = a^2 * e^2 * cos(alpha0) * sin(alpha0)
+      _A4 = GeoMath.sq(_a) * _calp0 * _salp0 * g._e2;
+      _B41 = Geodesic.SinCosSeries(false, _ssig1, _csig1, _C4a);
+    }
+  }
+
+  /**
+   * A default constructor.  If GeodesicLine.Position is called on the
+   * resulting object, it returns immediately (without doing any calculations).
+   * The object can be set with a call to {@link Geodesic.Line}.  Use {@link
+   * Init()} to test whether object is still in this uninitialized state.
+   * (This constructor was useful in C++, e.g., to allow vectors of
+   * GeodesicLine objects.  It may not be needed in Java, so make it private.)
+   **********************************************************************/
+  private GeodesicLine() { _caps = 0; }
+
+  /**
+   * Compute the position of point 2 which is a distance <i>s12</i> (meters)
+   * from point 1.
+   * <p>
+   * @param s12 distance between point 1 and point 2 (meters); it can be
+   *   negative.
+   * @return a {@link GeodesicData} object with the following fields:
+   *   <i>lat1</i>, <i>lon1</i>, <i>azi1</i>, <i>lat2</i>, <i>lon2</i>,
+   *   <i>azi2</i>, <i>s12</i>, <i>a12</i>.  Some of these results may be
+   *   missing if the GeodesicLine did not include the relevant capability.
+   * <p>
+   * The values of <i>lon2</i> and <i>azi2</i> returned are in the range
+   * [&minus;180&deg;, 180&deg;).
+   * <p>
+   * The GeodesicLine object <i>must</i> have been constructed with <i>caps</i>
+   * |= {@link GeodesicMask#DISTANCE_IN}; otherwise no parameters are set.
+   **********************************************************************/
+  public GeodesicData Position(double s12) {
+    return Position(false, s12,
+                    GeodesicMask.LATITUDE | GeodesicMask.LONGITUDE |
+                    GeodesicMask.AZIMUTH);
+  }
+  /**
+   * Compute the position of point 2 which is a distance <i>s12</i> (meters)
+   * from point 1 and with a subset of the geodesic results returned.
+   * <p>
+   * @param s12 distance between point 1 and point 2 (meters); it can be
+   *   negative.
+   * @param outmask a bitor'ed combination of {@link GeodesicMask} values
+   *   specifying which results should be returned.
+   * @return a {@link GeodesicData} object including the requested results.
+   * <p>
+   * The GeodesicLine object <i>must</i> have been constructed with <i>caps</i>
+   * |= {@link GeodesicMask#DISTANCE_IN}; otherwise no parameters are set.
+   * Requesting a value which the GeodesicLine object is not capable of
+   * computing is not an error (no parameters will be set).
+   **********************************************************************/
+  public GeodesicData Position(double s12, int outmask) {
+    return Position(false, s12, outmask);
+  }
+
+  /**
+   * Compute the position of point 2 which is an arc length <i>a12</i>
+   * (degrees) from point 1.
+   * <p>
+   * @param a12 arc length between point 1 and point 2 (degrees); it can
+   *   be negative.
+   * @return a {@link GeodesicData} object with the following fields:
+   *   <i>lat1</i>, <i>lon1</i>, <i>azi1</i>, <i>lat2</i>, <i>lon2</i>,
+   *   <i>azi2</i>, <i>s12</i>, <i>a12</i>.  Some of these results may be
+   *   missing if the GeodesicLine did not include the relevant capability.
+   * <p>
+   * The values of <i>lon2</i> and <i>azi2</i> returned are in the range
+   * [&minus;180&deg;, 180&deg;).
+   * <p>
+   * The GeodesicLine object <i>must</i> have been constructed with <i>caps</i>
+   * |= {@link GeodesicMask#DISTANCE_IN}; otherwise no parameters are set.
+   **********************************************************************/
+  public GeodesicData ArcPosition(double a12) {
+    return Position(true, a12,
+                    GeodesicMask.LATITUDE | GeodesicMask.LONGITUDE |
+                    GeodesicMask.AZIMUTH | GeodesicMask.DISTANCE);
+  }
+  /**
+   * Compute the position of point 2 which is an arc length <i>a12</i>
+   * (degrees) from point 1 and with a subset of the geodesic results returned.
+   * <p>
+   * @param a12 arc length between point 1 and point 2 (degrees); it can
+   *   be negative.
+   * @param outmask a bitor'ed combination of {@link GeodesicMask} values
+   *   specifying which results should be returned.
+   * @return a {@link GeodesicData} object giving <i>lat1</i>, <i>lon2</i>,
+   *   <i>azi2</i>, and <i>a12</i>.
+   * <p>
+   * The GeodesicLine object <i>must</i> have been constructed with <i>caps</i>
+   * |= {@link GeodesicMask#DISTANCE_IN}; otherwise no parameters are set.
+   * Requesting a value which the GeodesicLine object is not capable of
+   * computing is not an error (no parameters will be set).
+   **********************************************************************/
+  public GeodesicData ArcPosition(double a12, int outmask) {
+    return Position(true, a12, outmask);
+  }
+
+  /**
+   * The general position function.  {@link #Position(double, int) Position}
+   * and {@link #ArcPosition(double, int) ArcPosition} are defined in terms of
+   * this function.
+   * <p>
+   * @param arcmode boolean flag determining the meaning of the second
+   *   parameter; if arcmode is false, then the GeodesicLine object must have
+   *   been constructed with <i>caps</i> |= {@link GeodesicMask#DISTANCE_IN}.
+   * @param s12_a12 if <i>arcmode</i> is false, this is the distance between
+   *   point 1 and point 2 (meters); otherwise it is the arc length between
+   *   point 1 and point 2 (degrees); it can be negative.
+   * @param outmask a bitor'ed combination of {@link GeodesicMask} values
+   *   specifying which results should be returned.
+   * @return a {@link GeodesicData} object with the requested results.
+   * <p>
+   * The {@link GeodesicMask} values possible for <i>outmask</i> are
+   * <ul>
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.LATITUDE for the latitude <i>lat2</i>.
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.LONGITUDE for the latitude <i>lon2</i>.
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.AZIMUTH for the latitude <i>azi2</i>.
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.DISTANCE for the distance <i>s12</i>.
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.REDUCEDLENGTH for the reduced length
+   *   <i>m12</i>.
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.GEODESICSCALE for the geodesic scales
+   *   <i>M12</i> and <i>M21</i>.
+   * <li>
+   *   <i>outmask</i> |= GeodesicMask.AREA for the area <i>S12</i>.
+   * </ul>
+   * <p>
+   * Requesting a value which the GeodesicLine object is not capable of
+   * computing is not an error; Double.NaN is returned instead.
+   **********************************************************************/
+  public GeodesicData Position(boolean arcmode, double s12_a12,
+                               int outmask) {
+    outmask &= _caps & GeodesicMask.OUT_ALL;
+    GeodesicData r = new GeodesicData();
+    if (!( Init() &&
+           (arcmode ||
+            (_caps & GeodesicMask.DISTANCE_IN & GeodesicMask.OUT_ALL) != 0) ))
+      // Uninitialized or impossible distance calculation requested
+      return r;
+    r.lat1 = _lat1; r.lon1 = _lon1; r.azi1 = _azi1;
+
+    // Avoid warning about uninitialized B12.
+    double sig12, ssig12, csig12, B12 = 0, AB1 = 0;
+    if (arcmode) {
+      // Interpret s12_a12 as spherical arc length
+      r.a12 = s12_a12;
+      sig12 = s12_a12 * GeoMath.degree;
+      double s12a = Math.abs(s12_a12);
+      s12a -= 180 * Math.floor(s12a / 180);
+      ssig12 = s12a ==  0 ? 0 : Math.sin(sig12);
+      csig12 = s12a == 90 ? 0 : Math.cos(sig12);
+    } else {
+      // Interpret s12_a12 as distance
+      r.s12 = s12_a12;
+      double
+        tau12 = s12_a12 / (_b * (1 + _A1m1)),
+        s = Math.sin(tau12),
+        c = Math.cos(tau12);
+      // tau2 = tau1 + tau12
+      B12 = - Geodesic.SinCosSeries(true,
+                                    _stau1 * c + _ctau1 * s,
+                                    _ctau1 * c - _stau1 * s,
+                                    _C1pa);
+      sig12 = tau12 - (B12 - _B11);
+      r.a12 = sig12 / GeoMath.degree;
+      ssig12 = Math.sin(sig12); csig12 = Math.cos(sig12);
+      if (Math.abs(_f) > 0.01) {
+        // Reverted distance series is inaccurate for |f| > 1/100, so correct
+        // sig12 with 1 Newton iteration.  The following table shows the
+        // approximate maximum error for a = WGS_a() and various f relative to
+        // GeodesicExact.
+        //     erri = the error in the inverse solution (nm)
+        //     errd = the error in the direct solution (series only) (nm)
+        //     errda = the error in the direct solution (series + 1 Newton) (nm)
+        //
+        //       f     erri  errd errda
+        //     -1/5    12e6 1.2e9  69e6
+        //     -1/10  123e3  12e6 765e3
+        //     -1/20   1110 108e3  7155
+        //     -1/50  18.63 200.9 27.12
+        //     -1/100 18.63 23.78 23.37
+        //     -1/150 18.63 21.05 20.26
+        //      1/150 22.35 24.73 25.83
+        //      1/100 22.35 25.03 25.31
+        //      1/50  29.80 231.9 30.44
+        //      1/20   5376 146e3  10e3
+        //      1/10  829e3  22e6 1.5e6
+        //      1/5   157e6 3.8e9 280e6
+        double
+          ssig2 = _ssig1 * csig12 + _csig1 * ssig12,
+          csig2 = _csig1 * csig12 - _ssig1 * ssig12;
+        B12 = Geodesic.SinCosSeries(true, ssig2, csig2, _C1a);
+        double serr = (1 + _A1m1) * (sig12 + (B12 - _B11)) - s12_a12 / _b;
+        sig12 = sig12 - serr / Math.sqrt(1 + _k2 * GeoMath.sq(ssig2));
+        ssig12 = Math.sin(sig12); csig12 = Math.cos(sig12);
+        // Update B12 below
+      }
+    }
+
+    double omg12, lam12, lon12;
+    double ssig2, csig2, sbet2, cbet2, somg2, comg2, salp2, calp2;
+    // sig2 = sig1 + sig12
+    ssig2 = _ssig1 * csig12 + _csig1 * ssig12;
+    csig2 = _csig1 * csig12 - _ssig1 * ssig12;
+    double dn2 = Math.sqrt(1 + _k2 * GeoMath.sq(ssig2));
+    if ((outmask & (GeodesicMask.DISTANCE | GeodesicMask.REDUCEDLENGTH |
+                    GeodesicMask.GEODESICSCALE)) != 0) {
+      if (arcmode || Math.abs(_f) > 0.01)
+        B12 = Geodesic.SinCosSeries(true, ssig2, csig2, _C1a);
+      AB1 = (1 + _A1m1) * (B12 - _B11);
+    }
+    // sin(bet2) = cos(alp0) * sin(sig2)
+    sbet2 = _calp0 * ssig2;
+    // Alt: cbet2 = hypot(csig2, salp0 * ssig2);
+    cbet2 = GeoMath.hypot(_salp0, _calp0 * csig2);
+    if (cbet2 == 0)
+      // I.e., salp0 = 0, csig2 = 0.  Break the degeneracy in this case
+      cbet2 = csig2 = Geodesic.tiny_;
+    // tan(omg2) = sin(alp0) * tan(sig2)
+    somg2 = _salp0 * ssig2; comg2 = csig2;  // No need to normalize
+    // tan(alp0) = cos(sig2)*tan(alp2)
+    salp2 = _salp0; calp2 = _calp0 * csig2; // No need to normalize
+    // omg12 = omg2 - omg1
+    omg12 = Math.atan2(somg2 * _comg1 - comg2 * _somg1,
+                  comg2 * _comg1 + somg2 * _somg1);
+
+    if ((outmask & GeodesicMask.DISTANCE) != 0 && arcmode)
+      r.s12 = _b * ((1 + _A1m1) * sig12 + AB1);
+
+    if ((outmask & GeodesicMask.LONGITUDE) != 0) {
+      lam12 = omg12 + _A3c *
+        ( sig12 + (Geodesic.SinCosSeries(true, ssig2, csig2, _C3a)
+                   - _B31));
+      lon12 = lam12 / GeoMath.degree;
+      // Use GeoMath.AngNormalize2 because longitude might have wrapped
+      // multiple times.
+      lon12 = GeoMath.AngNormalize2(lon12);
+      r.lon2 = GeoMath.AngNormalize(_lon1 + lon12);
+    }
+
+    if ((outmask & GeodesicMask.LATITUDE) != 0)
+      r.lat2 = Math.atan2(sbet2, _f1 * cbet2) / GeoMath.degree;
+
+    if ((outmask & GeodesicMask.AZIMUTH) != 0)
+      // minus signs give range [-180, 180). 0- converts -0 to +0.
+      r.azi2 = 0 - Math.atan2(-salp2, calp2) / GeoMath.degree;
+
+    if ((outmask &
+         (GeodesicMask.REDUCEDLENGTH | GeodesicMask.GEODESICSCALE)) != 0) {
+      double
+        B22 = Geodesic.SinCosSeries(true, ssig2, csig2, _C2a),
+        AB2 = (1 + _A2m1) * (B22 - _B21),
+        J12 = (_A1m1 - _A2m1) * sig12 + (AB1 - AB2);
+      if ((outmask & GeodesicMask.REDUCEDLENGTH) != 0)
+        // Add parens around (_csig1 * ssig2) and (_ssig1 * csig2) to ensure
+        // accurate cancellation in the case of coincident points.
+        r.m12 = _b * ((dn2 * (_csig1 * ssig2) - _dn1 * (_ssig1 * csig2))
+                    - _csig1 * csig2 * J12);
+      if ((outmask & GeodesicMask.GEODESICSCALE) != 0) {
+        double t = _k2 * (ssig2 - _ssig1) * (ssig2 + _ssig1) / (_dn1 + dn2);
+        r.M12 = csig12 + (t *  ssig2 -  csig2 * J12) * _ssig1 / _dn1;
+        r.M21 = csig12 - (t * _ssig1 - _csig1 * J12) *  ssig2 /  dn2;
+      }
+    }
+
+    if ((outmask & GeodesicMask.AREA) != 0) {
+      double
+        B42 = Geodesic.SinCosSeries(false, ssig2, csig2, _C4a);
+      double salp12, calp12;
+      if (_calp0 == 0 || _salp0 == 0) {
+        // alp12 = alp2 - alp1, used in atan2 so no need to normalized
+        salp12 = salp2 * _calp1 - calp2 * _salp1;
+        calp12 = calp2 * _calp1 + salp2 * _salp1;
+        // The right thing appears to happen if alp1 = +/-180 and alp2 = 0, viz
+        // salp12 = -0 and alp12 = -180.  However this depends on the sign
+        // being attached to 0 correctly.  The following ensures the correct
+        // behavior.
+        if (salp12 == 0 && calp12 < 0) {
+          salp12 = Geodesic.tiny_ * _calp1;
+          calp12 = -1;
+        }
+      } else {
+        // tan(alp) = tan(alp0) * sec(sig)
+        // tan(alp2-alp1) = (tan(alp2) -tan(alp1)) / (tan(alp2)*tan(alp1)+1)
+        // = calp0 * salp0 * (csig1-csig2) / (salp0^2 + calp0^2 * csig1*csig2)
+        // If csig12 > 0, write
+        //   csig1 - csig2 = ssig12 * (csig1 * ssig12 / (1 + csig12) + ssig1)
+        // else
+        //   csig1 - csig2 = csig1 * (1 - csig12) + ssig12 * ssig1
+        // No need to normalize
+        salp12 = _calp0 * _salp0 *
+          (csig12 <= 0 ? _csig1 * (1 - csig12) + ssig12 * _ssig1 :
+           ssig12 * (_csig1 * ssig12 / (1 + csig12) + _ssig1));
+        calp12 = GeoMath.sq(_salp0) + GeoMath.sq(_calp0) * _csig1 * csig2;
+      }
+      r.S12 = _c2 * Math.atan2(salp12, calp12) + _A4 * (B42 - _B41);
+    }
+
+    return r;
+  }
+
+  /**
+   * @return true if the object has been initialized.
+   **********************************************************************/
+  private boolean Init() { return _caps != 0; }
+
+  /**
+   * @return <i>lat1</i> the latitude of point 1 (degrees).
+   **********************************************************************/
+  public double Latitude()
+  { return Init() ? _lat1 : Double.NaN; }
+
+  /**
+   * @return <i>lon1</i> the longitude of point 1 (degrees).
+   **********************************************************************/
+  public double Longitude()
+  { return Init() ? _lon1 : Double.NaN; }
+
+  /**
+   * @return <i>azi1</i> the azimuth (degrees) of the geodesic line at point 1.
+   **********************************************************************/
+  public double Azimuth()
+  { return Init() ? _azi1 : Double.NaN; }
+
+  /**
+   * @return <i>azi0</i> the azimuth (degrees) of the geodesic line as it
+   *   crosses the equator in a northward direction.
+   **********************************************************************/
+  public double EquatorialAzimuth() {
+    return Init() ?
+      Math.atan2(_salp0, _calp0) / GeoMath.degree : Double.NaN;
+  }
+
+  /**
+   * @return <i>a1</i> the arc length (degrees) between the northward
+   *   equatorial crossing and point 1.
+   **********************************************************************/
+  public double EquatorialArc() {
+    return Init() ?
+      Math.atan2(_ssig1, _csig1) / GeoMath.degree : Double.NaN;
+  }
+
+  /**
+   * @return <i>a</i> the equatorial radius of the ellipsoid (meters).  This is
+   *   the value inherited from the Geodesic object used in the constructor.
+   **********************************************************************/
+  public double MajorRadius()
+  { return Init() ? _a : Double.NaN; }
+
+  /**
+   * @return <i>f</i> the flattening of the ellipsoid.  This is the value
+   *   inherited from the Geodesic object used in the constructor.
+   **********************************************************************/
+  public double Flattening()
+  { return Init() ? _f : Double.NaN; }
+
+  /**
+   * @return <i>caps</i> the computational capabilities that this object was
+   *   constructed with.  LATITUDE and AZIMUTH are always included.
+   **********************************************************************/
+  public int Capabilities() { return _caps; }
+
+  /**
+   * @param testcaps a set of bitor'ed {@link GeodesicMask} values.
+   * @return true if the GeodesicLine object has all these capabilities.
+   **********************************************************************/
+  public boolean Capabilities(int testcaps) {
+    testcaps &= GeodesicMask.OUT_ALL;
+    return (_caps & testcaps) == testcaps;
+  }
+
+}
diff --git a/OpenVehicleApp/src/net/sf/geographiclib/GeodesicMask.java b/OpenVehicleApp/src/net/sf/geographiclib/GeodesicMask.java
new file mode 100644
index 00000000..6b72ea79
--- /dev/null
+++ b/OpenVehicleApp/src/net/sf/geographiclib/GeodesicMask.java
@@ -0,0 +1,77 @@
+/**
+ * Implementation of the net.sf.geographiclib.GeodesicMask class
+ *
+ * Copyright (c) Charles Karney (2013) <charles@karney.com> and licensed
+ * under the MIT/X11 License.  For more information, see
+ * http://geographiclib.sourceforge.net/
+ **********************************************************************/
+package net.sf.geographiclib;
+
+/**
+ * Bit masks for what geodesic calculations to do.
+ * <p>
+ * These masks do double duty.  They specify (via the <i>outmask</i> parameter)
+ * which results to return in the {@link GeodesicData} object returned by the
+ * general routines {@link Geodesic#Direct(double, double, double, double, int)
+ * Geodesic.Direct} and {@link Geodesic#Inverse(double, double, double, double,
+ * int) Geodesic.Inverse} routines.  They also signify (via the <i>caps</i>
+ * parameter) to the {@link GeodesicLine#GeodesicLine(Geodesic, double, double,
+ * double, int) GeodesicLine.GeodesicLine} constructor and to {@link
+ * Geodesic#Line(double, double, double, int) Geodesic.Line} what capabilities
+ * should be included in the {@link GeodesicLine} object.
+ **********************************************************************/
+public class GeodesicMask {
+  protected static final int CAP_NONE = 0;
+  protected static final int CAP_C1   = 1<<0;
+  protected static final int CAP_C1p  = 1<<1;
+  protected static final int CAP_C2   = 1<<2;
+  protected static final int CAP_C3   = 1<<3;
+  protected static final int CAP_C4   = 1<<4;
+  protected static final int CAP_ALL  = 0x1F;
+  protected static final int OUT_ALL  = 0x7F80;
+
+  /**
+   * No capabilities, no output.
+   **********************************************************************/
+  public static final int NONE          = 0;
+  /**
+   * Calculate latitude <i>lat2</i>.  (It's not necessary to include this as a
+   * capability to {@link GeodesicLine} because this is included by default.)
+   **********************************************************************/
+  public static final int LATITUDE      = 1<<7  | CAP_NONE;
+  /**
+   * Calculate longitude <i>lon2</i>.
+   **********************************************************************/
+  public static final int LONGITUDE     = 1<<8  | CAP_C3;
+  /**
+   * Calculate azimuths <i>azi1</i> and <i>azi2</i>.  (It's not necessary to
+   * include this as a capability to {@link GeodesicLine} because this is
+   * included by default.)
+   **********************************************************************/
+  public static final int AZIMUTH       = 1<<9  | CAP_NONE;
+  /**
+   * Calculate distance <i>s12</i>.
+   **********************************************************************/
+  public static final int DISTANCE      = 1<<10 | CAP_C1;
+  /**
+   * Allow distance <i>s12</i> to be used as <i>input</i> in the direct
+   * geodesic problem.
+   **********************************************************************/
+  public static final int DISTANCE_IN   = 1<<11 | CAP_C1 | CAP_C1p;
+  /**
+   * Calculate reduced length <i>m12</i>.
+   **********************************************************************/
+  public static final int REDUCEDLENGTH = 1<<12 | CAP_C1 | CAP_C2;
+  /**
+   * Calculate geodesic scales <i>M12</i> and <i>M21</i>.
+   **********************************************************************/
+  public static final int GEODESICSCALE = 1<<13 | CAP_C1 | CAP_C2;
+  /**
+   * Calculate area <i>S12</i>.
+   **********************************************************************/
+  public static final int AREA          = 1<<14 | CAP_C4;
+  /**
+   * All capabilities, calculate everything.
+   **********************************************************************/
+  public static final int ALL           = OUT_ALL| CAP_ALL;
+}
diff --git a/OpenVehicleApp/src/net/sf/geographiclib/GeographicErr.java b/OpenVehicleApp/src/net/sf/geographiclib/GeographicErr.java
new file mode 100644
index 00000000..d437a000
--- /dev/null
+++ b/OpenVehicleApp/src/net/sf/geographiclib/GeographicErr.java
@@ -0,0 +1,24 @@
+/**
+ * Implementation of the net.sf.geographiclib.GeographicErr class
+ *
+ * Copyright (c) Charles Karney (2013) <charles@karney.com> and licensed
+ * under the MIT/X11 License.  For more information, see
+ * http://geographiclib.sourceforge.net/
+ **********************************************************************/
+package net.sf.geographiclib;
+
+/**
+ * Exception handling for GeographicLib.
+ * <p>
+ * A class to handle exceptions.  It's derived from RuntimeException so it
+ * can be caught by the usual catch clauses.
+ **********************************************************************/
+public class GeographicErr extends RuntimeException {
+  /**
+   * Constructor
+   * <p>
+   * @param msg a string message, which is accessible in the catch
+   *   clause via getMessage().
+   **********************************************************************/
+  public GeographicErr(String msg) { super(msg); }
+}
diff --git a/OpenVehicleApp/src/net/sf/geographiclib/Pair.java b/OpenVehicleApp/src/net/sf/geographiclib/Pair.java
new file mode 100644
index 00000000..1e1140b4
--- /dev/null
+++ b/OpenVehicleApp/src/net/sf/geographiclib/Pair.java
@@ -0,0 +1,32 @@
+/**
+ * Implementation of the net.sf.geographiclib.Pair class
+ *
+ * Copyright (c) Charles Karney (2013) <charles@karney.com> and licensed
+ * under the MIT/X11 License.  For more information, see
+ * http://geographiclib.sourceforge.net/
+ **********************************************************************/
+package net.sf.geographiclib;
+
+/**
+ * A pair of double precision numbers.
+ * <p>
+ * This duplicates the C++ class {@code std::pair<double, double>}.
+ **********************************************************************/
+public class Pair {
+  /**
+   * The first member of the pair.
+   **********************************************************************/
+  public double first;
+  /**
+   * The second member of the pair.
+   **********************************************************************/
+  public double second;
+  /**
+   * Constructor
+   * <p>
+   * @param first the first member of the pair.
+   * @param second the second member of the pair.
+   **********************************************************************/
+  public Pair(double first, double second)
+  { this.first = first; this.second = second; }
+}
diff --git a/OpenVehicleApp/src/net/sf/geographiclib/PolygonArea.java b/OpenVehicleApp/src/net/sf/geographiclib/PolygonArea.java
new file mode 100644
index 00000000..75cb09a4
--- /dev/null
+++ b/OpenVehicleApp/src/net/sf/geographiclib/PolygonArea.java
@@ -0,0 +1,383 @@
+/**
+ * Implementation of the net.sf.geographiclib.PolygonArea class
+ *
+ * Copyright (c) Charles Karney (2013) <charles@karney.com> and licensed
+ * under the MIT/X11 License.  For more information, see
+ * http://geographiclib.sourceforge.net/
+ **********************************************************************/
+package net.sf.geographiclib;
+
+/**
+ * Polygon areas.
+ * <p>
+ * This computes the area of a geodesic polygon using the method given
+ * Section 6 of
+ * <ul>
+ * <li>
+ *   C. F. F. Karney,
+ *   <a href="http://dx.doi.org/10.1007/s00190-012-0578-z">
+ *   Algorithms for geodesics</a>,
+ *   J. Geodesy <b>87</b>, 43&ndash;55 (2013);
+ *   DOI: <a href="http://dx.doi.org/10.1007/s00190-012-0578-z">
+ *   10.1007/s00190-012-0578-z</a>;
+ *   addenda: <a href="http://geographiclib.sf.net/geod-addenda.html">
+ *   geod-addenda.html</a>.
+ * </ul>
+ * <p>
+ * This class lets you add vertices one at a time to the polygon.  The area
+ * and perimeter are accumulated in two times the standard floating point
+ * precision to guard against the loss of accuracy with many-sided polygons.
+ * At any point you can ask for the perimeter and area so far.  There's an
+ * option to treat the points as defining a polyline instead of a polygon; in
+ * that case, only the perimeter is computed.
+ * <p>
+ * Example of use:
+ * <pre>
+ * {@code
+ * // Compute the area of a geodesic polygon.
+ *
+ * // This program reads lines with lat, lon for each vertex of a polygon.
+ * // At the end of input, the program prints the number of vertices,
+ * // the perimeter of the polygon and its area (for the WGS84 ellipsoid).
+ *
+ * import java.util.*;
+ * import net.sf.geographiclib.*;
+ *
+ * public class Planimeter {
+ *   public static void main(String[] args) {
+ *     PolygonArea p = new PolygonArea(Geodesic.WGS84, false);
+ *     try {
+ *       Scanner in = new Scanner(System.in);
+ *       while (true) {
+ *         double lat = in.nextDouble(), lon = in.nextDouble();
+ *         p.AddPoint(lat, lon);
+ *       }
+ *     }
+ *     catch (Exception e) {}
+ *     PolygonResult r = p.Compute();
+ *     System.out.println(r.num + " " + r.perimeter + " " + r.area);
+ *   }
+ * }}</pre>
+ **********************************************************************/
+public class PolygonArea {
+
+  private Geodesic _earth;
+  private double _area0;        // Full ellipsoid area
+  private boolean _polyline;    // Assume polyline (don't close and skip area)
+  private int _mask;
+  private int _num;
+  private int _crossings;
+  private Accumulator _areasum, _perimetersum;
+  private double _lat0, _lon0, _lat1, _lon1;
+  private static int transit(double lon1, double lon2) {
+    // Return 1 or -1 if crossing prime meridian in east or west direction.
+    // Otherwise return zero.
+    // Compute lon12 the same way as Geodesic.Inverse.
+    lon1 = GeoMath.AngNormalize(lon1);
+    lon2 = GeoMath.AngNormalize(lon2);
+    double lon12 = GeoMath.AngDiff(lon1, lon2);
+    int cross =
+      lon1 < 0 && lon2 >= 0 && lon12 > 0 ? 1 :
+      (lon2 < 0 && lon1 >= 0 && lon12 < 0 ? -1 : 0);
+    return cross;
+  }
+
+  /**
+   * Constructor for PolygonArea.
+   * <p>
+   * @param earth the Geodesic object to use for geodesic calculations.
+   * @param polyline if true that treat the points as defining a polyline
+   *   instead of a polygon.
+   **********************************************************************/
+  public PolygonArea(Geodesic earth, boolean polyline) {
+    _earth = earth;
+    _area0 = _earth.EllipsoidArea();
+    _polyline = polyline;
+     _mask = GeodesicMask.LATITUDE | GeodesicMask.LONGITUDE |
+       GeodesicMask.DISTANCE |
+       (_polyline ? GeodesicMask.NONE : GeodesicMask.AREA);
+     _perimetersum = new Accumulator(0);
+     if (!_polyline)
+       _areasum = new Accumulator(0);
+     Clear();
+  }
+
+  /**
+   * Clear PolygonArea, allowing a new polygon to be started.
+   **********************************************************************/
+  public void Clear() {
+    _num = 0;
+    _crossings = 0;
+    _perimetersum.Set(0);
+    if (!_polyline) _areasum.Set(0);
+    _lat0 = _lon0 = _lat1 = _lon1 = Double.NaN;
+  }
+
+  /**
+   * Add a point to the polygon or polyline.
+   * <p>
+   * @param lat the latitude of the point (degrees).
+   * @param lon the latitude of the point (degrees).
+   * <p>
+   * <i>lat</i> should be in the range [&minus;90&deg;, 90&deg;] and <i>lon</i>
+   * should be in the range [&minus;540&deg;, 540&deg;).
+   **********************************************************************/
+  public void AddPoint(double lat, double lon) {
+    lon = GeoMath.AngNormalize(lon);
+    if (_num == 0) {
+      _lat0 = _lat1 = lat;
+      _lon0 = _lon1 = lon;
+    } else {
+      GeodesicData g = _earth.Inverse(_lat1, _lon1, lat, lon, _mask);
+      _perimetersum.Add(g.s12);
+      if (!_polyline) {
+        _areasum.Add(g.S12);
+        _crossings += transit(_lon1, lon);
+      }
+      _lat1 = lat; _lon1 = lon;
+    }
+    ++_num;
+  }
+
+  /**
+   * Add an edge to the polygon or polyline.
+   * <p>
+   * @param azi azimuth at current point (degrees).
+   * @param s distance from current point to next point (meters).
+   * <p>
+   * <i>azi</i> should be in the range [&minus;540&deg;, 540&deg;).  This does
+   * nothing if no points have been added yet.  Use PolygonArea.CurrentPoint to
+   * determine the position of the new vertex.
+   **********************************************************************/
+  public void AddEdge(double azi, double s) {
+    if (_num > 0) {             // Do nothing if _num is zero
+      GeodesicData g = _earth.Direct(_lat1, _lon1, azi, s, _mask);
+      _perimetersum.Add(g.s12);
+      if (!_polyline) {
+        _areasum.Add(g.S12);
+        _crossings += transit(_lon1, g.lon2);
+      }
+      _lat1 = g.lat2; _lon1 = g.lon2;
+      ++_num;
+    }
+  }
+
+  /**
+   * Return the results so far.
+   * <p>
+   * @return PolygonResult(<i>num</i>, <i>perimeter</i>, <i>area</i>) where
+   *   <i>num</i> is the number of vertices, <i>perimeter</i> is the perimeter
+   *   of the polygon or the length of the polyline (meters), and <i>area</i>
+   *   is the area of the polygon (meters<sup>2</sup>) or Double.NaN of
+   *   <i>polyline</i> is true in the constructor.
+   * <p>
+   * Counter-clockwise traversal counts as a positive area.
+   **********************************************************************/
+  public PolygonResult Compute() { return Compute(false, true); }
+  /**
+   * Return the results so far.
+   * <p>
+   * @param reverse if true then clockwise (instead of counter-clockwise)
+   *   traversal counts as a positive area.
+   * @param sign if true then return a signed result for the area if
+   *   the polygon is traversed in the "wrong" direction instead of returning
+   *   the area for the rest of the earth.
+   * @return PolygonResult(<i>num</i>, <i>perimeter</i>, <i>area</i>) where
+   *   <i>num</i> is the number of vertices, <i>perimeter</i> is the perimeter
+   *   of the polygon or the length of the polyline (meters), and <i>area</i>
+   *   is the area of the polygon (meters<sup>2</sup>) or Double.NaN of
+   *   <i>polyline</i> is true in the constructor.
+   **********************************************************************/
+  public PolygonResult Compute(boolean reverse, boolean sign) {
+    if (_num < 2)
+      return new PolygonResult(_num, 0, _polyline ? Double.NaN : 0);
+    if (_polyline)
+      return new PolygonResult(_num, _perimetersum.Sum(), Double.NaN);
+
+    GeodesicData g = _earth.Inverse(_lat1, _lon1, _lat0, _lon0, _mask);
+    Accumulator tempsum = new Accumulator(_areasum);
+    tempsum.Add(g.S12);
+    int crossings = _crossings + transit(_lon1, _lon0);
+    if ((crossings & 1) != 0)
+      tempsum.Add((tempsum.Sum() < 0 ? 1 : -1) * _area0/2);
+    // area is with the clockwise sense.  If !reverse convert to
+    // counter-clockwise convention.
+    if (!reverse)
+      tempsum.Negate();
+    // If sign put area in (-area0/2, area0/2], else put area in [0, area0)
+    if (sign) {
+      if (tempsum.Sum() > _area0/2)
+        tempsum.Add(-_area0);
+      else if (tempsum.Sum() <= -_area0/2)
+        tempsum.Add(+_area0);
+    } else {
+      if (tempsum.Sum() >= _area0)
+        tempsum.Add(-_area0);
+      else if (tempsum.Sum() < 0)
+        tempsum.Add(+_area0);
+    }
+    return new PolygonResult(_num, _perimetersum.Sum(g.s12), 0 + tempsum.Sum());
+  }
+
+  /**
+   * Return the results assuming a tentative final test point is added;
+   * however, the data for the test point is not saved.  This lets you report
+   * a running result for the perimeter and area as the user moves the mouse
+   * cursor.  Ordinary floating point arithmetic is used to accumulate the
+   * data for the test point; thus the area and perimeter returned are less
+   * accurate than if AddPoint and Compute are used.
+   * <p>
+   * @param lat the latitude of the test point (degrees).
+   * @param lon the longitude of the test point (degrees).
+   * @param reverse if true then clockwise (instead of counter-clockwise)
+   *   traversal counts as a positive area.
+   * @param sign if true then return a signed result for the area if
+   *   the polygon is traversed in the "wrong" direction instead of returning
+   *   the area for the rest of the earth.
+   * @return PolygonResult(<i>num</i>, <i>perimeter</i>, <i>area</i>) where
+   *   <i>num</i> is the number of vertices, <i>perimeter</i> is the perimeter
+   *   of the polygon or the length of the polyline (meters), and <i>area</i>
+   *   is the area of the polygon (meters<sup>2</sup>) or Double.NaN of
+   *   <i>polyline</i> is true in the constructor.
+   * <p>
+   * <i>lat</i> should be in the range [&minus;90&deg;, 90&deg;] and <i>lon</i>
+   * should be in the range [&minus;540&deg;, 540&deg;).
+   **********************************************************************/
+  public PolygonResult TestPoint(double lat, double lon,
+                                 boolean reverse, boolean sign) {
+    if (_num == 0)
+      return new PolygonResult(1, 0, _polyline ? Double.NaN : 0);
+
+    double perimeter = _perimetersum.Sum();
+    double tempsum = _polyline ? 0 : _areasum.Sum();
+    int crossings = _crossings;
+    int num = _num + 1;
+    for (int i = 0; i < (_polyline ? 1 : 2); ++i) {
+      GeodesicData g =
+        _earth.Inverse(i == 0 ? _lat1 : lat, i == 0 ? _lon1 : lon,
+                       i != 0 ? _lat0 : lat, i != 0 ? _lon0 : lon,
+                       _mask);
+      perimeter += g.s12;
+      if (!_polyline) {
+        tempsum += g.S12;
+        crossings += transit(i == 0 ? _lon1 : lon,
+                             i != 0 ? _lon0 : lon);
+      }
+    }
+
+    if (_polyline)
+      return new PolygonResult(num, perimeter, Double.NaN);
+
+    if ((crossings & 1) != 0)
+      tempsum += (tempsum < 0 ? 1 : -1) * _area0/2;
+    // area is with the clockwise sense.  If !reverse convert to
+    // counter-clockwise convention.
+    if (!reverse)
+      tempsum *= -1;
+    // If sign put area in (-area0/2, area0/2], else put area in [0, area0)
+    if (sign) {
+      if (tempsum > _area0/2)
+        tempsum -= _area0;
+      else if (tempsum <= -_area0/2)
+        tempsum += _area0;
+    } else {
+      if (tempsum >= _area0)
+        tempsum -= _area0;
+      else if (tempsum < 0)
+        tempsum += _area0;
+    }
+    return new PolygonResult(num, perimeter, 0 + tempsum);
+  }
+
+  /**
+   * Return the results assuming a tentative final test point is added via an
+   * azimuth and distance; however, the data for the test point is not saved.
+   * This lets you report a running result for the perimeter and area as the
+   * user moves the mouse cursor.  Ordinary floating point arithmetic is used
+   * to accumulate the data for the test point; thus the area and perimeter
+   * returned are less accurate than if AddPoint and Compute are used.
+   * <p>
+   * @param azi azimuth at current point (degrees).
+   * @param s distance from current point to final test point (meters).
+   * @param reverse if true then clockwise (instead of counter-clockwise)
+   *   traversal counts as a positive area.
+   * @param sign if true then return a signed result for the area if
+   *   the polygon is traversed in the "wrong" direction instead of returning
+   *   the area for the rest of the earth.
+   * @return PolygonResult(<i>num</i>, <i>perimeter</i>, <i>area</i>) where
+   *   <i>num</i> is the number of vertices, <i>perimeter</i> is the perimeter
+   *   of the polygon or the length of the polyline (meters), and <i>area</i>
+   *   is the area of the polygon (meters<sup>2</sup>) or Double.NaN of
+   *   <i>polyline</i> is true in the constructor.
+   * <p>
+   * <i>azi</i> should be in the range [&minus;540&deg;, 540&deg;).
+   **********************************************************************/
+  public PolygonResult TestEdge(double azi, double s,
+                                boolean reverse, boolean sign) {
+    if (_num == 0)              // we don't have a starting point!
+      return new PolygonResult(0, Double.NaN, Double.NaN);
+
+    int num = _num + 1;
+    double perimeter = _perimetersum.Sum() + s;
+    if (_polyline)
+      return new PolygonResult(num, perimeter, Double.NaN);
+
+    double tempsum =  _areasum.Sum();
+    int crossings = _crossings;
+    {
+      double lat, lon, s12, S12, t;
+      GeodesicData g =
+        _earth.Direct(_lat1, _lon1, azi, false, s, _mask);
+      tempsum += g.S12;
+      crossings += transit(_lon1, g.lon2);
+      g = _earth.Inverse(g.lat2, g.lon2, _lat0, _lon0, _mask);
+      perimeter += g.s12;
+      tempsum += g.S12;
+      crossings += transit(g.lon2, _lon0);
+    }
+
+    if ((crossings & 1) != 0)
+      tempsum += (tempsum < 0 ? 1 : -1) * _area0/2;
+    // area is with the clockwise sense.  If !reverse convert to
+    // counter-clockwise convention.
+    if (!reverse)
+      tempsum *= -1;
+    // If sign put area in (-area0/2, area0/2], else put area in [0, area0)
+    if (sign) {
+      if (tempsum > _area0/2)
+        tempsum -= _area0;
+      else if (tempsum <= -_area0/2)
+        tempsum += _area0;
+    } else {
+      if (tempsum >= _area0)
+        tempsum -= _area0;
+      else if (tempsum < 0)
+        tempsum += _area0;
+    }
+
+    return new PolygonResult(num, perimeter, 0 + tempsum);
+  }
+
+  /**
+   * @return <i>a</i> the equatorial radius of the ellipsoid (meters).  This is
+   *   the value inherited from the Geodesic object used in the constructor.
+   **********************************************************************/
+
+  public double MajorRadius() { return _earth.MajorRadius(); }
+
+  /**
+   * @return <i>f</i> the flattening of the ellipsoid.  This is the value
+   *   inherited from the Geodesic object used in the constructor.
+   **********************************************************************/
+  public double Flattening() { return _earth.Flattening(); }
+
+  /**
+   * Report the previous vertex added to the polygon or polyline.
+   * <p>
+   * @return Pair(<i>lat</i>, <i>lon</i>), the current latitude and longitude.
+   * <p>
+   * If no points have been added, then Double.NaN is returned.  Otherwise,
+   * <i>lon</i> will be in the range [&minus;180&deg;, 180&deg;).
+   **********************************************************************/
+  public Pair CurrentPoint() { return new Pair(_lat1, _lon1); }
+}
diff --git a/OpenVehicleApp/src/net/sf/geographiclib/PolygonResult.java b/OpenVehicleApp/src/net/sf/geographiclib/PolygonResult.java
new file mode 100644
index 00000000..fdbb7ef1
--- /dev/null
+++ b/OpenVehicleApp/src/net/sf/geographiclib/PolygonResult.java
@@ -0,0 +1,39 @@
+/**
+ * Implementation of the net.sf.geographiclib.PolygonResult class
+ *
+ * Copyright (c) Charles Karney (2013) <charles@karney.com> and licensed
+ * under the MIT/X11 License.  For more information, see
+ * http://geographiclib.sourceforge.net/
+ **********************************************************************/
+package net.sf.geographiclib;
+
+/**
+ * A container for the results from PolygonArea.
+ **********************************************************************/
+public class PolygonResult {
+  /**
+   * The number of vertices in the polygon
+   **********************************************************************/
+  public int num;
+  /**
+   * The perimeter of the polygon or the length of the polyline (meters).
+   **********************************************************************/
+  public double perimeter;
+  /**
+   * The area of the polygon (meters<sup>2</sup>).
+   **********************************************************************/
+  public double area;
+  /**
+   * Constructor
+   * <p>
+   * @param num the number of vertices in the polygon.
+   * @param perimeter the perimeter of the polygon or the length of the
+   *   polyline (meters).
+   * @param area the area of the polygon (meters<sup>2</sup>).
+   **********************************************************************/
+  public PolygonResult(int num, double perimeter, double area) {
+    this.num = num;
+    this.perimeter = perimeter;
+    this.area = area;
+  }
+}
diff --git a/OpenVehicleApp/src/net/sf/geographiclib/package-info.java b/OpenVehicleApp/src/net/sf/geographiclib/package-info.java
new file mode 100644
index 00000000..6bceb8f6
--- /dev/null
+++ b/OpenVehicleApp/src/net/sf/geographiclib/package-info.java
@@ -0,0 +1,182 @@
+/**
+ * <h1>Geodesic routines from GeographicLib implemented in Java</h1>
+ * @author Charles F. F. Karney (charles@karney.com)
+ * @version 1.31
+ *
+ * <h2>Abstract</h2>
+ * <p>
+ * This is a Java implementation of the geodesic algorithms from <a
+ * href="http://geographiclib.sf.net">GeographicLib</a>.  This is a
+ * self-contained library which makes it easy to do geodesic computations
+ * for an ellipsoid of revolution in a Java program.  It requires Java
+ * version 1.1 or later.
+ * <p>
+ * <h2>Downloading the source</h2>
+ * <p>
+ * The Java library is part of GeographicLib which available for download at
+ * <ul>
+ * <li>
+ *   <a href="http://sf.net/projects/geographiclib/files/distrib/GeographicLib-1.31.tar.gz">
+ *   GeographicLib-1.31.tar.gz</a>
+ * <li>
+ *   <a href="http://sf.net/projects/geographiclib/files/distrib/GeographicLib-1.31.zip">
+ *   GeographicLib-1.31.zip</a>
+ * </ul>
+ * <p>
+ * as either a compressed tar file (tar.gz) or a zip file.  After unpacking
+ * the source, the Java library can be found in GeographicLib-1.31/java.  (This
+ * library is completely independent from the rest of GeodegraphicLib.)  The
+ * library consists of the files in the src/main/java/net/sf/geographiclib
+ * subdirectory.
+ * <p>
+ * <h2>Sample programs</h2>
+ * <p>
+ * Also included are 3 small test programs
+ * <ul>
+ * <li>
+ *    {@code direct/src/main/java/Direct.java} is a simple command line utility
+ *    for solving the direct geodesic problem;
+ * <li>
+ *    {@code inverse/src/main/java/Inverse.java} is a simple command line
+ *    utility for solving the inverse geodesic problem;
+ * <li>
+ *    {@code planimter/src/main/java/Planimeter.java} is a simple command line
+ *    utility for computing the area of a geodesic polygon given its vertices.
+ * </ul>
+ * <p>
+ * Here, for example, is {@code Inverse.java}
+ * <pre>
+ * {@code
+ * // Solve the inverse geodesic problem.
+ *
+ * // This program reads in lines with lat1, lon1, lat2, lon2 and prints
+ * // out lines with azi1, azi2, s12 (for the WGS84 ellipsoid).
+ *
+ * import java.util.*;
+ * import net.sf.geographiclib.*;
+ * public class Inverse {
+ *   public static void main(String[] args) {
+ *     try {
+ *       Scanner in = new Scanner(System.in);
+ *       double lat1, lon1, lat2, lon2;
+ *       while (true) {
+ *         lat1 = in.nextDouble(); lon1 = in.nextDouble();
+ *         lat2 = in.nextDouble(); lon2 = in.nextDouble();
+ *         GeodesicData g = Geodesic.WGS84.Inverse(lat1, lon1, lat2, lon2);
+ *         System.out.println(g.azi1 + " " + g.azi2 + " " + g.s12);
+ *       }
+ *     }
+ *     catch (Exception e) {}
+ *   }
+ * }}</pre>
+ * <h2>Compiling and running a sample program</h2>
+ * Three difference ways of compiling and running {@code Inverse.java} are
+ * given.  These differ in the degree to which they utilize
+ * <a href="http://maven.apache.org/">maven</a> to manage your Java code and
+ * its dependencies.  (Thanks to Skip Breidbach for supplying the maven
+ * support.)
+ * <h3>Without using maven</h3>
+ * Compile and run as follows <pre>
+ * cd inverse/src/main/java
+ * javac -cp .:../../../../src/main/java Inverse.java
+ * echo -30 0 29.5 179.5 | java -cp .:../../../../src/main/java Inverse </pre>
+ * <h3>Using maven to package GeographicLib</h3>
+ * Use <a href="http://maven.apache.org/">maven</a> to create a jar file by
+ * running (in the main java directory) <pre>
+ * mvn package </pre>
+ * (Your first run of maven may take a long time, because it needs to download
+ * some additional packages to your local repository.)  Then compile and run
+ * Inverse.java with <pre>
+ * cd inverse/src/main/java
+ * javac -cp .:../../../../target/GeographicLib-1.31.jar Inverse.java
+ * echo -30 0 29.5 179.5 |
+ *   java -cp .:../../../../target/GeographicLib-1.31.jar Inverse </pre>
+ * <h3>Using maven to build and run {@code Inverse.java}</h3>
+ * Use <a href="http://maven.apache.org/">maven</a> to install GeographicLib by
+ * running (in the main java directory) <pre>
+ * mvn install </pre>
+ * (Your first run of maven may take a long time, because it needs to download
+ * some additional packages to your local repository.)  Then compile and run
+ * Inverse.java using {@code inverse/pom.xml} with <pre>
+ * cd inverse
+ * mvn compile
+ * echo -30 0 29.5 179.5 | mvn -q exec:java </pre>
+ * <h2>Using the library</h2>
+ * <p>
+ * <ul>
+ * <li>
+ *   Put <pre>
+ *   import net.sf.geographiclib.*</pre>
+ *   in your source code.
+ * <li>
+ *   Make calls to the geodesic routines from your code.
+ * <li>
+ *   Compile and run in one of the ways described above.
+ * </ul>
+ * <p>
+ * The important classes are
+ * <ul>
+ * <li>
+ *   {@link net.sf.geographiclib.Geodesic}, for direct and inverse geodesic
+ *   calculations;
+ * <li>
+ *   {@link net.sf.geographiclib.GeodesicLine}, an efficient way of
+ *   calculating multiple points on a single geodesic;
+ * <li>
+ *   {@link net.sf.geographiclib.GeodesicData}, the object containing the
+ *   results of the geodesic calculations;
+ * <li>
+ *   {@link net.sf.geographiclib.GeodesicMask}, the constants that let you
+ *   specify the variables to return in {@link
+ *   net.sf.geographiclib.GeodesicData} and the capabilities of a {@link
+ *   net.sf.geographiclib.GeodesicLine};
+ * <li>
+ *   {@link net.sf.geographiclib.Constants}, the parameters for the WGS84
+ *   ellipsoid;
+ * <li>
+ *   {@link net.sf.geographiclib.PolygonArea}, a class to compute the
+ *   perimeter and area of a geodesic polygon (returned as a {@link
+ *   net.sf.geographiclib.PolygonResult}).
+ * </ul>
+ * <p>
+ * The documentation is generated using javadoc when {@code mvn package} is run
+ * (the top of the documentation tree is {@code target/apidocs/index.html}).
+ * This is also available on the web at
+ * <a href="http://geographiclib.sf.net/html/C/index.html">
+ * http://geographiclib.sf.net/html/C/index.html</a>.
+ * <p>
+ * <h2>External links</h2>
+ * <p>
+ * <ul>
+ * <li>
+ *   These algorithms are derived in C. F. F. Karney,
+ *   <a href="http://dx.doi.org/10.1007/s00190-012-0578-z">
+ *   Algorithms for geodesics</a>,
+ *   J. Geodesy <b>87</b>, 43&ndash;55 (2013)
+ *   (<a href="http://geographiclib.sf.net/geod-addenda.html">addenda</a>).
+ * <li>
+ *   A longer paper on geodesics: C. F. F. Karney,
+ *    <a href="http://arxiv.org/abs/1102.1215v1">Geodesics
+ *    on an ellipsoid of revolution</a>,
+ *    Feb. 2011
+ *    (<a href=
+ *    "http://geographiclib.sf.net/geod-addenda.html#geod-errata">errata</a>).
+ * <li>
+ *   <a href="http://geographiclib.sf.net">The GeographicLib web site</a>.
+ * <li>
+ *   <a href="http://geographiclib.sf.net/html/index.html">The C++ library</a>.
+ * <li>
+ *   <a href="http://geographiclib.sf.net/html/C/index.html">The C library</a>.
+ * <li>
+ *   <a href="http://geographiclib.sf.net/html/Fortran/index.html">The
+ *   Fortran library</a>.
+ * <li>
+ *   The section in the GeographicLib documentation on geodesics:
+ *   <a href="http://geographiclib.sf.net/html/geodesic.html">Geodesics
+ *   on an ellipsoid of revolution</a>.
+ * <li>
+ *   <a href="http://geographiclib.sf.net/geodesic-papers/biblio.html">
+ *   An online geodesic bibliography</a>.
+ * </ul>
+ **********************************************************************/
+package net.sf.geographiclib;

From e758fbfc196b17488c4fd25292e11621f30eff2e Mon Sep 17 00:00:00 2001
From: anhr <anhr@mail.ru>
Date: Wed, 6 May 2015 08:03:54 +0700
Subject: [PATCH 5/6] add the 24 hour logged path of the vehicle into Google
 map. Debug version

User can see a track of his vehicle for last 24 hours. Also he can see
the speed and other values for each location of the car for last 24
hours. ATTENTION!!! This is debug version. Current version do not
displays real track of the vehicle for last 24 hours because current
version of the OVMS server do not responses from C33 command correctly.
This version emulates the three points of the track.
---
 OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java
index 2d75b6a2..e0acd0b3 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java
@@ -2340,7 +2340,10 @@ public void updateclustLoggedPath(int clusterSizeIndex, boolean enabled) {
     public boolean onMyLocationButtonClick() {
     	
 		if(mlatLng != null)
+		{
+//			map.moveCamera(CameraUpdateFactory.newLatLngZoom(mlatLng, 18));
 			map.moveCamera(CameraUpdateFactory.newLatLng(mlatLng));
+		}
 		else Toast.makeText(getActivity(), R.string.Undefined_location, Toast.LENGTH_SHORT).show();//Location of a vehicle is not defined
 		
         // Return false so that we don't consume the event and the default behavior still occurs

From df604a1680dd810c9d9ee9582ae8294e9632e4c1 Mon Sep 17 00:00:00 2001
From: anhr <anhr@mail.ru>
Date: Thu, 7 May 2015 08:59:16 +0700
Subject: [PATCH 6/6] Add the 24 hour logged path of the vehicle into Google
 map.

User can see a track of his vehicle for last 24 hours. Also he can see
the speed and other values for each location of the car for last 24
hours. ATTENTION!!! This is debug version. Current version do not
displays real track of the vehicle for last 24 hours because current
version of the OVMS server do not responses from C33 command correctly.
This version emulates the three points of the track.
---
 OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java
index e0acd0b3..2d75b6a2 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/FragMap.java
@@ -2340,10 +2340,7 @@ public void updateclustLoggedPath(int clusterSizeIndex, boolean enabled) {
     public boolean onMyLocationButtonClick() {
     	
 		if(mlatLng != null)
-		{
-//			map.moveCamera(CameraUpdateFactory.newLatLngZoom(mlatLng, 18));
 			map.moveCamera(CameraUpdateFactory.newLatLng(mlatLng));
-		}
 		else Toast.makeText(getActivity(), R.string.Undefined_location, Toast.LENGTH_SHORT).show();//Location of a vehicle is not defined
 		
         // Return false so that we don't consume the event and the default behavior still occurs