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

@@ -151,7 +151,6 @@ function SendToStrava() {

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

   var array = [GPX]; // an array consisting of a single string

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

   var blob = new Blob(array, { type: "application/gpx+xml" }); // the blob

   // creating multipart/form-data to be sent

@@ -169,7 +168,8 @@ function SendToStrava() {

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

   xhr.setRequestHeader("Authorization", "Bearer d8927033b3996efe1e5a4e62425bc2aff8f635b0");

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

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

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

   xhr.onload = function () {

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

     if (xhr.readyState === 4) {

@@ -185,6 +185,7 @@ function SendToStrava() {

     }

   };

+  // send with data in body

   xhr.send(data);

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

@@ -194,7 +195,7 @@ function SendToStrava() {

 // Build CSV

 function CSV(pos) {

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

-  var datapoint = pos.timestamp + "," + pos.coords.lat + "," + pos.coords.long + "," + pos.coords.altitude + "," + pos.coords.accuracy + "," + pos.coords.altitudeAccuracy + "," + pos.coords.heading + "," + pos.coords.speed;

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

@@ -204,13 +205,13 @@ function CSV(pos) {

 function PostToWeb() {

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

-  var url = "https://192.168.170.33/strava/upload.php";

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

   var xhr = new XMLHttpRequest();

   xhr.timeout = 10000; // time in milliseconds

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

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

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

   xhr.onload = function () {

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

     if (xhr.readyState === 4) {

@@ -231,6 +232,40 @@ function PostToWeb() {

 }

+// Send location to web server for instant location (no 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();

+

+}

+

 // Adding leading characters to string for nice displays

 //

@@ -250,7 +285,7 @@ function padStart(string, max_length, padding) {

 //

 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(" location is " + new_pos.coords.latitude + ',' + new_pos.coords.longitude + ' , acc. ' + new_pos.coords.accuracy);

   var prev_pos = getLocation();

   storeLocation(new_pos);

@@ -269,7 +304,15 @@ function locationSuccess(new_pos) {

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

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

+    }

     // Prepare display on watch

     // now it's only raw data

@@ -300,13 +343,14 @@ function locationSuccess(new_pos) {

     if (gpx_to_strava) {

       //add a new datapoint to GPX file

       GPXtrkptBuilder(latitudeString, longitudeString, altitudeString, timestampISO);

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

     }

     if (csv_to_web) {

       // Start the csv file

       CSV(new_pos);

+      console.log('CSV: ' + localStorage.getItem("CSV"));

     }

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

     // Build message

     message = "OK";

@@ -357,12 +401,17 @@ function get_coordinate() {

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

   }, 5000);

+  instantLocationInterval = setInterval(function () {

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

+  }, 60000);

+

 }

 function init() {

   // local storage init,

   // todo : clear only temporary values, not clay config (and do it on exit ?)

   localStorage.clear();

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

   // clear any other var to do

   clearInterval(locationInterval);