From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sun, 1 Feb 2015 09:54:45 +0000 (+0100)
Subject: countries: note reservation status in descriptions
X-Git-Tag: v1.6~38
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/f03fe76fee9df1d6261f2306acc9fd9da0759e2c

countries: note reservation status in descriptions
---

diff --git a/tools/mkcountries-geonames b/tools/mkcountries-geonames
index f5a1cf1..5b196f0 100755
--- a/tools/mkcountries-geonames
+++ b/tools/mkcountries-geonames
@@ -5,49 +5,49 @@ use warnings;
 my %cc;  # map of country code to info array
 %cc = (
 	# exceptional reservations
-	ac => ["Ascension Island", "c-oc Xr", undef, 'sh'],
-	cp => ["Clipperton Island", "c-na Xr"],
-	dg => ["Diego Garcia", "c-as Xr", undef, 'io'],
-	ea => ["Ceuta and Melilla", "c-af Xr"],
-	eu => ["European Union", "c-eu Xr"],
-	fx => ["Metropolitan France", "c-eu Xr", undef, 'fr'],
-	ic => ["Canary Islands", "c-af Xr"],
-	su => ["former USSR", "c-eu Xr"],
-	ta => ["Tristan da Cunha", "c-oc Xr", undef, 'sh'],
-	uk => ["(United Kingdom)", "c-eu Xr", undef, 'gb'],
+	ac => ["exceptionally reserved: Ascension Island", "c-oc Xr", "Ascension Island", 'sh'],
+	cp => ["exceptionally reserved: Clipperton Island", "c-na Xr", "Clipperton Island"],
+	dg => ["exceptionally reserved: Diego Garcia", "c-as Xr", "Diego Garcia", 'io'],
+	ea => ["exceptionally reserved: Ceuta and Melilla", "c-af Xr", "Ceuta and Melilla"],
+	eu => ["exceptionally reserved: European Union", "c-eu Xr", "European Union"],
+	fx => ["exceptionally reserved: Metropolitan France", "c-eu Xr", "Metropolitan France", 'fr'],
+	ic => ["exceptionally reserved: Canary Islands", "c-af Xr", "Canary Islands"],
+	su => ["exceptionally reserved: former USSR", "c-eu Xr", "USSR"],
+	ta => ["exceptionally reserved: Tristan da Cunha", "c-oc Xr", "Tristan da Cunha", 'sh'],
+	uk => ["exceptionally reserved: United Kingdom", "c-eu Xr", "(United Kingdom)", 'gb'],
 
 	# indeterminate reservations
-	dy => ["(Benin)", "c-af Xr", undef, 'bj'],
-	ew => ["(Estonia)", "c-eu Xr", undef, 'ee'],
-	fl => ["(Liechtenstein)", "c-eu Xr", undef, 'li'],
-	ja => ["(Jamaica)", "c-na Xr", undef, 'jm'],
-	lf => ["Libya Fezzan", "c-af Xr", "Fezzan", 'ly'],
-	pi => ["(Philippines)", "c-as Xr", undef, 'ph'],
-	ra => ["(Argentina)", "c-sa Xr", undef, 'ar'],
-	rb => ["(Botswana, Bolivia)", "c-sa Xr", "(Bots...)"],
-	rc => ["(RoC)", "c-as Xr", undef, 'tw'],
-	rh => ["(Haiti)", "c-na Xr",undef, 'ht'],
-	ri => ["(Indonesia)", "c-as Xr", undef, 'id'],
-	rl => ["(Lebanon)", "c-as Xr", undef, 'lb'],
-	rm => ["(Madagascar)", "c-af Xr", undef, 'mg'],
-	rn => ["(Niger)", "c-af Xr",undef, 'ne'],
-	rp => ["(Philippines)", "c-as Xr", undef, 'ph'],
-	wg => ["(Grenada)", "c-na Xr", undef, 'gd'],
-	wl => ["(Saint Lucia)", "c-na Xr", "(Saint Luc.)", 'lc'],
-	wv => ["(Saint Vincent)", "c-na Xr", "(Saint Vin.)", 'vc'],
-	yv => ["(Venezuela)", "c-sa Xr", undef, 've'],
+	dy => ["indeterminately reserved: Benin", "c-af Xr", "(Benin)", 'bj'],
+	ew => ["indeterminately reserved: Estonia", "c-eu Xr", "(Estonia)", 'ee'],
+	fl => ["indeterminately reserved: Liechtenstein", "c-eu Xr", "(Liechtenstein)", 'li'],
+	ja => ["indeterminately reserved: Jamaica", "c-na Xr", "(Jamaica)", 'jm'],
+	lf => ["indeterminately reserved: Libya Fezzan", "c-af Xr", "Fezzan", 'ly'],
+	pi => ["indeterminately reserved: Philippines", "c-as Xr", "(Philippines)", 'ph'],
+	ra => ["indeterminately reserved: Argentina", "c-sa Xr", "(Argentina)", 'ar'],
+	rb => ["indeterminately reserved: Botswana, Bolivia", "c-sa Xr", "(Bots...)"],
+	rc => ["indeterminately reserved: Republic of China", "c-as Xr", "(RoC)", 'tw'],
+	rh => ["indeterminately reserved: Haiti", "c-na Xr", "(Haiti)", 'ht'],
+	ri => ["indeterminately reserved: Indonesia", "c-as Xr", "(Indonesia)", 'id'],
+	rl => ["indeterminately reserved: Lebanon", "c-as Xr", "(Lebanon)", 'lb'],
+	rm => ["indeterminately reserved: Madagascar", "c-af Xr", "(Madagascar)", 'mg'],
+	rn => ["indeterminately reserved: Niger", "c-af Xr", "(Niger)", 'ne'],
+	rp => ["indeterminately reserved: Philippines", "c-as Xr", "(Philippines)", 'ph'],
+	wg => ["indeterminately reserved: Grenada", "c-na Xr", "(Grenada)", 'gd'],
+	wl => ["indeterminately reserved: Saint Lucia", "c-na Xr", "(Saint Luc.)", 'lc'],
+	wv => ["indeterminately reserved: Saint Vincent", "c-na Xr", "(Saint Vin.)", 'vc'],
+	yv => ["indeterminately reserved: Venezuela", "c-sa Xr", "(Venezuela)", 've'],
 
 	# WIPO, agreed not to use
-	ap => ["African Regional Industrial Property Organization", "Xi", "ARIPO"], # c-af
-	bx => ["Benelux Office for Intellectual Property", "Xi", "BOIP"], # c-eu
-	ef => ["European Community Patent Convention", "Xi", "CPC"], # c-eu
-	em => ["European Trademark Office", "Xi", "OHIM"], # c-eu
-	ep => ["European Patent Organization", "Xi", "EPOrg"], # c-eu
-	ev => ["Eurasian Patent Organization", "Xi", "EAPO"], # c-as
-	gc => ["Gulf Patent Office", "Xi", "GCCPO"], # c-as
-	ib => ["International Bureau of WIPO", "Xi", "IB WIPO"],
-	oa => ["African Intellectual Property Organization", "Xi", "OAPI"], # c-af
-	wo => ["World Intellectual Property Organization", "Xi", "WIPO"],
+	ap => ["not used: African Regional Industrial Property Organization", "Xi", "ARIPO"], # c-af
+	bx => ["not used: Benelux Office for Intellectual Property", "Xi", "BOIP"], # c-eu
+	ef => ["not used: European Community Patent Convention", "Xi", "CPC"], # c-eu
+	em => ["not used: European Trademark Office", "Xi", "OHIM"], # c-eu
+	ep => ["not used: European Patent Organization", "Xi", "EPOrg"], # c-eu
+	ev => ["not used: Eurasian Patent Organization", "Xi", "EAPO"], # c-as
+	gc => ["not used: Gulf Patent Office", "Xi", "GCCPO"], # c-as
+	ib => ["not used: International Bureau of WIPO", "Xi", "IB"],
+	oa => ["not used: African Intellectual Property Organization", "Xi", "OAPI"], # c-af
+	wo => ["not used: World Intellectual Property Organization", "Xi", "WIPO"],
 );
 
 while (<>) {