From 6c80bccddefe187111b82d9b1ec3559185a9e94f Mon Sep 17 00:00:00 2001
From: Fabian Peller <fabian.peller-konrad@kit.edu>
Date: Sun, 30 Jul 2023 10:28:44 +0200
Subject: [PATCH] add check to requestObject.at
---
.../RobotAPI/libraries/armem_locations/client/Reader.cpp | 3 ++-
.../armem_objects/client/instance/ObjectReader.cpp | 8 +++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/source/RobotAPI/libraries/armem_locations/client/Reader.cpp b/source/RobotAPI/libraries/armem_locations/client/Reader.cpp
index ca641d541..0fd0c6a1b 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 66bd99afb..b2b740b73 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>
--
GitLab