@@ -16,31 +16,30 @@ namespace impl {
1616
1717using namespace service ::navigation::v1;
1818
19- ::grpc::Status NavigationServer::GetMode (::grpc::ServerContext* context ,
19+ ::grpc::Status NavigationServer::GetMode (::grpc::ServerContext*,
2020 const GetModeRequest* request,
2121 GetModeResponse* response) noexcept {
2222 return make_service_helper<Navigation>(
2323 " NavigationServer::GetMode" , this , request)([&](auto & helper, auto & nav) {
24- response->set_mode (Mode (nav->get_mode (request->name (), struct_to_map (request-> extra () ))));
24+ response->set_mode (Mode (nav->get_mode (request->name (), helper. getExtra ( ))));
2525 });
2626}
2727
28- ::grpc::Status NavigationServer::SetMode (::grpc::ServerContext* context ,
28+ ::grpc::Status NavigationServer::SetMode (::grpc::ServerContext*,
2929 const SetModeRequest* request,
30- SetModeResponse* response ) noexcept {
30+ SetModeResponse*) noexcept {
3131 return make_service_helper<Navigation>(
3232 " NavigationServer::SetMode" , this , request)([&](auto & helper, auto & nav) {
33- nav->set_mode (
34- request->name (), Navigation::Mode (request->mode ()), struct_to_map (request->extra ()));
33+ nav->set_mode (request->name (), Navigation::Mode (request->mode ()), helper.getExtra ());
3534 });
3635}
3736
38- ::grpc::Status NavigationServer::GetLocation (::grpc::ServerContext* context ,
37+ ::grpc::Status NavigationServer::GetLocation (::grpc::ServerContext*,
3938 const GetLocationRequest* request,
4039 GetLocationResponse* response) noexcept {
4140 return make_service_helper<Navigation>(
4241 " NavigationServer::GetLocation" , this , request)([&](auto & helper, auto & nav) {
43- const auto & loc = nav->get_location (request->name (), struct_to_map (request-> extra () ));
42+ const auto & loc = nav->get_location (request->name (), helper. getExtra ( ));
4443 *response->mutable_location () = loc.location ;
4544 response->set_compass_heading (loc.compass_heading );
4645 });
@@ -55,61 +54,59 @@ void vecToRepeatedPtr(std::vector<Src>& vec, google::protobuf::RepeatedPtrField<
5554 }
5655}
5756
58- ::grpc::Status NavigationServer::GetWaypoints (::grpc::ServerContext* context ,
57+ ::grpc::Status NavigationServer::GetWaypoints (::grpc::ServerContext*,
5958 const GetWaypointsRequest* request,
6059 GetWaypointsResponse* response) noexcept {
6160 return make_service_helper<Navigation>(
6261 " NavigationServer::GetWaypoints" , this , request)([&](auto & helper, auto & nav) {
63- const auto & waypoints =
64- nav->get_waypoints (request->name (), struct_to_map (request->extra ()));
62+ const auto & waypoints = nav->get_waypoints (request->name (), helper.getExtra ());
6563 vecToRepeatedPtr (*waypoints, response->mutable_waypoints ());
6664 });
6765}
6866
69- ::grpc::Status NavigationServer::AddWaypoint (::grpc::ServerContext* context ,
67+ ::grpc::Status NavigationServer::AddWaypoint (::grpc::ServerContext*,
7068 const AddWaypointRequest* request,
71- AddWaypointResponse* response ) noexcept {
69+ AddWaypointResponse*) noexcept {
7270 return make_service_helper<Navigation>(
7371 " NavigationServer::AddWaypoint" , this , request)([&](auto & helper, auto & nav) {
74- nav->add_waypoint (request->name (), request->location (), struct_to_map (request-> extra () ));
72+ nav->add_waypoint (request->name (), request->location (), helper. getExtra ( ));
7573 });
7674}
7775
78- ::grpc::Status NavigationServer::RemoveWaypoint (::grpc::ServerContext* context ,
76+ ::grpc::Status NavigationServer::RemoveWaypoint (::grpc::ServerContext*,
7977 const RemoveWaypointRequest* request,
80- RemoveWaypointResponse* response ) noexcept {
78+ RemoveWaypointResponse*) noexcept {
8179 return make_service_helper<Navigation>(
8280 " NavigationServer::RemoveWaypoint" , this , request)([&](auto & helper, auto & nav) {
83- nav->remove_waypoint (request->name (), request->id (), struct_to_map (request-> extra () ));
81+ nav->remove_waypoint (request->name (), request->id (), helper. getExtra ( ));
8482 });
8583}
8684
87- ::grpc::Status NavigationServer::GetObstacles (::grpc::ServerContext* context ,
85+ ::grpc::Status NavigationServer::GetObstacles (::grpc::ServerContext*,
8886 const GetObstaclesRequest* request,
8987 GetObstaclesResponse* response) noexcept {
9088 return make_service_helper<Navigation>(
9189 " NavigationServer::GetObstacles" , this , request)([&](auto & helper, auto & nav) {
92- const auto & obstacles =
93- nav->get_obstacles (request->name (), struct_to_map (request->extra ()));
90+ const auto & obstacles = nav->get_obstacles (request->name (), helper.getExtra ());
9491 vecToRepeatedPtr (*obstacles, response->mutable_obstacles ());
9592 });
9693}
9794
98- ::grpc::Status NavigationServer::GetPaths (::grpc::ServerContext* context ,
95+ ::grpc::Status NavigationServer::GetPaths (::grpc::ServerContext*,
9996 const GetPathsRequest* request,
10097 GetPathsResponse* response) noexcept {
10198 return make_service_helper<Navigation>(
10299 " NavigationServer::GetPaths" , this , request)([&](auto & helper, auto & nav) {
103- const auto & paths = nav->get_paths (request->name (), struct_to_map (request-> extra () ));
100+ const auto & paths = nav->get_paths (request->name (), helper. getExtra ( ));
104101 vecToRepeatedPtr (*paths, response->mutable_paths ());
105102 });
106103}
107104
108- ::grpc::Status NavigationServer::GetProperties (::grpc::ServerContext* context ,
105+ ::grpc::Status NavigationServer::GetProperties (::grpc::ServerContext*,
109106 const GetPropertiesRequest* request,
110107 GetPropertiesResponse* response) noexcept {
111108 return make_service_helper<Navigation>(
112- " NavigationServer::GetProperties" , this , request)([&](auto & helper , auto & nav) {
109+ " NavigationServer::GetProperties" , this , request)([&](auto &, auto & nav) {
113110 response->set_map_type (
114111 viam::service::navigation::v1::MapType (nav->get_properties (request->name ())));
115112 });
0 commit comments