mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-11-29 07:24:13 +01:00
OP-1543 Elevation display fix (wrong coordinates) - Small changes on SVG
This commit is contained in:
Laurent Lalanne
parent
389f769f28
commit
0061a97000
@ -170,19 +170,18 @@ QPointF GpsConstellationWidget::polarToCoord(int elevation, int azimuth)
|
||||
{
|
||||
double x;
|
||||
double y;
|
||||
double rad_elevation;
|
||||
double vect_elevation;
|
||||
double rad_azimuth;
|
||||
|
||||
|
||||
rad_elevation = M_PI * elevation / 180;
|
||||
// Vector modulus scaled to circle and angle (azimut)
|
||||
vect_elevation = 0.93 - (elevation / 90.00f) * 0.93;
|
||||
rad_azimuth = M_PI * azimuth / 180;
|
||||
|
||||
x = cos(rad_elevation) * sin(rad_azimuth);
|
||||
y = -cos(rad_elevation) * cos(rad_azimuth);
|
||||
|
||||
x = world->boundingRect().width() / 2 * x;
|
||||
y = world->boundingRect().height() / 2 * y;
|
||||
// Cartesian coordinates
|
||||
x = ((world->boundingRect().width() * vect_elevation) / 2) * sin(rad_azimuth);
|
||||
y = ((world->boundingRect().height() * vect_elevation) / 2) * -cos(rad_azimuth);
|
||||
|
||||
// Start from center
|
||||
x = (world->boundingRect().width() / 2) + x;
|
||||
y = (world->boundingRect().height() / 2) + y;
|
||||
|
||||
|
||||
@ -18,6 +18,18 @@
|
||||
sodipodi:docname="gpsEarth.svg">
|
||||
<defs
|
||||
id="defs4">
|
||||
<linearGradient
|
||||
id="linearGradient3902"
|
||||
inkscape:collect="always">
|
||||
<stop
|
||||
id="stop3904"
|
||||
offset="0"
|
||||
style="stop-color:#f1f4fc;stop-opacity:0.92084942" />
|
||||
<stop
|
||||
id="stop3906"
|
||||
offset="1"
|
||||
style="stop-color:#f1f4fc;stop-opacity:0;" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient3943">
|
||||
<stop
|
||||
@ -41,10 +53,9 @@
|
||||
id="stop3857" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient3845">
|
||||
<stop
|
||||
style="stop-color:#fff954;stop-opacity:1;"
|
||||
style="stop-color:#ffe054;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop3847" />
|
||||
<stop
|
||||
@ -191,15 +202,6 @@
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3845"
|
||||
id="linearGradient3851"
|
||||
x1="545.28937"
|
||||
y1="196.2579"
|
||||
x2="540.71686"
|
||||
y2="196.2579"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3853"
|
||||
id="linearGradient3859"
|
||||
x1="572.75409"
|
||||
y1="197.75398"
|
||||
@ -228,24 +230,6 @@
|
||||
fx="528.15979"
|
||||
fy="189.95265"
|
||||
r="2.2728431" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3853"
|
||||
id="linearGradient3903"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="572.75409"
|
||||
y1="197.75398"
|
||||
x2="599.88422"
|
||||
y2="231.04071" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3845"
|
||||
id="linearGradient3905"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="545.28937"
|
||||
y1="196.2579"
|
||||
x2="540.71686"
|
||||
y2="196.2579" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3815"
|
||||
@ -495,6 +479,25 @@
|
||||
stdDeviation="4.5456863"
|
||||
id="feGaussianBlur4258" />
|
||||
</filter>
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3902"
|
||||
id="radialGradient3900"
|
||||
cx="219.28656"
|
||||
cy="264.63971"
|
||||
fx="219.28656"
|
||||
fy="264.63971"
|
||||
r="229.28432"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.36621472,0.44959574,-0.69284855,0.5643542,330.33614,1.9177412)" />
|
||||
<filter
|
||||
inkscape:collect="always"
|
||||
id="filter3932">
|
||||
<feGaussianBlur
|
||||
inkscape:collect="always"
|
||||
stdDeviation="2.2728432"
|
||||
id="feGaussianBlur3934" />
|
||||
</filter>
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
@ -503,9 +506,9 @@
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1.2134707"
|
||||
inkscape:cx="427.48348"
|
||||
inkscape:cy="236.45147"
|
||||
inkscape:zoom="1.4710073"
|
||||
inkscape:cx="246.00764"
|
||||
inkscape:cy="247.78938"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="map"
|
||||
showgrid="false"
|
||||
@ -542,11 +545,11 @@
|
||||
sodipodi:cy="404.8544"
|
||||
sodipodi:rx="227.28432"
|
||||
sodipodi:ry="227.28432"
|
||||
d="m 598.0103,404.8544 c 0,125.52566 -101.75866,227.28432 -227.28432,227.28432 -125.52566,0 -227.28431,-101.75866 -227.28431,-227.28432 0,-125.52566 101.75865,-227.28432 227.28431,-227.28432 125.52566,0 227.28432,101.75866 227.28432,227.28432 z"
|
||||
d="M 598.0103,404.8544 C 598.0103,530.38006 496.25164,632.13872 370.72598,632.13872 C 245.20032,632.13872 143.44167,530.38006 143.44167,404.8544 C 143.44167,279.32874 245.20032,177.57008 370.72598,177.57008 C 496.25164,177.57008 598.0103,279.32874 598.0103,404.8544 z"
|
||||
transform="translate(3.1541623,-3.1541561)" />
|
||||
<path
|
||||
transform="translate(3.1541623,-3.1541561)"
|
||||
d="m 598.0103,404.8544 c 0,125.52566 -101.75866,227.28432 -227.28432,227.28432 -125.52566,0 -227.28431,-101.75866 -227.28431,-227.28432 0,-125.52566 101.75865,-227.28432 227.28431,-227.28432 125.52566,0 227.28432,101.75866 227.28432,227.28432 z"
|
||||
d="M 598.0103,404.8544 C 598.0103,530.38006 496.25164,632.13872 370.72598,632.13872 C 245.20032,632.13872 143.44167,530.38006 143.44167,404.8544 C 143.44167,279.32874 245.20032,177.57008 370.72598,177.57008 C 496.25164,177.57008 598.0103,279.32874 598.0103,404.8544 z"
|
||||
sodipodi:ry="227.28432"
|
||||
sodipodi:rx="227.28432"
|
||||
sodipodi:cy="404.8544"
|
||||
@ -554,6 +557,16 @@
|
||||
id="path3590"
|
||||
style="fill:url(#linearGradient3820);fill-opacity:1;stroke:#909196;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
sodipodi:type="arc" />
|
||||
<path
|
||||
sodipodi:type="arc"
|
||||
style="fill:url(#radialGradient3900);fill-opacity:1;stroke:none;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3932)"
|
||||
id="path3130"
|
||||
sodipodi:cx="370.72598"
|
||||
sodipodi:cy="404.8544"
|
||||
sodipodi:rx="227.28432"
|
||||
sodipodi:ry="227.28432"
|
||||
d="M 598.0103,404.8544 C 598.0103,530.38006 496.25164,632.13872 370.72598,632.13872 C 245.20032,632.13872 143.44167,530.38006 143.44167,404.8544 C 143.44167,279.32874 245.20032,177.57008 370.72598,177.57008 C 496.25164,177.57008 598.0103,279.32874 598.0103,404.8544 z"
|
||||
transform="translate(3.1541623,-3.1541561)" />
|
||||
<path
|
||||
id="path3604"
|
||||
d="m 145.31205,404.8544 447.79741,0"
|
||||
@ -655,64 +668,72 @@
|
||||
sodipodi:role="line">W</tspan></text>
|
||||
</g>
|
||||
<g
|
||||
id="g3035">
|
||||
id="g3035"
|
||||
transform="matrix(1.0013302,0,0,1.0013302,-0.26088662,-0.77082907)">
|
||||
<path
|
||||
sodipodi:type="arc"
|
||||
style="fill:none;stroke:url(#linearGradient3831);stroke-width:2.39174904000000010;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
style="fill:none;stroke:url(#linearGradient3831);stroke-width:2.39174914;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
id="path3608"
|
||||
sodipodi:cx="392.44427"
|
||||
sodipodi:cy="410.41025"
|
||||
sodipodi:rx="89.398499"
|
||||
sodipodi:ry="89.398499"
|
||||
d="m 451.71402,343.4835 c 36.96262,32.73378 40.39077,89.23387 7.657,126.19649 -32.73378,36.96262 -89.23387,40.39078 -126.19649,7.657 -36.96262,-32.73377 -40.39077,-89.23386 -7.657,-126.19648 28.33719,-31.99805 75.3601,-39.46142 112.2124,-17.8101"
|
||||
transform="matrix(1.2543122,0,0,1.2543122,-121.52166,-109.92818)"
|
||||
d="M 451.71402,343.4835 C 488.67664,376.21728 492.10479,432.71737 459.37102,469.67999 C 426.63724,506.64261 370.13715,510.07077 333.17453,477.33699 C 296.21191,444.60322 292.78376,388.10313 325.51753,351.14051 C 353.85472,319.14246 400.87763,311.67909 437.72993,333.33041"
|
||||
transform="matrix(1.2638612,0,0,1.2638612,-124.40402,-114.71229)"
|
||||
sodipodi:start="5.4371862"
|
||||
sodipodi:end="11.526764"
|
||||
sodipodi:open="true" />
|
||||
<path
|
||||
transform="matrix(1.9716104,0,0,1.9716104,-399.86707,-407.46887)"
|
||||
d="m 451.12161,342.96352 c 37.2498,32.4066 41.17599,88.87427 8.76939,126.12407 -32.4066,37.2498 -88.87426,41.17599 -126.12407,8.76939 -37.2498,-32.4066 -41.17598,-88.87427 -8.76938,-126.12407 29.53979,-33.95454 79.71538,-40.65585 117.1306,-15.64362"
|
||||
d="M 451.12161,342.96352 C 488.37141,375.37012 492.2976,431.83779 459.891,469.08759 C 427.4844,506.33739 371.01674,510.26358 333.76693,477.85698 C 296.51713,445.45038 292.59095,388.98271 324.99755,351.73291 C 354.53734,317.77837 404.71293,311.07706 442.12815,336.08929"
|
||||
sodipodi:ry="89.398499"
|
||||
sodipodi:rx="89.398499"
|
||||
sodipodi:cy="410.41025"
|
||||
sodipodi:cx="392.44427"
|
||||
id="path3610"
|
||||
style="fill:none;stroke:url(#linearGradient3823);stroke-width:1.52159879000000009;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.44600001000000000;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
style="fill:none;stroke:url(#linearGradient3823);stroke-width:1.52159882;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.44600004;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
sodipodi:type="arc"
|
||||
sodipodi:start="5.428369"
|
||||
sodipodi:end="11.584848"
|
||||
sodipodi:open="true" />
|
||||
<g
|
||||
style="font-size:40px;font-style:normal;font-weight:normal;fill:#f1f4fc;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
|
||||
id="text3727">
|
||||
id="text3727"
|
||||
transform="translate(2,-2)">
|
||||
<path
|
||||
d="m 432.35937,317.06058 -5.07226,0 0,-2.29004 5.07226,-6.0293 2.42676,0 0,6.15918 1.25782,0 0,2.16016 -1.25782,0 0,1.87304 -2.42676,0 z m 0,-2.16016 0,-3.15137 -2.67968,3.15137 z"
|
||||
d="M 432.35937,317.06058 L 427.28711,317.06058 L 427.28711,314.77054 L 432.35937,308.74124 L 434.78613,308.74124 L 434.78613,314.90042 L 436.04395,314.90042 L 436.04395,317.06058 L 434.78613,317.06058 L 434.78613,318.93362 L 432.35937,318.93362 z M 432.35937,314.90042 L 432.35937,311.74905 L 429.67969,314.90042 z"
|
||||
style="font-size:14px;fill:#f1f4fc;font-family:Arial Black;-inkscape-font-specification:Arial Black"
|
||||
id="path3764" />
|
||||
id="path3764"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
d="m 438.05371,308.91214 6.61035,0 0,2.22168 -4.47754,0 -0.23925,1.50391 c 0.30989,-0.14583 0.61637,-0.25521 0.91943,-0.32813 0.30305,-0.0729 0.6027,-0.10937 0.89892,-0.10937 1.0026,0 1.81608,0.30306 2.44043,0.90918 0.62435,0.60612 0.93652,1.36947 0.93653,2.29003 -1e-5,0.64714 -0.16066,1.26921 -0.48194,1.86622 -0.32129,0.597 -0.77702,1.05273 -1.36718,1.36718 -0.59018,0.31446 -1.34555,0.47168 -2.26612,0.47168 -0.66081,0 -1.22705,-0.0627 -1.69873,-0.18799 -0.47168,-0.12532 -0.87272,-0.31217 -1.20312,-0.56054 -0.33041,-0.24837 -0.59815,-0.52979 -0.80322,-0.84424 -0.20508,-0.31445 -0.37598,-0.70638 -0.5127,-1.17578 l 2.81641,-0.30762 c 0.0683,0.45118 0.22786,0.79411 0.47851,1.02881 0.25065,0.2347 0.54915,0.35205 0.89551,0.35205 0.38736,0 0.70751,-0.14697 0.96045,-0.44092 0.25292,-0.29394 0.37939,-0.73258 0.37939,-1.31592 0,-0.597 -0.12761,-1.0345 -0.38281,-1.3125 -0.25521,-0.27799 -0.59473,-0.41698 -1.01855,-0.41699 -0.26889,10e-6 -0.52865,0.0661 -0.7793,0.19824 -0.18685,0.0957 -0.39193,0.26889 -0.61523,0.51954 l -2.37208,-0.3418 z"
|
||||
d="M 438.05371,308.91214 L 444.66406,308.91214 L 444.66406,311.13382 L 440.18652,311.13382 L 439.94727,312.63773 C 440.25716,312.4919 440.56364,312.38252 440.8667,312.3096 C 441.16975,312.2367 441.4694,312.20023 441.76562,312.20023 C 442.76822,312.20023 443.5817,312.50329 444.20605,313.10941 C 444.8304,313.71553 445.14257,314.47888 445.14258,315.39944 C 445.14257,316.04658 444.98192,316.66865 444.66064,317.26566 C 444.33935,317.86266 443.88362,318.31839 443.29346,318.63284 C 442.70328,318.9473 441.94791,319.10452 441.02734,319.10452 C 440.36653,319.10452 439.80029,319.04182 439.32861,318.91653 C 438.85693,318.79121 438.45589,318.60436 438.12549,318.35599 C 437.79508,318.10762 437.52734,317.8262 437.32227,317.51175 C 437.11719,317.1973 436.94629,316.80537 436.80957,316.33597 L 439.62598,316.02835 C 439.69428,316.47953 439.85384,316.82246 440.10449,317.05716 C 440.35514,317.29186 440.65364,317.40921 441,317.40921 C 441.38736,317.40921 441.70751,317.26224 441.96045,316.96829 C 442.21337,316.67435 442.33984,316.23571 442.33984,315.65237 C 442.33984,315.05537 442.21223,314.61787 441.95703,314.33987 C 441.70182,314.06188 441.3623,313.92289 440.93848,313.92288 C 440.66959,313.92289 440.40983,313.98898 440.15918,314.12112 C 439.97233,314.21682 439.76725,314.39001 439.54395,314.64066 L 437.17187,314.29886 z"
|
||||
style="font-size:14px;fill:#f1f4fc;font-family:Arial Black;-inkscape-font-specification:Arial Black"
|
||||
id="path3766" />
|
||||
id="path3766"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
d="m 450.43359,310.68948 c 0,0.53777 -0.19141,0.99806 -0.57422,1.38086 -0.38281,0.38282 -0.84538,0.57423 -1.38769,0.57422 -0.53776,10e-6 -0.99805,-0.1914 -1.38086,-0.57422 -0.38281,-0.3828 -0.57422,-0.84309 -0.57422,-1.38086 0,-0.54231 0.19141,-1.00373 0.57422,-1.38427 0.38281,-0.38053 0.8431,-0.57079 1.38086,-0.5708 0.54231,10e-6 1.00488,0.19027 1.38769,0.5708 0.38281,0.38054 0.57422,0.84196 0.57422,1.38427 z m -1.27148,-0.007 c 0,-0.1914 -0.0672,-0.35546 -0.20166,-0.49219 -0.13444,-0.13671 -0.29737,-0.20507 -0.48877,-0.20508 -0.19141,1e-5 -0.35547,0.0684 -0.49219,0.20508 -0.13672,0.13673 -0.20508,0.30079 -0.20508,0.49219 0,0.19141 0.0684,0.35434 0.20508,0.48877 0.13672,0.13444 0.30078,0.20166 0.49219,0.20166 0.1914,0 0.35433,-0.0672 0.48877,-0.20166 0.13444,-0.13443 0.20166,-0.29736 0.20166,-0.48877 z"
|
||||
d="M 450.43359,310.68948 C 450.43359,311.22725 450.24218,311.68754 449.85937,312.07034 C 449.47656,312.45316 449.01399,312.64457 448.47168,312.64456 C 447.93392,312.64457 447.47363,312.45316 447.09082,312.07034 C 446.70801,311.68754 446.5166,311.22725 446.5166,310.68948 C 446.5166,310.14717 446.70801,309.68575 447.09082,309.30521 C 447.47363,308.92468 447.93392,308.73442 448.47168,308.73441 C 449.01399,308.73442 449.47656,308.92468 449.85937,309.30521 C 450.24218,309.68575 450.43359,310.14717 450.43359,310.68948 z M 449.16211,310.68248 C 449.16211,310.49108 449.09491,310.32702 448.96045,310.19029 C 448.82601,310.05358 448.66308,309.98522 448.47168,309.98521 C 448.28027,309.98522 448.11621,310.05361 447.97949,310.19029 C 447.84277,310.32702 447.77441,310.49108 447.77441,310.68248 C 447.77441,310.87389 447.84281,311.03682 447.97949,311.17125 C 448.11621,311.30569 448.28027,311.37291 448.47168,311.37291 C 448.66308,311.37291 448.82601,311.30571 448.96045,311.17125 C 449.09489,311.03682 449.16211,310.87389 449.16211,310.68248 z"
|
||||
style="font-size:14px;fill:#f1f4fc;font-family:Arial Black;-inkscape-font-specification:Arial Black"
|
||||
id="path3768" />
|
||||
id="path3768"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<g
|
||||
style="font-size:40px;font-style:normal;font-weight:normal;fill:#f1f4fc;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
|
||||
id="text3727-1">
|
||||
<path
|
||||
d="m 480.27866,266.95483 -8.35352,0 c 0.0957,-0.82486 0.38623,-1.60074 0.87158,-2.32763 0.48535,-0.72689 1.39567,-1.5848 2.73096,-2.57373 0.81575,-0.60612 1.33756,-1.0664 1.56543,-1.38086 0.22786,-0.31445 0.34179,-0.61295 0.3418,-0.89551 -10e-6,-0.30533 -0.1128,-0.56624 -0.33838,-0.78272 -0.22559,-0.21646 -0.50929,-0.32469 -0.85108,-0.3247 -0.35547,10e-6 -0.646,0.11166 -0.87158,0.33496 -0.22559,0.22331 -0.37712,0.61752 -0.45459,1.18262 l -2.78906,-0.22559 c 0.10937,-0.78385 0.30989,-1.39566 0.60156,-1.83545 0.29167,-0.43977 0.70296,-0.77701 1.23389,-1.01172 0.53092,-0.23469 1.26578,-0.35204 2.20459,-0.35205 0.97981,10e-6 1.74202,0.11166 2.28662,0.33496 0.54459,0.22332 0.97297,0.56625 1.28515,1.02881 0.31217,0.46257 0.46826,0.98097 0.46827,1.55518 -1e-5,0.61068 -0.17889,1.19401 -0.53662,1.75 -0.35776,0.55599 -1.00831,1.16667 -1.95166,1.83203 -0.56056,0.38737 -0.93539,0.65853 -1.12452,0.81347 -0.18913,0.15495 -0.4113,0.35775 -0.6665,0.6084 l 4.34766,0 z"
|
||||
d="M 480.27866,266.95483 L 471.92514,266.95483 C 472.02084,266.12997 472.31137,265.35409 472.79672,264.6272 C 473.28207,263.90031 474.19239,263.0424 475.52768,262.05347 C 476.34343,261.44735 476.86524,260.98707 477.09311,260.67261 C 477.32097,260.35816 477.4349,260.05966 477.43491,259.7771 C 477.4349,259.47177 477.32211,259.21086 477.09653,258.99438 C 476.87094,258.77792 476.58724,258.66969 476.24545,258.66968 C 475.88998,258.66969 475.59945,258.78134 475.37387,259.00464 C 475.14828,259.22795 474.99675,259.62216 474.91928,260.18726 L 472.13022,259.96167 C 472.23959,259.17782 472.44011,258.56601 472.73178,258.12622 C 473.02345,257.68645 473.43474,257.34921 473.96567,257.1145 C 474.49659,256.87981 475.23145,256.76246 476.17026,256.76245 C 477.15007,256.76246 477.91228,256.87411 478.45688,257.09741 C 479.00147,257.32073 479.42985,257.66366 479.74203,258.12622 C 480.0542,258.58879 480.21029,259.10719 480.2103,259.6814 C 480.21029,260.29208 480.03141,260.87541 479.67368,261.4314 C 479.31592,261.98739 478.66537,262.59807 477.72202,263.26343 C 477.16146,263.6508 476.78663,263.92196 476.5975,264.0769 C 476.40837,264.23185 476.1862,264.43465 475.931,264.6853 L 480.27866,264.6853 z"
|
||||
style="font-size:14px;fill:#f1f4fc;font-family:Arial Black;-inkscape-font-specification:Arial Black"
|
||||
id="path3757" />
|
||||
id="path3757"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
d="m 481.48178,261.90308 c 0,-1.90494 0.34294,-3.23795 1.02881,-3.99903 0.68587,-0.76106 1.73063,-1.14159 3.13428,-1.1416 0.67447,10e-6 1.22818,0.0832 1.66113,0.24951 0.43294,0.16635 0.78613,0.38282 1.05957,0.64942 0.27343,0.26661 0.48876,0.54688 0.646,0.84082 0.15721,0.29395 0.28368,0.63689 0.37939,1.02881 0.18684,0.7474 0.28027,1.52669 0.28027,2.33789 0,1.81836 -0.30762,3.14909 -0.92285,3.99218 -0.61524,0.8431 -1.67481,1.26465 -3.17871,1.26465 -0.8431,0 -1.52442,-0.13444 -2.04394,-0.40332 -0.51954,-0.26888 -0.94564,-0.66308 -1.27832,-1.18262 -0.24154,-0.36913 -0.42953,-0.87385 -0.56397,-1.51416 -0.13444,-0.64029 -0.20166,-1.34781 -0.20166,-2.12255 z m 2.76172,0.007 c 0,1.27605 0.11279,2.14763 0.33838,2.61475 0.22558,0.46712 0.55257,0.70068 0.98096,0.70068 0.28254,0 0.5275,-0.0991 0.73486,-0.29736 0.20735,-0.19824 0.36002,-0.51155 0.45801,-0.93994 0.098,-0.42838 0.14696,-1.09603 0.14697,-2.00293 -10e-6,-1.33073 -0.1128,-2.22509 -0.33838,-2.68311 -0.22559,-0.458 -0.56397,-0.687 -1.01514,-0.68701 -0.46029,10e-6 -0.79297,0.23357 -0.99804,0.70068 -0.20508,0.46713 -0.30762,1.33188 -0.30762,2.59424 z"
|
||||
d="M 481.48178,261.90308 C 481.48178,259.99814 481.82472,258.66513 482.51059,257.90405 C 483.19646,257.14299 484.24122,256.76246 485.64487,256.76245 C 486.31934,256.76246 486.87305,256.84565 487.306,257.01196 C 487.73894,257.17831 488.09213,257.39478 488.36557,257.66138 C 488.639,257.92799 488.85433,258.20826 489.01157,258.5022 C 489.16878,258.79615 489.29525,259.13909 489.39096,259.53101 C 489.5778,260.27841 489.67123,261.0577 489.67123,261.8689 C 489.67123,263.68726 489.36361,265.01799 488.74838,265.86108 C 488.13314,266.70418 487.07357,267.12573 485.56967,267.12573 C 484.72657,267.12573 484.04525,266.99129 483.52573,266.72241 C 483.00619,266.45353 482.58009,266.05933 482.24741,265.53979 C 482.00587,265.17066 481.81788,264.66594 481.68344,264.02563 C 481.549,263.38534 481.48178,262.67782 481.48178,261.90308 z M 484.2435,261.91008 C 484.2435,263.18613 484.35629,264.05771 484.58188,264.52483 C 484.80746,264.99195 485.13445,265.22551 485.56284,265.22551 C 485.84538,265.22551 486.09034,265.12641 486.2977,264.92815 C 486.50505,264.72991 486.65772,264.4166 486.75571,263.98821 C 486.85371,263.55983 486.90267,262.89218 486.90268,261.98528 C 486.90267,260.65455 486.78988,259.76019 486.5643,259.30217 C 486.33871,258.84417 486.00033,258.61517 485.54916,258.61516 C 485.08887,258.61517 484.75619,258.84873 484.55112,259.31584 C 484.34604,259.78297 484.2435,260.64772 484.2435,261.91008 z"
|
||||
style="font-size:14px;fill:#f1f4fc;font-family:Arial Black;-inkscape-font-specification:Arial Black"
|
||||
id="path3759" />
|
||||
id="path3759"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
d="m 494.98959,258.71069 c 0,0.53777 -0.19141,0.99806 -0.57422,1.38086 -0.38281,0.38282 -0.84538,0.57423 -1.38769,0.57422 -0.53776,10e-6 -0.99805,-0.1914 -1.38086,-0.57422 -0.38281,-0.3828 -0.57422,-0.84309 -0.57422,-1.38086 0,-0.54231 0.19141,-1.00373 0.57422,-1.38427 0.38281,-0.38053 0.8431,-0.57079 1.38086,-0.5708 0.54231,10e-6 1.00488,0.19027 1.38769,0.5708 0.38281,0.38054 0.57422,0.84196 0.57422,1.38427 z m -1.27148,-0.007 c 0,-0.1914 -0.0672,-0.35546 -0.20166,-0.49219 -0.13444,-0.13671 -0.29737,-0.20507 -0.48877,-0.20508 -0.19141,1e-5 -0.35547,0.0684 -0.49219,0.20508 -0.13672,0.13673 -0.20508,0.30079 -0.20508,0.49219 0,0.19141 0.0684,0.35433 0.20508,0.48877 0.13672,0.13444 0.30078,0.20166 0.49219,0.20166 0.1914,0 0.35433,-0.0672 0.48877,-0.20166 0.13444,-0.13444 0.20166,-0.29736 0.20166,-0.48877 z"
|
||||
d="M 494.98959,258.71069 C 494.98959,259.24846 494.79818,259.70875 494.41537,260.09155 C 494.03256,260.47437 493.56999,260.66578 493.02768,260.66577 C 492.48992,260.66578 492.02963,260.47437 491.64682,260.09155 C 491.26401,259.70875 491.0726,259.24846 491.0726,258.71069 C 491.0726,258.16838 491.26401,257.70696 491.64682,257.32642 C 492.02963,256.94589 492.48992,256.75563 493.02768,256.75562 C 493.56999,256.75563 494.03256,256.94589 494.41537,257.32642 C 494.79818,257.70696 494.98959,258.16838 494.98959,258.71069 z M 493.71811,258.70369 C 493.71811,258.51229 493.65091,258.34823 493.51645,258.2115 C 493.38201,258.07479 493.21908,258.00643 493.02768,258.00642 C 492.83627,258.00643 492.67221,258.07482 492.53549,258.2115 C 492.39877,258.34823 492.33041,258.51229 492.33041,258.70369 C 492.33041,258.8951 492.39881,259.05802 492.53549,259.19246 C 492.67221,259.3269 492.83627,259.39412 493.02768,259.39412 C 493.21908,259.39412 493.38201,259.32692 493.51645,259.19246 C 493.65089,259.05802 493.71811,258.8951 493.71811,258.70369 z"
|
||||
style="font-size:14px;fill:#f1f4fc;font-family:Arial Black;-inkscape-font-specification:Arial Black"
|
||||
id="path3761" />
|
||||
id="path3761"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
@ -722,13 +743,13 @@
|
||||
inkscape:label="#g3722">
|
||||
<path
|
||||
transform="translate(0.08444214,2.2540576e-8)"
|
||||
d="M 589.99999,195.93361 A 20.714285,20.714285 0 1 1 548.57142,195.93361 A 20.714285,20.714285 0 1 1 589.99999,195.93361 z"
|
||||
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z"
|
||||
sodipodi:ry="20.714285"
|
||||
sodipodi:rx="20.714285"
|
||||
sodipodi:cy="195.93361"
|
||||
sodipodi:cx="569.28571"
|
||||
id="path3712"
|
||||
style="fill:url(#linearGradient3859);fill-opacity:1;stroke:#fcaa21;stroke-width:1.56471384;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
style="fill:url(#linearGradient3859);fill-opacity:1.0;stroke:#fcaa21;stroke-width:1.56471384000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
sodipodi:type="arc" />
|
||||
<rect
|
||||
ry="2.2728431"
|
||||
@ -737,9 +758,9 @@
|
||||
height="45.456863"
|
||||
width="4.5456862"
|
||||
id="rect3718"
|
||||
style="fill:#fff954;fill-opacity:1;stroke:#fcaa21;stroke-width:1.56471384;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
|
||||
style="fill:#ffe054;fill-opacity:1;stroke:#fcaa21;stroke-width:1.56471384000000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
|
||||
<rect
|
||||
style="fill:url(#linearGradient3851);fill-opacity:1;stroke:#fcaa21;stroke-width:1.56471384000000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
style="fill:#ffe054;fill-opacity:1;stroke:#fcaa21;stroke-width:1.56471384000000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
id="rect3720"
|
||||
width="4.5456862"
|
||||
height="45.456863"
|
||||
@ -755,7 +776,7 @@
|
||||
sodipodi:rx="20.714285"
|
||||
sodipodi:ry="20.714285"
|
||||
d="M 589.99999,195.93361 A 20.714285,20.714285 0 1 1 548.57142,195.93361 A 20.714285,20.714285 0 1 1 589.99999,195.93361 z"
|
||||
transform="translate(0.08444218,-2.2540689e-8)" />
|
||||
transform="translate(0.08444218,2.2540576e-8)" />
|
||||
<rect
|
||||
ry="2.2728431"
|
||||
y="173.52946"
|
||||
@ -780,16 +801,16 @@
|
||||
style="opacity:0.4">
|
||||
<path
|
||||
sodipodi:type="arc"
|
||||
style="fill:url(#linearGradient3903);fill-opacity:1;stroke:#fcaa21;stroke-width:1.56471384;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
style="fill:#ffe054;fill-opacity:1;stroke:#fcaa21;stroke-width:1.56471384000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
id="path3891"
|
||||
sodipodi:cx="569.28571"
|
||||
sodipodi:cy="195.93361"
|
||||
sodipodi:rx="20.714285"
|
||||
sodipodi:ry="20.714285"
|
||||
d="M 589.99999,195.93361 A 20.714285,20.714285 0 1 1 548.57142,195.93361 A 20.714285,20.714285 0 1 1 589.99999,195.93361 z"
|
||||
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z"
|
||||
transform="translate(0.08444214,2.2540576e-8)" />
|
||||
<rect
|
||||
style="fill:#fff954;fill-opacity:1;stroke:#fcaa21;stroke-width:1.56471384;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
style="fill:#ffe054;fill-opacity:1;stroke:#fcaa21;stroke-width:1.56471384000000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
id="rect3893"
|
||||
width="4.5456862"
|
||||
height="45.456863"
|
||||
@ -803,9 +824,9 @@
|
||||
height="45.456863"
|
||||
width="4.5456862"
|
||||
id="rect3895"
|
||||
style="fill:url(#linearGradient3905);fill-opacity:1;stroke:#fcaa21;stroke-width:1.56471384;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
|
||||
style="fill:#ffe054;fill-opacity:1;stroke:#fcaa21;stroke-width:1.56471384000000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
|
||||
<path
|
||||
transform="translate(0.08444218,-2.2540689e-8)"
|
||||
transform="translate(0.08444218,2.2540576e-8)"
|
||||
d="M 589.99999,195.93361 A 20.714285,20.714285 0 1 1 548.57142,195.93361 A 20.714285,20.714285 0 1 1 589.99999,195.93361 z"
|
||||
sodipodi:ry="20.714285"
|
||||
sodipodi:rx="20.714285"
|
||||
@ -843,7 +864,7 @@
|
||||
sodipodi:cy="195.93361"
|
||||
sodipodi:rx="20.714285"
|
||||
sodipodi:ry="20.714285"
|
||||
d="M 589.99999,195.93361 A 20.714285,20.714285 0 1 1 548.57142,195.93361 A 20.714285,20.714285 0 1 1 589.99999,195.93361 z"
|
||||
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z"
|
||||
transform="translate(0.08444214,2.2540576e-8)" />
|
||||
<rect
|
||||
style="fill:#fd700b;fill-opacity:1;stroke:#ff5721;stroke-width:1.56477822999999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
@ -863,7 +884,7 @@
|
||||
style="fill:#fd700b;fill-opacity:1;stroke:#ff5721;stroke-width:1.56471384000000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
|
||||
<path
|
||||
transform="translate(0.08444218,-2.2540576e-8)"
|
||||
d="M 589.99999,195.93361 A 20.714285,20.714285 0 1 1 548.57142,195.93361 A 20.714285,20.714285 0 1 1 589.99999,195.93361 z"
|
||||
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z"
|
||||
sodipodi:ry="20.714285"
|
||||
sodipodi:rx="20.714285"
|
||||
sodipodi:cy="195.93361"
|
||||
@ -895,7 +916,7 @@
|
||||
style="opacity:0.4">
|
||||
<path
|
||||
transform="translate(0.08444214,2.2540576e-8)"
|
||||
d="M 589.99999,195.93361 A 20.714285,20.714285 0 1 1 548.57142,195.93361 A 20.714285,20.714285 0 1 1 589.99999,195.93361 z"
|
||||
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z"
|
||||
sodipodi:ry="20.714285"
|
||||
sodipodi:rx="20.714285"
|
||||
sodipodi:cy="195.93361"
|
||||
@ -927,7 +948,7 @@
|
||||
sodipodi:cy="195.93361"
|
||||
sodipodi:rx="20.714285"
|
||||
sodipodi:ry="20.714285"
|
||||
d="M 589.99999,195.93361 A 20.714285,20.714285 0 1 1 548.57142,195.93361 A 20.714285,20.714285 0 1 1 589.99999,195.93361 z"
|
||||
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z"
|
||||
transform="translate(0.08444218,-2.2540576e-8)" />
|
||||
<rect
|
||||
ry="2.2728431"
|
||||
@ -948,17 +969,17 @@
|
||||
</g>
|
||||
<g
|
||||
id="satellite-glonass"
|
||||
transform="matrix(0.93879118,0,0,0.93879118,26.496058,-115.05484)"
|
||||
transform="matrix(0.93879118,0,0,0.93879118,26.496058,-109.05484)"
|
||||
inkscape:label="#g3722">
|
||||
<path
|
||||
transform="translate(0.08444214,2.2540576e-8)"
|
||||
d="M 589.99999,195.93361 A 20.714285,20.714285 0 1 1 548.57142,195.93361 A 20.714285,20.714285 0 1 1 589.99999,195.93361 z"
|
||||
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z"
|
||||
sodipodi:ry="20.714285"
|
||||
sodipodi:rx="20.714285"
|
||||
sodipodi:cy="195.93361"
|
||||
sodipodi:cx="569.28571"
|
||||
id="path4023"
|
||||
style="fill:#008ef3;fill-opacity:1;stroke:#0061f3;stroke-width:1.56471384000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
style="fill:#008ef3;fill-opacity:1;stroke:#0061f3;stroke-width:1.56471384;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
sodipodi:type="arc" />
|
||||
<rect
|
||||
ry="2.2728431"
|
||||
@ -967,9 +988,9 @@
|
||||
height="45.456863"
|
||||
width="4.5456862"
|
||||
id="rect4025"
|
||||
style="fill:#008ef3;fill-opacity:1;stroke:#0061f3;stroke-width:1.56477821000000006;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
|
||||
style="fill:#008ef3;fill-opacity:1;stroke:#0061f3;stroke-width:1.56477821;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
|
||||
<rect
|
||||
style="fill:#008ef3;fill-opacity:1;stroke:#0061f3;stroke-width:1.56471384000000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
style="fill:#008ef3;fill-opacity:1;stroke:#0061f3;stroke-width:1.56471384;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
id="rect4027"
|
||||
width="4.5456862"
|
||||
height="45.456863"
|
||||
@ -984,7 +1005,7 @@
|
||||
sodipodi:cy="195.93361"
|
||||
sodipodi:rx="20.714285"
|
||||
sodipodi:ry="20.714285"
|
||||
d="M 589.99999,195.93361 A 20.714285,20.714285 0 1 1 548.57142,195.93361 A 20.714285,20.714285 0 1 1 589.99999,195.93361 z"
|
||||
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z"
|
||||
transform="translate(0.08444218,2.2540576e-8)" />
|
||||
<rect
|
||||
ry="2.2728431"
|
||||
@ -1005,7 +1026,7 @@
|
||||
</g>
|
||||
<g
|
||||
inkscape:label="#g3722"
|
||||
transform="matrix(0.93879118,0,0,0.93879118,94.496058,-115.05484)"
|
||||
transform="matrix(0.93879118,0,0,0.93879118,94.496058,-109.05484)"
|
||||
id="sat-glonass-notSeen"
|
||||
style="opacity:0.4">
|
||||
<path
|
||||
@ -1016,7 +1037,7 @@
|
||||
sodipodi:cy="195.93361"
|
||||
sodipodi:rx="20.714285"
|
||||
sodipodi:ry="20.714285"
|
||||
d="M 589.99999,195.93361 A 20.714285,20.714285 0 1 1 548.57142,195.93361 A 20.714285,20.714285 0 1 1 589.99999,195.93361 z"
|
||||
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z"
|
||||
transform="translate(0.08444214,2.2540576e-8)" />
|
||||
<rect
|
||||
style="fill:#008ef3;fill-opacity:1;stroke:#0061f3;stroke-width:1.56477821;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
@ -1036,7 +1057,7 @@
|
||||
style="fill:#008ef3;fill-opacity:1;stroke:#0061f3;stroke-width:1.56471384;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
|
||||
<path
|
||||
transform="translate(0.08444218,2.2540576e-8)"
|
||||
d="M 589.99999,195.93361 A 20.714285,20.714285 0 1 1 548.57142,195.93361 A 20.714285,20.714285 0 1 1 589.99999,195.93361 z"
|
||||
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z"
|
||||
sodipodi:ry="20.714285"
|
||||
sodipodi:rx="20.714285"
|
||||
sodipodi:cy="195.93361"
|
||||
|
||||
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 48 KiB |
Loading…
Reference in New Issue
Block a user