From 1d85d3dedf7d5e384417ebc66656a588f6944b3a Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Mon, 2 Oct 2017 20:30:15 +0100
Subject: [PATCH] Add VFRMap Section layer to Canvas-map

---
 gui/dialogs/map-canvas.xml | 68 +++++++++++++++++++++++++++++++++++---
 1 file changed, 63 insertions(+), 5 deletions(-)

diff --git a/gui/dialogs/map-canvas.xml b/gui/dialogs/map-canvas.xml
index 10cd6e4f3..3bf7cfc8d 100644
--- a/gui/dialogs/map-canvas.xml
+++ b/gui/dialogs/map-canvas.xml
@@ -26,8 +26,6 @@
             }
             setTransparency(0);
 
-
-
         ]]></open>
 
         <close><![CDATA[
@@ -143,6 +141,46 @@
                 </binding>
             </checkbox>
 
+            <checkbox>
+                <label>Route</label>
+                <halign>left</halign>
+                <property>/sim/gui/dialogs/map-canvas/draw-RTE</property>
+                <live>true</live>
+                <binding>
+                  <command>dialog-apply</command>
+                </binding>
+                <binding>
+                  <command>property-toggle</command>
+                </binding>
+            </checkbox>
+
+            <checkbox>
+                <label>Waypoints</label>
+                <halign>left</halign>
+                <property>/sim/gui/dialogs/map-canvas/draw-WPT</property>
+                <live>true</live>
+                <binding>
+                  <command>dialog-apply</command>
+                </binding>
+                <binding>
+                  <command>property-toggle</command>
+                </binding>
+            </checkbox>
+
+            <checkbox>
+                <label>APS</label>
+                <halign>left</halign>
+                <property>/sim/gui/dialogs/map-canvas/draw-APS</property>
+                <live>true</live>
+                <binding>
+                  <command>dialog-apply</command>
+                </binding>
+                <binding>
+                  <command>property-toggle</command>
+                </binding>
+            </checkbox>
+
+
 <!--
             <button>
                 <legend>Airways</legend>
@@ -230,6 +268,20 @@
                 </binding>
             </checkbox>
 
+            <checkbox>
+                <label>VFRChart</label>
+                <halign>left</halign>
+
+                <property>/sim/gui/dialogs/map-canvas/draw-VFRChart</property>
+                <live>true</live>
+                <binding>
+                  <command>dialog-apply</command>
+                </binding>
+                <binding>
+                  <command>property-toggle</command>
+                </binding>
+            </checkbox>
+
             <checkbox>
                 <label>OpenAIP</label>
                 <halign>left</halign>
@@ -353,6 +405,10 @@
                     <pref-width>600</pref-width>
                     <pref-height>400</pref-height>
                     <nasal><load><![CDATA[
+
+
+
+
                         var myCanvas = canvas.get( cmdarg() );
                         myCanvas.setColorBackground(0,0,0,0.5); # transparent
                         var TestMap = myCanvas.createGroup().createChild("map");
@@ -486,18 +542,20 @@
                                     setlistener("/sim/gui/dialogs/map-canvas/draw-"~name,
                                         func(n) SetLayerVisible(name,n.getValue()))
                                 );
+
+
                             })();
                         }
 
-                        foreach(var type; [ r('OSM'), r('OpenAIP')  ]) {
+                        foreach(var type; [ r('OSM'), r('VFRChart'), r('OpenAIP')  ]) {
                             TestMap.addLayer(factory: canvas.OverlayLayer, type_arg: type.name,
-                                             visible: type.vis, priority: 1,
+                                             visible: 0, priority: 1,
                                              style: Styles.get(type.name),
                                              options: Options.get(type.name) );
                             (func {
                                 # Notify MapStructure about layer visibility changes:
                                 var name = type.name;
-                                props.globals.initNode("/sim/gui/dialogs/map-canvas/draw-"~name, type.vis, "BOOL");
+                                props.globals.initNode("/sim/gui/dialogs/map-canvas/draw-"~name, 0, "BOOL");
                                 append(listeners,
                                     setlistener("/sim/gui/dialogs/map-canvas/draw-"~name,
                                         func(n) SetLayerVisible(name,n.getValue()))