Merge pull request #1950 from mavlink/pr-mission-import-from-string

mission_raw: add method to import plan from string

src/mavsdk/plugins/mission_raw/include/plugins/mission_raw/mission_raw.h

@@ -417,7 +417,7 @@ class MissionRaw : public PluginBase {
     void unsubscribe_mission_changed(MissionChangedHandle handle);
 
     /**
-     * @brief Import a QGroundControl missions in JSON .plan format.
+     * @brief Import a QGroundControl missions in JSON .plan format, from a file.
      *
      * Supported:
      * - Waypoints
@@ -432,6 +432,22 @@ class MissionRaw : public PluginBase {
     std::pair<Result, MissionRaw::MissionImportData>
     import_qgroundcontrol_mission(std::string qgc_plan_path) const;
 
+    /**
+     * @brief Import a QGroundControl missions in JSON .plan format, from a string.
+     *
+     * Supported:
+     * - Waypoints
+     * - Survey
+     * Not supported:
+     * - Structure Scan
+     *
+     * This function is blocking.
+     *
+     * @return Result of request.
+     */
+    std::pair<Result, MissionRaw::MissionImportData>
+    import_qgroundcontrol_mission_from_string(std::string qgc_plan) const;
+
     /**
      * @brief Copy constructor.
      */

src/mavsdk/plugins/mission_raw/mission_raw.cpp

@@ -152,6 +152,12 @@ MissionRaw::import_qgroundcontrol_mission(std::string qgc_plan_path) const
     return _impl->import_qgroundcontrol_mission(qgc_plan_path);
 }
 
+std::pair<MissionRaw::Result, MissionRaw::MissionImportData>
+MissionRaw::import_qgroundcontrol_mission_from_string(std::string qgc_plan) const
+{
+    return _impl->import_qgroundcontrol_mission_from_string(qgc_plan);
+}
+
 bool operator==(const MissionRaw::MissionProgress& lhs, const MissionRaw::MissionProgress& rhs)
 {
     return (rhs.current == lhs.current) && (rhs.total == lhs.total);

src/mavsdk/plugins/mission_raw/mission_raw_impl.cpp

@@ -543,6 +543,12 @@ MissionRawImpl::import_qgroundcontrol_mission(std::string qgc_plan_path)
     return MissionImport::parse_json(buf.str(), _parent->autopilot());
 }
 
+std::pair<MissionRaw::Result, MissionRaw::MissionImportData>
+MissionRawImpl::import_qgroundcontrol_mission_from_string(const std::string& qgc_plan)
+{
+    return MissionImport::parse_json(qgc_plan, _parent->autopilot());
+}
+
 MissionRaw::Result MissionRawImpl::convert_result(MavlinkMissionTransfer::Result result)
 {
     switch (result) {

src/mavsdk/plugins/mission_raw/mission_raw_impl.h

@@ -65,6 +65,9 @@ class MissionRawImpl : public PluginImplBase {
     std::pair<MissionRaw::Result, MissionRaw::MissionImportData>
     import_qgroundcontrol_mission(std::string qgc_plan_path);
 
+    std::pair<MissionRaw::Result, MissionRaw::MissionImportData>
+    import_qgroundcontrol_mission_from_string(const std::string& qgc_plan);
+
 #if 0
     void import_qgroundcontrol_mission_async(
         std::string qgc_plan_path, const MissionRaw::ImportQgroundcontrolMissionCallback callback);