worlddb 0.6.4 → 0.6.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5,6 +5,7 @@ Rakefile
5
5
  bin/worlddb
6
6
  db/africa/countries.txt
7
7
  db/africa/de.countries.yml
8
+ db/africa/en.wikipedia.yml
8
9
  db/america/br/cities.txt
9
10
  db/america/br/regions.txt
10
11
  db/america/ca/cities.txt
@@ -12,6 +13,7 @@ db/america/ca/regions.txt
12
13
  db/america/countries.motor.yml
13
14
  db/america/countries.txt
14
15
  db/america/de.countries.yml
16
+ db/america/en.wikipedia.yml
15
17
  db/america/es.countries.yml
16
18
  db/america/mx/cities.txt
17
19
  db/america/mx/regions.txt
@@ -21,6 +23,7 @@ db/america/ve/cities.txt
21
23
  db/america/ve/regions.txt
22
24
  db/asia/countries.txt
23
25
  db/asia/de.countries.yml
26
+ db/asia/en.wikipedia.yml
24
27
  db/asia/jp/cities.txt
25
28
  db/europe/at/cities.txt
26
29
  db/europe/at/regions.txt
@@ -38,6 +41,7 @@ db/europe/de/cities.txt
38
41
  db/europe/de/regions.txt
39
42
  db/europe/dk/cities.txt
40
43
  db/europe/ee/cities.txt
44
+ db/europe/en.wikipedia.yml
41
45
  db/europe/en/cities.txt
42
46
  db/europe/en/regions.txt
43
47
  db/europe/es.countries.yml
@@ -68,6 +72,7 @@ db/europe/wa/cities.txt
68
72
  db/oceania/au/cities.txt
69
73
  db/oceania/countries.txt
70
74
  db/oceania/de.countries.yml
75
+ db/oceania/en.wikipedia.yml
71
76
  db/tags.yml
72
77
  lib/worlddb.rb
73
78
  lib/worlddb/cli/opts.rb
@@ -12,28 +12,89 @@
12
12
  # - Southern Africa
13
13
 
14
14
 
15
+ ao, Angola, ANG, 1_246_700, 18_498_000, Luanda, un|fifa
16
+ bj, Benin, BEN, 112_622, 9_598_787, Porto-Novo, un|fifa
17
+ bw, Botswana, BOT, 581_730, 2_029_307, Gaborone, un|fifa
18
+ bf, Burkina Faso, BFA, 274_200, 15_730_977, Ouagadougou, un|fifa
19
+ bi, Burundi, BDI, 27_834, 8_749_000, Bujumbura, un|fifa
20
+ cv, Cape Verde, CPV, 4_033, 567_000, Praia, un|fifa
21
+ cf, Central African Republic, CTA, 622_984, 4_422_000, Bangui, un|fifa
22
+ td, Chad, CHA, 1_284_000, 10_329_208, N'Djamena, un|fifa
23
+ km, Comoros, COM, 2_235, 798_000, Moroni, un|fifa
24
+ cg, Congo, CGO, 342_000, 4_366_266, Brazzaville, un|fifa
25
+ cd, Congo DR, COD, 2_345_409, 71_712_867, Kinshasa, un|fifa
26
+ dj, Djibouti, DJI, 23_200, 923_000, Djibouti, un|fifa
27
+ gq, Equatorial Guinea, EQG, 28_050, 676_000, Malabo, un|fifa
28
+ er, Eritrea, ERI, 117_600, 6_086_495, Asmara, un|fifa
29
+ et, Ethiopia, ETH, 1_104_300, 84_320_987, un|fifa
30
+ ga, Gabon, GAB, 267_667, 1_475_000, un|fifa
31
+ gm, Gambia, GAM, 11_295, 1_782_893, un|fifa
32
+ gn, Guinea, GUI, 245_857, 10_057_975, Conakry, un|fifa
33
+ gw, Guinea-Bissau, GNB, 36_125, 1_647_000, Bissau, un|fifa
34
+ ke, Kenya, KEN, 580_367, 43_013_341, Nairobi, un|fifa
35
+
36
+ ls, Lesotho, LES, 30_355, 2_067_000, Maseru, un|fifa
37
+ lr, Liberia, LBR, 111_369, 3_786_764, Monrovia, un|fifa
38
+
39
+ mg, Madagascar, MAD, 587_041, 22_005_222, Antananarivo, un|fifa
40
+ mw, Malawi, MWI, 118_484, 14_901_000, Lilongwe, un|fifa
41
+ ml, Mali, MLI, 1_240_192, 14_517_176, Bamako, un|fifa
42
+
43
+ mr, Mauritania, MTN, 1_030_700, 3_359_185, un|fifa
44
+ mu, Mauritius, MRI, 2_040, 1_291_456, un|fifa
45
+
46
+ mz, Mozambique, MOZ, 801_590, 22_894_000, Maputo, un|fifa
47
+
48
+ na, Namibia, NAM, 825_418, 2_100_000, Windhoek, un|fifa
49
+
50
+ ne, Niger, NIG, 1_267_000, 16_274_738, Niamey, un|fifa
51
+
52
+ rw, Rwanda, RWA, 26_338, 11_689_696, Kigali, un|fifa
53
+
54
+ st, São Tomé and Príncipe, STP, 1_001, 183_176, São Tomé, un|fifa
55
+
56
+ sn, Senegal, SEN, 196_723, 12_855_153, Dakar, un|fifa
57
+ sc, Seychelles, SEY, 451, 84_000, Victoria, un|fifa
58
+ sl, Sierra Leone, SLE, 71_740, 5_485_998, Freetown, un|fifa
59
+
60
+ so, Somalia, SOM, 637_657, 10_085_638, Mogadishu, un|fifa
61
+ ss, South Sudan, SSD, 619_745, 8_260_490, Juba, un|fifa
62
+ sd, Sudan, SDN, 1_886_068, 30_894_000, Khartoum, un|fifa
63
+
64
+ sz, Swaziland, SWZ, 17_364, 1_185_000, Lobamba, un|fifa
65
+
66
+ tg, Togo, TOG, 56_785, 6_619_000, Lomé, un|fifa
67
+
68
+ ug, Uganda, UGA, 236_040, 35_873_253, Kampala, un|fifa
69
+
70
+ tz, Tanzania, TAN, 945_203, 43_188_000, Dodoma, un|fifa
71
+
72
+ zm, Zambia, ZAM, 752_618, 14_309_466, Lusaka, un|fifa
73
+ zw, Zimbabwe, ZIM, 390_757, 12_619_600, Harare, un|fifa
74
+
75
+
15
76
  ###############
16
77
  ## Northern Africa
17
78
  ##
18
79
 
19
- dz, Algeria, ALG, 2_381_740, 34_178_188, ar|northern africa
20
- eg, Egypt, EGY, 1_001_450, 82_868_000, ar|northern africa
21
- ma, Morocco, MAR, 446_550, 34_859_364, ar|northern africa
22
- ly, Libya, LBY, 1_759_540, 6_310_434, ar|northern africa
23
- tn, Tunisia, TUN, 163_610, 10_486_339, ar|northern africa
80
+ dz, Algeria, ALG, 2_381_740, 34_178_188, un|fifa|ar|northern africa
81
+ eg, Egypt, EGY, 1_001_450, 82_868_000, un|fifa|ar|northern africa
82
+ ma, Morocco, MAR, 446_550, 34_859_364, un|fifa|ar|northern africa
83
+ ly, Libya, LBY, 1_759_540, 6_310_434, un|fifa|ar|northern africa
84
+ tn, Tunisia, TUN, 163_610, 10_486_339, un|fifa|ar|northern africa
24
85
 
25
86
 
26
87
  #######
27
88
  ### More
28
89
 
29
- ci, Côte d'Ivoire, CIV, 322_460, 20_617_068, western africa
30
- gh, Ghana, GHA, 239_460, 23_832_495, western africa
31
- ng, Nigeria, NGA, 923_768, 166_629_000, western africa
90
+ ci, Côte d'Ivoire, CIV, 322_460, 20_617_068, un|fifa|western africa
91
+ gh, Ghana, GHA, 239_460, 23_832_495, un|fifa|western africa
92
+ ng, Nigeria, NGA, 923_768, 166_629_000, un|fifa|western africa
32
93
 
33
- cm, Cameroon, CMR, 475_440, 18_879_301, central africa
94
+ cm, Cameroon, CMR, 475_440, 18_879_301, un|fifa|central africa
34
95
 
35
96
 
36
97
  ################
37
98
  ## Southern Africa
38
99
 
39
- za, South Africa, RSA, 1_219_912, 51_770_560, southern africa|g5|g20
100
+ za, South Africa, RSA, 1_219_912, 51_770_560, un|fifa|southern africa|g5|g20
@@ -0,0 +1,30 @@
1
+ #####
2
+ ## e.g. en.wikipedia.org/wiki/Guinea etc.
3
+
4
+ gn: Guinea
5
+ gw: Guinea-Bissau
6
+ ke: Kenya
7
+ ls: Lesotho
8
+ lr: Liberia
9
+ mg: Madagascar
10
+ mw: Malawi
11
+ ml: Mali
12
+ mr: Mauritania
13
+ mu: Mauritius
14
+ mz: Mozambique
15
+ na: Namibia
16
+ ne: Niger
17
+ rw: Rwanda
18
+ st: São_Tomé_and_Príncipe
19
+ sn: Senegal
20
+ sc: Seychelles
21
+ sl: Sierra_Leone
22
+ so: Somalia
23
+ ss: South_Sudan
24
+ sd: Sudan
25
+ sz: Swaziland
26
+ tg: Togo
27
+ ug: Uganda
28
+ tz: Tanzania
29
+ zm: Zambia
30
+ zw: Zimbabwe
@@ -8,44 +8,58 @@
8
8
  ## South America
9
9
  ## extra Latin America
10
10
 
11
+
11
12
  #####################
12
13
  #### north america
13
14
 
14
15
  # area (in sq km), pop(ulation)
15
16
 
16
- ca, Canada, CAN, 9_984_670, 34_278_406, en|fr| north america|g8|g20
17
- us, United States, USA, 9_629_091, 314_167_157, en|es| north america|g8|g20
18
- mx, México [Mexico], MEX, 1_972_550, 112_322_757, es| north america|g5|g20
17
+ ca, Canada, CAN, 9_984_670, 34_278_406, en|fr| un|fifa|north america|g8|g20
18
+ us, United States, USA, 9_629_091, 314_167_157, en|es| un|fifa|north america|g8|g20
19
+ mx, México [Mexico], MEX, 1_972_550, 112_322_757, es| un|fifa|north america|g5|g20
19
20
 
20
21
  #####################
21
22
  ## central america & caribbean islands
22
23
 
23
- bz, Belize, BLZ, 22_966, 307_000, en|es|central_america
24
- gt, Guatemala, GUA, 108_889, 14_027_000, es|central_america
25
- cr, Costa Rica, CRC, 51_100, 4_579_000, es|central_america
26
- hn, Honduras, HON, 112_492, 7_466_000, es|central_america
27
- sv, El Salvador, SLV, 21_041, 6_163_000, es|central_america
28
- ni, Nicaragua, NCA, 130_373, 5_743_000, es|central_america
29
- pa, Panamá [Panama], PAN, 75_417, 3_454_000, es|central_america
24
+ bz, Belize, BLZ, 22_966, 307_000, un|fifa|en|es|central_america
25
+ gt, Guatemala, GUA, 108_889, 14_027_000, un|fifa|es|central_america
26
+ cr, Costa Rica, CRC, 51_100, 4_579_000, un|fifa|es|central_america
27
+ hn, Honduras, HON, 112_492, 7_466_000, un|fifa|es|central_america
28
+ sv, El Salvador, SLV, 21_041, 6_163_000, un|fifa|es|central_america
29
+ ni, Nicaragua, NCA, 130_373, 5_743_000, un|fifa|es|central_america
30
+ pa, Panamá [Panama], PAN, 75_417, 3_454_000, un|fifa|es|central_america
30
31
 
31
32
 
32
- cu, Cuba, CUB, 109_886, 11_204_000, es|caribbean
33
- jm, Jamaica, JAM, 10_991, 2_719_000, en|caribbean
33
+ cu, Cuba, CUB, 109_886, 11_204_000, un|fifa|es|caribbean
34
+ jm, Jamaica, JAM, 10_991, 2_719_000, un|fifa|en|caribbean
34
35
  pr, Puerto Rico, PUR, 8_870, 3_982_000, country:us, es|en|caribbean
35
- do, Dominican Republic, DOM, 48_671, 10_090_000, es|caribbean
36
+ do, Dominican Republic, DOM, 48_671, 10_090_000, un|fifa|es|caribbean
37
+ ht, Haiti, HAI, 27_750, 9_719_932, Port-au-Prince, un|fifa|caribbean
38
+
39
+ ag, Antigua and Barbuda, ATG, 440, 81_799, Saint John's, un|fifa|caribbean
40
+ bs, Bahamas, BAH, 13_878, 353_658, Nassau, un|fifa|caribbean
41
+ bb, Barbados, BRB, 431, 284_589, Bridgetown, un|fifa|caribbean
42
+ dm, Dominica, DMA, 750, 73_126, Roseau, un|fifa|caribbean
43
+ gd, Grenada, GRN, 344, 110_000, St. George's, un|fifa|caribbean
44
+ kn, Saint Kitts and Nevis, SKN, 261, 51_300, Basseterre, un|fifa|caribbean
45
+ lc, Saint Lucia, LCA, 617, 173_765, Castries, un|fifa|caribbean
46
+ vc, Saint Vincent and the Grenadines, VIN, 389, 120_000, Kingstown, un|fifa|caribbean
47
+ tt, Trinidad and Tobago, TRI, 5_131, 1_346_350, Port of Spain, un|fifa|caribbean
48
+
49
+
36
50
 
37
51
  ##############
38
52
  ## south america
39
-
40
- ar, Argentina, ARG, 2_780_400, 40_518_425, es| south america|g20
41
- bo, Bolivia, BOL, 1_098_581, 10_907_778, es|qu|ay| south america
42
- br, Brazil, BRA, 8_514_215, 192_380_000, pt| south america|g5|g20
43
- cl, Chile, CHI, 755_696, 16_763_470, south america|es
44
- co, Colombia, COL, 1_138_748, 46_413_791, south america|es
45
- ec, Ecuador, ECU, 258_238, 15_007_343, south america|es|qu
46
- gy, Guyana, GUY, 214_970, 752_940, south america|en
47
- pe, Peru, PER, 1_285_220, 29_546_963, south america|es
48
- sr, Suriname, SUR, 163_820, 492_829, south america|nl
49
- py, Paraguay, PAR, 406_752, 6_375_830, south america|es
50
- uy, Uruguay, URU, 176_215, 3_510_386, south america|es
51
- ve, Venezuela, VEN, 916_445, 28_833_845, south america|es
53
+
54
+ ar, Argentina, ARG, 2_780_400, 40_518_425, un|fifa|es| south america|g20
55
+ bo, Bolivia, BOL, 1_098_581, 10_907_778, un|fifa|es|qu|ay| south america
56
+ br, Brazil, BRA, 8_514_215, 192_380_000, un|fifa|pt| south america|g5|g20
57
+ cl, Chile, CHI, 755_696, 16_763_470, un|fifa|south america|es
58
+ co, Colombia, COL, 1_138_748, 46_413_791, un|fifa|south america|es
59
+ ec, Ecuador, ECU, 258_238, 15_007_343, un|fifa|south america|es|qu
60
+ gy, Guyana, GUY, 214_970, 752_940, un|fifa|south america|en
61
+ pe, Peru, PER, 1_285_220, 29_546_963, un|fifa|south america|es
62
+ sr, Suriname, SUR, 163_820, 492_829, un|fifa|south america|nl
63
+ py, Paraguay, PAR, 406_752, 6_375_830, un|fifa|south america|es
64
+ uy, Uruguay, URU, 176_215, 3_510_386, un|fifa|south america|es
65
+ ve, Venezuela, VEN, 916_445, 28_833_845, un|fifa|south america|es
@@ -0,0 +1,9 @@
1
+
2
+
3
+ gd: Grenada
4
+ ht: Haiti
5
+ kn: Saint_Kitts_and_Nevis
6
+ lc: Saint_Lucia
7
+ vc: Saint_Vincent_and_the_Grenadines
8
+ tt: Trinidad_and_Tobago
9
+
@@ -18,34 +18,79 @@
18
18
  # o South Caucasus
19
19
  # o Fertile Crescent
20
20
 
21
+
22
+ af, Afghanistan, AFG, 647_500, 30_419_928, Kabul, un|fifa
23
+ az, Azerbaijan, AZE, 86_600, 9_165_000, Baku, un|fifa
24
+
25
+ bh, Bahrain, BHR, 765, 1_234_571, Manama, un|fifa
26
+ bt, Bhutan, BHU, 38_394, 742_737, Thimphu, un|fifa
27
+ bn, Brunei, BRU, 5_765, 408_786, Bandar Seri Begawan, un|fifa
28
+
29
+ kh, Cambodia, CAM, 181_035, 14_952_665, Phnom Penh, un|fifa
30
+
31
+ ir, Iran, IRN, 1_648_195, 75_149_669, Tehran, un|fifa
32
+ iq, Iraq, IRQ, 438_317, 31_129_225, Baghdad, un|fifa
33
+
34
+ jo, Jordan, JOR, 89_342, 6_508_271, Amman, un|fifa
35
+
36
+ kw, Kuwait, KUW, 17_820, 3_566_437, Kuwait City, un|fifa
37
+ kg, Kyrgyzstan, KGZ, 199_900, 5_550_239, Bishkek, un|fifa
38
+
39
+ la, Laos, LAO, 236_800, 6_500_000, Vientiane, un|fifa
40
+ lb, Lebanon, LIB, 10_452, 4_224_000, Beirut, un|fifa
41
+
42
+
43
+ mv, Maldives, MDV, 298, 328_536, Malé, un|fifa
44
+
45
+ mn, Mongolia, MGL, 1_564_116, 2_754_685, Ulan Bator, un|fifa
46
+ mm, Myanmar, MYA, 676_578, 60_280_000, Naypyidaw, un|fifa
47
+
48
+ om, Oman, OMA, 309_501, 2_773_479, Muscat, un|fifa
49
+
50
+ qa, Qatar, QAT, 11_571, 1_853_563, Doha, un|fifa
51
+
52
+ sy, Syria, SYR, 185_180, 22_530_746, Damascus, un|fifa
53
+
54
+ tj, Tajikistan, TJK, 143_100, 7_616_000, Dushanbe, un|fifa
55
+
56
+ tl, Timor-Leste [East Timor], TLS, 14_874, 1_066_582, Dili, un|fifa
57
+
58
+ tm, Turkmenistan, TKM, 491_210, 5_125_693, Ashgabat, un|fifa
59
+
60
+ ae, United Arab Emirates, UAE, 83_600, 8_264_070, Abu Dhabi, un|fifa
61
+
62
+ uz, Uzbekistan, UZB, 447_400, 29_559_100, Tashkent, un|fifa
63
+
64
+ ye, Yemen, YEM, 527_829, 25_130_000, Sana'a, un|fifa
65
+
66
+
21
67
  ###
22
68
  # central asia
23
69
  # -> http://en.wikipedia.org/wiki/Central_Asia
24
70
 
25
-
26
- kz, Kazakhstan, KAZ, 2_724_900, 16_600_000, uefa|europe|central asia
71
+ kz, Kazakhstan, KAZ, 2_724_900, 16_600_000, un|fifa|uefa|europe|central asia
27
72
 
28
73
  ########
29
74
  ## middle east (nb: egypt listed in africa)
30
75
 
31
- sa, Saudi Arabia, KSA, 1_960_582, 27_136_977, middle_east|western_asia|arabian peninsula|g20
76
+ sa, Saudi Arabia, KSA, 1_960_582, 27_136_977, un|fifa|middle_east|western_asia|arabian peninsula|g20
32
77
 
33
- il, Israel, ISR, 20_770, 7_653_600, middle_east|western_asia|fertile crescent
78
+ il, Israel, ISR, 20_770, 7_653_600, un|fifa|middle_east|western_asia|fertile crescent
34
79
  pn, Palestine, PAL, 6_220, 4_260_636, middle_east|western_asia|fertile crescent
35
80
 
36
81
  ## add to middle east?
37
82
 
38
- ge, Georgia, GEO, 69_700, 4_570_934, uefa|europe|western asia|south caucasus
39
- am, Armenia, ARM, 29_743, 2_970_495, uefa|europe|western asia|south caucasus
83
+ ge, Georgia, GEO, 69_700, 4_570_934, un|fifa|uefa|europe|western asia|south caucasus
84
+ am, Armenia, ARM, 29_743, 2_970_495, un|fifa|uefa|europe|western asia|south caucasus
40
85
 
41
86
 
42
87
  #####
43
88
  # east asia
44
89
 
45
- jp, Japan, JPN, 377_930, 127_950_000, east_asia|g8|g20
46
- kp, North Korea, PRK, 120_538, 24_346_000, east_asia
47
- kr, South Korea, KOR, 99_828, 48_988_833, east_asia|g20
48
- cn, China, CHN, 9_596_961, 1_339_724_852, east_asia|g5|g20
90
+ jp, Japan, JPN, 377_930, 127_950_000, un|fifa|east_asia|g8|g20
91
+ kp, North Korea, PRK, 120_538, 24_346_000, un|fifa|east_asia
92
+ kr, South Korea, KOR, 99_828, 48_988_833, un|fifa|east_asia|g20
93
+ cn, China, CHN, 9_596_961, 1_339_724_852, un|fifa|east_asia|g5|g20
49
94
  hk, Hong Kong, HKG, 1_104, 7_061_200, country:cn, east_asia
50
95
  tw, Taiwan, TAI, 36_188, 23_174_528, east_asia
51
96
 
@@ -53,19 +98,19 @@ tw, Taiwan, TAI, 36_188, 23_174_528, east_asia
53
98
  ####
54
99
  # southeast asia
55
100
 
56
- id, Indonesia, IDN, 1_904_569, 241_030_522, southeast_asia|g20
57
- my, Malaysia, MAS, 329_847, 28_731_000, southeast_asia
58
- sg, Singapore, SIN, 724, 5_274_700, southeast_asia
59
- th, Thailand, THA, 513_120, 64_076_000, southeast_asia
60
- ph, Philippines, PHI, 300_000, 95_856_000, southeast_asia
61
- vn, Vietnam, VIE, 331_210, 89_316_000, southeast_asia
101
+ id, Indonesia, IDN, 1_904_569, 241_030_522, un|fifa|southeast_asia|g20
102
+ my, Malaysia, MAS, 329_847, 28_731_000, un|fifa|southeast_asia
103
+ sg, Singapore, SIN, 724, 5_274_700, un|fifa|southeast_asia
104
+ th, Thailand, THA, 513_120, 64_076_000, un|fifa|southeast_asia
105
+ ph, Philippines, PHI, 300_000, 95_856_000, un|fifa|southeast_asia
106
+ vn, Vietnam, VIE, 331_210, 89_316_000, un|fifa|southeast_asia
62
107
 
63
108
  ####
64
109
  # south asia
65
110
 
66
- pk, Pakistan, PAK, 796_095, 180_440_000, south_asia
67
- in, India, IND, 3_287_240, 1_210_193_422, south_asia|g5|g20
68
- bd, Bangladesh, BAN, 147_570, 152_518_015, south_asia
69
- np, Nepal, NEP, 147_181, 26_620_080, south_asia
70
- lk, Sri Lanka, SRI, 65_610, 20_277_597, south_asia
111
+ pk, Pakistan, PAK, 796_095, 180_440_000, un|fifa|south_asia
112
+ in, India, IND, 3_287_240, 1_210_193_422, un|fifa|south_asia|g5|g20
113
+ bd, Bangladesh, BAN, 147_570, 152_518_015, un|fifa|south_asia
114
+ np, Nepal, NEP, 147_181, 26_620_080, un|fifa|south_asia
115
+ lk, Sri Lanka, SRI, 65_610, 20_277_597, un|fifa|south_asia
71
116
 
@@ -0,0 +1,26 @@
1
+
2
+ ## map to wikipedia country page
3
+ ## e.g.
4
+ ## en.wikipedia.org/wiki/Qatar
5
+
6
+
7
+ ir: Iran
8
+ iq: Iraq
9
+ jo: Jordan
10
+ kw: Kuwait
11
+ kg: Kyrgyzstan
12
+ la: Laos
13
+ lb: Lebanon
14
+ mv: Maldives
15
+ mn: Mongolia
16
+ mm: Burma
17
+ om: Oman
18
+ qa: Qatar
19
+ sy: Syria
20
+ tj: Tajikistan
21
+ tl: East_Timor
22
+ tm: Turkmenistan
23
+ ae: United_Arab_Emirates
24
+ uz: Uzbekistan
25
+ ye: Yemen
26
+
@@ -2,6 +2,14 @@
2
2
  ### europe
3
3
 
4
4
 
5
+ ba, Bosnia and Herzegovina, BIH, 51_197, 3_839_737, Sarajevo, un|fifa
6
+ li, Liechtenstein, LIE, 160, 36281, Vaduz, un|fifa
7
+ mc, Monaco, MON, 2, 36371, Monaco, un # check code - NB: not fifa member
8
+ me, Montenegro, MNE, 13_812, 625_266, Podgorica, un|fifa
9
+ md, Moldova, MDA, 33_846, 3_559_500, Chișinău, un|fifa
10
+ sm, San Marino, SMR, 61, 32_404, City of San Marino, un|fifa
11
+
12
+
5
13
  ## NB:
6
14
  #
7
15
  # countries also include:
@@ -31,55 +39,61 @@ eu, European Union, EUR, 4_324_782, 503_492_041, supra, g20 # NB: no FIFA c
31
39
 
32
40
  ## todo: auto-add tag eu?? for supra:eu?
33
41
 
34
- at, Austria, AUT, 83_871, 8_414_638, supra:eu, de| eu|euro|schengen|uefa|central europe
35
- be, Belgium, BEL, 30_528, 11_007_020, supra:eu, nl|fr|de| eu|euro|schengen|uefa|benelux
36
- cy, Cyprus, CYP, 9_251, 1_099_341, supra:eu, eu|euro|uefa|asia|western asia
37
- de, Germany, GER, 357_050, 81_799_600, supra:eu, de| eu|euro|schengen|uefa|g8|g20|western europe|central europe # NB: ISO (DEU) <> FIFA (GER)
38
- ee, Estonia, EST, 45_226, 1_340_194, supra:eu, eu|euro|schengen|uefa
39
- es, Spain, ESP, 506_030, 46_030_109, supra:eu, eu|euro|schengen|uefa
40
- fi, Finland, FIN, 338_145, 5_391_700, supra:eu, eu|euro|schengen|uefa
41
- fr, France, FRA, 674_843, 65_821_885, supra:eu, eu|euro|schengen|uefa|g8|g20
42
- gr, Greece, GRE, 131_990, 10_787_690, supra:eu, eu|euro|schengen|uefa # NB: ISO (GRC) <> FIFA (GRE)
43
- ie, Irland, IRL, 70_273, 4_722_028, supra:eu, eu|euro|uefa
44
- it, Italy, ITA, 301_318, 60_681_514, supra:eu, eu|euro|schengen|uefa|g8|g20
45
- lu, Luxembourg, LUX, 2_586, 511_840, supra:eu, eu|euro|schengen|uefa|un|benelux
46
- mt, Malta, MLT, 316, 417_608, supra:eu, eu|euro|schengen|uefa
47
- nl, Netherlands, NED, 41_526, 16_703_700, supra:eu, eu|euro|schengen|uefa|un|benelux # NB: ISO (NLD) <> FIFA (NED)
48
- pt, Portugal, POR, 92_391, 10_647_763, supra:eu, eu|euro|schengen # NB: ISO (PRT) <> FIFA (POR)
49
- sk, Slovakia, SVK, 49_037, 5_440_078, supra:eu, eu|euro|schengen
50
- si, Slovenia, SVN, 20_273, 2_048_951, supra:eu, eu|euro|schengen
51
-
52
- bg, Bulgaria, BUL, 110_994, 7_364_570, supra:eu, eu|uefa # NB: ISO (BGR) <> FIFA (BUL)
53
- dk, Denmark, DEN, 43_094, 5_564_219, supra:eu, eu|uefa|schengen # NB: ISO (DNK) <> FIFA (DEN)
54
- gb, Great Britain, GBR, 243_610, 63_047_162, supra:eu, eu|g8|g20 # NB: no FIFA code exists; use GBR
55
- lv, Latvija [Latvia], LVA, 64_589, 2_245_357, supra:eu, eu|uefa|schengen
56
- lt, Lithuania, LTU, 65_303, 3_207_060, supra:eu, eu|uefa|schengen
57
- pl, Poland, POL, 312_683, 38_186_860, supra:eu, eu|uefa|schengen
58
- ro, Romania, ROU, 238_391, 19_042_936, supra:eu, eu|uefa
59
- se, Sweden, SWE, 449_964, 9_415_570, supra:eu, eu|uefa|schengen
60
- cz, Czech Republic, CZE, 78_866, 10_535_811, supra:eu, cs|sk| eu|uefa|schengen
61
- hu, Hungary, HUN, 93_030, 9_979_000, supra:eu, eu|uefa|schengen
62
-
63
-
64
- en, England, ENG, 130_395, 53_013_000, country:gb # NB: FIFA (ENG); not a valid iso country n internet domain / its uk - what to use - anything better?
65
- sc, Scotland, SCO, 78_387, 5_254_800, country:gb # NB: FIFA (SCO); not a valid iso country/internet domain - its uk - what to use - anything better?
66
- wa, Wales, WAL, 20_779, 3_064_000, country:gb
42
+ at, Austria, AUT, 83_871, 8_414_638, supra:eu, un|fifa|de| eu|euro|schengen|uefa|central europe
43
+ be, Belgium, BEL, 30_528, 11_007_020, supra:eu, un|fifa|nl|fr|de| eu|euro|schengen|uefa|benelux
44
+ cy, Cyprus, CYP, 9_251, 1_099_341, supra:eu, un|fifa|eu|euro|uefa|asia|western asia
45
+ de, Germany, GER, 357_050, 81_799_600, supra:eu, un|fifa|de| eu|euro|schengen|uefa|g8|g20|western europe|central europe # NB: ISO (DEU) <> FIFA (GER)
46
+ ee, Estonia, EST, 45_226, 1_340_194, supra:eu, un|fifa|eu|euro|schengen|uefa
47
+ es, Spain, ESP, 506_030, 46_030_109, supra:eu, un|fifa|eu|euro|schengen|uefa
48
+ fi, Finland, FIN, 338_145, 5_391_700, supra:eu, un|fifa|eu|euro|schengen|uefa
49
+ fr, France, FRA, 674_843, 65_821_885, supra:eu, un|fifa|eu|euro|schengen|uefa|g8|g20
50
+ gr, Greece, GRE, 131_990, 10_787_690, supra:eu, un|fifa|eu|euro|schengen|uefa # NB: ISO (GRC) <> FIFA (GRE)
51
+ ie, Irland, IRL, 70_273, 4_722_028, supra:eu, un|fifa|eu|euro|uefa
52
+ it, Italy, ITA, 301_318, 60_681_514, supra:eu, un|fifa|eu|euro|schengen|uefa|g8|g20
53
+ lu, Luxembourg, LUX, 2_586, 511_840, supra:eu, un|fifa|eu|euro|schengen|uefa|un|benelux
54
+ mt, Malta, MLT, 316, 417_608, supra:eu, un|fifa|eu|euro|schengen|uefa
55
+ nl, Netherlands, NED, 41_526, 16_703_700, supra:eu, un|fifa|eu|euro|schengen|uefa|un|benelux # NB: ISO (NLD) <> FIFA (NED)
56
+ pt, Portugal, POR, 92_391, 10_647_763, supra:eu, un|fifa|eu|euro|schengen # NB: ISO (PRT) <> FIFA (POR)
57
+ sk, Slovakia, SVK, 49_037, 5_440_078, supra:eu, un|fifa|eu|euro|schengen
58
+ si, Slovenia, SVN, 20_273, 2_048_951, supra:eu, un|fifa|eu|euro|schengen
59
+
60
+ bg, Bulgaria, BUL, 110_994, 7_364_570, supra:eu, un|fifa|eu|uefa # NB: ISO (BGR) <> FIFA (BUL)
61
+ dk, Denmark, DEN, 43_094, 5_564_219, supra:eu, un|fifa|eu|uefa|schengen # NB: ISO (DNK) <> FIFA (DEN)
62
+ lv, Latvija [Latvia], LVA, 64_589, 2_245_357, supra:eu, un|fifa|eu|uefa|schengen
63
+ lt, Lithuania, LTU, 65_303, 3_207_060, supra:eu, un|fifa|eu|uefa|schengen
64
+ pl, Poland, POL, 312_683, 38_186_860, supra:eu, un|fifa|eu|uefa|schengen
65
+ ro, Romania, ROU, 238_391, 19_042_936, supra:eu, un|fifa|eu|uefa
66
+ se, Sweden, SWE, 449_964, 9_415_570, supra:eu, un|fifa|eu|uefa|schengen
67
+ cz, Czech Republic, CZE, 78_866, 10_535_811, supra:eu, un|fifa|cs|sk| eu|uefa|schengen
68
+ hu, Hungary, HUN, 93_030, 9_979_000, supra:eu, un|fifa|eu|uefa|schengen
69
+
70
+ ## todo/check: make a distinction between uk and gb?
71
+ ##
72
+ ## uk, United Kingdown (of Great Britain and Northern Irleland), UKI, 243_610, London, supra:eu, un|fifa|eu|g8|g20
73
+
74
+ gb, Great Britain, GBR, 243_610, 63_047_162, supra:eu, un|eu|g8|g20
75
+ en, England, ENG, 130_395, 53_013_000, country:gb, fifa # NB: FIFA (ENG); not a valid iso country n internet domain / its uk - what to use - anything better?
76
+
77
+ ## nb: sc -> seychellen, use different two letter code st?
78
+ st, Scotland, SCO, 78_387, 5_254_800, country:gb, fifa # NB: FIFA (SCO); not a valid iso country/internet domain - its uk - what to use - anything better?
79
+ wa, Wales, WAL, 20_779, 3_064_000, country:gb, fifa
80
+
67
81
 
68
82
 
69
83
  fo, Faroe Islands, FRO, 1_399, 49_267, country:dk
70
84
 
71
- ad, Andorra, AND, 468, 85_082
72
- al, Albania, ALB, 28_748, 3_002_859
73
- by, Belarus, BLR, 207_600, 9_643_566
74
- ch, Switzerland, SUI, 41_285, 7_866_500, de|fr|it|rm| schengen|uefa|un # NB: ISO (CHE) <> FIFA (SUI)
75
- hr, Croatia, CRO, 56_594, 4_290_612 # NB: ISO (HRV) <> FIFA (CRO); local name: Hrvatska
76
- rs, Serbia, SRB, 88_361, 7_276_604
77
- ru, Russia, RUS, 17_098_242, 142_517_670, asia|north asia|g8|g20
78
- tr, Turkey, TUR, 783_562, 79_749_461, asia|western asia|g20
79
- ua, Ukraine, UKR, 603_550, 44_854_065
80
- mk, Macedonia, MKD, 25_713, 2_082_370
81
- no, Norway, NOR, 385_155, 4_993_300, schengen|uefa
82
- is, Iceland, ISL, 103_000, 318_452, schengen|uefa
85
+ ad, Andorra, AND, 468, 85_082, un|fifa
86
+ al, Albania, ALB, 28_748, 3_002_859, un|fifa
87
+ by, Belarus, BLR, 207_600, 9_643_566, un|fifa
88
+ ch, Switzerland, SUI, 41_285, 7_866_500, un|fifa|de|fr|it|rm| schengen|uefa|un # NB: ISO (CHE) <> FIFA (SUI)
89
+ hr, Croatia, CRO, 56_594, 4_290_612, un|fifa # NB: ISO (HRV) <> FIFA (CRO); local name: Hrvatska
90
+ rs, Serbia, SRB, 88_361, 7_276_604, un|fifa
91
+ ru, Russia, RUS, 17_098_242, 142_517_670, un|fifa|asia|north asia|g8|g20
92
+ tr, Turkey, TUR, 783_562, 79_749_461, un|fifa| asia|western asia|g20
93
+ ua, Ukraine, UKR, 603_550, 44_854_065, un|fifa
94
+ mk, Macedonia, MKD, 25_713, 2_082_370, un|fifa
95
+ no, Norway, NOR, 385_155, 4_993_300, un|fifa|schengen|uefa
96
+ is, Iceland, ISL, 103_000, 318_452, un|fifa|schengen|uefa
83
97
 
84
98
 
85
99
  ## todo/fix: add missing countries
@@ -0,0 +1,12 @@
1
+
2
+ ## map to wikipedia country page
3
+ ## e.g.
4
+ ## en.wikipedia.org/wiki/Liechtenstein
5
+
6
+
7
+ li: Liechtenstein
8
+ mc: Monaco
9
+ me: Montenegro
10
+ md: Moldova
11
+ sm: San_Marino
12
+
@@ -8,10 +8,24 @@
8
8
  ## - Polynesia
9
9
 
10
10
 
11
- au, Australia, AUS, 7_686_850, 22_028_000, en|g20
12
- nz, New Zealand, NZL, 268_680, 4_108_037, en
11
+ fj, Fiji, FIJ, 18_274, 849_000, Suva, un|fifa
12
+ kl, Kiribati, KIR, 811, 103_500, Tarawa, un # nb: check code; NOT fifa member
13
+ mh, Marshall Islands, MHI, 181, 68_000, Majuro, un # nb: check code; NOT fifa member
14
+ fm, Micronesia, FSM, 702, 111_000, Palikir, un
15
+ nr, Nauru, NAU, 21, 9_378, Yaren, un
16
+ pw, Palau, PWA, 459, 20_956, Ngerulmud, un # check code
17
+ ws, Samoa, SAM, 2_831, 194_320, Apia, un|fifa
18
+ sb, Solomon Islands, SOL, 28_400, 523_000, Honiara, un|fifa
19
+ to, Tonga, TGA, 748, 103_036, Nuku'alofa, un|fifa
20
+ tv, Tuvalu, TUV, 26, 10_544, Funafuti, un
21
+ vu, Vanuatu, VAN, 12_190, 224_564, Port Vila, un|fifa
22
+
23
+
24
+
25
+ au, Australia, AUS, 7_686_850, 22_028_000, un|fifa|en|g20
26
+ nz, New Zealand, NZL, 268_680, 4_108_037, un|fifa|en
13
27
 
14
28
  ##############
15
29
  ### Melanesia
16
30
 
17
- pg, Papua New Guinea, PNG, 462_840, 5_172_033
31
+ pg, Papua New Guinea, PNG, 462_840, 5_172_033, un|fifa
@@ -0,0 +1,11 @@
1
+
2
+ kl: Kiribati
3
+ mh: Marshall_Islands
4
+ fm: Federated_States_of_Micronesia
5
+ nr: Nauru
6
+ pw: Palau
7
+ ws: Samoa
8
+ sb: Solomon_Islands
9
+ to: Tonga
10
+ tv: Tuvalu
11
+ vu: Vanuatu
@@ -1,4 +1,8 @@
1
1
 
2
+ ###
3
+ # for 193 un members see www.un.org/en/members
4
+
5
+
2
6
  ## some tags
3
7
 
4
8
  continents: europe, america, asia, africa, oceania
@@ -1,5 +1,5 @@
1
1
 
2
2
  module WorldDB
3
- VERSION = '0.6.4'
3
+ VERSION = '0.6.5'
4
4
  end
5
5
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: worlddb
3
3
  version: !ruby/object:Gem::Version
4
- hash: 15
4
+ hash: 13
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 6
9
- - 4
10
- version: 0.6.4
9
+ - 5
10
+ version: 0.6.5
11
11
  platform: ruby
12
12
  authors:
13
13
  - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-11-26 00:00:00 Z
18
+ date: 2012-11-29 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  name: activerecord
@@ -135,6 +135,7 @@ files:
135
135
  - bin/worlddb
136
136
  - db/africa/countries.txt
137
137
  - db/africa/de.countries.yml
138
+ - db/africa/en.wikipedia.yml
138
139
  - db/america/br/cities.txt
139
140
  - db/america/br/regions.txt
140
141
  - db/america/ca/cities.txt
@@ -142,6 +143,7 @@ files:
142
143
  - db/america/countries.motor.yml
143
144
  - db/america/countries.txt
144
145
  - db/america/de.countries.yml
146
+ - db/america/en.wikipedia.yml
145
147
  - db/america/es.countries.yml
146
148
  - db/america/mx/cities.txt
147
149
  - db/america/mx/regions.txt
@@ -151,6 +153,7 @@ files:
151
153
  - db/america/ve/regions.txt
152
154
  - db/asia/countries.txt
153
155
  - db/asia/de.countries.yml
156
+ - db/asia/en.wikipedia.yml
154
157
  - db/asia/jp/cities.txt
155
158
  - db/europe/at/cities.txt
156
159
  - db/europe/at/regions.txt
@@ -168,6 +171,7 @@ files:
168
171
  - db/europe/de/regions.txt
169
172
  - db/europe/dk/cities.txt
170
173
  - db/europe/ee/cities.txt
174
+ - db/europe/en.wikipedia.yml
171
175
  - db/europe/en/cities.txt
172
176
  - db/europe/en/regions.txt
173
177
  - db/europe/es.countries.yml
@@ -198,6 +202,7 @@ files:
198
202
  - db/oceania/au/cities.txt
199
203
  - db/oceania/countries.txt
200
204
  - db/oceania/de.countries.yml
205
+ - db/oceania/en.wikipedia.yml
201
206
  - db/tags.yml
202
207
  - lib/worlddb.rb
203
208
  - lib/worlddb/cli/opts.rb