Do not require unique names for routes

[r2c2.git] / source / libmarklin / layout.cpp

diff --git a/source/libmarklin/layout.cpp b/source/libmarklin/layout.cpp
index a495a21968b62ade01645c3e733939d101c1feea..d32781578243a1631634d23ecf78e7223387ec93 100644 (file)
--- a/source/libmarklin/layout.cpp
+++ b/source/libmarklin/layout.cpp
@@ -41,7 +41,7 @@ Layout::~Layout()
        while(!trains.empty())
                delete trains.begin()->second;
        while(!routes.empty())
-               delete routes.begin()->second;
+               delete *routes.begin();
        while(!tracks.empty())
                delete *tracks.begin();
        while(!blocks.empty())
@@ -148,30 +148,27 @@ void Layout::remove_block(Block &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);
+       if(routes.insert(&r).second)
+               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;
+       for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
+               if((*i)->get_name()==name)
+                       return **i;
+       throw KeyError("Unknown route", name);
 }
 
 void Layout::update_routes()
 {
-       for(map<string, Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
-               i->second->update_turnouts();
+       for(set<Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
+               (*i)->update_turnouts();
 }
 
 void Layout::remove_route(Route &r)
 {
-       if(routes.erase(r.get_name()))
+       if(routes.erase(&r))
                signal_route_removed.emit(r);
 }
 
@@ -249,14 +246,13 @@ void Layout::save(const string &fn)
                writer.write(st);
        }
 
-       for(map<string, Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
+       for(set<Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
        {
-               if(i->second->is_temporary())
+               if((*i)->is_temporary())
                        continue;
 
                DataFile::Statement st("route");
-               st.append(i->first);
-               i->second->save(st.sub);
+               (*i)->save(st.sub);
                writer.write(st);
        }
 }
@@ -296,7 +292,8 @@ Layout::Loader::Loader(Layout &l):
        new_tracks(false)
 {
        add("base",  &Layout::base);
-       add("route", &Loader::route);
+       add("route", static_cast<void (Loader::*)()>(&Loader::route));
+       add("route", static_cast<void (Loader::*)(const string &)>(&Loader::route));
        add("track", &Loader::track);
        add("train", &Loader::train);
 }
@@ -307,9 +304,16 @@ void Layout::Loader::finish()
                (*i)->check_slope();
 }
 
+void Layout::Loader::route()
+{
+       Route *rte = new Route(obj);
+       load_sub(*rte);
+}
+
 void Layout::Loader::route(const string &n)
 {
-       Route *rte = new Route(obj, n);
+       Route *rte = new Route(obj);
+       rte->set_name(n);
        load_sub(*rte);
 }