From 25ce610f6ecca7325e7a743dc032c4a76559c63d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 02 Jul 2021 09:10:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap

---
 widgets/FlyRoute/flyroute.json |  465 +++++++++++++++++++++++++--------------------------------
 1 files changed, 206 insertions(+), 259 deletions(-)

diff --git a/widgets/FlyRoute/flyroute.json b/widgets/FlyRoute/flyroute.json
index 0bb9b72..44a6bcd 100644
--- a/widgets/FlyRoute/flyroute.json
+++ b/widgets/FlyRoute/flyroute.json
@@ -1,260 +1,207 @@
 [{
-    "name": "鄱阳湖区域漫游",
-    "sites": [{
-        "id": 1,
-        "lgtd": 116.13696579962681,
-        "lttd": 27.221462117854543,
-        "height": 69625.54238025927,
-        "heading": 2.770614027788599,
-        "pitch": -30.468120445644498,
-        "roll": 1.9149483626155542e-9,
-        "time": 2.593586572472713
-    }, {
-        "id": 2,
-        "lgtd": 116.40102040574489,
-        "lttd": 27.448113006353672,
-        "height": 69625.54238025789,
-        "heading": 356.1734320706876,
-        "pitch": -30.468120445644626,
-        "roll": 0.19345233721288962,
-        "time": 4.28862240235211
-    }, {
-        "id": 3,
-        "lgtd": 116.98970423040575,
-        "lttd": 27.583473004937616,
-        "height": 69625.5423802608,
-        "heading": 339.3020994144722,
-        "pitch": -30.468120445644548,
-        "roll": 0.39282634210952483,
-        "time": 4.698599153873587
-    }, {
-        "id": 4,
-        "lgtd": 117.54002942122602,
-        "lttd": 27.91811725902511,
-        "height": 69625.54238025965,
-        "heading": 319.5189245496973,
-        "pitch": -30.46812044564414,
-        "roll": 0.3344651251897885,
-        "time": 4.168660397496815
-    }, {
-        "id": 5,
-        "lgtd": 117.95427795010265,
-        "lttd": 28.294071395230148,
-        "height": 69625.54238025325,
-        "heading": 298.398812496663,
-        "pitch": -30.46812044564409,
-        "roll": 0.2722540584948179,
-        "time": 3.794001094775054
-    }, {
-        "id": 6,
-        "lgtd": 118.1492606146489,
-        "lttd": 28.73940139806807,
-        "height": 69625.54238025444,
-        "heading": 279.37765475703765,
-        "pitch": -30.468120445644853,
-        "roll": 0.25206741939215377,
-        "time": 5.267132599677685
-    }, {
-        "id": 7,
-        "lgtd": 118.15440296043559,
-        "lttd": 29.4018025509551,
-        "height": 69625.54238025927,
-        "heading": 253.0840095792882,
-        "pitch": -30.468120445644395,
-        "roll": 0.33789138605197255,
-        "time": 4.795333589966117
-    }, {
-        "id": 8,
-        "lgtd": 117.864665004058,
-        "lttd": 29.94983231931571,
-        "height": 69625.54238026211,
-        "heading": 229.65665912711376,
-        "pitch": -30.46812044564353,
-        "roll": 0.34147587830959975,
-        "time": 3.90164393578472
-    }, {
-        "id": 9,
-        "lgtd": 117.46815991160483,
-        "lttd": 30.300774486636858,
-        "height": 69625.54238026975,
-        "heading": 212.08224323327354,
-        "pitch": -30.468120445643276,
-        "roll": 0.26152078119332656,
-        "time": 5.79379779551162
-    }, {
-        "id": 10,
-        "lgtd": 116.70751493499984,
-        "lttd": 30.618643537315116,
-        "height": 69625.54238027362,
-        "heading": 187.13985080112406,
-        "pitch": -30.468120445643326,
-        "roll": 0.2970084342106054,
-        "time": 5.94380624333187
-    }, {
-        "id": 11,
-        "lgtd": 115.84830244730652,
-        "lttd": 30.51167181830559,
-        "height": 69625.54238026685,
-        "heading": 162.0296329896802,
-        "pitch": -30.46812044564381,
-        "roll": 0.29065629020315314,
-        "time": 6.34805274862854
-    }, {
-        "id": 12,
-        "lgtd": 115.06553239021456,
-        "lttd": 30.086685971423663,
-        "height": 69625.54238026496,
-        "heading": 131.28469766040868,
-        "pitch": -30.468120445643606,
-        "roll": 0.2670512309222153,
-        "time": 5.44447019439281
-    }, {
-        "id": 13,
-        "lgtd": 114.6186439058435,
-        "lttd": 29.522352771185933,
-        "height": 69625.54238026099,
-        "heading": 105.92597259963087,
-        "pitch": -30.468120445643557,
-        "roll": 0.3515198075178521,
-        "time": 7.751967610067505
-    }, {
-        "id": 14,
-        "lgtd": 114.60888241471893,
-        "lttd": 28.54747058966928,
-        "height": 69625.54238025077,
-        "heading": 69.31583687053215,
-        "pitch": -30.468120445643404,
-        "roll": 0.3163993607862109,
-        "time": 5.8403926688473
-    }, {
-        "id": 15,
-        "lgtd": 114.96560043470814,
-        "lttd": 27.883613737880435,
-        "height": 69625.54238025342,
-        "heading": 43.189625385096654,
-        "pitch": -30.468120445643073,
-        "roll": 0.33788219699373634,
-        "time": 4.745027408869115
-    }, {
-        "id": 16,
-        "lgtd": 115.2920604052509,
-        "lttd": 27.361645264596028,
-        "height": 69625.54238025373,
-        "heading": 23.649506702823388,
-        "pitch": -30.468120445643173,
-        "roll": 0.32169504301905333,
-        "time": 2.289093655343274
-    }]
-},
-{
-    "name": "鄱阳湖区域浏览2",
-    "sites": [{
-        "id": 0,
-        "lgtd": 116.36485651934478,
-        "lttd": 28.61499997888566,
-        "height": 21615.65670519218,
-        "heading": 357.5324369211186,
-        "pitch": -33.949736768804875,
-        "roll": 0.07493032373110281,
-        "time": 3
-    }, {
-        "id": 1,
-        "lgtd": 116.61798359831062,
-        "lttd": 28.678026785994387,
-        "height": 21615.65670518082,
-        "heading": 328.4540952954534,
-        "pitch": -33.9497367688052,
-        "roll": 0.1007963589203403,
-        "time": 3
-    }, {
-        "id": 2,
-        "lgtd": 116.87603493936163,
-        "lttd": 28.921761691820024,
-        "height": 21615.6567051778,
-        "heading": 287.79156780309444,
-        "pitch": -33.94973676880269,
-        "roll": 0.12547175713320183,
-        "time": 3
-    }, {
-        "id": 3,
-        "lgtd": 116.909026583975,
-        "lttd": 29.210477509533032,
-        "height": 21615.656705175323,
-        "heading": 250.72860434190048,
-        "pitch": -33.94973676880164,
-        "roll": 0.1182078443376804,
-        "time": 3
-    }, {
-        "id": 4,
-        "lgtd": 116.83971215830472,
-        "lttd": 29.411874687056383,
-        "height": 21615.656705178324,
-        "heading": 220.5678813179093,
-        "pitch": -33.949736768801614,
-        "roll": 0.14418892227725896,
-        "time": 3
-    }, {
-        "id": 5,
-        "lgtd": 116.63736760852666,
-        "lttd": 29.559276610554274,
-        "height": 21615.65670518267,
-        "heading": 192.7750271204978,
-        "pitch": -33.94973676880136,
-        "roll": 0.11990434840510432,
-        "time": 3
-    }, {
-        "id": 6,
-        "lgtd": 116.35268250530002,
-        "lttd": 29.569093455601525,
-        "height": 21615.656705182217,
-        "heading": 159.031653642729,
-        "pitch": -33.949736768801486,
-        "roll": 0.12226477526126023,
-        "time": 3
-    }, {
-        "id": 7,
-        "lgtd": 116.03398252452703,
-        "lttd": 29.43313255053548,
-        "height": 21615.656705183854,
-        "heading": 129.44379294438437,
-        "pitch": -33.949736768801486,
-        "roll": 0.1399973458170845,
-        "time": 3
-    }, {
-        "id": 8,
-        "lgtd": 115.56656976497351,
-        "lttd": 29.31417361097843,
-        "height": 36832.409250694924,
-        "heading": 104.1903000851007,
-        "pitch": -36.64434419262527,
-        "roll": 359.9999999990976,
-        "time": 3
-    }, {
-        "id": 9,
-        "lgtd": 115.740825901675,
-        "lttd": 28.69543529618644,
-        "height": 29061.533148178412,
-        "heading": 48.8874638325123,
-        "pitch": -37.012291045271574,
-        "roll": 0.13594606119813848,
-        "time": 3
-    }, {
-        "id": 10,
-        "lgtd": 116.04912917565872,
-        "lttd": 28.499254393238655,
-        "height": 24977.858469140665,
-        "heading": 23.312402615521254,
-        "pitch": -36.97115669047082,
-        "roll": 0.1669937889431866,
-        "time": 3
-    }, {
-        "id": 11,
-        "lgtd": 116.0488849187321,
-        "lttd": 27.591614215992426,
-        "height": 100049.13699253049,
-        "heading": 10.451947125671502,
-        "pitch": -37.89649963820525,
-        "roll": 0.15288734882291413,
-        "time": 3
-    }]
-}]
\ No newline at end of file
+        "name": "鄱阳湖国家级保护区倾斜飞行路线1",
+        "sites": [{
+            "id": 0,
+            "lgtd": 115.749088,
+            "lttd": 28.674319,
+            "height": 12179.32,
+            "heading": 338.02,
+            "pitch": -70.89,
+            "roll": 0,
+            "time": 10
+        }, {
+            "id": 1,
+            "lgtd": 115.741067,
+            "lttd": 28.695646,
+            "height": 3236.37,
+            "heading": 338.02,
+            "pitch": -70.86,
+            "roll": 0,
+            "time": 10
+        }, {
+            "id": 2,
+            "lgtd": 115.738726,
+            "lttd": 28.702285,
+            "height": 330.00,
+            "heading": 350.00,
+            "pitch": -37.45,
+            "roll": 0,
+            "time": 0
+        }]
+    },
+    {
+        "name": "鄱阳湖国家级保护区倾斜飞行路线2",
+        "sites": [{
+            "id": 0,
+            "lgtd": 115.960852,
+            "lttd": 29.164005,
+            "height": 1497.76,
+            "heading": 87.75,
+            "pitch": -41.49,
+            "roll": 0,
+            "time": 16
+        }, {
+            "id": 1,
+            "lgtd": 116.010312,
+            "lttd": 29.187787,
+            "height": 140.39,
+            "heading": 88.07,
+            "pitch": -24.73,
+            "roll": 0,
+            "time": 0
+        }]
+    },
+    {
+        "name": "五星白鹤保护区倾斜飞行路线",
+        "sites": [{
+                "id": 0,
+                "lgtd": 116.296646,
+                "lttd": 28.735445,
+                "height": 60.00,
+                "heading": 38.62,
+                "pitch": -15.00,
+                "roll": 360.00,
+                "time": 15
+            }, {
+                "id": 1,
+                "lgtd": 116.316991,
+                "lttd": 28.746756,
+                "height": 60.00,
+                "heading": 11.20,
+                "pitch": -15.00,
+                "roll": 360.00,
+                "time": 9
+            },
+            {
+                "id": 2,
+                "lgtd": 116.317868,
+                "lttd": 28.757318,
+                "height": 60.00,
+                "heading": -18.00,
+                "pitch": -15.00,
+                "roll": 360.00,
+                "time": 10
+            }, {
+                "id": 3,
+                "lgtd": 116.315890,
+                "lttd": 28.770270,
+                "height": 60.00,
+                "heading": -42.25,
+                "pitch": -15.00,
+                "roll": 360.00,
+                "time": 12
+            }
+        ]
+    },
+    {
+        "name": "东鄱阳湖湿地公园倾斜飞行路线",
+        "sites": [{
+            "id": 0,
+            "lgtd": 116.559264,
+            "lttd": 29.080982,
+            "height": 500.00,
+            "heading": 340.00,
+            "pitch": -26.00,
+            "roll": 0,
+            "time": 22
+        }, {
+            "id": 1,
+            "lgtd": 116.508000,
+            "lttd": 29.133462,
+            "height": 500.00,
+            "heading": 341.41,
+            "pitch": -34.71,
+            "roll": 0,
+            "time": 0
+        }]
+    },
+    {
+        "name": "都昌候鸟保护区倾斜飞行路线1",
+        "sites": [{
+            "id": 0,
+            "lgtd": 116.296478,
+            "lttd": 29.118665,
+            "height": 379.47,
+            "heading": 20.70,
+            "pitch": -22.85,
+            "roll": 0,
+            "time": 20
+        }, {
+            "id": 1,
+            "lgtd": 116.300000,
+            "lttd": 29.160133,
+            "height": 150.00,
+            "heading": 20.00,
+            "pitch": -23.00,
+            "roll": 0,
+            "time": 0
+        }]
+    },
+    {
+        "name": "都昌候鸟保护区倾斜飞行路线2",
+        "sites": [{
+            "id": 0,
+            "lgtd": 116.323711,
+            "lttd": 29.115406,
+            "height": 800.00,
+            "heading": 335.00,
+            "pitch": -26.12,
+            "roll": 0,
+            "time": 14
+        }, {
+            "id": 1,
+            "lgtd": 116.304094,
+            "lttd": 29.156029,
+            "height": 303.59,
+            "heading": 335.00,
+            "pitch": -21.43,
+            "roll": 0,
+            "time": 0
+        }]
+    },
+    {
+        "name": "南矶山保护区倾斜飞行路线1",
+        "sites": [{
+            "id": 0,
+            "lgtd": 116.294604,
+            "lttd": 28.892321,
+            "height": 658.39,
+            "heading": 33.53,
+            "pitch": -25.65,
+            "roll": 0,
+            "time": 30
+        }, {
+            "id": 1,
+            "lgtd": 116.350689,
+            "lttd": 28.958424,
+            "height": 300.00,
+            "heading": 59.72,
+            "pitch": -19.43,
+            "roll": 0,
+            "time": 0
+        }]
+    },
+    {
+        "name": "南矶山保护区倾斜飞行路线2",
+        "sites": [{
+            "id": 0,
+            "lgtd": 116.354654,
+            "lttd": 28.941695,
+            "height": 100.00,
+            "heading": 332.00,
+            "pitch": -15.81,
+            "roll": 0,
+            "time": 30
+        }, {
+            "id": 1,
+            "lgtd": 116.336091,
+            "lttd": 28.966149,
+            "height": 100.00,
+            "heading": 332.00,
+            "pitch": -15.81,
+            "roll": 0,
+            "time": 0
+        }]
+    }
+
+]
\ No newline at end of file

--
Gitblit v1.9.3