@@ -53,6 +53,9 @@ class MissionItem:
53
53
yaw_deg : float
54
54
Absolute yaw angle (in degrees)
55
55
56
+ camera_photo_distance_m : float
57
+ Camera photo distance to use after this mission item (in meters)
58
+
56
59
"""
57
60
58
61
@@ -154,7 +157,8 @@ def __init__(
154
157
loiter_time_s ,
155
158
camera_photo_interval_s ,
156
159
acceptance_radius_m ,
157
- yaw_deg ):
160
+ yaw_deg ,
161
+ camera_photo_distance_m ):
158
162
""" Initializes the MissionItem object """
159
163
self .latitude_deg = latitude_deg
160
164
self .longitude_deg = longitude_deg
@@ -168,6 +172,7 @@ def __init__(
168
172
self .camera_photo_interval_s = camera_photo_interval_s
169
173
self .acceptance_radius_m = acceptance_radius_m
170
174
self .yaw_deg = yaw_deg
175
+ self .camera_photo_distance_m = camera_photo_distance_m
171
176
172
177
def __eq__ (self , to_compare ):
173
178
""" Checks if two MissionItem are the same """
@@ -186,7 +191,8 @@ def __eq__(self, to_compare):
186
191
(self .loiter_time_s == to_compare .loiter_time_s ) and \
187
192
(self .camera_photo_interval_s == to_compare .camera_photo_interval_s ) and \
188
193
(self .acceptance_radius_m == to_compare .acceptance_radius_m ) and \
189
- (self .yaw_deg == to_compare .yaw_deg )
194
+ (self .yaw_deg == to_compare .yaw_deg ) and \
195
+ (self .camera_photo_distance_m == to_compare .camera_photo_distance_m )
190
196
191
197
except AttributeError :
192
198
return False
@@ -205,7 +211,8 @@ def __str__(self):
205
211
"loiter_time_s: " + str (self .loiter_time_s ),
206
212
"camera_photo_interval_s: " + str (self .camera_photo_interval_s ),
207
213
"acceptance_radius_m: " + str (self .acceptance_radius_m ),
208
- "yaw_deg: " + str (self .yaw_deg )
214
+ "yaw_deg: " + str (self .yaw_deg ),
215
+ "camera_photo_distance_m: " + str (self .camera_photo_distance_m )
209
216
])
210
217
211
218
return f"MissionItem: [{ struct_repr } ]"
@@ -248,7 +255,10 @@ def translate_from_rpc(rpcMissionItem):
248
255
rpcMissionItem .acceptance_radius_m ,
249
256
250
257
251
- rpcMissionItem .yaw_deg
258
+ rpcMissionItem .yaw_deg ,
259
+
260
+
261
+ rpcMissionItem .camera_photo_distance_m
252
262
)
253
263
254
264
def translate_to_rpc (self , rpcMissionItem ):
@@ -327,6 +337,12 @@ def translate_to_rpc(self, rpcMissionItem):
327
337
328
338
329
339
340
+
341
+
342
+ rpcMissionItem .camera_photo_distance_m = self .camera_photo_distance_m
343
+
344
+
345
+
330
346
331
347
332
348
class MissionPlan :
0 commit comments