From e935f40576d779242f0b4f4ed1dae6e713d483b2 Mon Sep 17 00:00:00 2001 From: Frank Rohde <frank.rohde@tu-dresden.de> Date: Thu, 25 Aug 2022 12:47:43 +0200 Subject: [PATCH] added OSMWaypoint --- interfaces/OSM/OSM.proto | 9 +++++++++ interfaces/SimpleScene/SimpleScene.proto | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/interfaces/OSM/OSM.proto b/interfaces/OSM/OSM.proto index 77eebeb..10a565f 100644 --- a/interfaces/OSM/OSM.proto +++ b/interfaces/OSM/OSM.proto @@ -4,6 +4,7 @@ package ipos.models; message OSMOutputWrapper { repeated OSMObject objects = 1; + repeated OSMWaypoint waypoints = 2; } message OSMExtInputWrapper { @@ -57,4 +58,12 @@ message OSMExtractedAttributes{ message OSMZoneDescriptor{ string zoneId = 1; string notificationType = 2; // may be ExitNotification or EntryNotification +} + +message OSMWaypoint{ + string agentId = 1; + string agentType = 2; + string publisher = 3; + OSMPosition position = 4; + string time = 5; } \ No newline at end of file diff --git a/interfaces/SimpleScene/SimpleScene.proto b/interfaces/SimpleScene/SimpleScene.proto index e2ed5a6..26eeb20 100644 --- a/interfaces/SimpleScene/SimpleScene.proto +++ b/interfaces/SimpleScene/SimpleScene.proto @@ -76,7 +76,6 @@ message RefSystem { } message IposMonitoringRequest { - // frameId = 1; // deprecated repeated string frameIds = 1; // a monitoring request can be concerned with multiple overlapping frames float delta = 2; // min. change in position to trigger a position update, setting delta and updateFrequency to -1 cancels the (existing) monitoring task float updateFrequency = 3; // defines how many times per second a PositionUpdateEvent is sent @@ -86,7 +85,7 @@ message IposMonitoringRequest { bool exit_notification = 7; // IPos will notify receiver when object has left the frame repeated string properties = 8; // properties that shall be monitored: position or id or type or distance string monitoringTaskId = 9; // unique for each monitoringRequest. IPosFW uses this info for configuring the communication protocol, e.g., for selecting a specific topic for MQTT-communication; a monitoringRequest with the same monitoringTaskId like a previous request updates this request - string refSystemId = 10; + string refSystemId = 10; // id of the reference system according to which positions are to be provided string requestorProtocol = 11; // communication protocol, e.g., "mqtt"; Assumption: requestor = receiver string serializationType = 12; // accepted values: "protobuf" or "json" } -- GitLab