@@ -1,27 +1,13 @@

 /*STRAVA_API

-{

-  "file": /path/to/file.txt, // {File} The uploaded file.

-  "name": name_example, // {String} The desired name of the resulting activity.

-  "description": description_example, // {String} The desired description of the resulting activity.

-  "trainer": trainer_example, // {String} Whether the resulting activity should be marked as having been performed on a trainer.

-  "commute": commute_example, // {String} Whether the resulting activity should be tagged as a commute.

-  "dataType": dataType_example, // {String} The format of the uploaded file.

-  "externalId": externalId_example // {String} The desired external identifier of the resulting activity.

-}

-

-

-https://resmedglobal.atlassian.net/secure/CreateIssue.jspa?issuetype=2&pid=ISMS2

-https://resmedglobal.atlassian.net/secure/CreateIssue.jspa?issuetype=3&pid=ISMS2

-

 OAuth2.0 strava / pebble

 1 - get activity:write authorization (once and for all)

     GET https://www.strava.com/oauth/authorize?client_id=94880&response_type=code&redirect_uri=http://strava.jonget.fr&approval_prompt=force&state=bike_companion&scope=activity:write

     monitor state, code and scope (as upload can be unchecked)!

     code is short lived and one time usage

-2 - get tokens in exchange of code

-    POST https://www.strava.com/oauth/token?client_id=94880&client_secret=08dc170f0fe38f39dd327bea82a28db4400e6f00&code=e0aeb60ea9f508d25974bb56ccb551be56b91470&grant_type=authorization_code

+2 - get tokens in exchange of code (make it done by jonget.fr because of secret ? )

+    POST https://www.strava.com/oauth/token?client_id=94880&client_secret=08dc170f0fe38f39dd327bea82a28db4400e6f00&code=db896b06f89804997a8088320fba755e6299c0d6&grant_type=authorization_code

     refresh & access tokens + expiry of access token (6hours) retrieved

 3 - test if access token expired

@@ -29,55 +15,6 @@ OAuth2.0 strava / pebble

 4a- if not, API call

     GET https://www.strava.com/api/v3/athlete with "Authorization" header ="Bearer XXXXX"  XXXXX=access token

-4b- if yes refresh access token with refresh token get in 2

+4b- if yes refresh access token with refresh token get in 2  (make it done by jonget.fr because of secret ? )

     POST https://www.strava.com/oauth/token?client_id=94880&client_secret=8a68d5b79f2fb3e00ad3eaa5025253990fbd6a58&refresh_token=c313d612768db4b12af2782372aa1d9349c265cb&grant_type=refresh_token

 */

-

-gpxfile = b.getGpx(!0) // returned gpxfile is string

-upload(gpxfile)

-

-function getGpx(t) {

-    if (0 == points.length) return "";

-    if (creator = "Ventoo SE", gpxfile = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n<gpx xmlns="http://www.topografix.com/GPX/1/1" xmlns:gpxtpx="http://www.garmin.com/xmlschemas/TrackPointExtension/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" creator="' + creator + '" version="1.1" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd  http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd" xmlns:pb10="http://www.pebblebike.com/GPX/1/0/">\n', itemId = -1, trackNumber = 1, points.length > 0) {

-        for (gpxfile += "<trk>\n<name>Track #1</name>\n<trkseg>\n", prevTime = -1, i = 0; i < points.length; i++) prevTime > 0 && points[i].t - prevTime > 43200 ? (trackNumber++, gpxfile += "</trkseg>\n</trk>\n<trk>\n<name>Track #" + trackNumber + "</name>\n<trkseg>\n") : prevTime > 0 && points[i].t - prevTime > 7200 && (gpxfile += "</trkseg>\n<trkseg>\n"), d = new Date(1e3 * points[i].t), ti = d.toISOString(), gpxfile += '<trkpt lat="' + points[i].la + '" lon="' + points[i].lo + '">\n  <ele>' + points[i].a + "</ele><time>" + ti + "</time>\n", !t && points[i].h || (gpxfile += "  <extensions>", t && (gpxfile += "<pb10:accuracy>" + points[i].ac + "</pb10:accuracy>"), points[i].h && (gpxfile += "<gpxtpx:TrackPointExtension>", gpxfile += "<gpxtpx:hr>" + points[i].h + "</gpxtpx:hr>", gpxfile += "</gpxtpx:TrackPointExtension>\n"), gpxfile += "</extensions>\n"), gpxfile += "</trkpt>\n", prevTime = points[i].t;

-        gpxfile += "</trkseg>\n</trk>\n"

-    }

-    return gpxfile += "</gpx>\n", gpxfile

-}

-

-function upload(gpxfile) {

-    params = {

-            url: s,

-            method: "POST",

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

-            files: { file: gpxfile },

-        authorization: "Bearer " + c,

-            callback: function() {

-                var z = "";

-                if (r && console.log(e.status + " - " + e.txt), 201 == e.status) z = "Your activity has been created";

-                else if (400 == e.status) z = "An error has occurred. If you've already uploaded the current activity, please delete it in Strava.";

-                else if (401 == e.status) z = "Error - Unauthorized. Please check your credentials in the settings.", o.setAccessToken("");

-                else try { response_json = JSON.parse(e.txt), response_json.error ? (r && console.log("error:" + response_json.error), z = response_json.error, o.setAccessToken("")) : response_json.status && (r && console.log("status:" + response_json.status), z = response_json.status) } catch (z) { console.log("Error log, " + z) }

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

-            }

-        }

-        //e[0] = params

-    var XHR = new XMLHttpRequest

-    console.log(e[0].url)

-    XHR.open(e[0].method, e[0].url, !0)

-    var r = Math.random().toString().substr(2);

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

-    e[0].authorization && XHR.setRequestHeader("Authorization", e[0].authorization);

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

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

-    o += "--" + r + "--\r\n"

-

-    XHR.onreadystatechange = function() {

-        try {

-            4 == XHR.readyState && (n.status = XHR.status, n.txt = XHR.responseText, n.xml = XHR.responseXML, e[0].callback && e[0].callback())

-        } catch (t) {

-            console.error("Error2 loading, ", t)

-        }

-    }

-    XHR.send(o)

-}

\ No newline at end of file

Binary files a/build/bike_companion.pbw and b/build/bike_companion.pbw differ

@@ -11,7 +11,7 @@ const uint32_t outbox_size = 64;

 static uint32_t size ;

 //static char * msg;

-static char s_status[3];

+static char s_status[4];

 //restricting long and lat to 13 char : 0-1 for the sign, 1-3 for integer, 1 for the point, 7-10 for decimal, 1 for \0

 static char s_longitude[13];

@@ -76,7 +76,7 @@ static void prv_up_click_handler(ClickRecognizerRef recognizer, void *context) {

 static void prv_down_click_handler(ClickRecognizerRef recognizer, void *context) {

   //text_layer_set_text(s_other_text_layer, "Down");

-  //send_message("exit");

+  send_message("exit");

 }

 static void prv_back_click_handler(ClickRecognizerRef recognizer, void *context) {

@@ -260,7 +260,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

   if(status_tuple) {

     memset(s_status,'\0',sizeof(s_status));

-    strncpy(s_status, status_tuple->value->cstring, 2);

+    strncpy(s_status, status_tuple->value->cstring, 4);

     /*if (strcmp(s_status,"KO")== 0){

       //find a way to exit 

     }else{*/

@@ -333,7 +333,7 @@ static void prv_init(void) {

 }

 static void prv_deinit(void) {

-  send_message("exit");

+  //send_message("exit");

   window_destroy(s_window);

 }

@@ -1,53 +1,90 @@

-module.exports = [

-  {

-    "type": "heading",

-    "defaultValue": "Bike Companion Configuration"

-  },

-  {

-    "type": "text",

-    "defaultValue": "This is not used for now, no action will be executed with these info."

-  },

-  {

-  "type": "section",

-    "items":

-    [

-      {

-        "type": "heading",

-        "defaultValue": "Your synology account"

-      },

-      {

-        "type": "input",

-        "messageKey": "username",

-        "label": "Your DSM Username",

-        "attributes":

-        {

-           "maxlength":40

-        }

-      },

-      {

-        "type": "input",

-        "messageKey": "password",

-        "label": "Your DSM Password",

-        "attributes":

-        {

-          "type": "password",

-          "maxlength":40

-        }

-      },

-      {

-        "type": "input",

-        "messageKey": "server",

-        "label": "Your DSM Server",

-        "attributes":

-        {

-          "type": "url",

-          "maxlength":255

-        }

-      }

-    ]

-  },

-  {

-    "type": "submit",

-    "defaultValue": "Save Settings"

-  }

-];

+module.exports = [{

+        type: "section",

+        items: [{

+                type: "heading",

+                defaultValue: "Locate Me"

+            },

+            {

+                type: "toggle",

+                messageKey: "ping_location_enable",

+                label: "Locate me on another server"

+            },

+            {

+                type: "text",

+                messageKey: "ping_location_url",

+                label: "full URL of server getting the location"

+            },

+            {

+                type: "input",

+                messageKey: "ping_location_login",

+                label: "Login (unused)"

+            },

+            {

+                type: "input",

+                messageKey: "ping_location_password",

+                label: "Password (unused)",

+                attributes: { type: "password" }

+            }

+        ]

+    }, {

+        type: "section",

+        items: [{

+                type: "heading",

+                defaultValue: "Send GPX to another server"

+            },

+            {

+                type: "toggle",

+                messageKey: "gpx_web_enable",

+                label: "Send GPX to another server"

+            },

+            {

+                type: "text",

+                messageKey: "gpx_web_url",

+                label: "full URL of server getting the GPX"

+            },

+            {

+                type: "input",

+                messageKey: "gpx_web_login",

+                label: "Login (unused)"

+            },

+            {

+                type: "input",

+                messageKey: "gpx_web_password",

+                label: "Password (unused)",

+                attributes: { type: "password" }

+            }

+        ]

+    },

+    {

+        type: "section",

+        items: [{

+                type: "heading",

+                defaultValue: "strava"

+            },

+            {

+                type: "text",

+                defaultValue: "Grant this application access to upload to Strava<br/><a onclick='return confirm(&quot;Have you saved your changes? They would be lost if you continue.&quot;)' href='https://www.strava.com/oauth/authorize?client_id=94880&response_type=code&redirect_uri=http://strava.jonget.fr&approval_prompt=force&state=bike_companion&scope=activity:write'><img src='data:image/png;base64,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'/></a>"

+            },

+            {

+                type: "toggle",

+                messageKey: "strava_upload",

+                label: "strava_upload"

+            },

+            {

+                type: "toggle",

+                messageKey: "strava_automatic_upload",

+                label: "Automatic upload at the end of the track"

+            }

+        ]

+    },

+    {

+        type: "toggle",

+        messageKey: "debug",

+        label: "Debug"

+    },

+    {

+        type: "submit",

+        id: "submitButton",

+        defaultValue: "Save"

+    }

+];

\ No newline at end of file

@@ -1,511 +1,477 @@

 var Clay = require('pebble-clay');

 var clayConfig = require('./config');

-var clay = new Clay(clayConfig);

+var clay = new Clay(clayConfig, null, { autoHandleEvents: false });

+var messageKeys = require('message_keys');

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

+

+    // This is an example of how you might load a different config based on platform.

+    var platform = clay.meta.activeWatchInfo.platform || 'aplite';

+    if (platform === 'aplite') {

+        clay.config = clayConfigAplite;

+    }

+

+    Pebble.openURL(clay.generateUrl());

+});

+

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

+    if (!t || t.response) {

+        try {

+            if (data = JSON.parse(t.response), data.strava) {

+                //data.strava will be like this :

+                // {"code":"db896b06f89804997a8088320fba755e6299c0d6","scope":"read,activity:write","state":"bike_companion"}

+                // so need to parse it correctly

+                //console.log("strava temp code to exchange to access token : " + data.code)

+                // placeholder to get token from code from php

+                return token

+            }

+        } catch (t) {

+            i && console.error("Parsing error:", t)

+        }

+        var dict = clay.getSettings(t.response);

+

+        /* assess if needed to send setting to watch as already in phone (done with "getsettings")

+        m.live_mmt_enable = dict[p.live_mmt_enable]

+        m.live_mmt_login = dict[p.live_mmt_login]

+        m.live_mmt_password = dict[p.live_mmt_password]

+        m.live_jayps_enable = dict[p.live_jayps_enable]

+        m.live_jayps_login = dict[p.live_jayps_login]

+        m.live_jayps_password = dict[p.live_jayps_password]

+        m.strava_automatic_upload = dict[p.strava_automatic_upload]

+    

+        i = dict[p.debug]

+        console.log("debug:" + i)

+        g.setDebug(i)

+        h.setDebug(i)

+        b.setDebug(i)

+        y.setDebug(i)

+        m.setDebug(i)

+    

+        m.save()

+        // Assess if needed to send settings values to watch side

+        /*

+        Pebble.sendAppMessage(dict, function(e) {

+            console.log('Sent config data to Pebble');

+        }, function(e) {

+            console.log('Failed to send config data!');

+            console.log(JSON.stringify(e));

+        });*/

+    }

+});

-var messageKeys = require('message_keys');

 var message;

-var gpx_to_strava = false;

-var gpx_to_web = true;

+var gpx_to_strava

+var gpx_to_web

+var locate_me

 var locationInterval;

+var instantLocationInterval;

 var firstlocationOptions = {

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

-  'timeout': 60000, //60s timeout to get a good signal

-  'maximumAge': 5 // no cache

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

+    'timeout': 60000, //60s timeout to get a first good signal

+    'maximumAge': 0 // no cache

 };

 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': 5 // no cache

+    '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

 };

 var geoloc_id;

 // Store location in Pebble app local storage

 //

 function storeLocation(position) {

-  var latitude = position.coords.latitude;

-  var longitude = position.coords.longitude;

-  var timestamp = position.timestamp;

-  localStorage.setItem("latitude", latitude);

-  localStorage.setItem("longitude", longitude);

-  localStorage.setItem("timestamp", timestamp);

-  // console.log("Stored location " + position.coords.latitude + ',' + position.coords.longitude);

+    var latitude = position.coords.latitude;

+    var longitude = position.coords.longitude;

+    var timestamp = position.timestamp;

+    localStorage.setItem("latitude", latitude);

+    localStorage.setItem("longitude", longitude);

+    localStorage.setItem("timestamp", timestamp);

+    // console.log("Stored location " + position.coords.latitude + ',' + position.coords.longitude);

 }

 // Get location from Pebble app local storage

 //

 function getLocation() {

-  if (localStorage.getItem("latitude") || localStorage.getItem("longitude") || localStorage.getItem("timestamp")) {

-    var la = localStorage.getItem("latitude");

-    var lo = localStorage.getItem("longitude");

-    var ti = localStorage.getItem("timestamp");

-    var co = { "latitude": la, "longitude": lo };

-    var pos = { "coords": co, "timestamp": ti };

-    // console.log("Stored location " + pos.co.la + ',' + pos.co.lo);

-    return pos;

-  } else {

-    return null;

-  }

-}

-

-// Calculate the distance from 2 geoloc in degrees.

-// IMPORTANT : this is a calculation from 2D projection, altitude is not involved

-//

-function distance_on_geoid(lat1, lon1, lat2, lon2) {

-  // Convert degrees to radians

-  lat1 = lat1 * Math.PI / 180.0;

-  lon1 = lon1 * Math.PI / 180.0;

-  lat2 = lat2 * Math.PI / 180.0;

-  lon2 = lon2 * Math.PI / 180.0;

-  // radius of earth in metres

-  r = 6378100;

-  // P

-  rho1 = r * Math.cos(lat1);

-  z1 = r * Math.sin(lat1);

-  x1 = rho1 * Math.cos(lon1);

-  y1 = rho1 * Math.sin(lon1);

-  // Q

-  rho2 = r * Math.cos(lat2);

-  z2 = r * Math.sin(lat2);

-  x2 = rho2 * Math.cos(lon2);

-  y2 = rho2 * Math.sin(lon2);

-  // Dot product

-  dot = (x1 * x2 + y1 * y2 + z1 * z2);

-  cos_theta = dot / (r * r);

-  theta = Math.acos(cos_theta);

-  // Distance in Metres

-  return r * theta;

-}

-

-// Calculate speed from 2 geoloc point arrays (with lat,long,timestamp)

-//

-function speed_from_distance_and_time(p1, p2) {

-  dist = distance_on_geoid(p1.coords.latitude, p1.coords.longitude, p2.coords.latitude, p2.coords.longitude);

-  // timestamp is in milliseconds

-  time_s = (p2.timestamp - p1.timestamp) / 1000.0;

-  speed_mps = dist / time_s;

-  speed_kph = (speed_mps * 3600.0) / 1000.0;

-  return speed_kph;

+    if (localStorage.getItem("latitude") || localStorage.getItem("longitude") || localStorage.getItem("timestamp")) {

+        var la = localStorage.getItem("latitude");

+        var lo = localStorage.getItem("longitude");

+        var ti = localStorage.getItem("timestamp");

+        var co = { "latitude": la, "longitude": lo };

+        var pos = { "coords": co, "timestamp": ti };

+        // console.log("Stored location " + pos.co.la + ',' + pos.co.lo);

+        return pos;

+    } else {

+        return null;

+    }

 }

 // Get max speed of the run

 //

 function getMaxSpeed(lastSpeed) {

-  oldmax = localStorage.getItem("maxSpeed") || -1;

-  if (oldmax < lastSpeed) {

-    maxSpeed = lastSpeed

-  } else if (oldmax > lastSpeed) {

-    maxSpeed = oldmax

-  } else {

-    maxSpeed = oldmax

-  }

-  localStorage.setItem("maxSpeed", maxSpeed);

-  return maxSpeed

+    oldmax = localStorage.getItem("maxSpeed") || -1;

+    if (oldmax < lastSpeed) {

+        maxSpeed = lastSpeed

+    } else if (oldmax > lastSpeed) {

+        maxSpeed = oldmax

+    } else {

+        maxSpeed = oldmax

+    }

+    localStorage.setItem("maxSpeed", maxSpeed);

+    return maxSpeed

 }

 // split float number into an array of int (null returned instead of 0 for decimal)

 //

 function splitFloatNumber(num) {

-  const intStr = num.toString().split('.')[0];

-  const decimalStr = num.toString().split('.')[1];

-  return [Number(intStr), Number(decimalStr)];

+    const intStr = num.toString().split('.')[0];

+    const decimalStr = num.toString().split('.')[1];

+    return [Number(intStr), Number(decimalStr)];

 }

 // Build GPX headers

 //

 function GPXHeadersBuilder(timestamp, name, type) {

-  var headers = '<?xml version="1.0" encoding="UTF-8"?><gpx creator="Pebble with barometer" 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>';

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

-  return true;

+    var headers = '<?xml version="1.0" encoding="UTF-8"?><gpx creator="Pebble with barometer" 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>';

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

+    return true;

 }

 // Build GPX footer

 //

 function GPXtrkptBuilder(lat, lon, ele, timestamp) {

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

-  var trkpt = '<trkpt lat="' + lat + '" lon="' + lon + '"><ele>' + ele + '</ele><time>' + timestamp + '</time></trkpt>';

-  localStorage.setItem("GPX", GPX + trkpt);

-  return true;

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

+    var trkpt = '<trkpt lat="' + lat + '" lon="' + lon + '"><ele>' + ele + '</ele><time>' + timestamp + '</time></trkpt>';

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

+    return true;

 }

 // 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 : " + GPX + footer);

+    return ret;

 }

 // Send GPX to Strava profile

 // TODO : get authentication creds from settings

 function SendToStrava() {

-  console.log('--- GPX upload to strava');

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

-  // need to automate oAUTH

-  var bearer = "8a68d5b79f2fb3e00ad3eaa5025253990fbd6a58"

-  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 () {

-      var message = "";

-      // what is 'r'

-      // what is 'e'

-      // what is 'o'

-      // what is 'z'

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

-        message = "Your activity has been created";

-      } 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.", o.setAccessToken("");

-      } else {

+    console.log('--- GPX upload to strava');

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

+    // need to automate oAUTH

+    var bearer = "09f93068353f11f09d22059f1e8e42ef526949a5"

+    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 = "";

+            // what is 'r'

+            // what is 'e'

+            // what is 'o'

+            // what is 'z'

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

+                message = "Your activity has been created";

+            } 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.", o.setAccessToken("");

+            } else {

+                try {

+                    response_json = JSON.parse(e.txt)

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

+                } catch (e) {

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

+                }

+            }

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

+        }

+    }

+    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() {

+        // what is 'n'

         try {

-          response_json = JSON.parse(e.txt)

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

+            4 == XHR.readyState && (n.status = XHR.status, n.txt = XHR.responseText, n.xml = XHR.responseXML, params.callback && params.callback(n))

         } catch (e) {

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

+            console.error("Error2 loading, ", e)

         }

-      }

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

-    }

-  }

-  var XHR = new XMLHttpRequest;

-  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 () {

-    // what is 'n'

-    try {

-      4 == XHR.readyState && (n.status = XHR.status, n.txt = XHR.responseText, n.xml = XHR.responseXML, params.callback && params.callback())

-    } catch (e) {

-      console.error("Error2 loading, ", e)

     }

-  }

-  XHR.send(body)

-

-

-

-  // fetch or Blob or Formdata are not implemented in pebblekitJS

-  /*fetch('data:application/gpx+xml;base64,'.btoa(GPX))

-      .then(function(value) { return value.blob() })

-      .then(

-          function(value) {

-  var data = new FormData();

-  data.append("name", "test");

-  data.append("description", "description");

-  data.append("data_type", "gpx");

-  data.append("file", value, "blob.gpx");

-

-  var xhr = new XMLHttpRequest();

-  var url = "https://www.strava.com/api/v3/uploads";

-  xhr.withCredentials = true;

-  xhr.timeout = 10000; // time in milliseconds

-

-  xhr.open("POST", url, false);

-  xhr.setRequestHeader("Authorization", "Bearer 8a68d5b79f2fb3e00ad3eaa5025253990fbd6a58");

-

-  console.log('------GPX / xhr opened with authorization')

-  console.log('------array for blob: ' + [GPX])

-  xhr.onload = function() {

-      console.log('------xhr onload')

-      if (xhr.readyState === 4) {

-          console.log('------xhr request returned with ' + xhr.status);

-          console.log(this.responseText);

-          if (xhr.status == 200) {

-              //console.log('--> HTTP 200');

-              return true;

-          } else {

-              //console.log('--> HTTP ' + xhr.status);

-              return false;

-          }

-      }

-  };

-

-  xhr.send(data);

-  },

-          function(error) {

-              console.log('error')

-          }

-      )*/

-  /* -------------------- */

-

-

+    XHR.send(body)

 }

-// Build CSV

-function CSV(pos) {

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

-  var datapoint = pos.timestamp + "," + pos.coords.latitude + "," + pos.coords.longitude + "," + pos.coords.altitude + "," + pos.coords.accuracy + "," + pos.coords.altitudeAccuracy + "," + pos.coords.heading + "," + pos.coords.speed + "\n";

-

-  localStorage.setItem("CSV", CSV + datapoint);

-

-}

-// Send CSV to web server (need configuration on serverside)

+// Send GPX to web server (need configuration on serverside)

 // TODO : secure it ?

 function PostToWeb() {

-  console.log('--- GPX upload to custom web server');

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

-

-  var url = "https://jonget.fr/strava/upload.php?name=pebblegpx&type=application/gpx+xml";

-  var xhr = new XMLHttpRequest();

-  xhr.timeout = 10000; // time in milliseconds

-

-  xhr.open("POST", url, false);

-

-  //console.log('------ CSV / xhr opened')

-  xhr.onload = function () {

-    //console.log('------xhr onload')

-    if (xhr.readyState === 4) {

-      //console.log('------xhr request returned with ' + xhr.status);

-      //console.log(this.responseText);

-      if (xhr.status == 200) {

-        //console.log('--> HTTP 200');

-        return true;

-      } else {

-        //console.log('--> HTTP ' + xhr.status);

-        return false;

-      }

-    }

-  };

+    console.log('--- GPX upload to custom web server');

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

+    var url = JSON.parse(localStorage.getItem('clay-settings')).gpx_web_url + "?name=pebblegpx&type=application/gpx+xml";

+    var xhr = new XMLHttpRequest();

+    xhr.timeout = 10000; // time in milliseconds

+

+    xhr.open("POST", url, false);

+

+    //console.log('------ CSV / xhr opened')

+    xhr.onload = function() {

+        //console.log('------xhr onload')

+        if (xhr.readyState === 4) {

+            //console.log('------xhr request returned with ' + xhr.status);

+            //console.log(this.responseText);

+            if (xhr.status == 200) {

+                //console.log('--> HTTP 200');

+                return true;

+            } else {

+                //console.log('--> HTTP ' + xhr.status);

+                return false;

+            }

+        }

+    };

-  //send CSV in body

-  xhr.send(GPX);

+    //send CSV in body

+    xhr.send(GPX);

 }

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

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

 // TODO : secure it ?

 function instantLocationUpdate(pos) {

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

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

-

-  var url = "https://jonget.fr/find_me/update.php?lat=" + pos.coords.latitude + "&long=" + pos.coords.longitude + "&acc=" + pos.coords.accuracy + "&timestamp=" + pos.timestamp;

-  var xhr = new XMLHttpRequest();

-  xhr.timeout = 10000; // time in milliseconds

-

-  xhr.open("POST", url);

-

-  //console.log('------ instant / xhr opened')

-  xhr.onload = function () {

-    //console.log('------xhr onload')

-    if (xhr.readyState === 4) {

-      //console.log('------xhr request returned with ' + xhr.status);

-      //console.log(this.responseText);

-      if (xhr.status == 200) {

-        //console.log('--> HTTP 200');

-        return true;

-      } else {

-        //console.log('--> HTTP ' + xhr.status);

-        return false;

-      }

-    }

-  };

-

-  //send without body

-  xhr.send();

-

-}

+    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;

+    var xhr = new XMLHttpRequest();

+    xhr.timeout = 10000; // time in milliseconds

+

+    xhr.open("POST", url);

+

+    //console.log('------ instant / xhr opened')

+    xhr.onload = function() {

+        //console.log('------xhr onload')

+        if (xhr.readyState === 4) {

+            //console.log('------xhr request returned with ' + xhr.status);

+            //console.log(this.responseText);

+            if (xhr.status == 200) {

+                //console.log('--> HTTP 200');

+                return true;

+            } else {

+                //console.log('--> HTTP ' + xhr.status);

+                return false;

+            }

+        }

+    };

+    //send without body

+    xhr.send();

-// Adding leading characters to string for nice displays

-//

-function padStart(string, max_length, padding) {

-  if (string.length > max_length) {

-    return string;

-  } else {

-    var new_str = string;

-    for (index = string.length; index < max_length; index++) {

-      new_str = "0" + new_str;

-    }

-    return new_str;

-  }

 }

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

 //

 function locationSuccess(new_pos) {

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

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

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

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

-  var prev_pos = getLocation();

-  storeLocation(new_pos);

-  if (prev_pos === null) {

-    console.log('--- start building gpx');

+    var prev_pos = getLocation();

+    storeLocation(new_pos);

+    if (prev_pos === null) {

+        console.log('--- start building gpx');

-    if (gpx_to_strava || gpx_to_web) {

-      // Start the GPX file

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

-    }

-  } else {

-    //clear watch of new position to avoid overlap

-    //navigator.geolocation.clearWatch(geoloc_id);

-    //console.log('--- watch geoloc cleared');

-    //var speed = speed_from_distance_and_time(prev_pos, new_pos);

-

-    //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;

+        if (gpx_to_strava || gpx_to_web) {

+            // Start the GPX file

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

+        }

     } else {

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

-    }

+        //clear watch of new position to avoid overlap

+        //navigator.geolocation.clearWatch(geoloc_id);

+        //console.log('--- watch geoloc cleared');

+        //var speed = speed_from_distance_and_time(prev_pos, new_pos);

+

+        //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;

+        }