From 98c8e73c57f8f76e5720a066f155ebfff2a7cc5f Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 18 Apr 2024 20:05:48 +0800
Subject: [PATCH] 修改DB成果展示入库失败,增加TbfjEntity表的字段,无对应字段默认0.

---
 src/main/resources/template/wpmz/waylines.wpml |  366 ++++++++++++++++++++++++++--------------------------
 1 files changed, 183 insertions(+), 183 deletions(-)

diff --git a/src/main/resources/template/wpmz/waylines.wpml b/src/main/resources/template/wpmz/waylines.wpml
index c342f04..7b1bc36 100644
--- a/src/main/resources/template/wpmz/waylines.wpml
+++ b/src/main/resources/template/wpmz/waylines.wpml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:wpml="http://www.dji.com/wpmz/1.0.3">
+<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:wpml="http://www.dji.com/wpmz/1.0.5">
   <Document>
     <wpml:missionConfig>
       <wpml:flyToWaylineMode>safely</wpml:flyToWaylineMode>
@@ -32,7 +32,65 @@
           </Point>
           <wpml:index>0</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
+          <wpml:waypointHeadingParam>
+            <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
+            <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
+            <wpml:waypointPoiPoint>0.000000,0.000000,0.000000</wpml:waypointPoiPoint>
+            <wpml:waypointHeadingPathMode>followBadArc</wpml:waypointHeadingPathMode>
+            <wpml:waypointHeadingPoiIndex>0</wpml:waypointHeadingPoiIndex>
+          </wpml:waypointHeadingParam>
+          <wpml:waypointTurnParam>
+            <wpml:waypointTurnMode>toPointAndStopWithDiscontinuityCurvature</wpml:waypointTurnMode>
+            <wpml:waypointTurnDampingDist>0.2</wpml:waypointTurnDampingDist>
+          </wpml:waypointTurnParam>
+          <wpml:useStraightLine>1</wpml:useStraightLine>
+          <wpml:actionGroup>
+            <wpml:actionGroupId>0</wpml:actionGroupId>
+            <wpml:actionGroupStartIndex>0</wpml:actionGroupStartIndex>
+            <wpml:actionGroupEndIndex>0</wpml:actionGroupEndIndex>
+            <wpml:actionGroupMode>sequence</wpml:actionGroupMode>
+            <wpml:actionTrigger>
+              <wpml:actionTriggerType>reachPoint</wpml:actionTriggerType>
+            </wpml:actionTrigger>
+            <wpml:action>
+              <wpml:actionId>0</wpml:actionId>
+              <wpml:actionActuatorFunc>takePhoto</wpml:actionActuatorFunc>
+              <wpml:actionActuatorFuncParam>
+              <wpml:payloadPositionIndex>0</wpml:payloadPositionIndex>
+                <wpml:fileSuffix>航点dkbh0</wpml:fileSuffix>
+                <wpml:payloadLensIndex>wide,ir</wpml:payloadLensIndex>
+                <wpml:useGlobalPayloadLensIndex>1</wpml:useGlobalPayloadLensIndex>
+              </wpml:actionActuatorFuncParam>
+            </wpml:action>
+            <wpml:action>
+              <wpml:actionId>1</wpml:actionId>
+              <wpml:actionActuatorFunc>gimbalRotate</wpml:actionActuatorFunc>
+              <wpml:actionActuatorFuncParam>
+              <wpml:payloadPositionIndex>0</wpml:payloadPositionIndex>
+                <wpml:gimbalHeadingYawBase>north</wpml:gimbalHeadingYawBase>
+                <wpml:gimbalRotateMode>absoluteAngle</wpml:gimbalRotateMode>
+                <wpml:gimbalPitchRotateEnable>1</wpml:gimbalPitchRotateEnable>
+                <wpml:gimbalPitchRotateAngle>-83</wpml:gimbalPitchRotateAngle>
+                <wpml:gimbalRollRotateEnable>0</wpml:gimbalRollRotateEnable>
+                <wpml:gimbalRollRotateAngle>0</wpml:gimbalRollRotateAngle>
+                <wpml:gimbalYawRotateEnable>0</wpml:gimbalYawRotateEnable>
+                <wpml:gimbalYawRotateAngle>0</wpml:gimbalYawRotateAngle>
+                <wpml:gimbalRotateTimeEnable>0</wpml:gimbalRotateTimeEnable>
+                <wpml:gimbalRotateTime>0</wpml:gimbalRotateTime>
+              </wpml:actionActuatorFuncParam>
+            </wpml:action>
+          </wpml:actionGroup>
+        </Placemark>
+        <Placemark>
+          <Point>
+            <coordinates>
+              115.8576,28.5729
+            </coordinates>
+          </Point>
+          <wpml:index>1</wpml:index>
+          <wpml:executeHeight>100</wpml:executeHeight>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -85,12 +143,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8576,28.5729
+              115.8591,28.5729
             </coordinates>
           </Point>
-          <wpml:index>1</wpml:index>
+          <wpml:index>2</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -143,12 +201,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8591,28.5729
+              115.8591,28.5751
             </coordinates>
           </Point>
-          <wpml:index>2</wpml:index>
+          <wpml:index>3</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -201,12 +259,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8591,28.5751
+              115.8834,28.5772
             </coordinates>
           </Point>
-          <wpml:index>3</wpml:index>
+          <wpml:index>4</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -232,7 +290,7 @@
               <wpml:actionActuatorFunc>takePhoto</wpml:actionActuatorFunc>
               <wpml:actionActuatorFuncParam>
               <wpml:payloadPositionIndex>0</wpml:payloadPositionIndex>
-                <wpml:fileSuffix>航点dkbh0</wpml:fileSuffix>
+                <wpml:fileSuffix>航点dkbh1</wpml:fileSuffix>
                 <wpml:payloadLensIndex>wide,ir</wpml:payloadLensIndex>
                 <wpml:useGlobalPayloadLensIndex>1</wpml:useGlobalPayloadLensIndex>
               </wpml:actionActuatorFuncParam>
@@ -259,12 +317,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8834,28.5772
+              115.8834,28.5721
             </coordinates>
           </Point>
-          <wpml:index>4</wpml:index>
+          <wpml:index>5</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -317,12 +375,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8834,28.5721
+              115.8875,28.5721
             </coordinates>
           </Point>
-          <wpml:index>5</wpml:index>
+          <wpml:index>6</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -375,12 +433,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8875,28.5721
+              115.8875,28.5772
             </coordinates>
           </Point>
-          <wpml:index>6</wpml:index>
+          <wpml:index>7</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -433,12 +491,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8875,28.5772
+              115.86,28.6203
             </coordinates>
           </Point>
-          <wpml:index>7</wpml:index>
+          <wpml:index>8</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -464,7 +522,7 @@
               <wpml:actionActuatorFunc>takePhoto</wpml:actionActuatorFunc>
               <wpml:actionActuatorFuncParam>
               <wpml:payloadPositionIndex>0</wpml:payloadPositionIndex>
-                <wpml:fileSuffix>航点dkbh1</wpml:fileSuffix>
+                <wpml:fileSuffix>航点dkbh2</wpml:fileSuffix>
                 <wpml:payloadLensIndex>wide,ir</wpml:payloadLensIndex>
                 <wpml:useGlobalPayloadLensIndex>1</wpml:useGlobalPayloadLensIndex>
               </wpml:actionActuatorFuncParam>
@@ -491,12 +549,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.86,28.6203
+              115.86,28.6142
             </coordinates>
           </Point>
-          <wpml:index>8</wpml:index>
+          <wpml:index>9</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -549,12 +607,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.86,28.6142
+              115.8664,28.6142
             </coordinates>
           </Point>
-          <wpml:index>9</wpml:index>
+          <wpml:index>10</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -607,12 +665,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8664,28.6142
+              115.8664,28.6203
             </coordinates>
           </Point>
-          <wpml:index>10</wpml:index>
+          <wpml:index>11</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -665,12 +723,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8664,28.6203
+              115.8643,28.6357
             </coordinates>
           </Point>
-          <wpml:index>11</wpml:index>
+          <wpml:index>12</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -696,7 +754,7 @@
               <wpml:actionActuatorFunc>takePhoto</wpml:actionActuatorFunc>
               <wpml:actionActuatorFuncParam>
               <wpml:payloadPositionIndex>0</wpml:payloadPositionIndex>
-                <wpml:fileSuffix>航点dkbh2</wpml:fileSuffix>
+                <wpml:fileSuffix>航点dkbh3</wpml:fileSuffix>
                 <wpml:payloadLensIndex>wide,ir</wpml:payloadLensIndex>
                 <wpml:useGlobalPayloadLensIndex>1</wpml:useGlobalPayloadLensIndex>
               </wpml:actionActuatorFuncParam>
@@ -723,12 +781,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8643,28.6357
+              115.8643,28.6331
             </coordinates>
           </Point>
-          <wpml:index>12</wpml:index>
+          <wpml:index>13</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -781,12 +839,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8643,28.6331
+              115.867,28.6331
             </coordinates>
           </Point>
-          <wpml:index>13</wpml:index>
+          <wpml:index>14</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -839,12 +897,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.867,28.6331
+              115.867,28.6357
             </coordinates>
           </Point>
-          <wpml:index>14</wpml:index>
+          <wpml:index>15</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -897,12 +955,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.867,28.6357
+              115.841,28.6317
             </coordinates>
           </Point>
-          <wpml:index>15</wpml:index>
+          <wpml:index>16</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -928,7 +986,7 @@
               <wpml:actionActuatorFunc>takePhoto</wpml:actionActuatorFunc>
               <wpml:actionActuatorFuncParam>
               <wpml:payloadPositionIndex>0</wpml:payloadPositionIndex>
-                <wpml:fileSuffix>航点dkbh3</wpml:fileSuffix>
+                <wpml:fileSuffix>航点dkbh4</wpml:fileSuffix>
                 <wpml:payloadLensIndex>wide,ir</wpml:payloadLensIndex>
                 <wpml:useGlobalPayloadLensIndex>1</wpml:useGlobalPayloadLensIndex>
               </wpml:actionActuatorFuncParam>
@@ -955,12 +1013,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.841,28.6317
+              115.841,28.6305
             </coordinates>
           </Point>
-          <wpml:index>16</wpml:index>
+          <wpml:index>17</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1013,12 +1071,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.841,28.6305
+              115.844,28.6305
             </coordinates>
           </Point>
-          <wpml:index>17</wpml:index>
+          <wpml:index>18</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1071,12 +1129,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.844,28.6305
+              115.844,28.6317
             </coordinates>
           </Point>
-          <wpml:index>18</wpml:index>
+          <wpml:index>19</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1129,12 +1187,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.844,28.6317
+              115.8381,28.6187
             </coordinates>
           </Point>
-          <wpml:index>19</wpml:index>
+          <wpml:index>20</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1160,7 +1218,7 @@
               <wpml:actionActuatorFunc>takePhoto</wpml:actionActuatorFunc>
               <wpml:actionActuatorFuncParam>
               <wpml:payloadPositionIndex>0</wpml:payloadPositionIndex>
-                <wpml:fileSuffix>航点dkbh4</wpml:fileSuffix>
+                <wpml:fileSuffix>航点dkbh5</wpml:fileSuffix>
                 <wpml:payloadLensIndex>wide,ir</wpml:payloadLensIndex>
                 <wpml:useGlobalPayloadLensIndex>1</wpml:useGlobalPayloadLensIndex>
               </wpml:actionActuatorFuncParam>
@@ -1187,12 +1245,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8381,28.6187
+              115.8381,28.6161
             </coordinates>
           </Point>
-          <wpml:index>20</wpml:index>
+          <wpml:index>21</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1245,12 +1303,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8381,28.6161
+              115.8413,28.6161
             </coordinates>
           </Point>
-          <wpml:index>21</wpml:index>
+          <wpml:index>22</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1303,12 +1361,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8413,28.6161
+              115.8413,28.6187
             </coordinates>
           </Point>
-          <wpml:index>22</wpml:index>
+          <wpml:index>23</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1361,12 +1419,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8413,28.6187
+              115.8059,28.6239
             </coordinates>
           </Point>
-          <wpml:index>23</wpml:index>
+          <wpml:index>24</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1392,7 +1450,7 @@
               <wpml:actionActuatorFunc>takePhoto</wpml:actionActuatorFunc>
               <wpml:actionActuatorFuncParam>
               <wpml:payloadPositionIndex>0</wpml:payloadPositionIndex>
-                <wpml:fileSuffix>航点dkbh5</wpml:fileSuffix>
+                <wpml:fileSuffix>航点dkbh6</wpml:fileSuffix>
                 <wpml:payloadLensIndex>wide,ir</wpml:payloadLensIndex>
                 <wpml:useGlobalPayloadLensIndex>1</wpml:useGlobalPayloadLensIndex>
               </wpml:actionActuatorFuncParam>
@@ -1419,12 +1477,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8059,28.6239
+              115.8059,28.622
             </coordinates>
           </Point>
-          <wpml:index>24</wpml:index>
+          <wpml:index>25</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1477,12 +1535,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8059,28.622
+              115.8102,28.622
             </coordinates>
           </Point>
-          <wpml:index>25</wpml:index>
+          <wpml:index>26</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1535,12 +1593,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8102,28.622
+              115.8102,28.6239
             </coordinates>
           </Point>
-          <wpml:index>26</wpml:index>
+          <wpml:index>27</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1593,12 +1651,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8102,28.6239
+              115.8297,28.6659
             </coordinates>
           </Point>
-          <wpml:index>27</wpml:index>
+          <wpml:index>28</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1624,7 +1682,7 @@
               <wpml:actionActuatorFunc>takePhoto</wpml:actionActuatorFunc>
               <wpml:actionActuatorFuncParam>
               <wpml:payloadPositionIndex>0</wpml:payloadPositionIndex>
-                <wpml:fileSuffix>航点dkbh6</wpml:fileSuffix>
+                <wpml:fileSuffix>航点dkbh7</wpml:fileSuffix>
                 <wpml:payloadLensIndex>wide,ir</wpml:payloadLensIndex>
                 <wpml:useGlobalPayloadLensIndex>1</wpml:useGlobalPayloadLensIndex>
               </wpml:actionActuatorFuncParam>
@@ -1651,12 +1709,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8297,28.6659
+              115.8297,28.6604
             </coordinates>
           </Point>
-          <wpml:index>28</wpml:index>
+          <wpml:index>29</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1709,12 +1767,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8297,28.6604
+              115.837,28.6604
             </coordinates>
           </Point>
-          <wpml:index>29</wpml:index>
+          <wpml:index>30</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1767,12 +1825,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.837,28.6604
+              115.837,28.6659
             </coordinates>
           </Point>
-          <wpml:index>30</wpml:index>
+          <wpml:index>31</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1825,12 +1883,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.837,28.6659
+              115.8575,28.6791
             </coordinates>
           </Point>
-          <wpml:index>31</wpml:index>
+          <wpml:index>32</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1856,7 +1914,7 @@
               <wpml:actionActuatorFunc>takePhoto</wpml:actionActuatorFunc>
               <wpml:actionActuatorFuncParam>
               <wpml:payloadPositionIndex>0</wpml:payloadPositionIndex>
-                <wpml:fileSuffix>航点dkbh7</wpml:fileSuffix>
+                <wpml:fileSuffix>航点dkbh8</wpml:fileSuffix>
                 <wpml:payloadLensIndex>wide,ir</wpml:payloadLensIndex>
                 <wpml:useGlobalPayloadLensIndex>1</wpml:useGlobalPayloadLensIndex>
               </wpml:actionActuatorFuncParam>
@@ -1883,12 +1941,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8575,28.6791
+              115.8575,28.6762
             </coordinates>
           </Point>
-          <wpml:index>32</wpml:index>
+          <wpml:index>33</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1941,12 +1999,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8575,28.6762
+              115.8637,28.6762
             </coordinates>
           </Point>
-          <wpml:index>33</wpml:index>
+          <wpml:index>34</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -1999,12 +2057,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8637,28.6762
+              115.8637,28.6791
             </coordinates>
           </Point>
-          <wpml:index>34</wpml:index>
+          <wpml:index>35</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -2057,12 +2115,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.8637,28.6791
+              115.9122,28.6232
             </coordinates>
           </Point>
-          <wpml:index>35</wpml:index>
+          <wpml:index>36</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -2088,7 +2146,7 @@
               <wpml:actionActuatorFunc>takePhoto</wpml:actionActuatorFunc>
               <wpml:actionActuatorFuncParam>
               <wpml:payloadPositionIndex>0</wpml:payloadPositionIndex>
-                <wpml:fileSuffix>航点dkbh8</wpml:fileSuffix>
+                <wpml:fileSuffix>航点dkbh9</wpml:fileSuffix>
                 <wpml:payloadLensIndex>wide,ir</wpml:payloadLensIndex>
                 <wpml:useGlobalPayloadLensIndex>1</wpml:useGlobalPayloadLensIndex>
               </wpml:actionActuatorFuncParam>
@@ -2115,12 +2173,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.9122,28.6232
+              115.9122,28.6212
             </coordinates>
           </Point>
-          <wpml:index>36</wpml:index>
+          <wpml:index>37</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -2173,12 +2231,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.9122,28.6212
+              115.916,28.6212
             </coordinates>
           </Point>
-          <wpml:index>37</wpml:index>
+          <wpml:index>38</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -2231,12 +2289,12 @@
         <Placemark>
           <Point>
             <coordinates>
-              115.916,28.6212
+              115.916,28.6232
             </coordinates>
           </Point>
-          <wpml:index>38</wpml:index>
+          <wpml:index>39</wpml:index>
           <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
+          <wpml:waypointSpeed>10</wpml:waypointSpeed>
           <wpml:waypointHeadingParam>
             <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
             <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
@@ -2253,64 +2311,6 @@
             <wpml:actionGroupId>39</wpml:actionGroupId>
             <wpml:actionGroupStartIndex>39</wpml:actionGroupStartIndex>
             <wpml:actionGroupEndIndex>39</wpml:actionGroupEndIndex>
-            <wpml:actionGroupMode>sequence</wpml:actionGroupMode>
-            <wpml:actionTrigger>
-              <wpml:actionTriggerType>reachPoint</wpml:actionTriggerType>
-            </wpml:actionTrigger>
-            <wpml:action>
-              <wpml:actionId>0</wpml:actionId>
-              <wpml:actionActuatorFunc>takePhoto</wpml:actionActuatorFunc>
-              <wpml:actionActuatorFuncParam>
-              <wpml:payloadPositionIndex>0</wpml:payloadPositionIndex>
-                <wpml:fileSuffix>航点dkbh9</wpml:fileSuffix>
-                <wpml:payloadLensIndex>wide,ir</wpml:payloadLensIndex>
-                <wpml:useGlobalPayloadLensIndex>1</wpml:useGlobalPayloadLensIndex>
-              </wpml:actionActuatorFuncParam>
-            </wpml:action>
-            <wpml:action>
-              <wpml:actionId>1</wpml:actionId>
-              <wpml:actionActuatorFunc>gimbalRotate</wpml:actionActuatorFunc>
-              <wpml:actionActuatorFuncParam>
-              <wpml:payloadPositionIndex>0</wpml:payloadPositionIndex>
-                <wpml:gimbalHeadingYawBase>north</wpml:gimbalHeadingYawBase>
-                <wpml:gimbalRotateMode>absoluteAngle</wpml:gimbalRotateMode>
-                <wpml:gimbalPitchRotateEnable>1</wpml:gimbalPitchRotateEnable>
-                <wpml:gimbalPitchRotateAngle>-83</wpml:gimbalPitchRotateAngle>
-                <wpml:gimbalRollRotateEnable>0</wpml:gimbalRollRotateEnable>
-                <wpml:gimbalRollRotateAngle>0</wpml:gimbalRollRotateAngle>
-                <wpml:gimbalYawRotateEnable>0</wpml:gimbalYawRotateEnable>
-                <wpml:gimbalYawRotateAngle>0</wpml:gimbalYawRotateAngle>
-                <wpml:gimbalRotateTimeEnable>0</wpml:gimbalRotateTimeEnable>
-                <wpml:gimbalRotateTime>0</wpml:gimbalRotateTime>
-              </wpml:actionActuatorFuncParam>
-            </wpml:action>
-          </wpml:actionGroup>
-        </Placemark>
-        <Placemark>
-          <Point>
-            <coordinates>
-              115.916,28.6232
-            </coordinates>
-          </Point>
-          <wpml:index>39</wpml:index>
-          <wpml:executeHeight>100</wpml:executeHeight>
-          <wpml:waypointSpeed></wpml:waypointSpeed>
-          <wpml:waypointHeadingParam>
-            <wpml:waypointHeadingMode>followWayline</wpml:waypointHeadingMode>
-            <wpml:waypointHeadingAngle>0</wpml:waypointHeadingAngle>
-            <wpml:waypointPoiPoint>0.000000,0.000000,0.000000</wpml:waypointPoiPoint>
-            <wpml:waypointHeadingPathMode>followBadArc</wpml:waypointHeadingPathMode>
-            <wpml:waypointHeadingPoiIndex>0</wpml:waypointHeadingPoiIndex>
-          </wpml:waypointHeadingParam>
-          <wpml:waypointTurnParam>
-            <wpml:waypointTurnMode>toPointAndStopWithDiscontinuityCurvature</wpml:waypointTurnMode>
-            <wpml:waypointTurnDampingDist>0.2</wpml:waypointTurnDampingDist>
-          </wpml:waypointTurnParam>
-          <wpml:useStraightLine>1</wpml:useStraightLine>
-          <wpml:actionGroup>
-            <wpml:actionGroupId>40</wpml:actionGroupId>
-            <wpml:actionGroupStartIndex>40</wpml:actionGroupStartIndex>
-            <wpml:actionGroupEndIndex>40</wpml:actionGroupEndIndex>
             <wpml:actionGroupMode>sequence</wpml:actionGroupMode>
             <wpml:actionTrigger>
               <wpml:actionTriggerType>reachPoint</wpml:actionTriggerType>

--
Gitblit v1.9.3