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

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index df59a0e..d86fac0 100644
--- a/source/libr2c2/catalogue.cpp
+++ b/source/libr2c2/catalogue.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/maputils.h>
 #include <msp/core/refptr.h>
 #include <msp/datafile/parser.h>
 #include "catalogue.h"
@@ -30,43 +31,29 @@ float Catalogue::get_rail_elevation() const
 
 void Catalogue::add_track(TrackType &track)
 {
-	if(tracks.count(track.get_article_number()))
-		throw Exception("Duplicate track type");
-
-	tracks[track.get_article_number()] = &track;
+	insert_unique(tracks, track.get_article_number(), &track);
 	signal_track_added.emit(track);
 }
 
 const TrackType &Catalogue::get_track(const ArticleNumber &art_nr) const
 {
-	TrackMap::const_iterator i=tracks.find(art_nr);
-	if(i==tracks.end())
-		throw KeyError("Unknown track type");
-
-	return *i->second;
+	return *get_item(tracks, art_nr);
 }
 
 void Catalogue::add_vehicle(VehicleType &veh)
 {
-	if(vehicles.count(veh.get_article_number()))
-		throw Exception("Duplicate vehicle type");
-
-	vehicles[veh.get_article_number()] = &veh;
+	insert_unique(vehicles, veh.get_article_number(), &veh);
 	signal_vehicle_added.emit(veh);
 }
 
 const VehicleType &Catalogue::get_vehicle(const ArticleNumber &art_nr) const
 {
-	VehicleMap::const_iterator i = vehicles.find(art_nr);
-	if(i==vehicles.end())
-		throw KeyError("Unknown vehicle type");
-
-	return *i->second;
+	return *get_item(vehicles, art_nr);
 }
 
 
 Catalogue::Loader::Loader(Catalogue &c):
-	DataFile::BasicLoader<Catalogue>(c)
+	DataFile::ObjectLoader<Catalogue>(c)
 {
 	add("ballast_profile", &Loader::ballast_profile);
 	add("gauge", &Loader::gauge);
@@ -116,7 +103,7 @@ void Catalogue::Loader::track(unsigned art_nr)
 void Catalogue::Loader::track(ArticleNumber art_nr)
 {
 	if(obj.tracks.count(art_nr))
-		throw KeyError("Duplicate track type", art_nr.str());
+		throw key_error(art_nr);
 
 	RefPtr<TrackType> trk = new TrackType(art_nr);
 	load_sub(*trk);
@@ -131,7 +118,7 @@ void Catalogue::Loader::vehicle(unsigned art_nr)
 void Catalogue::Loader::vehicle(ArticleNumber art_nr)
 {
 	if(obj.vehicles.count(art_nr))
-		throw KeyError("Duplicate vehicle type", art_nr.str());
+		throw key_error(art_nr);
 
 	RefPtr<VehicleType> veh = new VehicleType(art_nr);
 	load_sub(*veh);