Add option to isplay horizontal distance in hours

The Horus team found that horizontal distances in m/s were hard to get
an intuition for, particularly as the speed across land is often used
for calculating if a car can travel to the landing site in time.

This change adds a selectable option that modifies the horizontal speed
to be calculated in km/h, or m/h if the user has selected imperial
units. The default behaviour is still to use distance per second.

Signed-off-by: Joel Stanley <[email protected]>

Author: shenki

cache.manifest

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# version 219
+# version 220
 
 # gogole maps files
 http://maps.google.com/maps/api/js?v=3.10&sensor=false&language=en_us&key=AIzaSyCOqkcNey4CCyG4X0X5qxHAhCgD8g5DwXg

index.html

@@ -105,6 +105,13 @@ <h2><i class="icon-settings rfloat"></i>Settings</h2>
                     <input type="checkbox" id="opt_imperial">
                 </div>
             </div>
+            <div class="row option">
+                <span><b>Horizontal speed in hours</b></span>
+                <div class="switch off" id="sw_haxis_hours">
+                    <span class="thumb hourswitch"></span>
+                    <input type="checkbox" id="opt_haxis_hours">
+                </div>
+            </div>
             <div class="row option">
                 <span><b>Availability offline</b></span>
                 <div class="switch off" id="sw_offline">

js/app.js

@@ -451,7 +451,7 @@ $(window).ready(function() {
     if(offline.get('opt_daylight')) $('#sw_daylight').removeClass('off').addClass('on');
 
     // offline and mobile
-    $('#sw_offline, #sw_station, #sw_imperial').click(function() {
+    $('#sw_offline, #sw_station, #sw_imperial, #sw_haxis_hours').click(function() {
         var e = $(this);
         var name = e.attr('id').replace('sw', 'opt');
         var on;
@@ -465,12 +465,13 @@ $(window).ready(function() {
         }
 
         offline.set(name, on);
-        if(name == "opt_imperial") refreshUI();
+        if(name == "opt_imperial" || name == "opt_haxis_hours") refreshUI();
     });
 
     if(offline.get('opt_offline')) $('#sw_offline').removeClass('off').addClass('on');
     if(offline.get('opt_station')) $('#sw_station').removeClass('off').addClass('on');
     if(offline.get('opt_imperial')) $('#sw_imperial').removeClass('off').addClass('on');
+    if(offline.get('opt_haxis_hours')) $('#sw_haxis_hours').removeClass('off').addClass('on');
 
     // force re-cache
     $('#sw_cache').click(function() {

js/tracker.js

@@ -357,7 +357,11 @@ function updateVehicleInfo(index, position) {
 
   var imp = offline.get('opt_imperial');
   var ascent_text = imp ? (vehicles[index].ascent_rate * 196.850394).toFixed(1) + ' ft/min' : vehicles[index].ascent_rate.toFixed(1) + ' m/s';
-  var hrate_text = imp ? (vehicles[index].horizontal_rate * 196.850394).toFixed(1) + ' ft/min' : vehicles[index].horizontal_rate.toFixed(1) + ' m/s';
+  if (offline.get('opt_haxis_hours')) {
+          var hrate_text = imp ? (vehicles[index].horizontal_rate * 2.23693629).toFixed(1) + ' mph' : (vehicles[index].horizontal_rate * 3.6).toFixed(1) + ' km/h';
+  } else {
+          var hrate_text = imp ? (vehicles[index].horizontal_rate * 196.850394).toFixed(1) + ' ft/min' : vehicles[index].horizontal_rate.toFixed(1) + ' m/s';
+  }
 
   var coords_text;
   var ua =  navigator.userAgent.toLowerCase();
@@ -815,7 +819,7 @@ function addPosition(position) {
                    - convert_time(vehicle.curr_position.gps_time);
 
                 if(dt != 0) {
-                    // calcualte vertical rate
+                    // calculate vertical rate
                     var rate = (position.gps_alt - vehicle.curr_position.gps_alt) / dt;
                     vehicle.ascent_rate = 0.7 * rate
                                           + 0.3 * vehicle.ascent_rate;