diff --git a/source/RobotAPI/libraries/armem_locations/client/Reader.cpp b/source/RobotAPI/libraries/armem_locations/client/Reader.cpp index ca641d541ac01430350b5e1e72998545c6c82805..0fd0c6a1b5258d7960e9179c649ab0286b26be5a 100644 --- a/source/RobotAPI/libraries/armem_locations/client/Reader.cpp +++ b/source/RobotAPI/libraries/armem_locations/client/Reader.cpp @@ -65,7 +65,7 @@ namespace armarx::armem::locations::client if (i) { auto loc = i->dataAs<armarx::navigation::location::arondto::Location>(); - ret[i->id().entityName] = loc; + ret[i->id().providerSegmentName + "/" + i->id().entityName] = loc; } }); return ret; @@ -83,6 +83,7 @@ namespace armarx::armem::locations::client for (auto& [locName, location] : locations) { + (void) locName; if (location.framedPose.header.frame == armarx::GlobalFrame) { location.framedPose.header.agent = ""; //sanity set diff --git a/source/RobotAPI/libraries/armem_objects/client/instance/ObjectReader.cpp b/source/RobotAPI/libraries/armem_objects/client/instance/ObjectReader.cpp index 66bd99afbcf294f533a180bfe8727b1e73bc01a5..b2b740b735e933245a44bbfd3ce8d1c437ff30b2 100644 --- a/source/RobotAPI/libraries/armem_objects/client/instance/ObjectReader.cpp +++ b/source/RobotAPI/libraries/armem_objects/client/instance/ObjectReader.cpp @@ -88,7 +88,13 @@ namespace armarx::armem::obj::instance auto requestResult = objPoseStorage->requestObjects(req); - return requestResult.results.at(requestObject).result.success; + if (requestResult.results.count(requestObject)) + { + return requestResult.results.at(requestObject).result.success; + } + return false; + + } std::optional<objpose::ObjectPose>