Replace various map lookups with functions from maputils.h

[r2c2.git] / source / libr2c2 / catalogue.cpp

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index 838b15bd254638fa22e8b367fdf843022e5276ab..847045634a1927ea142020a1a54c9a2d43360d72 100644 (file)
--- a/source/libr2c2/catalogue.cpp
+++ b/source/libr2c2/catalogue.cpp
@@ -1,10 +1,4 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
+#include <msp/core/maputils.h>
 #include <msp/core/refptr.h>
 #include <msp/datafile/parser.h>
 #include "catalogue.h"
@@ -37,38 +31,24 @@ 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);
 }
 
 
@@ -82,6 +62,7 @@ Catalogue::Loader::Loader(Catalogue &c):
        add("scale", &Loader::scale);
        add("track", static_cast<void (Loader::*)(unsigned)>(&Loader::track));
        add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
+       add("track_technique", &Catalogue::track_technique);
        add("vehicle", static_cast<void (Loader::*)(unsigned)>(&Loader::vehicle));
        add("vehicle", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::vehicle));
 }
@@ -95,8 +76,8 @@ void Catalogue::Loader::gauge(float g)
 {
        obj.gauge = g/1000;
        obj.path_profile = Profile();
-       obj.path_profile.append_point(Point(0.1*obj.gauge, 0));
-       obj.path_profile.append_point(Point(-0.1*obj.gauge, 0));
+       obj.path_profile.append_vertex(Vector(0.1*obj.gauge, 0), false);
+       obj.path_profile.append_vertex(Vector(-0.1*obj.gauge, 0), false);
 }
 
 void Catalogue::Loader::layout()
@@ -122,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);
@@ -137,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);