Default value for distance 0 closes #400

app/Http/Resources/Acars.php

@@ -22,15 +22,13 @@ public function toArray($request)
         $res = parent::toArray($request);
 
         // Set these to the response units
-        if (!empty($res['distance'])) {
-            $distance = new Distance($res['distance'], config('phpvms.internal_units.distance'));
-            $res['distance'] = $distance->getResponseUnits();
-        }
+        $distance = ! empty($res['distance']) ? $res['distance'] : 0;
+        $distance = new Distance($distance, config('phpvms.internal_units.distance'));
+        $res['distance'] = $distance->getResponseUnits();
 
-        if (!empty($res['fuel'])) {
-            $fuel = new Fuel($res['fuel'], config('phpvms.internal_units.fuel'));
-            $res['fuel'] = $fuel->getResponseUnits();
-        }
+        $fuel = ! empty($res['fuel']) ? $res['fuel'] : 0;
+        $fuel = new Fuel($fuel, config('phpvms.internal_units.fuel'));
+        $res['fuel'] = $fuel->getResponseUnits();
 
         return $res;
     }

public/mix-manifest.json

@@ -1,14 +1,14 @@
 {
-    "/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=88270e919809fead277c",
+    "/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=218bdf369c2dd02856cc",
     "/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=20b82d8dbacf7e058df2",
     "/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=9f24c5e6612e74065901",
-    "/assets/frontend/js/app.js.map": "/assets/frontend/js/app.js.map?id=0019c21255cb4eca716d",
+    "/assets/frontend/js/app.js.map": "/assets/frontend/js/app.js.map?id=6b1ab9e89d979ba41fc4",
     "/assets/frontend/css/now-ui-kit.css.map": "/assets/frontend/css/now-ui-kit.css.map?id=fdc4f42ad9047d073145",
     "/assets/admin/css/vendor.min.css.map": "/assets/admin/css/vendor.min.css.map?id=c266c31652dea865307c",
-    "/assets/admin/js/app.js": "/assets/admin/js/app.js?id=cd8b03d3b7bd54e960ca",
-    "/assets/admin/js/app.js.map": "/assets/admin/js/app.js.map?id=a43168e6da458119da61",
-    "/assets/installer/js/app.js": "/assets/installer/js/app.js?id=7eb8b66dce0064082abc",
-    "/assets/installer/js/app.js.map": "/assets/installer/js/app.js.map?id=b277e94eb1368204a7d5",
+    "/assets/admin/js/app.js": "/assets/admin/js/app.js?id=37a4ecf79cdc64e724e5",
+    "/assets/admin/js/app.js.map": "/assets/admin/js/app.js.map?id=295a34b9c67c5a178d8a",
+    "/assets/installer/js/app.js": "/assets/installer/js/app.js?id=aa8661200da32787441c",
+    "/assets/installer/js/app.js.map": "/assets/installer/js/app.js.map?id=917f0f8bcd02d558f615",
     "/assets/fonts/glyphicons-halflings-regular.woff2": "/assets/fonts/glyphicons-halflings-regular.woff2?id=349344e92fb16221dd56",
     "/assets/admin/fonts/glyphicons-halflings-regular.woff2": "/assets/admin/fonts/glyphicons-halflings-regular.woff2?id=349344e92fb16221dd56",
     "/assets/admin/img/clear.png": "/assets/admin/img/clear.png?id=63b3af84650a0145d61a",

resources/js/common.js

@@ -3,8 +3,10 @@ const rivets = require('rivets');
 
 /**
  * Generic formatter to prepend
+ *
  * @param value
  * @param prepend
+ *
  * @returns {*}
  */
 rivets.formatters.prepend = function (value, prepend) {
@@ -13,7 +15,9 @@ rivets.formatters.prepend = function (value, prepend) {
 
 /**
  * Format minutes into HHh MMm
+ *
  * @param value
+ *
  * @returns {string}
  */
 rivets.formatters.time_hm = function (value) {
@@ -26,6 +30,7 @@ rivets.formatters.time_hm = function (value) {
  *
  * @param value
  * @param len
+ *
  * @returns {boolean}
  */
 rivets.formatters.gt = (value, len) => value.length > len;
@@ -34,6 +39,7 @@ rivets.formatters.gt = (value, len) => value.length > len;
  *
  * @param value
  * @param len
+ *
  * @returns {boolean}
  */
 rivets.formatters.lt = (value, len) => value.length < len;
@@ -42,6 +48,15 @@ rivets.formatters.lt = (value, len) => value.length < len;
  *
  * @param value
  * @param len
+ *
  * @returns {boolean}
  */
 rivets.formatters.eq = (value, len) => value.length > len;
+
+/**
+ * Use a default value if value is null or blank
+ *
+ * @param value Value to use
+ * @param def   Default value to use if value is null
+ */
+rivets.formatters.fallback = (value, def) => value || def;

resources/views/layouts/default/widgets/live_map.blade.php

@@ -98,8 +98,8 @@
                     <td>{ pirep.aircraft.name }</td>
                     <td>{ pirep.position.altitude }</td>
                     <td>{ pirep.position.gs }</td>
-                    <td>{ pirep.position.distance.{{setting('units.distance')}} } /
-                        { pirep.planned_distance.{{setting('units.distance')}} }
+                    <td>{ pirep.position.distance.{{setting('units.distance')}} | fallback 0 } /
+                        { pirep.planned_distance.{{setting('units.distance')}} | fallback 0 }
                     </td>
                     <td>{ pirep.status_text }</td>
                 </tr>