@@ -14,7 +14,7 @@

    viewBox="0 0 1024 768"

    version="1.1"

    id="SVGRoot"

-   inkscape:version="0.92.1 r15371"

+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"

    sodipodi:docname="header-nav-comm.svg">

   <sodipodi:namedview

      id="base"

@@ -23,14 +23,14 @@

      borderopacity="0"

      inkscape:pageopacity="0.0"

      inkscape:pageshadow="2"

-     inkscape:zoom="0.5"

-     inkscape:cx="512"

-     inkscape:cy="384"

+     inkscape:zoom="1.4142136"

+     inkscape:cx="510.72149"

+     inkscape:cy="555.21759"

      inkscape:document-units="px"

-     inkscape:current-layer="layer1"

+     inkscape:current-layer="PFD-navbox"

      showgrid="false"

-     inkscape:window-width="1600"

-     inkscape:window-height="836"

+     inkscape:window-width="1920"

+     inkscape:window-height="1016"

      inkscape:window-x="0"

      inkscape:window-y="27"

      inkscape:window-maximized="1" />

@@ -417,14 +417,13 @@

          inkscape:label="LEG-text"

          id="LEG-text"

          y="22.123667"

-         x="263.75085"

-         style="font-style:normal;font-weight:normal;font-size:21.33333397px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

+         x="504.70834"

+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

          xml:space="preserve"><tspan

-           style="fill:#ff00ff"

-           y="40.998669"

-           x="263.75085"

-           id="tspan4549"

-           sodipodi:role="line" /></text>

+           sodipodi:role="line"

+           id="tspan102"

+           x="504.70834"

+           y="40.998669"></tspan></text>

       <text

          inkscape:label="DIS"

          id="DIS"

@@ -385,7 +385,10 @@ var displayClass = {

         },

         'BARO-text' : {

             alignment : 'left-bottom',

-        }

+        },

+        'LEG-text' : {

+            alignment : 'center-center',

+        },

 #        'TAS-text' : {

 #            alignment : 'right-bottom',

 #        },

@@ -449,12 +452,12 @@ var displayClass = {

             DIS: func {

                 if (fpSize == 0) return '---NM';

                 var dist = getprop('/autopilot/route-manager/distance-remaining-nm');

-                return sprintf(dist >= 100 ? '%i' : '%.1f', dist);

+                return sprintf(dist < 100 ? '%2.1fNM' : '%3iNM', dist);

             },

             LEG: func {

                 if (fpSize == 0) return '';

                 var wp = route.flightPlan[route.currentLeg.index];

-                return wp[0].name ~ ' > ' ~ wp[1].name;

+                return sprintf(' %s %s %s', wp[0].name, utf8.chstr(9658), wp[1].name);

             },

             GS : func return sprintf('%iKT', getprop('/velocities/groundspeed-kt')),

             TRK: func return sprintf('%03i°', getprop('/orientation/track-deg')),

@@ -474,17 +477,22 @@ var displayClass = {

         if (getDataFields)

             return keys(navbox);

         if (me.device.role == 'MFD') {

+            var enroute = getprop('/autopilot/route-manager/current-wp') > -1;

             for (var i=1; i<=4; i+=1)

                 me.screenElements['DATA-FIELD' ~ i ~ '-VAL-text']

+                    .setVisible(enroute)

                     .setText(

-                        navbox[me.screenElements['DATA-FIELD' ~ i ~ '-ID-text'].get('text')]()

+                        navbox[me.screenElements['DATA-FIELD' ~ i ~ '-ID-text'].setVisible(enroute).get('text')]()

                     );

             settimer(func me.updateNavigationBox(), 0.6);

         }

         else { # PFD

-            me.screenElements['ETE-text'].setText(navbox.ETE());

-            me.screenElements['DIS-text'].setText(navbox.DIS());

-            me.screenElements['LEG-text'].setText(navbox.LEG());

+            var enroute = getprop('/autopilot/route-manager/current-wp') > -1;

+            me.screenElements['ETE'].setVisible(enroute);

+            me.screenElements['DIS'].setVisible(enroute);

+            me.screenElements['ETE-text'].setVisible(enroute).setText(navbox.ETE());

+            me.screenElements['DIS-text'].setVisible(enroute).setText(navbox.DIS());

+            me.screenElements['LEG-text'].setVisible(enroute).setText(navbox.LEG());

             settimer(func me.updateNavigationBox(), 0.3);

         }

     },