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

@@ -21,6 +21,9 @@

       "watchface": false

     },

     "messageKeys": [

+      "distance",

+      "avg_speed",

+      "duration",

       "latitude",

       "longitude",

       "accuracy",

@@ -1,11 +1,16 @@

 #include <pebble.h>

 static Window *s_window;

-static TextLayer *s_speed_text_layer;

-static TextLayer *s_other_text_layer;

+static StatusBarLayer *s_status_text_layer;

+static TextLayer *s_upperleft_text_layer;

+static TextLayer *s_upperright_text_layer;

+static TextLayer *s_main_text_layer;

+static TextLayer *s_lowerleft_text_layer;

+static TextLayer *s_lowerright_text_layer;

+static TextLayer *s_lower_text_layer;

 // Largest expected inbox and outbox message sizes

-const uint32_t inbox_size = 64;

+const uint32_t inbox_size = 150;

 const uint32_t outbox_size = 64;

 static uint32_t size ;

@@ -16,13 +21,16 @@ 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];

 static char s_latitude[13];

+static char s_distance[6];

 static char s_accuracy[5];

 static char s_altitude[6];

 static char s_altitude_accuracy[4];

 static char s_timestamp[14];

+static char s_duration[9];

 static char s_speed[6];

 static char s_max_speed[5];

+static char s_avg_speed[4];

 static char s_msg[50];

@@ -32,12 +40,15 @@ typedef enum {

   status,

   latitude,

   longitude,

+  distance,

   altitude,

   accuracy,

   altitude_accuracy,

   speed,

   max_speed,

-  timestamp

+  avg_speed,

+  timestamp,

+  duration

 } AppKey;

@@ -65,25 +76,27 @@ static void send_message(char * msg){

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

-  text_layer_set_text(s_speed_text_layer, "");

-  text_layer_set_text(s_other_text_layer, "sending get geoloc");

-  send_message("get");

+  text_layer_set_text(s_main_text_layer, "");

+  text_layer_set_text(s_lower_text_layer, "sending get geoloc");

+  send_message("startstop");

 }

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

-  text_layer_set_text(s_other_text_layer, "Tracking stopped, sending...");

-  send_message("exit");

+  text_layer_set_text(s_lower_text_layer, "Tracking stopped, sending track...");

+  send_message("send");

 }

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

-  text_layer_set_text(s_other_text_layer, "Tracking stopped, sending...");

-  send_message("exit");

+  //text_layer_set_text(s_lower_text_layer, "Tracking stopped, sending track...");

+  //send_message("exit");

 }

+/*

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

   //text_layer_set_text(s_other_text_layer, "back");

   //send_message("exit");

 }

+*/

 static void prv_click_config_provider(void *context) {

   window_single_click_subscribe(BUTTON_ID_SELECT, prv_select_click_handler);

@@ -96,33 +109,82 @@ static void prv_window_load(Window *window) {

   Layer *window_layer = window_get_root_layer(window);

   GRect bounds = layer_get_bounds(window_layer);

-  s_speed_text_layer = text_layer_create(GRect(0, 0, bounds.size.w, bounds.size.h/2));

-

-  text_layer_set_background_color(s_speed_text_layer, GColorBlack);

-  text_layer_set_text_color(s_speed_text_layer, GColorWhite);

-  text_layer_set_font(s_speed_text_layer, fonts_get_system_font(FONT_KEY_BITHAM_42_BOLD));

-  text_layer_set_text_alignment(s_speed_text_layer, GTextAlignmentCenter);

-  layer_add_child(window_layer, text_layer_get_layer(s_speed_text_layer));

-

-

-  s_other_text_layer = text_layer_create(GRect(0, bounds.size.h/2,bounds.size.w, bounds.size.h/2));

+  // creation of all text layers

+  s_status_text_layer = status_bar_layer_create();

+  s_upperleft_text_layer = text_layer_create(GRect(0, 18, bounds.size.w/2, 34));

+  s_upperright_text_layer = text_layer_create(GRect(bounds.size.w/2, 18, bounds.size.w/2, 34));

+  s_main_text_layer = text_layer_create(GRect(0, 52, bounds.size.w, 52));

+  s_lowerleft_text_layer = text_layer_create(GRect(0, 104, bounds.size.w/2, 34));

+  s_lowerright_text_layer = text_layer_create(GRect(bounds.size.w/2, 104, bounds.size.w/2, 34));

+  s_lower_text_layer = text_layer_create(GRect(0, 138, bounds.size.w, 30));

+

+  // settings of status layer

+  status_bar_layer_set_colors(s_status_text_layer, GColorBlack, GColorWhite);

+  status_bar_layer_set_separator_mode(s_status_text_layer, StatusBarLayerSeparatorModeDotted);

+  layer_set_frame(status_bar_layer_get_layer(s_status_text_layer), GRect(0, 0, bounds.size.w, 18));

+  layer_add_child(window_layer, status_bar_layer_get_layer(s_status_text_layer));

+  /*

+  may need to add other layers to disply BT and GPS in status bar ?

+  */

+

+  // settings of upperleft layer

+  text_layer_set_background_color(s_upperleft_text_layer, GColorWhite);

+  text_layer_set_text_color(s_upperleft_text_layer, GColorBlack);

+  text_layer_set_font(s_upperleft_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_18_BOLD));

+  text_layer_set_text_alignment(s_upperleft_text_layer, GTextAlignmentCenter);

+  layer_add_child(window_layer, text_layer_get_layer(s_upperleft_text_layer));

+

+  // settings of upperright layer

+  text_layer_set_background_color(s_upperright_text_layer, GColorWhite);

+  text_layer_set_text_color(s_upperright_text_layer, GColorBlack);

+  text_layer_set_font(s_upperright_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_18_BOLD));

+  text_layer_set_text_alignment(s_upperright_text_layer, GTextAlignmentCenter);

+  layer_add_child(window_layer, text_layer_get_layer(s_upperright_text_layer));

+

+  // settings of main layer

+  text_layer_set_background_color(s_main_text_layer, GColorBlack);

+  text_layer_set_text_color(s_main_text_layer, GColorWhite);

+  text_layer_set_font(s_main_text_layer, fonts_get_system_font(FONT_KEY_BITHAM_42_BOLD));

+  text_layer_set_text_alignment(s_main_text_layer, GTextAlignmentCenter);

+  layer_add_child(window_layer, text_layer_get_layer(s_main_text_layer));

+

+  // settings of lowerleft layer

+  text_layer_set_background_color(s_lowerleft_text_layer, GColorWhite);

+  text_layer_set_text_color(s_lowerleft_text_layer, GColorBlack);

+  text_layer_set_font(s_lowerleft_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_18_BOLD));

+  text_layer_set_text_alignment(s_lowerleft_text_layer, GTextAlignmentCenter);

+  layer_add_child(window_layer, text_layer_get_layer(s_lowerleft_text_layer));

+

+  // settings of lowerright layer

+  text_layer_set_background_color(s_lowerright_text_layer, GColorWhite);

+  text_layer_set_text_color(s_lowerright_text_layer, GColorBlack);

+  text_layer_set_font(s_lowerright_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_18_BOLD));

+  text_layer_set_text_alignment(s_lowerright_text_layer, GTextAlignmentCenter);

+  layer_add_child(window_layer, text_layer_get_layer(s_lowerright_text_layer));

+

+  // settings of lower layer

+  text_layer_set_background_color(s_lower_text_layer, GColorBlack);

+  text_layer_set_text_color(s_lower_text_layer, GColorWhite);

+  text_layer_set_font(s_lower_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_18_BOLD));

+  text_layer_set_text_alignment(s_lower_text_layer, GTextAlignmentCenter);

+  layer_add_child(window_layer, text_layer_get_layer(s_lower_text_layer));

-  text_layer_set_background_color(s_other_text_layer, GColorClear);

-  text_layer_set_text_color(s_other_text_layer, GColorBlack);

-  text_layer_set_font(s_other_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_18_BOLD));

-  text_layer_set_text_alignment(s_other_text_layer, GTextAlignmentCenter);

-  layer_add_child(window_layer, text_layer_get_layer(s_other_text_layer));

 }

 static void prv_window_unload(Window *window) {

-  text_layer_destroy(s_speed_text_layer);

+  text_layer_destroy(s_main_text_layer);

 }

 void comm_is_ready() {

   // set the text

-  text_layer_set_text(s_speed_text_layer, "Press Select");

-  text_layer_set_text(s_other_text_layer, "Welcome to Bike Companion ! JS is ready");

+  //text_layer_set_text(s_status_text_layer, "0......................................");

+  text_layer_set_text(s_upperleft_text_layer, "-");

+  text_layer_set_text(s_upperleft_text_layer, "-");

+  text_layer_set_text(s_main_text_layer, "Ready");

+  text_layer_set_text(s_lowerleft_text_layer, "-");

+  text_layer_set_text(s_lowerright_text_layer, "-");

+  text_layer_set_text(s_lower_text_layer, "--:--:--");

 }

@@ -170,6 +232,16 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     //APP_LOG(APP_LOG_LEVEL_DEBUG, "not longitude message... ");

   }

+  // Read distance returns

+  Tuple *distance_tuple = dict_find(iter, MESSAGE_KEY_distance);

+

+  if(distance_tuple) {

+    memset(s_distance,'\0',sizeof(s_distance));

+    strncpy(s_distance, distance_tuple->value->cstring, 6);

+  }else{

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "not distance message... ");

+  }

+

   // Read accuracy returns

   Tuple *accuracy_tuple = dict_find(iter, MESSAGE_KEY_accuracy);

@@ -226,6 +298,16 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     //APP_LOG(APP_LOG_LEVEL_DEBUG, "not timestamp message... ");

   }

+  // Read duration returns

+  Tuple *duration_tuple = dict_find(iter, MESSAGE_KEY_duration);

+

+  if(duration_tuple) {

+    memset(s_duration,'\0',sizeof(s_duration));

+    strncpy(s_duration, duration_tuple->value->cstring, 9);

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "duration message received : %s",s_duration);

+  }else{

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "not duration message... ");

+  }

   // Read speed returns

   Tuple *speed_tuple = dict_find(iter, MESSAGE_KEY_speed);

@@ -255,6 +337,15 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     //APP_LOG(APP_LOG_LEVEL_DEBUG, "not max_speed message... ");

   }

+  // Read avg_speed returns

+  Tuple *avg_speed_tuple = dict_find(iter, MESSAGE_KEY_avg_speed);

+

+  if(avg_speed_tuple) {

+    memset(s_avg_speed,'\0',sizeof(s_avg_speed));

+    strncpy(s_avg_speed, avg_speed_tuple->value->cstring, 4);

+  }else{

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "not avg_speed message... ");

+  }

   // Read status returns

   Tuple *status_tuple = dict_find(iter, MESSAGE_KEY_status);

@@ -266,25 +357,29 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     // DEBUG concatenate all data received

     /*

-    memset(s_msg,'\0',sizeof(s_msg));

-    strncpy(s_msg, "Acc. ",5);

-    strcat(s_msg, s_accuracy);

-    strcat(s_msg, "    Alt. ");

-    strcat(s_msg, s_altitude);

-    strcat(s_msg, "\n Max. ");

-    strcat(s_msg, s_max_speed);

-    strcat(s_msg, "\n Lat. ");

-    strcat(s_msg, s_latitude);

-    strcat(s_msg, "\n Long. ");

-    strcat(s_msg, s_longitude);

-    strcat(s_msg, "\n Time. ");

-    strcat(s_msg, s_timestamp);

+      memset(s_msg,'\0',sizeof(s_msg));

+      strncpy(s_msg, "Acc. ",5);

+      strcat(s_msg, s_accuracy);

+      strcat(s_msg, "    Alt. ");

+      strcat(s_msg, s_altitude);

+      strcat(s_msg, "\n Max. ");

+      strcat(s_msg, s_max_speed);

+      strcat(s_msg, "\n Lat. ");

+      strcat(s_msg, s_latitude);

+      strcat(s_msg, "\n Long. ");

+      strcat(s_msg, s_longitude);

+      strcat(s_msg, "\n Time. ");

+      strcat(s_msg, s_timestamp);

     */

     //APP_LOG(APP_LOG_LEVEL_DEBUG, "to display : %s ",s_msg);

-    text_layer_set_text(s_speed_text_layer, s_speed);

-    text_layer_set_text(s_other_text_layer, s_msg);

+    text_layer_set_text(s_upperleft_text_layer, s_altitude);

+    text_layer_set_text(s_upperright_text_layer, s_distance);

+    text_layer_set_text(s_main_text_layer, s_speed);

+    text_layer_set_text(s_lowerleft_text_layer, s_avg_speed);

+    text_layer_set_text(s_lowerright_text_layer, s_max_speed);

+    text_layer_set_text(s_lower_text_layer, s_duration);

   }else{

     //APP_LOG(APP_LOG_LEVEL_DEBUG, "not status message... ");

   }

@@ -4,138 +4,205 @@ var clay = new Clay(clayConfig, null, { autoHandleEvents: false });

 var messageKeys = require('message_keys');

 var message;

-var gpx_to_strava

-var gpx_to_web

 var locate_me

-var locationInterval;

-var instantLocationInterval;

+var firstlocationInterval = false;

+var locationInterval = false;

+var instantLocationInterval = false;

 // TODO to remove for security

 var client_id = "94880";

 var client_secret = "08dc170f0fe38f39dd327bea82a28db4400e6f00";

 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 first good signal

-    'maximumAge': 0 // 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': 0 // 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

 };

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

-    clay.config = clayConfig;

-    console.log("Clay config is showing...")

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

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

+  clay.config = clayConfig;

+  console.log("Clay config is showing...")

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

 });

-Pebble.addEventListener('webviewclosed', function(t) {

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

-        console.log("Clay config is submitted : " + t.response)

-        try {

-            if (data = JSON.parse(t.response), data.code && data.scope == "read,activity:write") {

-                if (data.state == "bike_companion" && data.scope == "read,activity:write") {

-                    getTokens(data.code);

-                } else {

-                    console.log("Error on response returned : scope is " + grantcode.scope + " and state is " + grantcode.state);

-                }

-            } else {

-                clay.getSettings(t.response);

-                console.log("Clay settings in Localstorage looks like " + localStorage.getItem("clay-settings"));

-            }

-        } catch (t) {

-            console.log("Oauth parsing error, continue on saving clay settings");

-            clay.getSettings(t.response);

-            var claysettings = JSON.parse(localStorage.getItem('clay-settings'))

-            claysettings.strava_enabled = false;

-            localStorage.setItem("clay-settings", JSON.stringify("claysettings"));

-            console.log("Clay settings in Localstorage looks like " + localStorage.getItem("clay-settings"));

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

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

+    console.log("Clay config is submitted : " + t.response)

+    try {

+      if (data = JSON.parse(t.response), data.code && data.scope == "read,activity:write") {

+        if (data.state == "bike_companion" && data.scope == "read,activity:write") {

+          getTokens(data.code);

+        } else {

+          console.log("Error on response returned : scope is " + grantcode.scope + " and state is " + grantcode.state);

         }

-

+      } else {

+        clay.getSettings(t.response);

+        console.log("Clay settings in Localstorage looks like " + localStorage.getItem("clay-settings"));

+      }

+    } catch (t) {

+      console.log("Oauth parsing error, continue on saving clay settings");

+      clay.getSettings(t.response);

+      var claysettings = JSON.parse(localStorage.getItem('clay-settings'))

+      claysettings.strava_enabled = false;

+      localStorage.setItem("clay-settings", JSON.stringify("claysettings"));

+      console.log("Clay settings in Localstorage looks like " + localStorage.getItem("clay-settings"));

     }

+

+  }

 });

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

+}

+

+// 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 = padding + new_str;

+    }

+    return new_str;

+  }

+}

+

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

+function storeLocation(position, first) {

+  var latitude = position.coords.latitude;

+  var longitude = position.coords.longitude;

+  var timestamp = position.timestamp;

+  if (first == true) {

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

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

+    localStorage.setItem("firsttimestamp", Date.now());

+    //console.log("-- First timestamp: " + localStorage.getItem("firsttimestamp"));

+    localStorage.setItem("totalcoordinates", 0)

+  }

+

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

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

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

+  localStorage.setItem("totalcoordinates", parseInt(localStorage.getItem("totalcoordinates")) + 1)

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

+function getLocation(first) {

+

+  if (first == false) {

+    if (localStorage.getItem("lastlatitude") || localStorage.getItem("lastlongitude") || localStorage.getItem("lasttimestamp")) {

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

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

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

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

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

+      return pos;

+    } else {

+      return null;

+    }

+  } else {

+    if (localStorage.getItem("firstlatitude") || localStorage.getItem("firstlongitude") || localStorage.getItem("firsttimestamp")) {

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

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

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

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

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

+      return pos;

     } else {

-        return null;

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

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

+  if (decimalStr === undefined) { decimalStr = 0 } else { decimalStr = decimalStr }

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

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

+  return true;

 }

 // Build GPX track point

 //

 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;

 }

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

@@ -143,397 +210,438 @@ function GPXfooterBuilder() {

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

 function getTokens(code) {

-    // call to strava api to get tokens in exchange of temp code

-    // need to use strava.jonget.fr to proxy request and hide secret

-    var url = "https://www.strava.com/oauth/token?client_id=" + client_id + "&client_secret=" + client_secret + "&code=" + code + "&grant_type=authorization_code";

-    var xhr = new XMLHttpRequest();

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

-

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

-

-    xhr.onload = function() {

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

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

-            console.log('------xhr request returned :', xhr.responseText);

-            response_json = JSON.parse(xhr.responseText);

-

-            var tokenjson = {

-                access_token: response_json.access_token,

-                refresh_token: response_json.refresh_token,

-                expiry: response_json.expires_at

-            };

-            localStorage.setItem("strava_tokens", JSON.stringify(tokenjson));

+  // call to strava api to get tokens in exchange of temp code

+  // need to use strava.jonget.fr to proxy request and hide secret

+  var url = "https://www.strava.com/oauth/token?client_id=" + client_id + "&client_secret=" + client_secret + "&code=" + code + "&grant_type=authorization_code";

+  var xhr = new XMLHttpRequest();

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

+

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

+

+  xhr.onload = function () {

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

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

+      console.log('------xhr request returned :', xhr.responseText);

+      response_json = JSON.parse(xhr.responseText);

+

+      var tokenjson = {

+        access_token: response_json.access_token,

+        refresh_token: response_json.refresh_token,

+        expiry: response_json.expires_at,

+        delay: response_json.expires_in

+      };

+      localStorage.setItem("strava_tokens", JSON.stringify(tokenjson));

-        }

-    };

+    }

+  };

-    xhr.send();

+  xhr.send();

 }

 function refreshTokens(refresh_token) {

-    // call to strava api to get tokens in exchange of refresh code

-    // need to use strava.jonget.fr to proxy request and hide secret

-    var url = "https://www.strava.com/oauth/token?client_id=" + client_id + "&client_secret=" + client_secret + "&refresh_token=" + refresh_token + "&grant_type=refresh_token";

-    var xhr = new XMLHttpRequest();

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

-

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

-

-    xhr.onload = function() {

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

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

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

-            response_json = JSON.parse(xhr.responseText);

-

-            var tokenjson = {

-                access_token: response_json.access_token,

-                refresh_token: response_json.refresh_token,

-                expiry: response_json.expires_at

-            };

-            localStorage.setItem("strava_tokens", JSON.stringify(tokenjson));

+  // call to strava api to get tokens in exchange of refresh code

+  // need to use strava.jonget.fr to proxy request and hide secret

+  var url = "https://www.strava.com/oauth/token?client_id=" + client_id + "&client_secret=" + client_secret + "&refresh_token=" + refresh_token + "&grant_type=refresh_token";

+  var xhr = new XMLHttpRequest();

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

+

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

+

+  xhr.onload = function () {

+    //console.log('------Refresh token - xhr onloaded')

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

+      console.log('------Refresh token - xhr request returned with ' + xhr.responseText);

+      response_json = JSON.parse(xhr.responseText);

+

+      var tokenjson = {

+        access_token: response_json.access_token,

+        refresh_token: response_json.refresh_token,

+        expiry: response_json.expires_at,

+        delay: response_json.expires_in

+      };

+      localStorage.setItem("strava_tokens", JSON.stringify(tokenjson));

-        }

-    };

+    }

+  };

-    xhr.send();

+  xhr.send();

 }

 // Send GPX to Strava profile

 function SendToStrava() {

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

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

-

-    var tokens = localStorage.getItem("strava_tokens");

-

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

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

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

+

+  var tokens = localStorage.getItem("strava_tokens");

+

+  //checking token expiry

+  var date = (Date.now()) / 1000

+

+  if (JSON.parse(tokens).expiry < date) {

+    console.log("Strava oAuth token expired, refreshing it")

+    refreshTokens(JSON.parse(tokens).refresh_token);

+  } else {

+    console.log("token (" + JSON.parse(tokens).access_token + ") valid, continuing")

+  }

+

+

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

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

+          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.error("Error2 loading, ", 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 () {

+    try {

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

+    } catch (e) {

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

     }

-    XHR.send(body)

+  }

+  XHR.send(body)

 }

 // 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 = 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 onloaded')

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

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

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

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

-            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 onloaded')

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

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

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

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

+      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 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 = 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 onloaded')