about summary refs log tree commit diff stats
path: root/tools/validator/human_processor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tools/validator/human_processor.cpp')
-rw-r--r--tools/validator/human_processor.cpp20
1 files changed, 15 insertions, 5 deletions
diff --git a/tools/validator/human_processor.cpp b/tools/validator/human_processor.cpp index 407d951..ffa9765 100644 --- a/tools/validator/human_processor.cpp +++ b/tools/validator/human_processor.cpp
@@ -570,12 +570,14 @@ class HumanProcessor {
570 auto ids = ReadIdsFromYaml(path.string()); 570 auto ids = ReadIdsFromYaml(path.string());
571 571
572 DoorIdentifier di; 572 DoorIdentifier di;
573 PanelIdentifier pi; 573 PanelIdentifier pai;
574 PortIdentifier poi;
574 KeyholderIdentifier ki; 575 KeyholderIdentifier ki;
575 576
576 for (const auto& [map_name, map] : ids.maps()) { 577 for (const auto& [map_name, map] : ids.maps()) {
577 di.set_map(map_name); 578 di.set_map(map_name);
578 pi.set_map(map_name); 579 pai.set_map(map_name);
580 poi.set_map(map_name);
579 ki.set_map(map_name); 581 ki.set_map(map_name);
580 582
581 for (const auto& [door_name, ap_id] : map.doors()) { 583 for (const auto& [door_name, ap_id] : map.doors()) {
@@ -586,13 +588,14 @@ class HumanProcessor {
586 } 588 }
587 589
588 for (const auto& [room_name, room] : map.rooms()) { 590 for (const auto& [room_name, room] : map.rooms()) {
589 pi.set_room(room_name); 591 pai.set_room(room_name);
592 poi.set_room(room_name);
590 ki.set_room(room_name); 593 ki.set_room(room_name);
591 594
592 for (const auto& [panel_name, ap_id] : room.panels()) { 595 for (const auto& [panel_name, ap_id] : room.panels()) {
593 pi.set_name(panel_name); 596 pai.set_name(panel_name);
594 597
595 PanelInfo& panel_info = info_.panels[pi]; 598 PanelInfo& panel_info = info_.panels[pai];
596 panel_info.has_id = true; 599 panel_info.has_id = true;
597 } 600 }
598 601
@@ -606,6 +609,13 @@ class HumanProcessor {
606 KeyholderInfo& keyholder_info = info_.keyholders[ki]; 609 KeyholderInfo& keyholder_info = info_.keyholders[ki];
607 keyholder_info.has_id = true; 610 keyholder_info.has_id = true;
608 } 611 }
612
613 for (const auto& [port_name, ap_id] : room.ports()) {
614 poi.set_name(port_name);
615
616 PortInfo& port_info = info_.ports[poi];
617 port_info.has_id = true;
618 }
609 } 619 }
610 } 620 }
611 621