1
0
Fork 0

Merge commit 'd88a359cd18df81f49df70407025b00177306e92' into next

This was https://sourceforge.net/p/flightgear/fgdata/merge-requests/18/
This commit is contained in:
Torsten Dreyer 2015-05-19 12:07:39 +02:00
commit 954f5ad5d6
2 changed files with 1736 additions and 1699 deletions

View file

@ -9,7 +9,7 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="boeingND.svg"
sodipodi:docname="boeingND_tcn.svg"
inkscape:version="0.48.4 r9939"
xml:space="preserve"
id="svg5180"
@ -24,15 +24,15 @@
guidetolerance="10"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:window-width="1366"
inkscape:window-height="716"
inkscape:window-width="1280"
inkscape:window-height="948"
id="namedview102"
showgrid="false"
inkscape:zoom="5.65685"
inkscape:cx="165.847"
inkscape:cy="140.874"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:zoom="0.35355313"
inkscape:cx="10.267885"
inkscape:cy="105.47714"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:current-layer="layer3"
inkscape:object-nodes="true"
@ -210,8 +210,6 @@
x="844.04407"
id="tspan7245"
sodipodi:role="line">ABCD</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -224,8 +222,6 @@
id="tspan7251"
x="844.04407"
y="126.12489">999.9</tspan></text>
<path
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
@ -250,8 +246,6 @@
id="tspan3801"
x="36.862175"
y="92.904839">999°/ 99</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -264,8 +258,6 @@
x="77.874374"
id="tspan3809"
sodipodi:role="line">999</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -278,8 +270,6 @@
id="tspan3813"
x="210.49673"
y="53.306854">999</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -293,8 +283,6 @@
id="tspan3817"
x="38.276394"
y="53.306854">GS</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -308,8 +296,6 @@
id="tspan3821"
sodipodi:role="line"
style="font-size:24px">TAS</tspan></text>
<g
id="hdgGroup"
inkscape:label="#g3141"><path
@ -330,8 +316,6 @@
x="476.28857"
y="65.781754"
style="font-size:48px">999</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -345,8 +329,6 @@
id="tspan3849"
sodipodi:role="line"
style="font-size:32px;fill:#32f519">HDG</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -360,8 +342,6 @@
id="tspan3853"
x="578.66278"
y="67.549522">MAG</tspan></text>
</g><text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -375,8 +355,6 @@
id="tspan3056"
x="41.732624"
y="929.57532">VOR L</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -390,8 +368,6 @@
id="tspan3060"
sodipodi:role="line"
style="font-size:24px;fill:#32f519">DME</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -405,8 +381,6 @@
id="tspan3068"
x="101.1296"
y="993.85461">99.9</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -420,8 +394,6 @@
id="tspan3072"
x="41.732624"
y="961.71497">ABC</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -435,8 +407,6 @@
id="tspan3076"
sodipodi:role="line"
style="font-size:32px;fill:#32f519">VOR R</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -450,8 +420,6 @@
id="tspan3080"
x="889.7326"
y="993.85461">DME</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -465,8 +433,6 @@
id="tspan3084"
sodipodi:role="line"
style="font-size:32px;fill:#32f519">99.9</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -480,8 +446,6 @@
id="tspan3088"
sodipodi:role="line"
style="font-size:32px;fill:#32f519">ABC</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -495,8 +459,6 @@
x="844.04407"
id="tspan3092"
sodipodi:role="line">08 34.4z</tspan></text>
<g
inkscape:label="#g3124"
id="compass"><path
@ -521,8 +483,6 @@
x="500.44846"
y="195.26741"
style="font-size:40px">0</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -537,8 +497,6 @@
x="9.1033907"
id="tspan3082"
sodipodi:role="line">33</tspan></text>
<text
transform="matrix(0.5,-0.866026,0.866026,0.5,0,0)"
xml:space="preserve"
@ -553,8 +511,6 @@
x="-478.97894"
y="231.34868"
style="font-size:39.999996px">30</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -569,8 +525,6 @@
x="-845.96948"
id="tspan3090"
sodipodi:role="line">27</tspan></text>
<text
transform="matrix(-0.5,-0.866025,0.866025,-0.5,0,0)"
xml:space="preserve"
@ -585,8 +539,6 @@
x="-992.34058"
y="-584.99097"
style="font-size:39.99995px">24</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -601,8 +553,6 @@
x="-879.19897"
id="tspan3098"
sodipodi:role="line">21</tspan></text>
<text
transform="scale(-1,-1)"
xml:space="preserve"
@ -617,8 +567,6 @@
x="-533.67151"
y="-1436.3594"
style="font-size:40.000004px">18</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -633,8 +581,6 @@
x="-51.792171"
id="tspan3106"
sodipodi:role="line">15</tspan></text>
<text
transform="matrix(-0.5,0.866026,-0.866026,-0.5,0,0)"
xml:space="preserve"
@ -649,8 +595,6 @@
x="435.97983"
y="-1462.8785"
style="font-size:40.000011px">12</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -665,8 +609,6 @@
x="812.80585"
id="tspan3114"
sodipodi:role="line">9</tspan></text>
<text
transform="matrix(0.5,0.866025,-0.866025,0.5,0,0)"
xml:space="preserve"
@ -681,8 +623,6 @@
x="958.43561"
y="-645.76654"
style="font-size:39.999981px">6</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -697,8 +637,6 @@
x="844.79596"
id="tspan3122"
sodipodi:role="line">3</tspan></text>
<path
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccscccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccc"
id="path3181"
@ -763,8 +701,6 @@
id="tspan5002"
x="500.86594"
y="464.10147">99</tspan></text>
<path
sodipodi:nodetypes="cscc"
inkscape:connector-curvature="0"
@ -785,8 +721,6 @@
id="tspan3093"
sodipodi:role="line"
style="font-size:32px;fill:#0099d9;fill-opacity:1">TA ONLY</tspan></text>
<g
id="staArrowL"
inkscape:label="#g4072"
@ -853,8 +787,6 @@
id="tspan3097"
x="41.732624"
y="769.12952">WXR</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -868,8 +800,6 @@
id="tspan3101"
sodipodi:role="line"
style="font-size:32px;fill:#0099d9;fill-opacity:1">ARPT</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0099d9;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -883,8 +813,6 @@
id="tspan3105"
x="41.732624"
y="697.12939">WPT</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -898,8 +826,6 @@
id="tspan3109"
sodipodi:role="line"
style="font-size:32px;fill:#0099d9;fill-opacity:1">STA</tspan></text>
<path
inkscape:label="#path7253"
style="fill:none;stroke:#ededed;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
@ -943,8 +869,6 @@
id="tspan3179"
x="937.04547"
y="125.43141">NM</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -958,8 +882,6 @@
id="tspan4172"
x="803.289"
y="53.929054">ILS L</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -973,8 +895,6 @@
id="tspan4176"
sodipodi:role="line"
style="font-size:32px;fill:#ededed;fill-opacity:1">999.99</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0099d9;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -1040,6 +960,77 @@
id="tspan4732"
x="41.732624"
y="897.43567">TCAS TEST</tspan></text>
<g
inkscape:transform-center-y="-2.9215"
inkscape:label="#g4072"
id="TCNArrow"><path
style="fill:none;stroke:#ff7f00;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 512,1431.07 0,111.48 0,11.91 m 22.274,3.21 -22.274,-15.12 -22.274,15.12"
id="path3268"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc"
inkscape:label="#path3100"
inkscape:transform-center-y="663.729"
inkscape:transform-center-x="-1.011" /><path
style="fill:none;stroke:#ff7f00;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 512.25,84.501 -0.5,130.364 m 20.25,-7.217 -20.25,-0.283 -19.75,0 M 524.774,96.259 512.25,84.501 499.726,95.824"
id="path3270"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc"
inkscape:label="#path3100"
inkscape:transform-center-y="-663.324"
inkscape:transform-center-x="-0.25" /></g><text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
id="TACAN"
y="929.57532"
x="185.73262"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ff7f00;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
xml:space="preserve"><tspan
y="929.57532"
x="185.73262"
id="tspan4060"
sodipodi:role="line"
style="font-size:32px;fill:#ff7f00;fill-opacity:1">TACAN</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ff7f00;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
x="185.73262"
y="993.85461"
id="TACANdme"
sodipodi:linespacing="125%"
inkscape:label="#text7243"><tspan
style="font-size:24px;fill:#ff7f00;fill-opacity:1"
sodipodi:role="line"
id="tspan4064"
x="185.73262"
y="993.85461">DIST</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
id="TACANdmeDist"
y="993.85461"
x="241.12961"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ff7f00;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
xml:space="preserve"><tspan
y="993.85461"
x="241.12961"
id="tspan4068"
sodipodi:role="line"
style="font-size:32px;fill:#ff7f00;fill-opacity:1">99.9</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
id="TACANId"
y="961.71497"
x="185.73262"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ff7f00;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
xml:space="preserve"><tspan
y="961.71497"
x="185.73262"
id="tspan4072"
sodipodi:role="line"
style="font-size:32px;fill:#ff7f00;fill-opacity:1">ABC</tspan></text>
</g><g
inkscape:groupmode="layer"
id="layer1"
@ -1119,8 +1110,6 @@
x="488.38348"
id="tspan3922"
sodipodi:role="line">0</tspan></text>
<text
transform="matrix(0.866025,-0.5,0.5,0.866025,0,0)"
xml:space="preserve"
@ -1135,8 +1124,6 @@
x="-13.265571"
y="377.83694"
style="font-size:80.433212px">33</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1151,8 +1138,6 @@
x="-503.69513"
id="tspan3930"
sodipodi:role="line">30</tspan></text>
<text
transform="matrix(0,-1,1,0,0,0)"
xml:space="preserve"
@ -1167,8 +1152,6 @@
x="-868.71942"
y="-71.969933"
style="font-size:80.433212px">27</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1183,8 +1166,6 @@
x="-1019.1653"
id="tspan3938"
sodipodi:role="line">24</tspan></text>
<text
transform="matrix(-0.866026,-0.5,0.5,-0.866026,0,0)"
xml:space="preserve"
@ -1199,8 +1180,6 @@
x="-904.95624"
y="-1033.6982"
style="font-size:80.433212px">21</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1215,8 +1194,6 @@
x="-557.84332"
id="tspan3946"
sodipodi:role="line">18</tspan></text>
<text
transform="matrix(-0.866025,0.5,-0.5,-0.866025,0,0)"
xml:space="preserve"
@ -1231,8 +1208,6 @@
x="-71.888855"
y="-1543.4183"
style="font-size:80.433212px">15</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1247,8 +1222,6 @@
x="409.84222"
id="tspan3954"
sodipodi:role="line">12</tspan></text>
<text
transform="matrix(0,1,-1,0,0,0)"
xml:space="preserve"
@ -1263,8 +1236,6 @@
x="801.43085"
y="-1088.3844"
style="font-size:80.433212px">9</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1279,8 +1250,6 @@
x="941.70276"
id="tspan3962"
sodipodi:role="line">6</tspan></text>
<text
transform="matrix(0.866026,0.5,-0.5,0.866026,0,0)"
xml:space="preserve"
@ -1295,8 +1264,6 @@
x="831.16284"
y="-130.83325"
style="font-size:80.433212px">3</tspan></text>
<path
inkscape:connector-curvature="0"
style="fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:#ededed;stroke-width:10.054152;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
@ -1366,8 +1333,6 @@
id="tspan4007"
sodipodi:role="line"
style="font-size:24px">CRS</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -1381,8 +1346,6 @@
id="tspan4011"
x="854.72168"
y="124.87983">DME</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1395,8 +1358,6 @@
x="913.95801"
id="tspan4046"
sodipodi:role="line">999</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -1409,8 +1370,6 @@
id="tspan4071"
x="913.95801"
y="126.12444">99.9</tspan></text>
<g
id="gsGroup"
transform="matrix(0,-1,1,0,746.592,1646.26)"
@ -1518,7 +1477,29 @@
d="m 350.959,598.552 c 0,0 72.1,-39.455 161.041,-39.455 88.942,0 161.041,39.455 161.041,39.455 l 0,0"
id="altArcCtr"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cscc" /></g></g><g
sodipodi:nodetypes="cscc" /></g><g
inkscape:transform-center-x="-0.198874"
inkscape:transform-center-y="3.80786"
inkscape:label="#g4072"
id="TCNArrow2"
style="display:inline"
transform="translate(0.174175,-115.585)"><path
style="fill:none;stroke:#ff7f00;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 512,973.468 0,51.482 0,11.91 m 22.274,3.21 -22.274,-15.12 -22.274,15.12"
id="path4054"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc"
inkscape:label="#path3100"
inkscape:transform-center-y="663.729"
inkscape:transform-center-x="-1.011" /><path
style="fill:none;stroke:#ff7f00;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 512.25,316.675 -0.5,70.364 m 20.25,-7.217 -20.25,-0.283 -19.75,0 m 32.774,-51.106 -12.524,-11.758 -12.524,11.323"
id="path4056"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc"
inkscape:label="#path3100"
inkscape:transform-center-y="-663.324"
inkscape:transform-center-x="-0.25" /></g></g><g
inkscape:groupmode="layer"
id="layer4"
inkscape:label="MAP_CTR"
@ -1541,8 +1522,6 @@
x="488.38348"
y="227.44069"
style="font-size:80.433212px">0</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1557,8 +1536,6 @@
x="-13.265571"
id="tspan3348"
sodipodi:role="line">33</tspan></text>
<text
transform="matrix(0.5,-0.866026,0.866026,0.5,0,0)"
xml:space="preserve"
@ -1573,8 +1550,6 @@
x="-503.69513"
y="265.32059"
style="font-size:80.433212px">30</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1589,8 +1564,6 @@
x="-868.71942"
id="tspan3356"
sodipodi:role="line">27</tspan></text>
<text
transform="matrix(-0.5,-0.866025,0.866025,-0.5,0,0)"
xml:space="preserve"
@ -1605,8 +1578,6 @@
x="-1019.1653"
y="-541.37213"
style="font-size:80.433212px">24</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1621,8 +1592,6 @@
x="-904.95624"
id="tspan3364"
sodipodi:role="line">21</tspan></text>
<text
transform="scale(-1,-1)"
xml:space="preserve"
@ -1637,8 +1606,6 @@
x="-557.84332"
y="-1392.2814"
style="font-size:80.433212px">18</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1653,8 +1620,6 @@
x="-71.888855"
id="tspan3372"
sodipodi:role="line">15</tspan></text>
<text
transform="matrix(-0.5,0.866026,-0.866026,-0.5,0,0)"
xml:space="preserve"
@ -1669,8 +1634,6 @@
x="409.84222"
y="-1431.3702"
style="font-size:80.433212px">12</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1685,8 +1648,6 @@
x="801.43085"
id="tspan3380"
sodipodi:role="line">9</tspan></text>
<text
transform="matrix(0.5,0.866025,-0.866025,0.5,0,0)"
xml:space="preserve"
@ -1701,8 +1662,6 @@
x="941.70276"
y="-611.09729"
style="font-size:80.433212px">6</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1717,8 +1676,6 @@
x="831.16284"
id="tspan3388"
sodipodi:role="line">3</tspan></text>
<path
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccscccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccc"
id="path3390"
@ -1747,7 +1704,6 @@
id="tspan3436"
sodipodi:role="line"
style="text-align:end;text-anchor:end">99</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -1761,7 +1717,6 @@
id="tspan3440"
x="492.84521"
y="743.96869">99</tspan></text>
<path
sodipodi:nodetypes="cscc"
inkscape:connector-curvature="0"
@ -1798,8 +1753,6 @@
x="489.24902"
id="tspan3178"
sodipodi:role="line">N</tspan></text>
<path
inkscape:label="#path3017"
sodipodi:nodetypes="cccccc"
@ -1818,8 +1771,6 @@
x="33.519165"
y="530.25165"
style="font-size:32px">W</tspan></text>
<text
sodipodi:linespacing="125%"
id="text3209"
@ -1832,8 +1783,6 @@
x="962.65656"
id="tspan3211"
sodipodi:role="line">E</tspan></text>
<text
xml:space="preserve"
style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#00ff00;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -1846,8 +1795,6 @@
x="503.03763"
y="1008.2553"
style="font-size:32px">S</tspan></text>
</g><text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -1861,8 +1808,6 @@
id="tspan5002-7"
x="511.74799"
y="320.56113">99</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1876,8 +1821,6 @@
id="tspan3201"
sodipodi:role="line"
style="text-align:center;text-anchor:middle">99</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -1891,8 +1834,6 @@
id="tspan3205"
x="512.21063"
y="752.73596">99</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1906,6 +1847,4 @@
id="tspan3209"
sodipodi:role="line"
style="text-align:center;text-anchor:middle">99</tspan></text>
</g></svg>

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 126 KiB

View file

@ -826,8 +826,8 @@ var NDStyles = {
var windSpd = getprop("environment/wind-speed-kt");
if(!nd.get_switch('toggle_true_north'))
windDir = windDir - getprop("environment/magnetic-variation-deg");
if(windDir < 0.5) windDir = 360 + windDir;
elsif(windDir >= 360.5) windDir = windDir - 360;
while(windDir < 0.5) windDir += 360;
while(windDir > 360.5) windDir -= 360;
if (windSpd > 6)
nd.windShown = 1;
if (nd.windShown != 0) {
@ -945,6 +945,104 @@ var NDStyles = {
is_false: func(nd) nd.symbols.dmeL.hide(),
},
},
# TACAN added by tikibar (J. Williams)
{
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),
is_true: func(nd) {
if (nd.get_switch('toggle_tacan')) {
nd.symbols.TCNArrow.show();
nd.symbols.TCNArrow.setRotation((getprop("instrumentation/tacan/indicated-bearing-true-deg")-nd.aircraft_source.get_hdg_tru())*D2R);
} else {
nd.symbols.TCNArrow.hide();
}
},
is_false: func(nd) nd.symbols.TCNArrow.hide(),
},
},
{
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),
is_true: func(nd) {
if (nd.get_switch('toggle_tacan')) {
nd.symbols.TCNArrow2.show();
nd.symbols.TCNArrow2.setRotation((getprop("instrumentation/tacan/indicated-bearing-true-deg")-nd.aircraft_source.get_hdg_tru())*D2R);
} else {
nd.symbols.TCNArrow2.hide();
}
},
is_false: func(nd) nd.symbols.TCNArrow2.hide(),
},
},
{
id:'TACAN',
impl: {
init: func(nd,symbol),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) and nd.efis_switches['toggle_tacan'] != nil),
is_true: func(nd) {
if (nd.get_switch('toggle_tacan')) {
nd.symbols.TACAN.setText("TACAN");
nd.symbols.TACAN.show();
} else {
nd.symbols.TACAN.hide();
}
},
is_false: func(nd) nd.symbols.TACAN.hide(),
},
},
{
id:'TACANId',
impl: {
init: func(nd,symbol),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) 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"));
nd.symbols.TACANId.show();
} else {
nd.symbols.TACANId.hide();
}
},
is_false: func(nd) nd.symbols.TACANId.hide(),
},
},
{
id:'TACANdme',
impl: {
init: func(nd,symbol),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) 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");
nd.symbols.TACANdme.show();
} else {
nd.symbols.TACANdme.hide();
}
},
is_false: func(nd) nd.symbols.TACANdme.hide(),
},
},
{
id:'TACANdmeDist',
impl: {
init: func(nd,symbol),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['MAP']) 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")));
nd.symbols.TACANdmeDist.show();
} else {
nd.symbols.TACANdmeDist.hide();
}
},
is_false: func(nd) nd.symbols.TACANdmeDist.hide(),
},
},
], # end of vector with features