worlddb 0.7.0 → 0.7.1

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.
Files changed (39) hide show
  1. data/Manifest.txt +0 -2
  2. data/data/africa/countries.txt +63 -73
  3. data/data/america/ca/cities.txt +35 -35
  4. data/data/america/countries.txt +29 -24
  5. data/data/america/mx/cities.txt +18 -18
  6. data/data/america/us/cities.txt +39 -39
  7. data/data/asia/countries.txt +74 -64
  8. data/data/europe/at/cities.txt +31 -31
  9. data/data/europe/at/regions.txt +6 -6
  10. data/data/europe/be/cities.txt +10 -10
  11. data/data/europe/countries.txt +71 -53
  12. data/data/europe/cz/cities.txt +16 -16
  13. data/data/europe/de/cities.txt +28 -28
  14. data/data/europe/en/cities.txt +21 -19
  15. data/data/europe/es/cities.txt +10 -10
  16. data/data/europe/fr/cities.txt +11 -11
  17. data/data/europe/it/cities.txt +14 -14
  18. data/data/europe/lt/cities.txt +2 -3
  19. data/data/europe/lv/cities.txt +3 -2
  20. data/data/europe/nl/cities.txt +3 -3
  21. data/data/europe/pl/cities.txt +3 -3
  22. data/data/europe/ru/cities.txt +5 -5
  23. data/data/europe/sc/cities.txt +1 -1
  24. data/data/europe/ua/cities.txt +5 -5
  25. data/data/europe/wa/cities.txt +1 -1
  26. data/data/oceania/1_codes/fifa.yml +1 -1
  27. data/data/oceania/1_codes/internet.yml +1 -1
  28. data/data/oceania/1_codes/iso3.yml +1 -1
  29. data/data/oceania/3_more/en.wikipedia.yml +1 -1
  30. data/data/oceania/countries.txt +24 -15
  31. data/lib/worlddb/cli/runner.rb +2 -5
  32. data/lib/worlddb/reader.rb +91 -2
  33. data/lib/worlddb/readers/hash_reader.rb +23 -8
  34. data/lib/worlddb/readers/values_reader.rb +86 -8
  35. data/lib/worlddb/version.rb +1 -1
  36. data/lib/worlddb.rb +1 -13
  37. metadata +4 -6
  38. data/data/america/br/cities.txt +0 -9971
  39. data/lib/worlddb/loader.rb +0 -55
data/Manifest.txt CHANGED
@@ -16,7 +16,6 @@ data/america/1_codes/motor.yml
16
16
  data/america/2_names/de.yml
17
17
  data/america/2_names/es.yml
18
18
  data/america/3_more/en.wikipedia.yml
19
- data/america/br/cities.txt
20
19
  data/america/br/regions.txt
21
20
  data/america/ca/cities.txt
22
21
  data/america/ca/regions.txt
@@ -94,7 +93,6 @@ lib/worlddb.rb
94
93
  lib/worlddb/cli/opts.rb
95
94
  lib/worlddb/cli/runner.rb
96
95
  lib/worlddb/console.rb
97
- lib/worlddb/loader.rb
98
96
  lib/worlddb/models/city.rb
99
97
  lib/worlddb/models/country.rb
100
98
  lib/worlddb/models/prop.rb
data/data/africa/countries.txt CHANGED
@@ -1,7 +1,7 @@
1
1
  ##################################
2
2
  ## africa
3
3
  ##
4
- ## -> http://en.wikipedia.org/wiki/Africa#Territories_and_regions
4
+ ## see http://en.wikipedia.org/wiki/Africa#Territories_and_regions
5
5
 
6
6
  ###
7
7
  ## regions:
@@ -12,91 +12,81 @@
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
15
 
16
+ ###############
17
+ ## Eastern Africa
18
+
19
+ bi, Burundi, BDI, 27_834, 8_749_000, Bujumbura, un|fifa|eastern_africa
20
+ km, Comoros, COM, 2_235, 798_000, Moroni, un|fifa|eastern_africa
21
+ dj, Djibouti, DJI, 23_200, 923_000, Djibouti, un|fifa|eastern_africa
22
+ er, Eritrea, ERI, 117_600, 6_086_495, Asmara, un|fifa|eastern_africa
23
+ et, Ethiopia, ETH, 1_104_300, 84_320_987, un|fifa|eastern_africa
24
+ ke, Kenya, KEN, 580_367, 43_013_341, Nairobi, un|fifa|eastern_africa|commonwealth
25
+ mg, Madagascar, MAD, 587_041, 22_005_222, Antananarivo, un|fifa|eastern_africa
26
+ mw, Malawi, MWI, 118_484, 14_901_000, Lilongwe, un|fifa|eastern_africa|commonwealth
27
+ mu, Mauritius, MRI, 2_040, 1_291_456, un|fifa|eastern_africa|commonwealth
28
+ mz, Mozambique, MOZ, 801_590, 22_894_000, Maputo, un|fifa|eastern_africa|commonwealth
29
+ rw, Rwanda, RWA, 26_338, 11_689_696, Kigali, un|fifa|eastern_africa|commonwealth
58
30
  ## NB: sc renamed to yc (sc used for Scottland)
59
- yc, Seychelles, SEY, 451, 84_000, Victoria, un|fifa
60
- sl, Sierra Leone, SLE, 71_740, 5_485_998, Freetown, un|fifa
61
-
62
- so, Somalia, SOM, 637_657, 10_085_638, Mogadishu, un|fifa
63
- ss, South Sudan, SSD, 619_745, 8_260_490, Juba, un|fifa
64
- sd, Sudan, SDN, 1_886_068, 30_894_000, Khartoum, un|fifa
65
-
66
- sz, Swaziland, SWZ, 17_364, 1_185_000, Lobamba, un|fifa
67
-
68
- tg, Togo, TOG, 56_785, 6_619_000, Lomé, un|fifa
69
-
70
- ug, Uganda, UGA, 236_040, 35_873_253, Kampala, un|fifa
71
-
72
- tz, Tanzania, TAN, 945_203, 43_188_000, Dodoma, un|fifa
73
-
74
- zm, Zambia, ZAM, 752_618, 14_309_466, Lusaka, un|fifa
75
- zw, Zimbabwe, ZIM, 390_757, 12_619_600, Harare, un|fifa
31
+ yc, Seychelles, SEY, 451, 84_000, Victoria, un|fifa|eastern_africa|indian_ocean|microstate|commonwealth
32
+ so, Somalia, SOM, 637_657, 10_085_638, Mogadishu, un|fifa|eastern_africa
33
+ tz, Tanzania, TAN, 945_203, 43_188_000, Dodoma, un|fifa|eastern_africa|commonwealth
34
+ ug, Uganda, UGA, 236_040, 35_873_253, Kampala, un|fifa|eastern_africa|commonwealth
35
+ zm, Zambia, ZAM, 752_618, 14_309_466, Lusaka, un|fifa|eastern_africa|commonwealth
36
+ zw, Zimbabwe, ZIM, 390_757, 12_619_600, Harare, un|fifa|eastern_africa
37
+
38
+ ######################
39
+ ## Central Africa
40
+
41
+ ao, Angola, ANG, 1_246_700, 18_498_000, Luanda, un|fifa|central_africa
42
+ cm, Cameroon, CMR, 475_440, 18_879_301, un|fifa|central_africa|commonwealth
43
+ cf, Central African Republic, CTA, 622_984, 4_422_000, Bangui, un|fifa|central_africa
44
+ td, Chad, CHA, 1_284_000, 10_329_208, N'Djamena, un|fifa|central_africa
45
+ cg, Congo, CGO, 342_000, 4_366_266, Brazzaville, un|fifa|central_africa
46
+ cd, Congo DR, COD, 2_345_409, 71_712_867, Kinshasa, un|fifa|central_africa
47
+ gq, Equatorial Guinea, EQG, 28_050, 676_000, Malabo, un|fifa|central_africa
48
+ ga, Gabon, GAB, 267_667, 1_475_000, un|fifa|central_africa
49
+ st, São Tomé and Príncipe, STP, 1_001, 183_176, São Tomé, un|fifa|central_africa|atlantic_ocean|microstate
76
50
 
77
51
 
78
52
  ###############
79
53
  ## Northern Africa
80
- ##
81
54
 
82
55
  dz, Algeria, ALG, 2_381_740, 34_178_188, un|fifa|ar|northern africa
83
- eg, Egypt, EGY, 1_001_450, 82_868_000, un|fifa|ar|northern africa
56
+ eg, Egypt, EGY, 1_001_450, 82_868_000, un|fifa|ar|northern africa|middle_east
84
57
  ma, Morocco, MAR, 446_550, 34_859_364, un|fifa|ar|northern africa
85
58
  ly, Libya, LBY, 1_759_540, 6_310_434, un|fifa|ar|northern africa
86
59
  tn, Tunisia, TUN, 163_610, 10_486_339, un|fifa|ar|northern africa
87
-
88
-
89
- #######
90
- ### More
91
-
92
- ci, Côte d'Ivoire, CIV, 322_460, 20_617_068, un|fifa|western africa
93
- gh, Ghana, GHA, 239_460, 23_832_495, un|fifa|western africa
94
- ng, Nigeria, NGA, 923_768, 166_629_000, un|fifa|western africa
95
-
96
- cm, Cameroon, CMR, 475_440, 18_879_301, un|fifa|central africa
60
+ ss, South Sudan, SSD, 619_745, 8_260_490, Juba, un|fifa|northern africa
61
+ sd, Sudan, SDN, 1_886_068, 30_894_000, Khartoum, un|fifa|northern africa
97
62
 
98
63
 
99
64
  ################
100
65
  ## Southern Africa
101
66
 
102
- za, South Africa, RSA, 1_219_912, 51_770_560, un|fifa|southern africa|g5|g20
67
+ za, South Africa, RSA, 1_219_912, 51_770_560, un|fifa|southern_africa|g5|g20|commonwealth
68
+ bw, Botswana, BOT, 581_730, 2_029_307, Gaborone, un|fifa|southern_africa|commonwealth
69
+ ls, Lesotho, LES, 30_355, 2_067_000, Maseru, un|fifa|southern_africa|commonwealth
70
+ na, Namibia, NAM, 825_418, 2_100_000, Windhoek, un|fifa|southern_africa|commonwealth
71
+ sz, Swaziland, SWZ, 17_364, 1_185_000, Lobamba, un|fifa|southern_africa|commonwealth
72
+
73
+
74
+ ###################
75
+ ## Western Africa
76
+
77
+ bj, Benin, BEN, 112_622, 9_598_787, Porto-Novo, un|fifa|western_africa
78
+ bf, Burkina Faso, BFA, 274_200, 15_730_977, Ouagadougou, un|fifa|western_africa
79
+ cv, Cape Verde, CPV, 4_033, 567_000, Praia, un|fifa|western_africa
80
+ ci, Côte d'Ivoire, CIV, 322_460, 20_617_068, un|fifa|western_africa
81
+ gm, Gambia, GAM, 11_295, 1_782_893, un|fifa|western_africa|commonwealth
82
+ gh, Ghana, GHA, 239_460, 23_832_495, un|fifa|western_africa|commonwealth
83
+ gn, Guinea, GUI, 245_857, 10_057_975, Conakry, un|fifa|western_africa
84
+ gw, Guinea-Bissau, GNB, 36_125, 1_647_000, Bissau, un|fifa|western_africa
85
+ lr, Liberia, LBR, 111_369, 3_786_764, Monrovia, un|fifa|western_africa
86
+ ml, Mali, MLI, 1_240_192, 14_517_176, Bamako, un|fifa|western_africa
87
+ mr, Mauritania, MTN, 1_030_700, 3_359_185, un|fifa|western_africa
88
+ ne, Niger, NIG, 1_267_000, 16_274_738, Niamey, un|fifa|western_africa
89
+ ng, Nigeria, NGA, 923_768, 166_629_000, un|fifa|western_africa|commonwealth
90
+ sn, Senegal, SEN, 196_723, 12_855_153, Dakar, un|fifa|western_africa
91
+ sl, Sierra Leone, SLE, 71_740, 5_485_998, Freetown, un|fifa|western_africa|commonwealth
92
+ tg, Togo, TOG, 56_785, 6_619_000, Lomé, un|fifa|western_africa
data/data/america/ca/cities.txt CHANGED
@@ -4,45 +4,45 @@
4
4
 
5
5
  # top 10 cities
6
6
 
7
- toronto, Toronto, region:on, 5_583_064
8
- montreal, Montreal, region:qc, 3_824_221
9
- vancouver, Vancouver, region:bc, 2_313_328
10
- ottawa, Ottawa, region:on, 1_236_324
11
- calgary, Calgary, region:ab, 1_214_839
12
- edmonton, Edmonton, region:ab, 1_159_869
13
- quebec, Québec, region:qc, 765_706
14
- winnipeg, Winnipeg, region:mb, 730_018
15
- hamilton, Hamilton, region:on, 721_053
16
- kitchener, Kitchener, region:on, 477_160
17
- london, London, region:on, 474_786
7
+ Toronto, region:on, 5_583_064
8
+ Montreal, region:qc, 3_824_221
9
+ Vancouver, region:bc, 2_313_328
10
+ Ottawa, region:on, 1_236_324
11
+ Calgary, region:ab, 1_214_839
12
+ Edmonton, region:ab, 1_159_869
13
+ Québec, region:qc, 765_706
14
+ Winnipeg, region:mb, 730_018
15
+ Hamilton, region:on, 721_053
16
+ Kitchener, region:on, 477_160
17
+ London, region:on, 474_786
18
18
 
19
19
  # more cities
20
20
 
21
21
 
22
- stcatharines, St Catharines-Niagara, region:on, 372_000
23
- halifax, Halifax, region:ns, 333_000
24
- victoria, Victoria, region:bc, 304_000
25
- windsor, Windsor, region:on, 279_000
26
- oshawa, Oshawa, region:on, 269_000
27
- saskatoon, Saskatoon, region:sk, 219_000
28
- regina, Regina, region:sk, 194_000
29
- stjohns, St John's, region:nl, 174_000
30
- sudbury, Sudbury, region:on, 160_000
31
- chicoutimi, Chicoutimi, region:qc, 160_000
32
- sherbrooke, Sherbrooke, region:qc, 147_000
33
- kingston, Kingston, region:on, 143_000
34
- troisrivieres, Trois-Rivières, region:qc, 140_000
35
- kelowna, Kelowna, region:bc, 137_000
36
- abbotsford, Abbotsford, region:bc, 136_000
37
- saintjohn, Saint John, region:nb, 126_000
38
- thunderbay, Thunder Bay, region:on, 126_000
39
- barrie, Barrie, region:on, 119_000
40
- sydney, Sydney, region:ns, 118_000
22
+ St Catharines-Niagara, region:on, 372_000
23
+ Halifax, region:ns, 333_000
24
+ Victoria, region:bc, 304_000
25
+ Windsor, region:on, 279_000
26
+ Oshawa, region:on, 269_000
27
+ Saskatoon, region:sk, 219_000
28
+ Regina, region:sk, 194_000
29
+ St John's, region:nl, 174_000
30
+ Sudbury, region:on, 160_000
31
+ Chicoutimi, region:qc, 160_000
32
+ Sherbrooke, region:qc, 147_000
33
+ Kingston, region:on, 143_000
34
+ Trois-Rivières, region:qc, 140_000
35
+ Kelowna, region:bc, 137_000
36
+ Abbotsford, region:bc, 136_000
37
+ Saint John, region:nb, 126_000
38
+ Thunder Bay, region:on, 126_000
39
+ Barrie, region:on, 119_000
40
+ Sydney, region:ns, 118_000
41
41
 
42
42
  # add more captials
43
43
 
44
- frederiction, Frederiction, region:nb
45
- yellowknife, Yellowknife, region:nt
46
- iqaluit, Iqaluit, region:nu
47
- charlottetown, Charlottetown, region:pe
48
- whitehorse, Whitehorse, region:yt
44
+ Frederiction, region:nb
45
+ Yellowknife, region:nt
46
+ Iqaluit, region:nu
47
+ Charlottetown, region:pe
48
+ Whitehorse, region:yt
data/data/america/countries.txt CHANGED
@@ -9,19 +9,20 @@
9
9
  ## extra Latin America
10
10
 
11
11
 
12
+
12
13
  #####################
13
14
  #### north america
14
15
 
15
16
  # area (in sq km), pop(ulation)
16
17
 
17
- ca, Canada, CAN, 9_984_670, 34_278_406, en|fr| un|fifa|north america|g8|g20
18
+ ca, Canada, CAN, 9_984_670, 34_278_406, en|fr| un|fifa|north america|g8|g20|commonwealth
18
19
  us, United States, USA, 9_629_091, 314_167_157, en|es| un|fifa|north america|g8|g20
19
20
  mx, México [Mexico], MEX, 1_972_550, 112_322_757, es| un|fifa|north america|g5|g20
20
21
 
21
22
  #####################
22
23
  ## central america & caribbean islands
23
24
 
24
- bz, Belize, BLZ, 22_966, 307_000, un|fifa|en|es|central_america
25
+ bz, Belize, BLZ, 22_966, 307_000, un|fifa|en|es|central_america|commonwealth
25
26
  gt, Guatemala, GUA, 108_889, 14_027_000, un|fifa|es|central_america
26
27
  cr, Costa Rica, CRC, 51_100, 4_579_000, un|fifa|es|central_america
27
28
  hn, Honduras, HON, 112_492, 7_466_000, un|fifa|es|central_america
@@ -31,35 +32,39 @@ pa, Panamá [Panama], PAN, 75_417, 3_454_000, un|fifa|es|central_america
31
32
 
32
33
 
33
34
  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
35
- pr, Puerto Rico, PUR, 8_870, 3_982_000, country:us, es|en|caribbean
35
+ jm, Jamaica, JAM, 10_991, 2_719_000, un|fifa|en|caribbean|commonwealth
36
+ pr, Puerto Rico, PUR, 8_870, 3_982_000, country:us, fifa|es|en|caribbean
36
37
  do, Dominican Republic, DOM, 48_671, 10_090_000, un|fifa|es|caribbean
37
38
  ht, Haiti, HAI, 27_750, 9_719_932, Port-au-Prince, un|fifa|caribbean
38
39
 
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
40
+ ag, Antigua and Barbuda, ATG, 440, 81_799, Saint John's, un|fifa|caribbean|microstate|commonwealth
41
+ bs, Bahamas, BAH, 13_878, 353_658, Nassau, un|fifa|caribbean|commonwealth
42
+ bb, Barbados, BRB, 431, 284_589, Bridgetown, un|fifa|caribbean|microstate|commonwealth
43
+ dm, Dominica, DMA, 750, 73_126, Roseau, un|fifa|caribbean|microstate|commonwealth
44
+ gd, Grenada, GRN, 344, 110_000, St. George's, un|fifa|caribbean|microstate|commonwealth
45
+ kn, Saint Kitts and Nevis, SKN, 261, 51_300, Basseterre, un|fifa|caribbean|microstate|commonwealth
46
+ lc, Saint Lucia, LCA, 617, 173_765, Castries, un|fifa|caribbean|microstate|commonwealth
47
+ vc, Saint Vincent and the Grenadines, VIN, 389, 120_000, Kingstown, un|fifa|caribbean|microstate|commonwealth
48
+ tt, Trinidad and Tobago, TRI, 5_131, 1_346_350, Port of Spain, un|fifa|caribbean|commonwealth
48
49
 
49
50
 
50
51
 
51
52
  ##############
52
53
  ## south america
54
+ ##
55
+ ## sub regions
56
+ ## - southern cone - see http://en.wikipedia.org/wiki/Southern_Cone
57
+ ## - andean states - see http://en.wikipedia.org/wiki/Andean_states
53
58
 
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
59
+ ar, Argentina, ARG, 2_780_400, 40_518_425, un|fifa|es| south america|g20|southern_cone
60
+ bo, Bolivia, BOL, 1_098_581, 10_907_778, un|fifa|es|qu|ay| south america|andean_states
61
+ br, Brazil, BRA, 8_514_215, 192_380_000, un|fifa|pt| south america|g5|g20|southern_cone
62
+ cl, Chile, CHI, 755_696, 16_763_470, un|fifa|south america|es|southern_cone
63
+ co, Colombia, COL, 1_138_748, 46_413_791, un|fifa|south america|es|andean_states
64
+ ec, Ecuador, ECU, 258_238, 15_007_343, un|fifa|south america|es|qu|andean_states
65
+ gy, Guyana, GUY, 214_970, 752_940, un|fifa|south america|en|commonwealth
66
+ pe, Peru, PER, 1_285_220, 29_546_963, un|fifa|south america|es|andean_states
62
67
  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
68
+ py, Paraguay, PAR, 406_752, 6_375_830, un|fifa|south america|es|southern_cone
69
+ uy, Uruguay, URU, 176_215, 3_510_386, un|fifa|south america|es|southern_cone
70
+ ve, Venezuela, VEN, 916_445, 28_833_845, un|fifa|south america|es|andean_states ## add to andean too - why? why not?
data/data/america/mx/cities.txt CHANGED
@@ -3,30 +3,30 @@
3
3
  #####
4
4
  # see http://en.wikipedia.org/wiki/Metropolitan_areas_of_Mexico
5
5
 
6
- mexico, México, region:df, 20137152
7
- guadalajara, Guadalajara, region:ja, 4434252
8
- monterrey, Monterrey, region:nl, 4080329
9
- puebla, Puebla, region:pb, 2668347
10
- toluca, Toluca|Toluca de Lerdo, region:me, 1846602
11
- tijuana, Tijuana, region:bc, 1751302
12
- leon, León, region:gt, 1609717
13
- juarez, Juárez|Ciudad Juárez, region:ch, 1495094
14
- torreon, Torreón, region:co, 1275993
15
- queretaro, Querétaro, region:qe, 1097028
16
- sanluispotosi, San Luis Potosì, region:sl, 1040822
6
+ México, region:df, 20137152
7
+ Guadalajara, region:ja, 4434252
8
+ Monterrey, region:nl, 4080329
9
+ Puebla, region:pb, 2668347
10
+ Toluca|Toluca de Lerdo, region:me, 1846602
11
+ Tijuana, region:bc, 1751302
12
+ León, region:gt, 1609717
13
+ Juárez|Ciudad Juárez, region:ch, 1495094
14
+ Torreón, region:co, 1275993
15
+ Querétaro, region:qe, 1097028
16
+ San Luis Potosì, region:sl, 1040822
17
17
 
18
18
 
19
19
  # more cities
20
20
 
21
- merida, Mérida, region:yu, 973046
21
+ Mérida, region:yu, 973046
22
22
 
23
- chihuahua, Chihuahua, region:ch, 809232
23
+ Chihuahua, region:ch, 809232
24
24
 
25
- morelia, Morelia, region:mi, 729757
25
+ Morelia, region:mi, 729757
26
26
 
27
- cancun, Cancún, region:qr, 628306
27
+ Cancún, region:qr, 628306
28
28
 
29
- tuxtla, Tuxtla Gutiérrez, region:cs, 503320
29
+ Tuxtla Gutiérrez, region:cs, 503320
30
30
 
31
- pachuca, Pachuca, region:hg, 275578
32
- sannicolas, San Nicolás de los Garza, region:nl, 476761
31
+ Pachuca, region:hg, 275578
32
+ San Nicolás de los Garza, region:nl, 476761
data/data/america/us/cities.txt CHANGED
@@ -1,46 +1,46 @@
1
1
 
2
2
  ### top 10 cities
3
3
 
4
- newyork, New York, region:ny, 8175133
5
- losangeles, Los Angeles, region:ca, 3792621
6
- chicago, Chicago, region:il, 2695598
7
- houston, Houston, region:tx, 2099451
8
- philadelphia, Philadelphia, region:pa, 1526006
9
- phoenix, Phoenix, region:az, 1445632
10
- sanantonio, San Antonio, region:tx, 1327407
11
- sandiego, San Diego, region:ca, 1307402
12
- dallas, Dallas, region:tx, 1197816
13
- sanjose, San Jose, region:ca, 945942
4
+ New York, region:ny, 8175133
5
+ Los Angeles, region:ca, 3792621
6
+ Chicago, region:il, 2695598
7
+ Houston, region:tx, 2099451
8
+ Philadelphia, region:pa, 1526006
9
+ Phoenix, region:az, 1445632
10
+ San Antonio, region:tx, 1327407
11
+ San Diego, region:ca, 1307402
12
+ Dallas, region:tx, 1197816
13
+ San Jose, region:ca, 945942
14
14
 
15
15
 
16
16
  ## more cities
17
17
 
18
- buffalo, Buffalo, region:ny, 261310
19
- boston, Boston, region:ma, 617594
20
- columbus, Columbus, region:oh, 787033
21
- detroit, Detroit, region:mi, 713777
22
- nashville, Nashville, region:tn, 601222
23
- anaheim, Anaheim, region:ca, 336265
24
- stlouis, St. Louis, region:mo, 319294
25
- pittsburgh, Pittsburgh, region:pa, 305704
26
- washington, Washington, region:dc, 601723
27
- newark, Newark, region:nj, 277140
28
- raleigh, Raleigh, region:nc, 403892
29
- miami, Miami, region:fl, 399457
30
- tampa, Tampa, region:fl, 335709
31
- denver, Denver, region:co, 600158
32
- stpaul, St. Paul, region:mn, 285068
33
- baltimore, Baltimore, region:md, 620961
34
- cincinnati, Cincinnati, region:oh, 296943
35
- cleveland, Cleveland, region:oh, 396815
36
- indianapolis, Indianapolis, region:in, 820445
37
- jacksonville, Jacksonville, region:fl, 821784
38
- oakland, Oakland, region:ca, 390724
39
- sanfrancisco, San Francisco, region:ca, 805235
40
- kansascity, Kansas City, region:mo, 459787
41
- greenbay, Green Bay, region:wi, 104057
42
- minneapolis, Minneapolis, region:mn, 382578
43
- atlanta, Atlanta, region:ga, 420003
44
- neworleans, New Orleans, region:la, 343829
45
- charlotte, Charlotte, region:nc, 731424
46
- seattle, Seattle, region:wa, 608660
18
+ Buffalo, region:ny, 261310
19
+ Boston, region:ma, 617594
20
+ Columbus, region:oh, 787033
21
+ Detroit, region:mi, 713777
22
+ Nashville, region:tn, 601222
23
+ Anaheim, region:ca, 336265
24
+ St. Louis, region:mo, 319294
25
+ Pittsburgh, region:pa, 305704
26
+ Washington, region:dc, 601723
27
+ Newark, region:nj, 277140
28
+ Raleigh, region:nc, 403892
29
+ Miami, region:fl, 399457
30
+ Tampa, region:fl, 335709
31
+ Denver, region:co, 600158
32
+ St. Paul, region:mn, 285068
33
+ Baltimore, region:md, 620961
34
+ Cincinnati, region:oh, 296943
35
+ Cleveland, region:oh, 396815
36
+ Indianapolis, region:in, 820445
37
+ Jacksonville, region:fl, 821784
38
+ Oakland, region:ca, 390724
39
+ San Francisco, region:ca, 805235
40
+ Kansas City, region:mo, 459787
41
+ Green Bay, region:wi, 104057
42
+ Minneapolis, region:mn, 382578
43
+ Atlanta, region:ga, 420003
44
+ New Orleans, region:la, 343829
45
+ Charlotte, region:nc, 731424
46
+ Seattle, region:wa, 608660