Merge pull request #5281 from DonLakeFlyer/SurveyFixes

Survey fixes

src/MissionManager/MissionManager.cc

@@ -1003,7 +1003,8 @@ void MissionManager::generateResumeMission(int resumeIndex)
                            << MAV_CMD_IMAGE_START_CAPTURE
                            << MAV_CMD_IMAGE_STOP_CAPTURE
                            << MAV_CMD_VIDEO_START_CAPTURE
-                           << MAV_CMD_VIDEO_STOP_CAPTURE;
+                           << MAV_CMD_VIDEO_STOP_CAPTURE
+                           << MAV_CMD_DO_CHANGE_SPEED;
     if (_vehicle->fixedWing() && _vehicle->px4Firmware()) {
         includedResumeCommands << MAV_CMD_NAV_TAKEOFF;
     }

src/MissionManager/SurveyMissionItem.cc

@@ -224,7 +224,7 @@ void SurveyMissionItem::save(QJsonArray&  missionItems)
     gridObject[_jsonGridAltitudeRelativeKey] =  _gridAltitudeRelativeFact.rawValue().toBool();
     gridObject[_jsonGridAngleKey] =             _gridAngleFact.rawValue().toDouble();
     gridObject[_jsonGridSpacingKey] =           _gridSpacingFact.rawValue().toDouble();
-    gridObject[_jsonGridEntryLocationKey] =           _gridSpacingFact.rawValue().toDouble();
+    gridObject[_jsonGridEntryLocationKey] =     _gridEntryLocationFact.rawValue().toDouble();
     gridObject[_jsonTurnaroundDistKey] =        _turnaroundDistFact.rawValue().toDouble();
 
     saveObject[_jsonGridObjectKey] = gridObject;