fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of gitorious.org:fg/fgdata

Browse source
This commit is contained in:
BARANGER Emmanuel 2014-02-16 20:07:01 +01:00
commit 3ee2e2bd10
2 changed files with 77 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
Nasal/canvas/map/boeingND.svg
View file

@ -28,13 +28,13 @@
inkscape:window-height="716"
id="namedview102"
showgrid="false"
inkscape:zoom="1"
inkscape:cx="240.103"
inkscape:cy="639.263"
inkscape:zoom="0.5"
inkscape:cx="432.905"
inkscape:cy="372.682"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="layer3"
inkscape:current-layer="layer1"
inkscape:object-nodes="true"
inkscape:snap-smooth-nodes="true"
inkscape:snap-object-midpoints="true"
@ -219,6 +219,7 @@
<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"
@ -237,6 +238,7 @@
<path
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
@ -267,6 +269,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -285,6 +288,7 @@
<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"
@ -303,6 +307,7 @@
<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"
@ -322,6 +327,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -341,6 +347,7 @@
<g
id="hdgGroup"
inkscape:label="#g3141"><path
@ -367,6 +374,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -386,6 +394,7 @@
<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,6 +414,7 @@
</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"
@ -424,6 +434,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -443,6 +454,7 @@
<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"
@ -462,6 +474,7 @@
<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"
@ -481,6 +494,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -500,6 +514,7 @@
<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"
@ -519,6 +534,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -538,6 +554,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -557,6 +574,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -576,6 +594,7 @@
<g
inkscape:label="#g3124"
id="compass"><path
@ -606,6 +625,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -626,6 +646,7 @@
<text
transform="matrix(0.5,-0.866026,0.866026,0.5,0,0)"
xml:space="preserve"
@ -646,6 +667,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -666,6 +688,7 @@
<text
transform="matrix(-0.5,-0.866025,0.866025,-0.5,0,0)"
xml:space="preserve"
@ -686,6 +709,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -706,6 +730,7 @@
<text
transform="scale(-1,-1)"
xml:space="preserve"
@ -726,6 +751,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -746,6 +772,7 @@
<text
transform="matrix(-0.5,0.866026,-0.866026,-0.5,0,0)"
xml:space="preserve"
@ -766,6 +793,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -786,6 +814,7 @@
<text
transform="matrix(0.5,0.866025,-0.866025,0.5,0,0)"
xml:space="preserve"
@ -806,6 +835,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -826,6 +856,7 @@
<path
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccscccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccc"
id="path3181"
@ -897,6 +928,7 @@
<path
sodipodi:nodetypes="cscc"
inkscape:connector-curvature="0"
@ -922,6 +954,7 @@
<g
id="staArrowL"
inkscape:label="#g4072"
@ -994,6 +1027,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1013,6 +1047,7 @@
<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"
@ -1032,6 +1067,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1051,6 +1087,7 @@
<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"
@ -1100,6 +1137,7 @@
<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"
@ -1116,6 +1154,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1132,6 +1171,7 @@
</g><g
inkscape:groupmode="layer"
id="layer1"
@ -1223,6 +1263,7 @@
<text
transform="matrix(0.866025,-0.5,0.5,0.866025,0,0)"
xml:space="preserve"
@ -1243,6 +1284,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1263,6 +1305,7 @@
<text
transform="matrix(0,-1,1,0,0,0)"
xml:space="preserve"
@ -1283,6 +1326,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1303,6 +1347,7 @@
<text
transform="matrix(-0.866026,-0.5,0.5,-0.866026,0,0)"
xml:space="preserve"
@ -1323,6 +1368,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1343,6 +1389,7 @@
<text
transform="matrix(-0.866025,0.5,-0.5,-0.866025,0,0)"
xml:space="preserve"
@ -1363,6 +1410,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1383,6 +1431,7 @@
<text
transform="matrix(0,1,-1,0,0,0)"
xml:space="preserve"
@ -1403,6 +1452,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1416,7 +1466,8 @@
y="-611.09729"
x="941.70276"
id="tspan3962"
sodipodi:role="line">4</tspan></text>
sodipodi:role="line">6</tspan></text>
@ -1443,6 +1494,7 @@
<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"
@ -1515,6 +1567,7 @@
<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"
@ -1531,6 +1584,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1546,6 +1600,7 @@
<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"
@ -1561,6 +1616,7 @@
<g
id="gsGroup"
transform="matrix(0,-1,1,0,746.592,1646.26)"
@ -1572,10 +1628,10 @@
sodipodi:cy="643.93"
sodipodi:rx="6.71751"
sodipodi:ry="6.71751"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
d="m 386.788,643.93 c 0,3.71 -3.008,6.718 -6.718,6.718 -3.71,0 -6.718,-3.008 -6.718,-6.718 0,-3.71 3.008,-6.718 6.718,-6.718 3.71,0 6.718,3.008 6.718,6.718 z"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,1048.27,-640.211)" /><path
transform="matrix(0.968853,0.690717,-0.690717,0.968853,1123.83,-640.211)"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
d="m 386.788,643.93 c 0,3.71 -3.008,6.718 -6.718,6.718 -3.71,0 -6.718,-3.008 -6.718,-6.718 0,-3.71 3.008,-6.718 6.718,-6.718 3.71,0 6.718,3.008 6.718,6.718 z"
sodipodi:ry="6.71751"
sodipodi:rx="6.71751"
sodipodi:cy="643.93"
@ -1590,10 +1646,10 @@
sodipodi:cy="643.93"
sodipodi:rx="6.71751"
sodipodi:ry="6.71751"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
d="m 386.788,643.93 c 0,3.71 -3.008,6.718 -6.718,6.718 -3.71,0 -6.718,-3.008 -6.718,-6.718 0,-3.71 3.008,-6.718 6.718,-6.718 3.71,0 6.718,3.008 6.718,6.718 z"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,1274.73,-640.211)" /><path
transform="matrix(0.968853,0.690717,-0.690717,0.968853,1350.58,-640.21)"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
d="m 386.788,643.93 c 0,3.71 -3.008,6.718 -6.718,6.718 -3.71,0 -6.718,-3.008 -6.718,-6.718 0,-3.71 3.008,-6.718 6.718,-6.718 3.71,0 6.718,3.008 6.718,6.718 z"
sodipodi:ry="6.71751"
sodipodi:rx="6.71751"
sodipodi:cy="643.93"
@ -1687,6 +1743,7 @@
<path
inkscape:label="#path3017"
sodipodi:nodetypes="cccccc"
@ -1711,6 +1768,7 @@
<text
sodipodi:linespacing="125%"
id="text3209"
@ -1729,6 +1787,7 @@
<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"
@ -1747,6 +1806,7 @@
</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"
@ -1766,6 +1826,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1785,6 +1846,7 @@
<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"
@ -1804,6 +1866,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1823,4 +1886,5 @@
</g></svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 97 KiB

After

Width:  |  Height:  |  Size: 97 KiB

6
Nasal/canvas/map/route.draw
View file

@ -45,16 +45,18 @@ var draw_route = func (group, theroute, controller=nil, lod=0)
{
if (i == 0) {
var leg = fp.getWP(1);
var j = 0;
foreach (var pt; leg.path()) {
append(coords,"N"~pt.lat);
append(coords,"E"~pt.lon);
if (i==0){
if (j==0){
append(cmds,2);
i+=1;
j=1;
} else
append(cmds,4);
}
canvas.drawwp(group, leg.path()[0].lat, leg.path()[0].lon, fp.getWP(0).alt_cstr, fp.getWP(0).wp_name, i, wp);
i+=1;
}
var leg = fp.getWP(i);
foreach (var pt; leg.path()) {