implement position and gravity modules in a simple way

diff --git a/index.html b/index.html
index 9d407e04e0b618f9d25a5563d4259cc180615256..cd2e16c8f050da819e50424677ff47c85462d9e5 100644 (file)
--- a/index.html
+++ b/index.html
@@ -53,14 +53,46 @@ Web Tricorder
 <div id="mainSepBottom"></div>\r
 \r
 <div id="mainContent">\r
 <div id="mainSepBottom"></div>\r
 \r
 <div id="mainContent">\r

-<section id="sectNull">\r
-<p>This is the main area for tricorder output.</p>\r
+<section id="sectNull" class="active">\r
+<p>Please select a data input module from the left-side navigation.</p>\r

 </section>\r
 <section id="sectPos">\r
 </section>\r
 <section id="sectPos">\r

-<p>This is the main area for position tricorder output.</p>\r
+<p id="posunavail">\r
+Position watching is unavailable on this tricorder device.\r
+<br/>Please talk to your superior officer or Starfleet contact to acquire\r
+a better device.\r
+</p>\r
+<div id="posavail" style="display:none">\r
+<table>\r
+<tr><td>Latitude:</td><td id="posLat">...</td></tr>\r
+<tr><td>Longitude:</td><td id="posLong">...</td></tr>\r
+<tr><td>Accuracy:</td><td id="posAcc">...</td></tr>\r
+<tr><td>Altitude:</td><td id="posAlt">...</td></tr>\r
+<tr><td>Alt. Accuracy:</td><td id="posAltAcc">...</td></tr>\r
+<tr><td>Heading:</td><td id="posHead">...</td></tr>\r
+<tr><td>Speed:</td><td id="posSpd">...</td></tr>\r
+<tr><td>Timestamp:</td><td id="posTime">...</td></tr>\r
+</table>\r
+</div>\r

 </section>\r
 <section id="sectGrav">\r
 </section>\r
 <section id="sectGrav">\r

-<p>This is the main area for gravity tricorder output.</p>\r
+<p id="gravunavail">\r
+Gravity sensors are unavailable on this tricorder device.\r
+<br/>Please talk to your superior officer or Starfleet contact to acquire\r
+a better device.\r
+</p>\r
+<div id="gravavail" style="display:none">\r
+<table>\r
+<tr><td>X:</td><td id="gravX">...</td></tr>\r
+<tr><td>Y:</td><td id="gravY">...</td></tr>\r
+<tr><td>Z:</td><td id="gravZ">...</td></tr>\r
+<tr><td>Rotation:</td><td id="gravRot">...</td></tr>\r
+<tr><td>Absolute Orientation:</td><td id="gravAbs">...</td></tr>\r
+<tr><td>Alpha:</td><td id="gravAlpha">...</td></tr>\r
+<tr><td>Beta:</td><td id="gravBeta">...</td></tr>\r
+<tr><td>Gamma:</td><td id="gravGamma">...</td></tr>\r
+</table>\r
+</div>\r

 </section>\r
 <section id="sectAcou">\r
 <p>This is the main area for acoustics tricorder output.</p>\r
 </section>\r
 <section id="sectAcou">\r
 <p>This is the main area for acoustics tricorder output.</p>\r

diff --git a/js/tricorder.js b/js/tricorder.js
index c1b61e7c389bd991a2229cae0eb8b8a8f040b0e5..f82d9921d8a6559bd2622fe20ae0f0aa2b286167 100644 (file)
--- a/js/tricorder.js
+++ b/js/tricorder.js
@@ -26,7 +26,10 @@ function updateStardate() {
 function switchModule(modname) {
   var sections = document.getElementsByTagName('section');
   for (var i = 0; i <= sections.length - 1; i++) {
 function switchModule(modname) {
   var sections = document.getElementsByTagName('section');
   for (var i = 0; i <= sections.length - 1; i++) {

-    sections[i].classList.remove("active");
+    if (sections[i].classList.contains("active")) {
+      window["gMod" + sections[i].id.replace("sect", "")].deactivate();
+      sections[i].classList.remove("active");
+    }

   }
   var navs = document.getElementById('navlist').children;
   for (var i = 0; i <= navs.length - 1; i++) {
   }
   var navs = document.getElementById('navlist').children;
   for (var i = 0; i <= navs.length - 1; i++) {


@@ -35,4 +38,97 @@ function switchModule(modname) {
 
   document.getElementById("nav" + modname).classList.add("active");
   document.getElementById("sect" + modname).classList.add("active");
 
   document.getElementById("nav" + modname).classList.add("active");
   document.getElementById("sect" + modname).classList.add("active");

+
+  window["gMod" + modname].activate();
+}
+
+var gModPos = {
+  activate: function() {
+    if (navigator.geolocation) {
+      document.getElementById("posunavail").style.display = "none";
+      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 || "---";
+           var locTime = new Date(position.timestamp);
+           document.getElementById("posTime").textContent = locTime.toISOString();
+        },
+        function(error) {
+          // See https://developer.mozilla.org/en/Using_geolocation#Handling_errors
+          document.getElementById("posLat").textContent = error.message;
+          document.getElementById("posLong").textContent = "...";
+          document.getElementById("posAlt").textContent = "...";
+          document.getElementById("posAcc").textContent = "...";
+          document.getElementById("posAltAcc").textContent = "...";
+          document.getElementById("posHead").textContent = "...";
+          document.getElementById("posSpd").textContent = "...";
+          document.getElementById("posTime").textContent = "...";
+        },
+        {enableHighAccuracy: true}
+      );
+    }
+    else {
+      document.getElementById("posunavail").style.display = "block";
+      document.getElementById("posavail").style.display = "none";
+    }
+  },
+  deactivate: function() {
+    if (this.watchID) {
+      navigator.geolocation.clearWatch(this.watchID);
+    }
+    document.getElementById("posunavail").style.display = "block";
+    document.getElementById("posavail").style.display = "none";
+    document.getElementById("posLat").textContent = "...";
+    document.getElementById("posLong").textContent = "...";
+    document.getElementById("posAlt").textContent = "...";
+    document.getElementById("posAcc").textContent = "...";
+    document.getElementById("posAltAcc").textContent = "...";
+    document.getElementById("posHead").textContent = "...";
+    document.getElementById("posSpd").textContent = "...";
+    document.getElementById("posTime").textContent = "...";
+  },
+  watchID: null,
+}
+
+var gModGrav = {
+  activate: function() {
+    document.getElementById("gravunavail").style.display = "none";
+    document.getElementById("gravavail").style.display = "block";
+    window.addEventListener("deviceorientation", this.orientEvent, true);
+    window.addEventListener("devicemotion", this.motionEvent, true);
+  },
+  deactivate: function() {
+    window.removeEventListener("deviceorientation", this.orientEvent, true);
+    window.removeEventListener("devicemotion", this.motionEvent, true);
+    document.getElementById("gravunavail").style.display = "block";
+    document.getElementById("gravavail").style.display = "none";
+  },
+  orientEvent: function(orientData) {
+    document.getElementById("gravAbs").textContent = orientData.absolute;
+    document.getElementById("gravAlpha").textContent = orientData.alpha;
+    document.getElementById("gravBeta").textContent = orientData.beta;
+    document.getElementById("gravGamma").textContent = orientData.gamma;
+  },
+  motionEvent: function(event) {
+    document.getElementById("gravX").textContent = event.accelerationIncludingGravity.x;
+    document.getElementById("gravY").textContent = event.accelerationIncludingGravity.y;
+    document.getElementById("gravZ").textContent = event.accelerationIncludingGravity.z;
+    document.getElementById("gravRot").textContent = event.rotationRate;
+  },
+}
+
+var gModAcou = {
+  activate: function() {},
+  deactivate: function() {},
+}
+
+var gModNull = {
+  activate: function() {},
+  deactivate: function() {},

 }
 }