cesium: add waypoint numbers

ArduPilot · Aug 22, 2023 · e30a0f2 · e30a0f2
1 parent 2684d34
commit e30a0f2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/components/CesiumViewer.vue b/src/components/CesiumViewer.vue
@@ -34,6 +34,7 @@ import {
     ClockRange,
     Cartesian3,
     SampledProperty,
+    LabelStyle,
     SampledPositionProperty,
     Transforms,
     PolylineDashMaterialProperty,
@@ -838,6 +839,22 @@ export default {
                             })
                         }
                     })
+                    for (const pos of points) {
+                        const position = Cartesian3.fromDegrees(pos[0], pos[1], pos[2] + 0.3 + this.heightOffset)
+                        this.viewer.entities.add({
+                            parent: this.waypoints,
+                            position: position,
+                            label: {
+                                text: `${pos[5]}`,
+                                font: '12px sans-serif',
+                                style: LabelStyle.FILL_AND_OUTLINE,
+                                fillColor: Color.WHITE,
+                                outlineColor: Color.BLACK,
+                                showBackground: false,
+                                outlineWidth: 3
+                            }
+                        })
+                    }
                 },
 
                 plotFences (fencesList) {

diff --git a/src/tools/dataflashDataExtractor.js b/src/tools/dataflashDataExtractor.js
@@ -178,11 +178,14 @@ export class DataflashDataExtractor {
                 if (cmdMsgs.Lat[i] !== 0) {
                     let lat = cmdMsgs.Lat[i]
                     let lon = cmdMsgs.Lng[[i]]
+                    const tot = cmdMsgs.CTot[i]
+                    const id = cmdMsgs.CId[i]
+                    const num = cmdMsgs.CNum[i]
                     if (Math.abs(lat) > 180) {
                         lat = lat / 10e6
                         lon = lon / 10e6
                     }
-                    wps.push([lon, lat, cmdMsgs.Alt[i]])
+                    wps.push([lon, lat, cmdMsgs.Alt[i], tot, id, num])
                 }
             }
         }