1 files changed, 21 insertions, 0 deletions

@@ -64,6 +64,13 @@ IdMappings ReadIdsFromYaml(const std::string& filename) {
                   keyholder_it.second.as<uint64_t>();
             }
           }
+
+          if (room_it.second["ports"]) {
+            for (const auto& port_it : room_it.second["ports"]) {
+              (*room_ids.mutable_ports())[port_it.first.as<std::string>()] =
+                  port_it.second.as<uint64_t>();
+            }
+          }
         }
       }
 
@@ -73,6 +80,10 @@ IdMappings ReadIdsFromYaml(const std::string& filename) {
               door_it.second.as<uint64_t>();
         }
       }
+
+      if (map_it.second["rte"]) {
+        map_ids.set_rte(map_it.second["rte"].as<uint64_t>());
+      }
     }
   }
 
@@ -146,6 +157,12 @@ void WriteIdsAsYaml(const IdMappings& ids, const std::string& filename) {
                                    keyholder_id;
                              });
 
+          OperateOnSortedMap(
+              room_ids.ports(),
+              [&room_node](const std::string& port_name, uint64_t port_id) {
+                room_node["ports"][port_name] = port_id;
+              });
+
           map_node["rooms"][room_name] = std::move(room_node);
         });
 
@@ -155,6 +172,10 @@ void WriteIdsAsYaml(const IdMappings& ids, const std::string& filename) {
           map_node["doors"][door_name] = door_id;
         });
 
+    if (map_ids.has_rte()) {
+      map_node["rte"] = map_ids.rte();
+    }
+
     result["maps"][map_name] = std::move(map_node);
   });