properties struct instead of returning raw maptype in case we add more fields

Author: abe-winter

src/viam/sdk/services/navigation.hpp

@@ -33,6 +33,10 @@ class Navigation : public Service {
         double compass_heading;
     };
 
+    struct Properties {
+        MapType map_type;
+    };
+
     struct Waypoint {
         std::string id;
         geo_point location;
@@ -55,7 +59,7 @@ class Navigation : public Service {
                                  const ProtoStruct& extra) = 0;
     virtual std::unique_ptr<std::vector<geo_geometry>> get_obstacles(const ProtoStruct& extra) = 0;
     virtual std::unique_ptr<std::vector<Path>> get_paths(const ProtoStruct& extra) = 0;
-    virtual MapType get_properties() = 0;
+    virtual Properties get_properties() = 0;
     virtual ProtoStruct do_command(const ProtoStruct& command) = 0;
 
     // overloads without `extra` param.

src/viam/sdk/services/private/navigation_client.cpp

@@ -111,10 +111,10 @@ std::unique_ptr<std::vector<NavigationClient::Path>> NavigationClient::get_paths
         });
 }
 
-NavigationClient::MapType NavigationClient::get_properties() {
+NavigationClient::Properties NavigationClient::get_properties() {
     return make_client_helper(this, *stub_, &StubType::GetProperties)
         .with([&](auto& request) {})
-        .invoke([](auto& response) { return MapType(response.map_type()); });
+        .invoke([](auto& response) { return Properties{MapType(response.map_type())}; });
 }
 
 ProtoStruct NavigationClient::do_command(const ProtoStruct& command) {

src/viam/sdk/services/private/navigation_client.hpp

@@ -29,7 +29,7 @@ class NavigationClient : public Navigation {
     void remove_waypoint(const std::string id, const ProtoStruct& extra) override;
     std::unique_ptr<std::vector<geo_geometry>> get_obstacles(const ProtoStruct& extra) override;
     std::unique_ptr<std::vector<Path>> get_paths(const ProtoStruct& extra) override;
-    MapType get_properties() override;
+    Properties get_properties() override;
     ProtoStruct do_command(const ProtoStruct& command) override;
 
    private:

src/viam/sdk/services/private/navigation_server.cpp

@@ -109,8 +109,11 @@ ::grpc::Status NavigationServer::GetPaths(::grpc::ServerContext*,
 ::grpc::Status NavigationServer::GetProperties(::grpc::ServerContext*,
                                                const GetPropertiesRequest* request,
                                                GetPropertiesResponse* response) noexcept {
-    return make_service_helper<Navigation>("NavigationServer::GetProperties", this, request)(
-        [&](auto&, auto& nav) { response->set_map_type(MapType(nav->get_properties())); });
+    return make_service_helper<Navigation>(
+        "NavigationServer::GetProperties", this, request)([&](auto&, auto& nav) {
+        Navigation::Properties props = nav->get_properties();
+        response->set_map_type(MapType(props.map_type));
+    });
 }
 
 ::grpc::Status NavigationServer::DoCommand(