From 9572f7d1ef8861d4e05ab7f3dcbdd312a775b347 Mon Sep 17 00:00:00 2001
From: Lilian Gasser <gasserli@ethz.ch>
Date: Wed, 30 Jan 2019 15:26:21 +0100
Subject: [PATCH] add CantonAbbreviation to MPs additional Info

---
 data/politicians/MPs_additionalInfo.csv | 82 +++++++++++++++----------
 src/python/extractMPs.py                |  2 +-
 2 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/data/politicians/MPs_additionalInfo.csv b/data/politicians/MPs_additionalInfo.csv
index 4e055601..83d56daf 100644
--- a/data/politicians/MPs_additionalInfo.csv
+++ b/data/politicians/MPs_additionalInfo.csv
@@ -1,34 +1,48 @@
-LastName,FirstName,DoubleName,Additional
-Cramer,Konrad H.,Cramer-Frey,Frey
-Blumer,Johannes,Blumer-Egloff,Egloff
-Jordan,Adolphe,Jordan-Martin,Martin
-Schmid,Jakob,Schmid-Ronca,Ronca
-Sulzer,Eduard,Sulzer-Ziegler,Ziegler
-Eugster,Howard,Eugster-Züst,Züst
-Bratschi,Peter,,Matten
-Jenny,Johann,,Worblaufen
-Seiler,Hermann,,Zermatt
-Steiner,Ferdinand,,Malters
-Naine,Charles-Théophile,,Préverenges
-Fischer,Hanspeter,,Weinfelden
-Hofer,Walther,,Flawil
-Weber,Rolf,,Arbon
-Zweifel,Esaja,,Landammann
-Zweifel,Peter,,Regierungsrath
-Bühler,Peter Theophil,,Bünden
-Welti,Franz,,Basel
-Schmid,Arthur,,Oberentfelden
-Schmid,Jacques,,Olten
-Müller,Alfred,,Amriswil
-Müller,Hans Gottfried,,Aarberg
-Müller,Alban,,Olten
-Perrin,Tell,,Chaux
-Perrin,Paul,,Corcelles
-Schmid-Ruedin,Philipp,,Philip
-Studer,Ernst,,Burgdorf
-Meier,Christian,,Netstal
-Kunz,Alois,,Hergiswil
-Cottier,Henry,,Lausanne
-Bringolf,Walther,,Schaff
-Bringolf,Richard,,Peilz
-Roth,August,,Frauenfeld
+LastName,FirstName,CantonAbbreviation,Additional
+Cramer,Konrad H.,ZH,Frey
+Blumer,Johannes,SG,Egloff
+Jordan,Adolphe,VD,Martin
+Schmid,Jakob,LU,Ronca
+Sulzer,Eduard,ZH,Ziegler
+Eugster,Howard,AR,Züst
+Bratschi,Peter,BE,Matten
+Jenny,Johann,BE,Worblaufen
+Seiler,Hermann,VS,Zermatt
+Steiner,Ferdinand,LU,Malters
+Naine,Charles-Théophile,VD,Préverenges
+Naine,Charles-Théophile,NE,Préverenges
+Fischer,Hanspeter,TG,Weinfelden
+Hofer,Walther,BE,Flawil
+Weber,Rolf,TG,Arbon
+Zweifel,Esaja,GL,Landammann
+Zweifel,Peter,GL,Regierungsrath
+Bühler,Peter Theophil,GR,Bünden
+Welti,Franz,BS,Basel
+Schmid,Arthur,AG,Oberentfelden
+Schmid,Jacques,SO,Olten
+Müller,Alfred,TG,Amriswil
+Müller,Hans Gottfried,BE,Aarberg
+Müller,Alban,SO,Olten
+Perrin,Tell,NE,Chaux
+Perrin,Paul,VD,Corcelles
+Schmid-Ruedin,Philipp,ZH,Philip
+Studer,Ernst,BE,Burgdorf
+Meier,Christian,GL,Netstal
+Kunz,Alois,LU,Hergiswil
+Cottier,Henry,VD,Lausanne
+Bringolf,Walther,SH,Schaff
+Bringolf,Richard,VD,Peilz
+Roth,August,TG,Frauenfeld
+Bossi,Bixio,TI,Lugano
+Bossi,Johann,GR,Chur,GR
+Müller,Hans,BE,Grosshöchstetten
+Roth,Hans,BE,Interlaken
+Bühler,Rolf Theodor,SG,Uzwil
+Pfister,Bruno,SG,Gallen
+Roth,August,TG,Arbon
+Rusca,Giovan-Battista,TI,Locarno
+Moser,Arthur,SH,Schaff
+Weber,Jakob Rudolf,BE,Grasswil
+Weber,Heinrich Otto,SG,Gallen
+Sigg,Jean-C.,GE,Genève
+Suter,Johannes,BL,Baselland
diff --git a/src/python/extractMPs.py b/src/python/extractMPs.py
index a84bc8e4..a246a3ef 100644
--- a/src/python/extractMPs.py
+++ b/src/python/extractMPs.py
@@ -186,7 +186,7 @@ class MPs_Extractor(object):
         # some people need additional information such as a place or a second last name to be uniquely identified
         df_addInfo = pd.read_csv(self.input_file_addInfo)
         for row in df_addInfo.itertuples(index=False, name='Pandas'):
-            _df_after1890.loc[(_df_after1890['LastName'] == row[0]) & (_df_after1890['FirstName'] == row[1]), 'additionalInfo'] = row[3]
+            _df_after1890.loc[(_df_after1890['LastName'] == row[0]) & (_df_after1890['FirstName'] == row[1]) & (_df_after1890['CantonAbbreviation'] == row[2]), 'additionalInfo'] = row[3]
 
         # write dataframe to csv
         _df_after1890.to_csv(self.output_file_csv)
-- 
GitLab