@@ -9,6 +9,7 @@ var locate_me

 var firstlocationInterval = false;

 var locationInterval = false;

 var instantLocationInterval = false;

+var locationTimeout = false;

 // TODO to move to C for security

 var client_id = "94880";

@@ -21,8 +22,8 @@ var firstlocationOptions = {

 };

 var locationOptions = {

     'enableHighAccuracy': true, // default = false (quick and dirty mode), can be true (more accurate but need more power and time)

-    'timeout': 10000, // ms timeout to get a good signal

-    'maximumAge': 5000 // location can be x milliseconds old

+    'timeout': 30000, //30s timeout to get a good position

+    'maximumAge': 0 // no cache

 };

 Pebble.addEventListener('showConfiguration', function(e) {

@@ -379,7 +380,7 @@ function PostToWeb() {

 // Send location to web server for instant location (no live tracking)

 // TODO : secure it ?

 function instantLocationUpdate(pos) {

-    console.log('--- Instant location update');

+    // console.log('--- Instant location update');

     // console.log(" location is " + new_pos.coords.latitude + ',' + new_pos.coords.longitude + ' , acc. ' + new_pos.coords.accuracy);

     var url = JSON.parse(localStorage.getItem('clay-settings')).ping_location_url + "?lat=" + pos.coords.latitude + "&long=" + pos.coords.longitude + "&acc=" + pos.coords.accuracy + "&timestamp=" + pos.timestamp;

@@ -412,7 +413,7 @@ function instantLocationUpdate(pos) {

 // called in case of successful geoloc gathering and sends the coordinate to watch

 //

 function locationSuccess(new_pos) {

-    console.log('--- locationSuccess');

+    // console.log('--- locationSuccess');

     // console.log(" location is " + new_pos.coords.latitude + ',' + new_pos.coords.longitude + ' , acc. ' + new_pos.coords.accuracy);

     var prev_pos = getLocation(false);

@@ -427,7 +428,6 @@ function locationSuccess(new_pos) {

         GPXHeadersBuilder(new Date(new_pos.timestamp).toISOString(), "Pebble track", "18");

     } else {

-        storeLocation(new_pos, false);

         // Prepare display on watch

         // now it's only raw data

@@ -439,49 +439,55 @@ function locationSuccess(new_pos) {

         var speedString = "";

         var distanceString = "";

-        // get speed from geoloc API isntead of calculate it

-        // speed is initially in m/s, get it at km/h

-        if (new_pos.coords.speed === null) {

-            var speed = 0;

-        } else {

-            var speed = new_pos.coords.speed * 3.6;

-            localStorage.setItem("speedsum", parseInt(localStorage.getItem("speedsum")) + speed);

-        }

+        

         // distance since beginning in m

+        console.log("--------- coordinates : " + new_pos.coords.latitude +", " + new_pos.coords.longitude);

         var dist = distance_on_geoid(prev_pos.coords.latitude, prev_pos.coords.longitude, new_pos.coords.latitude, new_pos.coords.longitude);

-        var totaldist = parseInt(localStorage.getItem("dist"));

-        if (!isNaN(dist)) {

+        console.log("--------- distance since last : " + dist);

+       var totaldist = parseInt(localStorage.getItem("dist"));

+        if (isNaN(dist) || dist == 0) {

+            // early exit as distance since previous position is too small to be parsed

+            console.log("--------- not recording this waypoint ");

+        }else{

+            // get speed from geoloc API isntead of calculate it

+            // speed is initially in m/s, get it at km/h

+            if (new_pos.coords.speed === null) {

+                var speed = 0;

+            } else {

+                var speed = new_pos.coords.speed * 3.6;

+                localStorage.setItem("speedsum", parseInt(localStorage.getItem("speedsum")) + speed);

+            }

             totaldist = totaldist + parseInt(dist);

             localStorage.setItem("dist", totaldist);

-        }

-        distanceString = splitFloatNumber(totaldist / 1000)[0].toString() + "." + splitFloatNumber(totaldist / 1000)[1].toString().substring(0, 3);

-        //console.log("total dist is now " + totaldist);

-

-        // avg speed (also when not moving) since beginning

-        var avgspeed = parseInt(localStorage.getItem("speedsum")) / parseInt(localStorage.getItem("totalcoordinates"));

-        var avgSpeedString = splitFloatNumber(avgspeed)[0].toString() + "." + splitFloatNumber(avgspeed)[1].toString().substring(0, 1);

-        console.log("speedsum=" + parseInt(localStorage.getItem("speedsum")) + " / totalcoordinates=" + parseInt(localStorage.getItem("totalcoordinates")));

-        console.log("--avgspeed=" + avgspeed + " / avgSpeedString=" + avgSpeedString)

-        if (avgSpeedString == "0.N") {

-            avgSpeedString = "0.0";

-        }

-        //console.log("avg speed is : " + avgSpeedString);

+            storeLocation(new_pos, false);

+        

+            distanceString = splitFloatNumber(totaldist / 1000)[0].toString() + "." + splitFloatNumber(totaldist / 1000)[1].toString().substring(0, 3);

+            //console.log("total dist is now " + totaldist);

+

+            // avg speed (also when not moving) since beginning

+            var avgspeed = parseInt(localStorage.getItem("speedsum")) / parseInt(localStorage.getItem("totalcoordinates"));

+            var avgSpeedString = splitFloatNumber(avgspeed)[0].toString() + "." + splitFloatNumber(avgspeed)[1].toString().substring(0, 1);

+            // console.log("speedsum=" + parseInt(localStorage.getItem("speedsum")) + " / totalcoordinates=" + parseInt(localStorage.getItem("totalcoordinates")));

+            if (avgSpeedString == "0.N") {

+                avgSpeedString = "-.-";

+            }

+            // console.log("--avgspeed=" + avgspeed + " / avgSpeedString=" + avgSpeedString)

-        // Duration

+            // Duration

-        var duration = new_pos.timestamp - first_pos.timestamp;

-        const date = new Date(duration);

-        durationString = padStart(date.getUTCHours().toString(), 2, "0") + ":" + padStart(date.getMinutes().toString(), 2, "0") + ":" + padStart(date.getSeconds().toString(), 2, "0");

-        console.log("durationString is : " + durationString);

+            var duration = new_pos.timestamp - first_pos.timestamp;

+            const date = new Date(duration);

+            durationString = padStart(date.getUTCHours().toString(), 2, "0") + ":" + padStart(date.getMinutes().toString(), 2, "0") + ":" + padStart(date.getSeconds().toString(), 2, "0");

+            // console.log("durationString is : " + durationString + "." + date.getUTCMilliseconds().toString());

-        //formating for precision and max size

-        latitudeString = new_pos.coords.latitude.toString().substring(0, 12);

-        longitudeString = new_pos.coords.longitude.toString().substring(0, 12);

-        accuracyString = new_pos.coords.accuracy.toString().substring(0, 4);

-        //console.log("split num : " + new_pos.coords.altitude);

-        altitudeString = splitFloatNumber(new_pos.coords.altitude)[0].toString().substring(0, 5);

-        timestampISO = new Date(new_pos.timestamp).toISOString();

+            //formating for precision and max size

+            latitudeString = new_pos.coords.latitude.toString().substring(0, 12);

+            longitudeString = new_pos.coords.longitude.toString().substring(0, 12);

+            accuracyString = new_pos.coords.accuracy.toString().substring(0, 4);

+            //console.log("split num : " + new_pos.coords.altitude);

+            altitudeString = splitFloatNumber(new_pos.coords.altitude)[0].toString().substring(0, 5);

+            timestampISO = new Date(new_pos.timestamp).toISOString();

         //console.log("split num : " + speed);

         if (isNaN(speed)) {

@@ -492,36 +498,48 @@ function locationSuccess(new_pos) {

                 speedString = "0.-";

             }

-            //console.log("split num : " + getMaxSpeed(speed));

-            maxSpeedString = splitFloatNumber(getMaxSpeed(speed))[0].toString().substring(0, 3);

+                //console.log("split num : " + getMaxSpeed(speed));

+                maxSpeedString = splitFloatNumber(getMaxSpeed(speed))[0].toString().substring(0, 3);

+            }

+            // console.log("--speed=" + speed + " / speedString=" + speedString)

+

+            //add a new datapoint to GPX file

+            GPXtrkptBuilder(latitudeString, longitudeString, altitudeString, timestampISO);

+

+

+

+            // Build message

+            message = "L200";

+            var dict = {

+                'accuracy': accuracyString,

+                'distance': distanceString,

+                'avg_speed': avgSpeedString,

+                'duration': durationString,

+                'altitude': altitudeString,

+                'speed': speedString,

+                'max_speed': maxSpeedString,

+                'status': message

+            };

+

+            // Send the message

+            Pebble.sendAppMessage(dict, function() {

+                // console.log('Message sent successfully: ' + JSON.stringify(dict));

+            }, function(e) {

+                console.log('Message (' + JSON.stringify(dict) + ') failed: ' + JSON.stringify(e));

+            });

         }

-        //add a new datapoint to GPX file

-        GPXtrkptBuilder(latitudeString, longitudeString, altitudeString, timestampISO);

-

-

-

-        // Build message

-        message = "L200";

-        var dict = {

-            'accuracy': accuracyString,

-            'distance': distanceString,

-            'avg_speed': avgSpeedString,

-            'duration': durationString,

-            'altitude': altitudeString,

-            'speed': speedString,

-            'max_speed': maxSpeedString,

-            'status': message

-        };

-

-        // Send the message

-        Pebble.sendAppMessage(dict, function() {

-            console.log('Message sent successfully: ' + JSON.stringify(dict));

-        }, function(e) {

-            console.log('Message (' + JSON.stringify(dict) + ') failed: ' + JSON.stringify(e));

-        });

     }

-

+    

+    if ( locationTimeout !== false) {    

+        // console.log("tracking is ongoing, clearing timeout ref and setting a new one");

+        clearTimeout(locationTimeout); 

+        locationTimeout = setTimeout(function() {

+            navigator.geolocation.getCurrentPosition(locationSuccess, locationError, locationOptions);

+        }, 1000);

+    }else{

+        // console.log("tracking is stopped");

+    }

 }

@@ -533,15 +551,15 @@ function locationError(err) {

 function start_get_coordinate() {

-    clearInterval(firstlocationInterval);

-    firstlocationInterval = false;

-    locationInterval = setInterval(function() {

+    clearTimeout(locationTimeout);

+    locationTimeout = false;

+    locationTimeout = setTimeout(function() {

         navigator.geolocation.getCurrentPosition(locationSuccess, locationError, locationOptions);

     }, 1000);

-

+    

     if (locate_me) {

         instantLocationInterval = setInterval(function() {

-            navigator.geolocation.getCurrentPosition(instantLocationUpdate, locationError, locationOptions);

+            navigator.geolocation.getCurrentPosition(instantLocationUpdate, locationError, firstlocationOptions);

         }, 60000);

     }

@@ -566,34 +584,34 @@ function init() {

     locate_me = JSON.parse(localStorage.getItem('clay-settings')).ping_location_enabled;

-    console.log("Locate_me = " + locate_me);

-    console.log("Strava = " + se + " (" + typeof se + ")/ uploaded = " + su + " (" + typeof su + ")");

-    console.log("Custom web = " + ce + " (" + typeof ce + ")/ uploaded = " + cu + " (" + typeof cu + ")");

+    // console.log("Locate_me = " + locate_me);

+    // console.log("Strava = " + se + " (" + typeof se + ")/ uploaded = " + su + " (" + typeof su + ")");

+    // console.log("Custom web = " + ce + " (" + typeof ce + ")/ uploaded = " + cu + " (" + typeof cu + ")");

     if ((se && !su) || (ce && !cu)) {

         var GPX = localStorage.getItem("GPX");

-        console.log("last 6 char of GPX are " + GPX.substring(GPX.length - 6, GPX.length))

+        // console.log("last 6 char of GPX are " + GPX.substring(GPX.length - 6, GPX.length))

         if (GPX.substring(GPX.length - 6, GPX.length) !== "</gpx>") {

             console.log("WARNING - NO GPX FOOTER ")

                 /*var footer = '</trkseg></trk></gpx>';

                 localStorage.setItem("GPX", GPX + footer);*/

             GPXfooterBuilder();

             GPX = localStorage.getItem("GPX");

-            console.log("GPX FOOTER is now : " + GPX.substring(GPX.length - 6, GPX.length))

+            // console.log("GPX FOOTER is now : " + GPX.substring(GPX.length - 6, GPX.length))

         }

         if (se) {

-            console.log("GPX upload needed to Strava")

+            // console.log("GPX upload needed to Strava")

             SendToStrava();

         }

         if (ce) {

-            console.log("GPX upload needed to custom server")

+            // console.log("GPX upload needed to custom server")

             PostToWeb();

         }

     } else {

-        console.log("clearing var")

+        // console.log("clearing var")

         localStorage.setItem("maxSpeed", 0);

         localStorage.setItem("firstlatitude", "");

         localStorage.setItem("firstlongitude", "");

@@ -623,10 +641,10 @@ Pebble.addEventListener('appmessage', function(e) {

     //console.log(dict[0].toString());

     switch (dict[0]) {

         case 'startstop':

-            if (!locationInterval == false) {

+            if (!locationTimeout == false) {

                 console.log("Stopping the track");

-                clearInterval(locationInterval);

-                locationInterval = false;

+                clearInterval(locationTimeout);

+                locationTimeout = false;

                 clearInterval(instantLocationInterval);

                 instantLocationInterval = false;

                 /*firstlocationInterval = setInterval(function () {

@@ -21,8 +21,8 @@ var firstlocationOptions = {

 };

 var locationOptions = {

     'enableHighAccuracy': true, // default = false (quick and dirty mode), can be true (more accurate but need more power and time)

-    'timeout': 5000, //5s timeout to get a good signal

-    'maximumAge': 0 // no cache

+    'timeout': 10000, // ms timeout to get a good signal

+    'maximumAge': 5000 // location can be x milliseconds old

 };

 Pebble.addEventListener('showConfiguration', function(e) {

@@ -485,11 +485,11 @@ function locationSuccess(new_pos) {

         //console.log("split num : " + speed);

         if (isNaN(speed)) {

-            speedString = "---";

+            speedString = "-.-";

         } else {

             speedString = splitFloatNumber(speed)[0].toString().substring(0, 3) + "." + splitFloatNumber(speed)[1].toString().substring(0, 1);

             if (speedString == "0.N") {

-                speedString = "0.0";

+                speedString = "0.-";

             }

             //console.log("split num : " + getMaxSpeed(speed));

@@ -283,7 +283,7 @@ function SendToStrava() {

   params = {

     url: "https://www.strava.com/api/v3/uploads",

     method: "POST",

-    data: { description: "desc", data_type: "gpx" },

+    data: { description: "desc", data_type: "gpx", sport_type: "Ride" , activity_types: "Ride"},

     files: { file: gpxfile },

     authorization: "Bearer " + bearer,

     callback: function (e) {

@@ -424,7 +424,7 @@ function locationSuccess(new_pos) {

         localStorage.setItem("custom_uploaded", false);

         // Start the GPX file

-        GPXHeadersBuilder(new Date(new_pos.timestamp).toISOString(), "test", "18");

+        GPXHeadersBuilder(new Date(new_pos.timestamp).toISOString(), "Pebble track", "18");

     } else {

         storeLocation(new_pos, false);

@@ -181,9 +181,9 @@ function splitFloatNumber(num) {

 // Build GPX headers

 //

 function GPXHeadersBuilder(timestamp, name, type) {

-  var headers = '<?xml version="1.0" encoding="UTF-8"?><gpx creator="Pebble" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd" version="1.1" xmlns="http://www.topografix.com/GPX/1/1"><metadata><time>' + timestamp + '</time></metadata><trk><name>' + name + '</name><type>' + type + '</type><trkseg>';

-  localStorage.setItem("GPX", headers);

-  return true;

+    var headers = '<?xml version="1.0" encoding="UTF-8"?><gpx creator="Pebble" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd" version="1.1" xmlns="http://www.topografix.com/GPX/1/1"><metadata><time>' + timestamp + '</time></metadata><trk><name>' + name + '</name><type>' + type + '</type><trkseg>';

+    localStorage.setItem("GPX", headers);

+    return true;

 }

 // Build GPX track point

@@ -198,11 +198,11 @@ function GPXtrkptBuilder(lat, lon, ele, timestamp) {

 // Build GPX footer

 //

 function GPXfooterBuilder() {

-  var GPX = localStorage.getItem("GPX");

-  var footer = '</trkseg></trk></gpx>';

-  var ret = localStorage.setItem("GPX", GPX + footer);

-  console.log("GPX closed : " + localStorage.getItem("GPX"));

-  return ret;

+    var GPX = localStorage.getItem("GPX");

+    var footer = '</trkseg></trk></gpx>';

+    var ret = localStorage.setItem("GPX", GPX + footer);

+    console.log("GPX closed : " + localStorage.getItem("GPX"));

+    return ret;

 }

 //------------------------------------------

@@ -279,58 +279,58 @@ function SendToStrava() {

     }

-  var bearer = JSON.parse(tokens).access_token;

-  params = {

-    url: "https://www.strava.com/api/v3/uploads",

-    method: "POST",

-    data: { description: "desc", data_type: "gpx" },

-    files: { file: gpxfile },

-    authorization: "Bearer " + bearer,

-    callback: function (e) {

-      var message = "";

-      if (console.log(e.status + " - " + e.txt), 201 == e.status) {

-        message = "S200";

-        localStorage.setItem("strava_uploaded", true);

-      } else if (400 == e.status) {

-        message = "S400";

-      } else if (401 == e.status) {

-        //token expired, retrying

-        message = "S401"

-        SendToStrava()

-      } else {

-        try {

-          response_json = JSON.parse(e.txt)

-          response_json.error ? (console.log("error:" + response_json.error), message = response_json.error) : response_json.status && (console.log("status:" + response_json.status))

-        } catch (err) {

-          console.log("Error log, " + err)

+    var bearer = JSON.parse(tokens).access_token;

+    params = {

+        url: "https://www.strava.com/api/v3/uploads",

+        method: "POST",

+        data: { description: "desc", data_type: "gpx" },

+        files: { file: gpxfile },

+        authorization: "Bearer " + bearer,

+        callback: function(e) {

+            var message = "";

+            if (console.log(e.status + " - " + e.txt), 201 == e.status) {

+                message = "S200";

+                localStorage.setItem("strava_uploaded", true);

+            } else if (400 == e.status) {

+                message = "S400";

+            } else if (401 == e.status) {

+                //token expired, retrying

+                message = "S401"

+                SendToStrava()

+            } else {

+                try {

+                    response_json = JSON.parse(e.txt)

+                    response_json.error ? (console.log("error:" + response_json.error), message = response_json.error) : response_json.status && (console.log("status:" + response_json.status))

+                } catch (err) {

+                    console.log("Error log, " + err)

+                }

+                message = "S500";

+            }

+            //message && Pebble.showSimpleNotificationOnPebble("Ventoo SE - Strava", message)

+

+            // Build message

+            var dict = {

+                'status': message

+            };

+            // Send the message

+            Pebble.sendAppMessage(dict, function() {

+                console.log('Message sent successfully: ' + JSON.stringify(dict));

+            }, function(e) {

+                console.log('Message (' + JSON.stringify(dict) + ') failed: ' + JSON.stringify(e));

+            });

         }

-        message = "S500";

-      }

-      //message && Pebble.showSimpleNotificationOnPebble("Ventoo SE - Strava", message)

-      

-      // Build message

-      var dict = {

-        'status': message

-      };

-      // Send the message

-      Pebble.sendAppMessage(dict, function () {

-        console.log('Message sent successfully: ' + JSON.stringify(dict));

-      }, function (e) {

-        console.log('Message (' + JSON.stringify(dict) + ') failed: ' + JSON.stringify(e));

-      });

     }

-  }

-  var XHR = new XMLHttpRequest;

-  var n = this;

-  //console.log(params.url);

-  XHR.open(params.method, params.url, !0);

-  var body = "";

-  var boundary = Math.random().toString().substring(2);

-  XHR.setRequestHeader("content-type", "multipart/form-data; charset=utf-8; boundary=" + boundary)

-  XHR.setRequestHeader("Authorization", params.authorization);

-  for (var i in params.data) body += "--" + boundary + '\r\nContent-Disposition: form-data; name="' + i + '"\r\n\r\n' + params.data[i] + "\r\n";

-  for (var i in params.files) body += "--" + boundary + '\r\nContent-Disposition: form-data; name="' + i + '" ; filename=test.gpx\r\n\r\n' + params.files[i] + "\r\n";

-  body += "--" + boundary + "--\r\n"

+    var XHR = new XMLHttpRequest;

+    var n = this;

+    //console.log(params.url);

+    XHR.open(params.method, params.url, !0);

+    var body = "";

+    var boundary = Math.random().toString().substring(2);

+    XHR.setRequestHeader("content-type", "multipart/form-data; charset=utf-8; boundary=" + boundary)

+    XHR.setRequestHeader("Authorization", params.authorization);

+    for (var i in params.data) body += "--" + boundary + '\r\nContent-Disposition: form-data; name="' + i + '"\r\n\r\n' + params.data[i] + "\r\n";

+    for (var i in params.files) body += "--" + boundary + '\r\nContent-Disposition: form-data; name="' + i + '" ; filename=test.gpx\r\n\r\n' + params.files[i] + "\r\n";

+    body += "--" + boundary + "--\r\n"

     XHR.onreadystatechange = function() {

         try {

@@ -371,8 +371,8 @@ function PostToWeb() {

         }

     };

-  //send GPX in body

-  xhr.send(GPX);

+    //send GPX in body

+    xhr.send(GPX);

 }

@@ -501,18 +501,18 @@ function locationSuccess(new_pos) {

-    // Build message

-    message = "L200";

-    var dict = {

-      'accuracy': accuracyString,

-      'distance': distanceString,

-      'avg_speed': avgSpeedString,

-      'duration': durationString,

-      'altitude': altitudeString,

-      'speed': speedString,

-      'max_speed': maxSpeedString,

-      'status': message

-    };

+        // Build message

+        message = "L200";

+        var dict = {

+            'accuracy': accuracyString,

+            'distance': distanceString,

+            'avg_speed': avgSpeedString,

+            'duration': durationString,

+            'altitude': altitudeString,

+            'speed': speedString,

+            'max_speed': maxSpeedString,

+            'status': message

+        };

         // Send the message

         Pebble.sendAppMessage(dict, function() {

@@ -572,16 +572,16 @@ function init() {

     if ((se && !su) || (ce && !cu)) {

-    var GPX = localStorage.getItem("GPX");

-    console.log("last 6 char of GPX are " + GPX.substring(GPX.length - 6, GPX.length))

-    if (GPX.substring(GPX.length - 6, GPX.length) !== "</gpx>") {

-        console.log("WARNING - NO GPX FOOTER ")

-            /*var footer = '</trkseg></trk></gpx>';

-            localStorage.setItem("GPX", GPX + footer);*/

-        GPXfooterBuilder();

-        GPX = localStorage.getItem("GPX");

-        console.log("GPX FOOTER is now : " + GPX.substring(GPX.length - 6, GPX.length))

-    }

+        var GPX = localStorage.getItem("GPX");

+        console.log("last 6 char of GPX are " + GPX.substring(GPX.length - 6, GPX.length))

+        if (GPX.substring(GPX.length - 6, GPX.length) !== "</gpx>") {

+            console.log("WARNING - NO GPX FOOTER ")

+                /*var footer = '</trkseg></trk></gpx>';

+                localStorage.setItem("GPX", GPX + footer);*/

+            GPXfooterBuilder();

+            GPX = localStorage.getItem("GPX");

+            console.log("GPX FOOTER is now : " + GPX.substring(GPX.length - 6, GPX.length))

+        }

         if (se) {

             console.log("GPX upload needed to Strava")

@@ -617,37 +617,37 @@ Pebble.addEventListener('ready', function(e) {

 });

 // Get AppMessage events

-Pebble.addEventListener('appmessage', function (e) {

-  // Get the dictionary from the message

-  var dict = e.payload;

-  //console.log(dict[0].toString());

-  switch (dict[0]) {

-    case 'startstop':

-      if (!locationInterval == false) {

-        console.log("Stopping the track");

-        clearInterval(locationInterval);

-        locationInterval = false;

-        clearInterval(instantLocationInterval);

-        instantLocationInterval = false;

-        /*firstlocationInterval = setInterval(function () {

-          navigator.geolocation.getCurrentPosition(null, locationError, firstlocationOptions);

-        }, 1000);*/

-      } else {

-        console.log("Starting the track");

-        start_get_coordinate();

-      }

-      break;

-    case 'send':

-      if (locate_me) {

-        var prev_pos = getLocation(false);

-        instantLocationUpdate(prev_pos);

-      }

-      

-      init();

-

-      break;

-    default:

-      console.log('Sorry. I don\'t understand your request :' + dict[0]);

-  }

+Pebble.addEventListener('appmessage', function(e) {

+    // Get the dictionary from the message

+    var dict = e.payload;

+    //console.log(dict[0].toString());

+    switch (dict[0]) {

+        case 'startstop':

+            if (!locationInterval == false) {

+                console.log("Stopping the track");

+                clearInterval(locationInterval);

+                locationInterval = false;

+                clearInterval(instantLocationInterval);

+                instantLocationInterval = false;

+                /*firstlocationInterval = setInterval(function () {

+                  navigator.geolocation.getCurrentPosition(null, locationError, firstlocationOptions);

+                }, 1000);*/

+            } else {

+                console.log("Starting the track");

+                start_get_coordinate();

+            }

+            break;

+        case 'send':

+            if (locate_me) {

+                var prev_pos = getLocation(false);

+                instantLocationUpdate(prev_pos);

+            }

+

+            init();

+

+            break;

+        default:

+            console.log('Sorry. I don\'t understand your request :' + dict[0]);

+    }

 });

\ No newline at end of file

@@ -181,9 +181,9 @@ function splitFloatNumber(num) {

 // Build GPX headers

 //

 function GPXHeadersBuilder(timestamp, name, type) {

-    var headers = '<?xml version="1.0" encoding="UTF-8"?><gpx creator="Pebble" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd" version="1.1" xmlns="http://www.topografix.com/GPX/1/1"><metadata><time>' + timestamp + '</time></metadata><trk><name>' + name + '</name><type>' + type + '</type><trkseg>';

-    localStorage.setItem("GPX", headers);

-    return true;

+  var headers = '<?xml version="1.0" encoding="UTF-8"?><gpx creator="Pebble" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd" version="1.1" xmlns="http://www.topografix.com/GPX/1/1"><metadata><time>' + timestamp + '</time></metadata><trk><name>' + name + '</name><type>' + type + '</type><trkseg>';

+  localStorage.setItem("GPX", headers);

+  return true;

 }

 // Build GPX track point

@@ -198,11 +198,11 @@ function GPXtrkptBuilder(lat, lon, ele, timestamp) {

 // Build GPX footer

 //

 function GPXfooterBuilder() {

-    var GPX = localStorage.getItem("GPX");

-    var footer = '</trkseg></trk></gpx>';

-    var ret = localStorage.setItem("GPX", GPX + footer);

-    //console.log("GPX closed : " + GPX + footer);

-    return ret;

+  var GPX = localStorage.getItem("GPX");

+  var footer = '</trkseg></trk></gpx>';

+  var ret = localStorage.setItem("GPX", GPX + footer);

+  console.log("GPX closed : " + localStorage.getItem("GPX"));

+  return ret;

 }

 //------------------------------------------

@@ -279,44 +279,58 @@ function SendToStrava() {

     }

-    var bearer = JSON.parse(tokens).access_token;

-    params = {

-        url: "https://www.strava.com/api/v3/uploads",

-        method: "POST",

-        data: { description: "desc", data_type: "gpx" },

-        files: { file: gpxfile },

-        authorization: "Bearer " + bearer,

-        callback: function(e) {

-            var message = "";

-            if (console.log(e.status + " - " + e.txt), 201 == e.status) {

-                message = "Your activity has been created";

-                localStorage.setItem("strava_uploaded", true);

-            } else if (400 == e.status) {

-                message = "An error has occurred. If you've already uploaded the current activity, please delete it in Strava.";

-            } else if (401 == e.status) {

-                message = "Error - Unauthorized. Please check your credentials in the settings."

-            } else {

-                try {

-                    response_json = JSON.parse(e.txt)

-                    response_json.error ? (console.log("error:" + response_json.error), message = response_json.error) : response_json.status && (console.log("status:" + response_json.status))

-                } catch (e) {

-                    console.log("Error log, " + e)

-                }

-            }

-            message && Pebble.showSimpleNotificationOnPebble("Ventoo SE - Strava", message)

+  var bearer = JSON.parse(tokens).access_token;

+  params = {

+    url: "https://www.strava.com/api/v3/uploads",

+    method: "POST",

+    data: { description: "desc", data_type: "gpx" },

+    files: { file: gpxfile },

+    authorization: "Bearer " + bearer,

+    callback: function (e) {

+      var message = "";

+      if (console.log(e.status + " - " + e.txt), 201 == e.status) {

+        message = "S200";

+        localStorage.setItem("strava_uploaded", true);

+      } else if (400 == e.status) {

+        message = "S400";

+      } else if (401 == e.status) {

+        //token expired, retrying

+        message = "S401"

+        SendToStrava()

+      } else {

+        try {

+          response_json = JSON.parse(e.txt)

+          response_json.error ? (console.log("error:" + response_json.error), message = response_json.error) : response_json.status && (console.log("status:" + response_json.status))

+        } catch (err) {

+          console.log("Error log, " + err)

         }

+        message = "S500";

+      }

+      //message && Pebble.showSimpleNotificationOnPebble("Ventoo SE - Strava", message)

+      

+      // Build message

+      var dict = {

+        'status': message

+      };

+      // Send the message

+      Pebble.sendAppMessage(dict, function () {

+        console.log('Message sent successfully: ' + JSON.stringify(dict));

+      }, function (e) {

+        console.log('Message (' + JSON.stringify(dict) + ') failed: ' + JSON.stringify(e));

+      });

     }

-    var XHR = new XMLHttpRequest;

-    var n = this;

-    //console.log(params.url);

-    XHR.open(params.method, params.url, !0);

-    var body = "";

-    var boundary = Math.random().toString().substring(2);

-    XHR.setRequestHeader("content-type", "multipart/form-data; charset=utf-8; boundary=" + boundary)

-    XHR.setRequestHeader("Authorization", params.authorization);

-    for (var i in params.data) body += "--" + boundary + '\r\nContent-Disposition: form-data; name="' + i + '"\r\n\r\n' + params.data[i] + "\r\n";

-    for (var i in params.files) body += "--" + boundary + '\r\nContent-Disposition: form-data; name="' + i + '" ; filename=test.gpx\r\n\r\n' + params.files[i] + "\r\n";

-    body += "--" + boundary + "--\r\n"

+  }

+  var XHR = new XMLHttpRequest;

+  var n = this;

+  //console.log(params.url);

+  XHR.open(params.method, params.url, !0);

+  var body = "";

+  var boundary = Math.random().toString().substring(2);

+  XHR.setRequestHeader("content-type", "multipart/form-data; charset=utf-8; boundary=" + boundary)

+  XHR.setRequestHeader("Authorization", params.authorization);

+  for (var i in params.data) body += "--" + boundary + '\r\nContent-Disposition: form-data; name="' + i + '"\r\n\r\n' + params.data[i] + "\r\n";

+  for (var i in params.files) body += "--" + boundary + '\r\nContent-Disposition: form-data; name="' + i + '" ; filename=test.gpx\r\n\r\n' + params.files[i] + "\r\n";

+  body += "--" + boundary + "--\r\n"

     XHR.onreadystatechange = function() {

         try {

@@ -357,8 +371,8 @@ function PostToWeb() {

         }

     };

-    //send GPX in body

-    xhr.send(GPX);

+  //send GPX in body

+  xhr.send(GPX);

 }

@@ -487,18 +501,18 @@ function locationSuccess(new_pos) {

-        // Build message

-        message = "OK";

-        var dict = {

-            'accuracy': accuracyString,

-            'distance': distanceString,

-            'avg_speed': avgSpeedString,

-            'duration': durationString,

-            'altitude': altitudeString,

-            'speed': speedString,

-            'max_speed': maxSpeedString,

-            'status': message

-        };

+    // Build message

+    message = "L200";

+    var dict = {

+      'accuracy': accuracyString,

+      'distance': distanceString,

+      'avg_speed': avgSpeedString,

+      'duration': durationString,

+      'altitude': altitudeString,

+      'speed': speedString,

+      'max_speed': maxSpeedString,

+      'status': message

+    };

         // Send the message

         Pebble.sendAppMessage(dict, function() {

@@ -558,16 +572,16 @@ function init() {

     if ((se && !su) || (ce && !cu)) {

-        var GPX = localStorage.getItem("GPX");

-        console.log("last 6 char of GPX are " + GPX.substring(GPX.length - 6, GPX.length))

-        if (GPX.substring(GPX.length - 6, GPX.length) !== "</gpx>") {

-            console.log("WARNING - NO GPX FOOTER ")

-                /*var footer = '</trkseg></trk></gpx>';

-                localStorage.setItem("GPX", GPX + footer);*/

-            GPXfooterBuilder();

-            GPX = localStorage.getItem("GPX");

-            console.log("GPX FOOTER is now : " + GPX.substring(GPX.length - 6, GPX.length))

-        }

+    var GPX = localStorage.getItem("GPX");

+    console.log("last 6 char of GPX are " + GPX.substring(GPX.length - 6, GPX.length))

+    if (GPX.substring(GPX.length - 6, GPX.length) !== "</gpx>") {

+        console.log("WARNING - NO GPX FOOTER ")

+            /*var footer = '</trkseg></trk></gpx>';

+            localStorage.setItem("GPX", GPX + footer);*/

+        GPXfooterBuilder();

+        GPX = localStorage.getItem("GPX");

+        console.log("GPX FOOTER is now : " + GPX.substring(GPX.length - 6, GPX.length))

+    }

         if (se) {

             console.log("GPX upload needed to Strava")

@@ -603,48 +617,37 @@ Pebble.addEventListener('ready', function(e) {

 });

 // Get AppMessage events

-Pebble.addEventListener('appmessage', function(e) {

-    // Get the dictionary from the message

-    var dict = e.payload;

-    //console.log(dict[0].toString());

-    switch (dict[0]) {

-        case 'startstop':

-            if (!locationInterval == false) {

-                console.log("Stopping the track");

-                clearInterval(locationInterval);

-                locationInterval = false;

-                clearInterval(instantLocationInterval);

-                instantLocationInterval = false;

-                firstlocationInterval = setInterval(function() {

-                    navigator.geolocation.getCurrentPosition(null, locationError, firstlocationOptions);

-                }, 1000);

-            } else {

-                console.log("Starting the track");

-                start_get_coordinate();

-            }

-            break;

-        case 'send':

-            if (locate_me) {

-                var prev_pos = getLocation(false);

-                instantLocationUpdate(prev_pos);

-            }

-

-            init();

-

-            /*

-            // Send the message

-            var dict = {

-              'status': "EXIT"

-            };

-            Pebble.sendAppMessage(dict, function () {

-              console.log('Message sent successfully: ' + JSON.stringify(dict));

-            }, function (e) {

-              console.log('Message (' + JSON.stringify(dict) + ') failed: ' + JSON.stringify(e));

-            });

-            */

-            break;

-        default:

-            console.log('Sorry. I don\'t understand your request :' + dict[0]);

-    }

+Pebble.addEventListener('appmessage', function (e) {

+  // Get the dictionary from the message

+  var dict = e.payload;

+  //console.log(dict[0].toString());

+  switch (dict[0]) {

+    case 'startstop':

+      if (!locationInterval == false) {

+        console.log("Stopping the track");

+        clearInterval(locationInterval);

+        locationInterval = false;

+        clearInterval(instantLocationInterval);

+        instantLocationInterval = false;

+        /*firstlocationInterval = setInterval(function () {

+          navigator.geolocation.getCurrentPosition(null, locationError, firstlocationOptions);

+        }, 1000);*/

+      } else {

+        console.log("Starting the track");

+        start_get_coordinate();

+      }

+      break;

+    case 'send':

+      if (locate_me) {

+        var prev_pos = getLocation(false);

+        instantLocationUpdate(prev_pos);

+      }

+      

+      init();

+