X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=de61b1bca4d5eb7e7ed5593af108ee34a2709abb;hb=64340dad429ba4040538fc06b6882aabdb489925;hp=df8ce74e62b01ba1d52a178469903992afb78a83;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index df8ce74..de61b1b 100644
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <msp/core/maputils.h>
 #include <msp/core/refptr.h>
 #include <msp/datafile/parser.h>
 #include <msp/datafile/writer.h>
@@ -56,7 +57,7 @@ Layout::~Layout()
 Driver &Layout::get_driver() const
 {
 	if(!driver)
-		throw InvalidState("No driver");
+		throw logic_error("!driver");
 	return *driver;
 }
 
@@ -119,7 +120,7 @@ Block &Layout::get_block(unsigned id) const
 		if((*i)->get_id()==id)
 			return **i;
 
-	throw KeyError("Unknown block", lexical_cast(id));
+	throw key_error(id);
 }
 
 void Layout::create_blocks()
@@ -179,7 +180,7 @@ Route &Layout::get_route(const string &name) const
 	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
 		if((*i)->get_name()==name)
 			return **i;
-	throw KeyError("Unknown route", name);
+	throw key_error(name);
 }
 
 void Layout::update_routes()
@@ -218,7 +219,7 @@ Zone &Layout::get_zone(const string &group, unsigned num) const
 		if((*i)->get_group()==group && (*i)->get_number()==num)
 			return **i;
 
-	throw KeyError("Unknown zone", format("%s %d", group, num));
+	throw key_error(format("%s %d", group, num));
 }
 
 void Layout::remove_zone(Zone &z)
@@ -229,19 +230,13 @@ void Layout::remove_zone(Zone &z)
 
 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;
+	insert_unique(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;
+	return *get_item(trains, addr);
 }
 
 void Layout::remove_train(Train &t)
@@ -349,7 +344,7 @@ void Layout::block_state_changed(Block &block, Block::State state)
 
 
 Layout::Loader::Loader(Layout &l):
-	DataFile::BasicLoader<Layout>(l),
+	DataFile::ObjectLoader<Layout>(l),
 	new_tracks(false)
 {
 	add("base",  &Layout::base);