split middle east out of asia

openmundi · Feb 25, 2013 · e99780b · e99780b
1 parent fc4717e
commit e99780b
Show file tree

Hide file tree

Showing 14 changed files with 122 additions and 107 deletions.
diff --git a/asia/1_codes/fifa.yml b/asia/1_codes/fifa.yml
@@ -5,33 +5,19 @@
 
 af: AFG           # Afghanistan
 az: AZE           # Azerbaijan
-bh: BHR           # Bahrain
 bt: BHU           # Bhutan
 bn: BRU           # Brunei
 kh: CAM           # Cambodia
-ir: IRN           # Iran
-iq: IRQ           # Iraq
-jo: JOR           # Jordan
-kw: KUW           # Kuwait
 kg: KGZ           # Kyrgyzstan
 la: LAO           # Laos
-lb: LIB           # Lebanon
 mv: MDV           # Maldives
 mn: MGL           # Mongolia
 mm: MYA           # Myanmar
-om: OMA           # Oman
-qa: QAT           # Qatar
-sy: SYR           # Syria
 tj: TJK           # Tajikistan
 tl: TLS           # Timor-Leste [East Timor]
 tm: TKM           # Turkmenistan
-ae: UAE           # United Arab Emirates
 uz: UZB           # Uzbekistan
-ye: YEM           # Yemen
 kz: KAZ           # Kazakhstan
-sa: KSA           # Saudi Arabia
-il: ISR           # Israel
-ps: PLE           # Palestine
 ge: GEO           # Georgia
 am: ARM           # Armenia
 jp: JPN           # Japan

diff --git a/asia/1_codes/internet.yml b/asia/1_codes/internet.yml
@@ -3,33 +3,19 @@
 
 af: af           # Afghanistan
 az: az           # Azerbaijan
-bh: bh           # Bahrain
 bt: bt           # Bhutan
 bn: bn           # Brunei
 kh: kh           # Cambodia
-ir: ir           # Iran
-iq: iq           # Iraq
-jo: jo           # Jordan
-kw: kw           # Kuwait
 kg: kg           # Kyrgyzstan
 la: la           # Laos
-lb: lb           # Lebanon
 mv: mv           # Maldives
 mn: mn           # Mongolia
 mm: mm           # Myanmar
-om: om           # Oman
-qa: qa           # Qatar
-sy: sy           # Syria
 tj: tj           # Tajikistan
 tl: tl           # Timor-Leste [East Timor]
 tm: tm           # Turkmenistan
-ae: ae           # United Arab Emirates
 uz: uz           # Uzbekistan
-ye: ye           # Yemen
 kz: kz           # Kazakhstan
-sa: sa           # Saudi Arabia
-il: il           # Israel
-ps: ps           # Palestine
 ge: ge           # Georgia
 am: am           # Armenia
 jp: jp           # Japan

diff --git a/asia/1_codes/iso3.yml b/asia/1_codes/iso3.yml
@@ -3,33 +3,20 @@
 
 af: AFG           # Afghanistan
 az: AZE           # Azerbaijan
-bh: BHR           # Bahrain
 bt: BTN           # Bhutan
 bn: BRN           # Brunei
 kh: KHM           # Cambodia
-ir: IRN           # Iran
-iq: IRQ           # Iraq
-jo: JOR           # Jordan
-kw: KWT           # Kuwait
 kg: KGZ           # Kyrgyzstan
 la: LAO           # Laos
 lb: LBN           # Lebanon
 mv: MDV           # Maldives
 mn: MNG           # Mongolia
 mm: MMR           # Myanmar
-om: OMN           # Oman
-qa: QAT           # Qatar
-sy: SYR           # Syria
 tj: TJK           # Tajikistan
 tl: TLS           # Timor-Leste [East Timor]
 tm: TKM           # Turkmenistan
-ae: ARE           # United Arab Emirates
 uz: UZB           # Uzbekistan
-ye: YEM           # Yemen
 kz: KAZ           # Kazakhstan
-sa: SAU           # Saudi Arabia
-il: ISR           # Israel
-ps: PSE           # Palestine
 ge: GEO           # Georgia
 am: ARM           # Armenia
 jp: JPN           # Japan

diff --git a/asia/3_more/en.wikipedia.yml b/asia/3_more/en.wikipedia.yml
@@ -1,26 +1,16 @@
 
 ## map to wikipedia country page
 ##  e.g.
-##  en.wikipedia.org/wiki/Qatar
+##  en.wikipedia.org/wiki/Mongolia
 
 
-ir: Iran
-iq: Iraq
-jo: Jordan
-kw: Kuwait
 kg: Kyrgyzstan
 la: Laos
-lb: Lebanon
 mv: Maldives
 mn: Mongolia
 mm: Burma
-om: Oman
-qa: Qatar
-sy: Syria
 tj: Tajikistan
 tl: East_Timor
 tm: Turkmenistan
-ae: United_Arab_Emirates
 uz: Uzbekistan
-ye: Yemen
 
diff --git a/asia/3_more/lang.yml b/asia/3_more/lang.yml
@@ -1,44 +1,32 @@
 ### official language mapping
 ##  country code:  language codes
 
-ae: ar
 af: fa,ps
 am: hy
 az: az
 bd: bn
-bh: ar
 bn: ms
 cn: zh
 ge: ka
 hk: zh,en
 id: id
-il: he
 in: hi,en
-iq: ar,ku
-ir: fa
-jo: ar
 jp: ja
 kg: ky,ru
 kh: km
 kp: ko
 kr: ko,en
-kw: ar
 kz: kk,ru
 la: lo
-lb: ar,fr
 lk: si,ta
 lr: en
 mm: my
 mn: mn
 mv: dv
 my: ms
 np: ne
-om: ar
 ph: en,tl
 pk: en,ur
-ps: ar,he
-qa: ar
-sa: ar
 sg: en,ms,zh,ta
 th: th
 tj: tg,ru
@@ -47,9 +35,3 @@ tm: tk
 tw: zh
 uz: uz # kaa
 vn: vi
-ye: ar
-
-
-
-
-
diff --git a/asia/3_more/template.yml b/asia/3_more/template.yml
@@ -1,35 +1,21 @@
 ####################
-## asia
+# asia
 
 af:            # Afghanistan
 az:            # Azerbaijan
-bh:            # Bahrain
 bt:            # Bhutan
 bn:            # Brunei
 kh:            # Cambodia
-ir:            # Iran
-iq:            # Iraq
-jo:            # Jordan
-kw:            # Kuwait
 kg:            # Kyrgyzstan
 la:            # Laos
-lb:            # Lebanon
 mv:            # Maldives
 mn:            # Mongolia
 mm:            # Myanmar
-om:            # Oman
-qa:            # Qatar
-sy:            # Syria
 tj:            # Tajikistan
 tl:            # Timor-Leste [East Timor]
 tm:            # Turkmenistan
-ae:            # United Arab Emirates
 uz:            # Uzbekistan
-ye:            # Yemen
 kz:            # Kazakhstan
-sa:            # Saudi Arabia
-il:            # Israel
-ps:            # Palestine
 ge:            # Georgia
 am:            # Armenia
 jp:            # Japan

diff --git a/asia/countries.txt b/asia/countries.txt
@@ -33,30 +33,10 @@
 ##
 ##  middle east; see -> http://en.wikipedia.org/wiki/Middle_East
 
-### arabian peninsula
 
-bh, Bahrain, BHR,      765,      1_234_571,     Manama,  un|fifa|middle_east|western_asia|arabian peninsula|microstate
-kw, Kuwait, KUW,      17_820,  3_566_437,  Kuwait City, un|fifa|middle_east|western_asia|arabian peninsula
-om, Oman, OMA,  309_501,   2_773_479,    Muscat,  un|fifa|middle_east|western_asia|arabian peninsula
-qa, Qatar, QAT, 11_571,  1_853_563,    Doha,  un|fifa|middle_east|western_asia|arabian peninsula
-sa, Saudi Arabia, KSA,  1_960_582,  27_136_977,  un|fifa|middle_east|western_asia|arabian peninsula|g20
-ae, United Arab Emirates, UAE, 83_600,  8_264_070,    Abu Dhabi,  un|fifa|middle_east|western_asia|arabian peninsula
-ye, Yemen, YEM, 527_829,   25_130_000,      Sana'a,  un|fifa|middle_east|western_asia|arabian peninsula
-
-
-## fertile crescent
-
-iq, Iraq,   IRQ,   438_317,  31_129_225,  Baghdad,  un|fifa|middle_east|western_asia|fertile crescent
-il, Israel, ISR,           20_770,   7_653_600,  un|fifa|middle_east|western_asia|fertile crescent
-jo, Jordan, JOR,    89_342,   6_508_271,  Amman, un|fifa|middle_east|western_asia|fertile crescent
-lb, Lebanon, LIB, 10_452,  4_224_000,    Beirut,  un|fifa|middle_east|western_asia|fertile crescent
-ps, Palestine, PLE,         6_220,   4_260_636,  fifa|middle_east|western_asia|fertile crescent
-sy, Syria, SYR,  185_180,  22_530_746,   Damascus,  un|fifa|middle_east|western_asia|fertile crescent
-
-### iranian Plateau
-
-ir, Iran,   IRN, 1_648_195,  75_149_669,  Tehran, un|fifa|middle_east|western_asia
 
+######
+# fix: move to europe/countries.txt
 
 ##  south caucasus
 ## - add to middle east?

diff --git a/middle-east/1_codes/fifa.yml b/middle-east/1_codes/fifa.yml
@@ -0,0 +1,18 @@
+
+bh: BHR           # Bahrain
+ir: IRN           # Iran
+iq: IRQ           # Iraq
+jo: JOR           # Jordan
+lb: LIB           # Lebanon
+kw: KUW           # Kuwait
+om: OMA           # Oman
+qa: QAT           # Qatar
+sy: SYR           # Syria
+ae: UAE           # United Arab Emirates
+ye: YEM           # Yemen
+sa: KSA           # Saudi Arabia
+il: ISR           # Israel
+ps: PLE           # Palestine
+
+
+
diff --git a/middle-east/1_codes/internet.yml b/middle-east/1_codes/internet.yml
@@ -0,0 +1,18 @@
+
+bh: bh           # Bahrain
+ir: ir           # Iran
+iq: iq           # Iraq
+jo: jo           # Jordan
+kw: kw           # Kuwait
+lb: lb           # Lebanon
+om: om           # Oman
+qa: qa           # Qatar
+sy: sy           # Syria
+ae: ae           # United Arab Emirates
+ye: ye           # Yemen
+sa: sa           # Saudi Arabia
+il: il           # Israel
+ps: ps           # Palestine
+
+
+
diff --git a/middle-east/1_codes/iso3.yml b/middle-east/1_codes/iso3.yml
@@ -0,0 +1,15 @@
+
+bh: BHR           # Bahrain
+ir: IRN           # Iran
+iq: IRQ           # Iraq
+jo: JOR           # Jordan
+kw: KWT           # Kuwait
+om: OMN           # Oman
+qa: QAT           # Qatar
+sy: SYR           # Syria
+ae: ARE           # United Arab Emirates
+ye: YEM           # Yemen
+sa: SAU           # Saudi Arabia
+il: ISR           # Israel
+ps: PSE           # Palestine
+
diff --git a/middle-east/3_more/en.wikipedia.yml b/middle-east/3_more/en.wikipedia.yml
@@ -0,0 +1,12 @@
+
+ir: Iran
+iq: Iraq
+jo: Jordan
+kw: Kuwait
+lb: Lebanon
+om: Oman
+qa: Qatar
+sy: Syria
+ae: United_Arab_Emirates
+ye: Yemen
+
diff --git a/middle-east/3_more/lang.yml b/middle-east/3_more/lang.yml
@@ -0,0 +1,14 @@
+
+bh: ar
+ir: fa
+iq: ar,ku
+jo: ar
+kw: ar
+lb: ar,fr
+om: ar
+qa: ar
+ae: ar
+ye: ar
+sa: ar
+il: he
+ps: ar,he
diff --git a/middle-east/3_more/template.yml b/middle-east/3_more/template.yml
@@ -0,0 +1,17 @@
+
+bh:            # Bahrain
+ir:            # Iran
+iq:            # Iraq
+jo:            # Jordan
+kw:            # Kuwait
+lb:            # Lebanon
+om:            # Oman
+qa:            # Qatar
+sy:            # Syria
+ae:            # United Arab Emirates
+ye:            # Yemen
+sa:            # Saudi Arabia
+il:            # Israel
+ps:            # Palestine
+
+
diff --git a/middle-east/countries.txt b/middle-east/countries.txt
@@ -0,0 +1,24 @@
+
+### arabian peninsula
+
+bh, Bahrain, BHR,      765,      1_234_571,     Manama,  un|fifa|middle_east|western_asia|arabian peninsula|microstate
+kw, Kuwait, KUW,      17_820,  3_566_437,  Kuwait City, un|fifa|middle_east|western_asia|arabian peninsula
+om, Oman, OMA,  309_501,   2_773_479,    Muscat,  un|fifa|middle_east|western_asia|arabian peninsula
+qa, Qatar, QAT, 11_571,  1_853_563,    Doha,  un|fifa|middle_east|western_asia|arabian peninsula
+sa, Saudi Arabia, KSA,  1_960_582,  27_136_977,  un|fifa|middle_east|western_asia|arabian peninsula|g20
+ae, United Arab Emirates, UAE, 83_600,  8_264_070,    Abu Dhabi,  un|fifa|middle_east|western_asia|arabian peninsula
+ye, Yemen, YEM, 527_829,   25_130_000,      Sana'a,  un|fifa|middle_east|western_asia|arabian peninsula
+
+
+## fertile crescent
+
+iq, Iraq,   IRQ,   438_317,  31_129_225,  Baghdad,  un|fifa|middle_east|western_asia|fertile crescent
+il, Israel, ISR,           20_770,   7_653_600,  un|fifa|middle_east|western_asia|fertile crescent
+jo, Jordan, JOR,    89_342,   6_508_271,  Amman, un|fifa|middle_east|western_asia|fertile crescent
+lb, Lebanon, LIB, 10_452,  4_224_000,    Beirut,  un|fifa|middle_east|western_asia|fertile crescent
+ps, Palestine, PLE,         6_220,   4_260_636,  fifa|middle_east|western_asia|fertile crescent
+sy, Syria, SYR,  185_180,  22_530_746,   Damascus,  un|fifa|middle_east|western_asia|fertile crescent
+
+### iranian Plateau
+
+ir, Iran,   IRN, 1_648_195,  75_149_669,  Tehran, un|fifa|middle_east|western_asia