@@ -139,7 +139,7 @@ var displayClass = {

                     'BRG1',

                     'BRG2',

                     'DME1',

-                    'PFD-Map',

+                    'PFD-Map-bg',

                     'PFD-Multilines',

                     'WindData', 'WindData-OPTN1', 'WindData-OPTN2', 'WindData-OPTN1-HDG', 'WindData-OPTN2-symbol', 'WindData-OPTN2-headwind', 'WindData-OPTN2-crosswind', 'WindData-NODATA',

                     'AOA', 'AOA-needle', 'AOA-text', 'AOA-approach',

@@ -213,21 +213,19 @@ var displayClass = {

                 me.updateBARO();

                 me.updateOMI();

                 me.timerTrigger();

+                me.device.data.mapclip = {

+                    top: math.ceil(me.screenElements['PFD-Map-bg'].getTransformedBounds()[1]) - 1,

+                    right: math.ceil(me.screenElements['PFD-Map-bg'].getTransformedBounds()[2]) - 1,

+                    bottom: math.ceil(me.screenElements['PFD-Map-bg'].getTransformedBounds()[3]) - 1,

+                    left: math.ceil(me.screenElements['PFD-Map-bg'].getTransformedBounds()[0]) - 1,

+                };

+                me.device.data.mapsize = [

+                    me.device.data.mapclip.right - me.device.data.mapclip.left,

+                    me.device.data.mapclip.bottom - me.device.data.mapclip.top,

+                ];

             }

             else {

                 me.updateEIS();

-                me.device.timers.map = maketimer(1, me, func {

-                        me.MFDMapTiles.updateTiles();

-                        me.MFDMapNavaids.update();

-                        var gspd = getprop('/velocities/groundspeed-kt');

-                        if (gspd != 0)

-                            var next = (me.device.data['range-nm']/(gspd/3600))/(me.display.get('view[1]')/2);

-                        else

-                            var next = 10;

-                        if (next > 10)

-                            next = 10;

-                        me.device.timers.map.restart(next);

-                    });

                 me.device.data.mapclip = {

                     top: math.ceil(me.screenElements['Header'].getTransformedBounds()[3]),

                     right: me.display.get('view[0]'),

@@ -238,15 +236,6 @@ var displayClass = {

                     me.device.data.mapclip.right - me.device.data.mapclip.left,

                     me.device.data.mapclip.bottom - me.device.data.mapclip.top,

                 ];

-                me.device.timers.map.singleShot = 1;

-                me.device.data.zoom = 10;

-                me.MFDMapTiles = MapTiles.new(me.device);

-                me.MFDMapTiles.changeZoom(0);

-                me.MFDMapNavaids = PositionedLayer.new(me.device);

-                me.MFDMapNavaids.setVisible(1);

-                me.MFDMapNavaids.update();

-                me.MFDMapTiles.initialize_grid();

-                me.device.timers.map.start();

                 io.load_nasal(data.zkv1000_dir ~ 'Nasal/MFD.pages.nas', 'zkv1000');

                 me['page selected'] = 0;

                 me.device.data['page selection'] = [

@@ -317,6 +306,28 @@ var displayClass = {

                 ];

                 me.setMFDPages();

             }

+            me.device.data.zoom = 10;

+            me.MapTiles = MapTiles.new(me.device);

+            me.MapNavaids = PositionedLayer.new(me.device);

+            if (! contains(data.timers, 'map')) {

+                data.timers.map = maketimer(1, me, func {

+                        foreach (var d; keys(flightdeck)) {

+                            flightdeck[d].display.MapTiles.update();

+                            flightdeck[d].display.MapNavaids.update();

+                        }

+                        var gspd = getprop('/velocities/groundspeed-kt');

+                        if (gspd != 0)

+                            var next = (me.device.data['range-nm']/(gspd/3600))/(me.display.get('view[1]')/2);

+                        else

+                            var next = 10;

+                        if (next > 10)

+                            next = 10;

+                        data.timers.map.restart(next);

+                    });

+                data.timers.map.singleShot = 1;

+                data.timers.map.start();

+            }

+

             me.updateNAV({auto:'nav', tune: radios.getNode('nav-tune').getValue()});

             me.updateCOMM({auto:'comm', tune: radios.getNode('comm-tune').getValue()});

             me.softkeys_inactivity();

@@ -18,6 +18,7 @@ var MapTiles = {

             (m.num_tiles[0] - 1) / 2,

             (m.num_tiles[1] - 1) / 2

         ];

+        m.visibility = m.device.role == 'MFD';

         m.group = m.display.createGroup()

             .setCenter(

                     m.device.data.mapsize[0] / 2 + m.device.data.mapclip.left,

@@ -33,10 +34,13 @@ var MapTiles = {

                         ~ m.device.data.mapclip.right ~','

                         ~ m.device.data.mapclip.bottom ~','

                         ~ m.device.data.mapclip.left ~')'

-                );

+                )

+            .setVisible(m.visibility);

         m.tiles = setsize([], m.num_tiles[0]);

         m.last_tile = [-1,-1];

         m.last_type = data['tiles-type'];

+        m.changeZoom(0);

+        m.initialize_grid();

         return m;

     },

@@ -46,6 +50,13 @@ var MapTiles = {

         me.device.data['range-nm'] = me.display.get('view[1]') / 2 * 84.53 * math.cos(data.lat) / math.pow(2, me.device.data.zoom);

     },

+    setVisible : func (v) {

+        if (v != me.visibility) {

+            me.visibility = v;

+            me.group.setVisible(v);

+        }

+    },

+

 # initialize the map by setting up a grid of raster images

     initialize_grid : func {

         for(var x = 0; x < me.num_tiles[0]; x += 1) {

@@ -56,7 +67,9 @@ var MapTiles = {

     },

 # this is the callback that will be regularly called by the timer to update the map

-    updateTiles : func {

+    update : func {

+         if (! me.visibility)

+             return;

 #        me.group.setRotation(-data.hdg * D2R);

         var n = math.pow(2, me.device.data.zoom);

@@ -453,6 +466,8 @@ var PositionedLayer = {

         m._model = nil;

         m.device = device;

+        m._visibility = m.device.role == 'MFD';

+

         var display = m.device.display.display;

         m._group = display.createGroup().createChild('map', 'MFD map')

             .set('clip',

@@ -460,14 +475,14 @@ var PositionedLayer = {

                         ~ m.device.data.mapclip.top ~','

                         ~ m.device.data.mapclip.right ~','

                         ~ m.device.data.mapclip.bottom ~','

-                        ~ m.device.data.mapclip.left ~')');

-        m._group

+                        ~ m.device.data.mapclip.left ~')')

             .setTranslation(

                     m.device.data.mapsize[0] / 2 + m.device.data.mapclip.left,

                     m.device.data.mapsize[1] / 2 + m.device.data.mapclip.top

-                );

-        m._group._node.getNode('range', 1)

-            .setDoubleValue(13.5); # TODO find a far less esoteric way to get range value

+                )

+            .setVisible(m._visibility);

+            m._group._node

+                .getNode('range', 1).setDoubleValue(13.5); # TODO find a far less esoteric way to get range value

         m._can = {};

         m._cache = {};

@@ -499,8 +514,6 @@ var PositionedLayer = {

         m._results = nil;

-        m._visibility = 0;

-

         return m;

     },

     update : func {