X-Git-Url: https://git-public.kairo.at//?a=blobdiff_plain;f=js%2Ftricorder.js;h=0f0ffcf1bc6c9d4bced7cb84fa71c4b6b8fb99ea;hb=48fd8f1ae5b9938c12136da7bbf4a8f061bbead7;hp=707910a9ba0d9f7e6fd8633bfbccfea70709e83f;hpb=d3e5ba11e304b4a5f3ed3c0625c2dc6cc2a4073b;p=tricorder.git

diff --git a/js/tricorder.js b/js/tricorder.js
index 707910a..0f0ffcf 100644
--- a/js/tricorder.js
+++ b/js/tricorder.js
@@ -74,8 +74,11 @@ function switchModule(modname) {
     navs[i].classList.remove("active");
   }
 
-  document.getElementById("nav" + modname).classList.add("active");
+  var navItem = document.getElementById("nav" + modname);
+  navItem.classList.add("active");
   document.getElementById("sect" + modname).classList.add("active");
+  document.getElementById("mainHeader").textContent =
+      (modname == "Other") ? "Web Tricorder" : navItem.textContent;
 
   window["gMod" + modname].activate();
 }
@@ -88,13 +91,20 @@ var gModPos = {
       document.getElementById("posavail").style.display = "block";
       this.watchID = navigator.geolocation.watchPosition(
         function(position) {
-           document.getElementById("posLat").textContent = position.coords.latitude;
-           document.getElementById("posLong").textContent = position.coords.longitude;
-           document.getElementById("posAlt").textContent = position.coords.altitude;
-           document.getElementById("posAcc").textContent = position.coords.accuracy;
-           document.getElementById("posAltAcc").textContent = position.coords.altitudeAccuracy;
-           document.getElementById("posHead").textContent = position.coords.heading || "---";
-           document.getElementById("posSpd").textContent = position.coords.speed || "---";
+           document.getElementById("posLat").textContent =
+               position.coords.latitude + "°";
+           document.getElementById("posLong").textContent =
+               position.coords.longitude + "°";
+           document.getElementById("posAlt").textContent =
+               position.coords.altitude.toFixed(0) + " m";
+           document.getElementById("posAcc").textContent =
+               position.coords.accuracy.toFixed(0) + " m";
+           document.getElementById("posAltAcc").textContent =
+               position.coords.altitudeAccuracy.toFixed(0) + " m";
+           document.getElementById("posHead").textContent =
+               position.coords.heading ? position.coords.heading.toFixed(0) + "°" : "---";
+           document.getElementById("posSpd").textContent =
+               position.coords.speed ? position.coords.speed.toFixed(1) + " m/s" : "---";
            var locTime = new Date(position.timestamp);
            document.getElementById("posTime").textContent = locTime.toISOString();
         },
@@ -109,13 +119,14 @@ var gModPos = {
             document.getElementById("posHead").textContent = "...";
             document.getElementById("posSpd").textContent = "...";
             document.getElementById("posTime").textContent = "...";
+            setTimeout(function() { gModPos.deactivate(); }, 5000);
           }
           else {
             document.getElementById("posunavail").style.display = "block";
             document.getElementById("posavail").style.display = "none";
           }
         },
-        {enableHighAccuracy: true}
+        {enableHighAccuracy: true, maximumAge: 10000, timeout: 60000}
       );
     }
     else {
@@ -166,6 +177,7 @@ var gModGrav = {
     document.getElementById("gravAlpha").textContent = "...";
     document.getElementById("gravBeta").textContent = "...";
     document.getElementById("gravGamma").textContent = "...";
+    document.getElementById("gravTotal").textContent = "...";
     document.getElementById("gravX").textContent = "...";
     document.getElementById("gravY").textContent = "...";
     document.getElementById("gravZ").textContent = "...";
@@ -178,6 +190,11 @@ var gModGrav = {
     document.getElementById("gravGamma").textContent = orientData.gamma.toFixed(1) + "°";
   },
   motionEvent: function(event) {
+    var gravTotal = 
+        Math.sqrt(Math.pow(event.accelerationIncludingGravity.x, 2) +
+                  Math.pow(event.accelerationIncludingGravity.y, 2) +
+                  Math.pow(event.accelerationIncludingGravity.z, 2));
+    document.getElementById("gravTotal").textContent = gravTotal.toFixed(2) + " m/s²";
     document.getElementById("gravX").textContent = event.accelerationIncludingGravity.x.toFixed(2) + " m/s²";
     document.getElementById("gravY").textContent = event.accelerationIncludingGravity.y.toFixed(2) + " m/s²";
     document.getElementById("gravZ").textContent = event.accelerationIncludingGravity.z.toFixed(2) + " m/s²";