From c6eab93660894d67410866b3a23e3c5205edd128 Mon Sep 17 00:00:00 2001
From: John Williams <dogsaysmoo@yahoo.com>
Date: Sun, 7 Jun 2015 21:13:29 +0200
Subject: [PATCH] Add canvas tacan display on VOR and APP modes in addition to
 MAP mode

---
 Nasal/canvas/map/navdisplay.styles | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Nasal/canvas/map/navdisplay.styles b/Nasal/canvas/map/navdisplay.styles
index 3213dce5b..d61578df7 100644
--- a/Nasal/canvas/map/navdisplay.styles
+++ b/Nasal/canvas/map/navdisplay.styles
@@ -950,8 +950,7 @@ var NDStyles = {
 				id:'TCNArrow',
 				impl: {
 					init: func(nd,symbol),
-#					predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) and !nd.get_switch('toggle_centered') and getprop("instrumentation/efis/enable-canvas-tacan-display")),
-					predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) and !nd.get_switch('toggle_centered') and nd.efis_switches['toggle_tacan'] != nil),
+					predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP','APP','VOR']) and !nd.get_switch('toggle_centered') and nd.efis_switches['toggle_tacan'] != nil),
 					is_true: func(nd) {
 						if (nd.get_switch('toggle_tacan')) {
 						    nd.symbols.TCNArrow.show();
@@ -967,7 +966,7 @@ var NDStyles = {
 				id:'TCNArrow2',
 				impl: {
 					init: func(nd,symbol),
-					predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) and nd.get_switch('toggle_centered') and nd.efis_switches['toggle_tacan'] != nil),
+					predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP','APP','VOR']) and nd.get_switch('toggle_centered') and nd.efis_switches['toggle_tacan'] != nil),
 					is_true: func(nd) {
 						if (nd.get_switch('toggle_tacan')) {
 						    nd.symbols.TCNArrow2.show();
@@ -983,7 +982,7 @@ var NDStyles = {
 				id:'TACAN',
 				impl: {
 					init: func(nd,symbol),
-					predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) and nd.efis_switches['toggle_tacan'] != nil),
+					predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP','APP','VOR']) and nd.efis_switches['toggle_tacan'] != nil),
 					is_true: func(nd) {
 						if (nd.get_switch('toggle_tacan')) {
 						    nd.symbols.TACAN.setText("TACAN");
@@ -999,7 +998,7 @@ var NDStyles = {
 				id:'TACANId',
 				impl: {
 					init: func(nd,symbol),
-					predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) and nd.efis_switches['toggle_tacan'] != nil),
+					predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP','APP','VOR']) and nd.efis_switches['toggle_tacan'] != nil),
 					is_true: func(nd) {
 						if (nd.get_switch('toggle_tacan') and getprop("instrumentation/tacan/in-range")) {
 						    nd.symbols.TACANId.setText(getprop("instrumentation/tacan/ident"));
@@ -1015,7 +1014,7 @@ var NDStyles = {
 				id:'TACANdme',
 				impl: {
 					init: func(nd,symbol),
-					predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) and nd.efis_switches['toggle_tacan'] != nil),
+					predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP','APP','VOR']) and nd.efis_switches['toggle_tacan'] != nil),
 					is_true: func(nd) {
 						if (nd.get_switch('toggle_tacan') and getprop("instrumentation/tacan/in-range")) {
 						    nd.symbols.TACANdme.setText("DIST");
@@ -1031,7 +1030,7 @@ var NDStyles = {
 				id:'TACANdmeDist',
 				impl: {
 					init: func(nd,symbol),
-					predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) and nd.efis_switches['toggle_tacan'] != nil),
+					predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP','APP','VOR']) and nd.efis_switches['toggle_tacan'] != nil),
 					is_true: func(nd) {
 						if (nd.get_switch('toggle_tacan') and getprop("instrumentation/tacan/in-range")) {
 						    nd.symbols.TACANdmeDist.setText(sprintf("%3.1f",getprop("instrumentation/tacan/indicated-distance-nm")));