+void Layout::remove_block(Block &b)
+{
+ blocks.erase(&b);
+}
+
+void Layout::add_route(Route &r)
+{
+ if(routes.count(r.get_name()))
+ throw KeyError("Duplicate route name", r.get_name());
+
+ routes[r.get_name()] = &r;
+ signal_route_added.emit(r);
+}
+
+Route &Layout::get_route(const string &name) const
+{
+ map<string, Route *>::const_iterator i = routes.find(name);
+ if(i==routes.end())
+ throw KeyError("Unknown route", name);
+ return *i->second;
+}
+
+void Layout::update_routes()
+{
+ for(map<string, Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
+ i->second->update_turnouts();
+}
+
+void Layout::remove_route(Route &r)
+{
+ if(routes.erase(r.get_name()))
+ signal_route_removed.emit(r);
+}
+
+void Layout::add_train(Train &t)
+{
+ if(trains.count(t.get_address()))
+ throw KeyError("Duplicate train address", lexical_cast(t.get_address()));
+
+ trains[t.get_address()] = &t;
+ signal_train_added.emit(t);
+}
+
+Train &Layout::get_train(unsigned addr) const
+{
+ map<unsigned, Train *>::const_iterator i = trains.find(addr);
+ if(i==trains.end())
+ throw KeyError("Unknown train", lexical_cast(addr));
+ return *i->second;
+}
+
+void Layout::remove_train(Train &t)
+{
+ if(trains.erase(t.get_address()))
+ signal_train_removed.emit(t);