| ... | ... |
@@ -122,28 +122,28 @@ var softkeysClass = {
|
| 122 | 122 |
.setVisible(contains(me.colored, root_id ~ 'APT')); |
| 123 | 123 |
}, |
| 124 | 124 |
VOR: func {
|
| 125 |
- call(me.bindings.PFD.INSET.NAVAIDS.declutter, ['INSETNAVAIDSVOR', 'VOR', 2], me); |
|
| 125 |
+ call(me.bindings.PFD.INSET.NAVAIDS.declutter, [ 'VOR' ], me); |
|
| 126 | 126 |
}, |
| 127 | 127 |
TACAN: func {
|
| 128 |
- call(me.bindings.PFD.INSET.NAVAIDS.declutter, ['INSETNAVAIDSTACAN', 'TACAN', 3], me); |
|
| 128 |
+ call(me.bindings.PFD.INSET.NAVAIDS.declutter, [ 'TACAN' ], me); |
|
| 129 | 129 |
}, |
| 130 | 130 |
NDB: func {
|
| 131 |
- call(me.bindings.PFD.INSET.NAVAIDS.declutter, ['INSETNAVAIDSNDB', 'NDB', 4], me); |
|
| 131 |
+ call(me.bindings.PFD.INSET.NAVAIDS.declutter, [ 'NDB' ], me); |
|
| 132 | 132 |
}, |
| 133 | 133 |
DME: func {
|
| 134 |
- call(me.bindings.PFD.INSET.NAVAIDS.declutter, ['INSETNAVAIDSDME', 'DME', 5], me); |
|
| 134 |
+ call(me.bindings.PFD.INSET.NAVAIDS.declutter, [ 'DME' ], me); |
|
| 135 | 135 |
}, |
| 136 | 136 |
APT: func {
|
| 137 |
- call(me.bindings.PFD.INSET.NAVAIDS.declutter, ['INSETNAVAIDSAPT', 'airport', 6], me); |
|
| 137 |
+ call(me.bindings.PFD.INSET.NAVAIDS.declutter, [ 'APT' ], me); |
|
| 138 | 138 |
}, |
| 139 |
- declutter: func (id, type) {
|
|
| 139 |
+ declutter: func (id) {
|
|
| 140 | 140 |
var root_id = (me.device.role == 'PFD' ? 'INSET' : 'MAP') ~ 'NAVAIDS'; |
| 141 |
- if (contains(me.colored, id)) {
|
|
| 142 |
- delete(me.colored, id); |
|
| 141 |
+ if (contains(me.colored, root_id ~ id)) {
|
|
| 142 |
+ delete(me.colored, root_id ~ id); |
|
| 143 | 143 |
delete(me.colored, root_id ~ 'ALL'); |
| 144 | 144 |
} |
| 145 | 145 |
else |
| 146 |
- me.colored[id] = 1; |
|
| 146 |
+ me.colored[root_id ~ id] = 1; |
|
| 147 | 147 |
|
| 148 | 148 |
var active_navaids = 0; |
| 149 | 149 |
foreach (var n; [ 'VOR', 'DME', 'NDB', 'TACAN', 'APT' ]) |
| ... | ... |
@@ -160,8 +160,8 @@ var softkeysClass = {
|
| 160 | 160 |
delete(me.colored, root_id); |
| 161 | 161 |
|
| 162 | 162 |
me.device.display.updateSoftKeys(); |
| 163 |
- me.device.map.layers.navaids._can[type] |
|
| 164 |
- .setVisible(contains(me.colored, id)); |
|
| 163 |
+ me.device.map.layers.navaids._can[id == 'APT' ? 'airport' : id] |
|
| 164 |
+ .setVisible(contains(me.colored, root_id ~ id)); |
|
| 165 | 165 |
}, |
| 166 | 166 |
}, |
| 167 | 167 |
declutter: func (id, layer) {
|
| ... | ... |
@@ -1216,19 +1216,19 @@ var softkeysClass = {
|
| 1216 | 1216 |
call(me.bindings.PFD.INSET.NAVAIDS.ALL, [ 'MAPNAVAIDS' ], me); |
| 1217 | 1217 |
}, |
| 1218 | 1218 |
VOR: func {
|
| 1219 |
- call(me.bindings.PFD.INSET.NAVAIDS.declutter, ['MAPNAVAIDSVOR', 'VOR', 2], me); |
|
| 1219 |
+ call(me.bindings.PFD.INSET.NAVAIDS.declutter, [ 'VOR' ], me); |
|
| 1220 | 1220 |
}, |
| 1221 | 1221 |
TACAN: func {
|
| 1222 |
- call(me.bindings.PFD.INSET.NAVAIDS.declutter, ['MAPNAVAIDSTACAN', 'TACAN', 3], me); |
|
| 1222 |
+ call(me.bindings.PFD.INSET.NAVAIDS.declutter, [ 'TACAN' ], me); |
|
| 1223 | 1223 |
}, |
| 1224 | 1224 |
NDB: func {
|
| 1225 |
- call(me.bindings.PFD.INSET.NAVAIDS.declutter, ['MAPNAVAIDSNDB', 'NDB', 4], me); |
|
| 1225 |
+ call(me.bindings.PFD.INSET.NAVAIDS.declutter, [ 'NDB' ], me); |
|
| 1226 | 1226 |
}, |
| 1227 | 1227 |
DME: func {
|
| 1228 |
- call(me.bindings.PFD.INSET.NAVAIDS.declutter, ['MAPNAVAIDSDME', 'DME', 5], me); |
|
| 1228 |
+ call(me.bindings.PFD.INSET.NAVAIDS.declutter, [ 'DME' ], me); |
|
| 1229 | 1229 |
}, |
| 1230 | 1230 |
APT: func {
|
| 1231 |
- call(me.bindings.PFD.INSET.NAVAIDS.declutter, ['MAPNAVAIDSAPT', 'airport', 6], me); |
|
| 1231 |
+ call(me.bindings.PFD.INSET.NAVAIDS.declutter, ['APT' ], me); |
|
| 1232 | 1232 |
}, |
| 1233 | 1233 |
}, |
| 1234 | 1234 |
}, |