worlddb 0.7.0 → 0.7.1

Sign up to get free protection for your applications and to get access to all the features.
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
@@ -19,98 +19,108 @@
19
19
  # o Fertile Crescent
20
20
 
21
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
-
22
+ #######
23
+ ## western asia / middle east
24
+ ## see
25
+ ## subregions used:
26
+ ## - arabian peninsula
27
+ ## - south caucasus
28
+ ## - fertile crescent
29
+ ##
30
+ ## nb: egypt listed in africa - marked as middle_east -- western_asia too?
31
+ ## nb: cyprus listed in europe - mark as middle_east|western_asia
32
+ ## nb: turkey listed in europe - mark as w/ middle_east|western_asia ??
33
+ ##
34
+ ## middle east; see -> http://en.wikipedia.org/wiki/Middle_East
42
35
 
43
- mv, Maldives, MDV, 298, 328_536, Malé, un|fifa
36
+ ### arabian peninsula
44
37
 
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
38
+ bh, Bahrain, BHR, 765, 1_234_571, Manama, un|fifa|middle_east|western_asia|arabian peninsula|microstate
39
+ kw, Kuwait, KUW, 17_820, 3_566_437, Kuwait City, un|fifa|middle_east|western_asia|arabian peninsula
40
+ om, Oman, OMA, 309_501, 2_773_479, Muscat, un|fifa|middle_east|western_asia|arabian peninsula
41
+ qa, Qatar, QAT, 11_571, 1_853_563, Doha, un|fifa|middle_east|western_asia|arabian peninsula
42
+ sa, Saudi Arabia, KSA, 1_960_582, 27_136_977, un|fifa|middle_east|western_asia|arabian peninsula|g20
43
+ ae, United Arab Emirates, UAE, 83_600, 8_264_070, Abu Dhabi, un|fifa|middle_east|western_asia|arabian peninsula
44
+ ye, Yemen, YEM, 527_829, 25_130_000, Sana'a, un|fifa|middle_east|western_asia|arabian peninsula
47
45
 
48
- om, Oman, OMA, 309_501, 2_773_479, Muscat, un|fifa
49
46
 
50
- qa, Qatar, QAT, 11_571, 1_853_563, Doha, un|fifa
47
+ ## fertile crescent
51
48
 
52
- sy, Syria, SYR, 185_180, 22_530_746, Damascus, un|fifa
49
+ iq, Iraq, IRQ, 438_317, 31_129_225, Baghdad, un|fifa|middle_east|western_asia|fertile crescent
50
+ il, Israel, ISR, 20_770, 7_653_600, un|fifa|middle_east|western_asia|fertile crescent
51
+ jo, Jordan, JOR, 89_342, 6_508_271, Amman, un|fifa|middle_east|western_asia|fertile crescent
52
+ lb, Lebanon, LIB, 10_452, 4_224_000, Beirut, un|fifa|middle_east|western_asia|fertile crescent
53
+ ps, Palestine, PLE, 6_220, 4_260_636, fifa|middle_east|western_asia|fertile crescent
54
+ sy, Syria, SYR, 185_180, 22_530_746, Damascus, un|fifa|middle_east|western_asia|fertile crescent
53
55
 
54
- tj, Tajikistan, TJK, 143_100, 7_616_000, Dushanbe, un|fifa
56
+ ### iranian Plateau
55
57
 
56
- tl, Timor-Leste [East Timor], TLS, 14_874, 1_066_582, Dili, un|fifa
58
+ ir, Iran, IRN, 1_648_195, 75_149_669, Tehran, un|fifa|middle_east|western_asia
57
59
 
58
- tm, Turkmenistan, TKM, 491_210, 5_125_693, Ashgabat, un|fifa
59
60
 
60
- ae, United Arab Emirates, UAE, 83_600, 8_264_070, Abu Dhabi, un|fifa
61
+ ## south caucasus
62
+ ## - add to middle east?
63
+ ## - check azerbaijan is in europe and fifa too?
61
64
 
62
- uz, Uzbekistan, UZB, 447_400, 29_559_100, Tashkent, un|fifa
65
+ ge, Georgia, GEO, 69_700, 4_570_934, un|fifa|uefa|europe|western asia|south caucasus
66
+ am, Armenia, ARM, 29_743, 2_970_495, un|fifa|uefa|europe|western asia|south caucasus
67
+ az, Azerbaijan, AZE, 86_600, 9_165_000, Baku, un|fifa|uefa|western asia|south caucasus
63
68
 
64
- ye, Yemen, YEM, 527_829, 25_130_000, Sana'a, un|fifa
65
69
 
66
70
 
67
- ###
71
+ #######################
68
72
  # central asia
69
- # -> http://en.wikipedia.org/wiki/Central_Asia
70
-
71
- kz, Kazakhstan, KAZ, 2_724_900, 16_600_000, un|fifa|uefa|europe|central asia
72
-
73
- ########
74
- ## middle east (nb: egypt listed in africa)
75
-
76
- sa, Saudi Arabia, KSA, 1_960_582, 27_136_977, un|fifa|middle_east|western_asia|arabian peninsula|g20
77
-
78
- il, Israel, ISR, 20_770, 7_653_600, un|fifa|middle_east|western_asia|fertile crescent
79
- ps, Palestine, PAL, 6_220, 4_260_636, middle_east|western_asia|fertile crescent
73
+ # see http://en.wikipedia.org/wiki/Central_Asia
80
74
 
81
- ## add to middle east?
75
+ kz, Kazakhstan, KAZ, 2_724_900, 16_600_000, un|fifa|uefa|europe|central_asia
76
+ kg, Kyrgyzstan, KGZ, 199_900, 5_550_239, Bishkek, un|fifa|central_asia
77
+ tj, Tajikistan, TJK, 143_100, 7_616_000, Dushanbe, un|fifa|central_asia
78
+ tm, Turkmenistan, TKM, 491_210, 5_125_693, Ashgabat, un|fifa|central_asia
79
+ uz, Uzbekistan, UZB, 447_400, 29_559_100, Tashkent, un|fifa|central_asia
82
80
 
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
85
81
 
86
-
87
- #####
82
+ ################
88
83
  # east asia
84
+ # see http://en.wikipedia.org/wiki/East_Asia
89
85
 
90
86
  jp, Japan, JPN, 377_930, 127_950_000, un|fifa|east_asia|g8|g20
91
87
  kp, North Korea, PRK, 120_538, 24_346_000, un|fifa|east_asia
92
88
  kr, South Korea, KOR, 99_828, 48_988_833, un|fifa|east_asia|g20
93
89
  cn, China, CHN, 9_596_961, 1_339_724_852, un|fifa|east_asia|g5|g20
94
- hk, Hong Kong, HKG, 1_104, 7_061_200, country:cn, east_asia
95
- tw, Taiwan, TAI, 36_188, 23_174_528, east_asia
90
+ hk, Hong Kong, HKG, 1_104, 7_061_200, country:cn, fifa|east_asia
91
+ tw, Taiwan, TPE, 36_188, 23_174_528, fifa|east_asia
92
+ mn, Mongolia, MGL, 1_564_116, 2_754_685, Ulan Bator, un|fifa|east_asia
96
93
 
97
94
 
98
- ####
95
+ ###################
96
+ # south asia
97
+ # see http://en.wikipedia.org/wiki/South_Asia
98
+
99
+ pk, Pakistan, PAK, 796_095, 180_440_000, un|fifa|south_asia|commonwealth
100
+ in, India, IND, 3_287_240, 1_210_193_422, un|fifa|south_asia|g5|g20|commonwealth
101
+ bd, Bangladesh, BAN, 147_570, 152_518_015, un|fifa|south_asia|commonwealth
102
+ np, Nepal, NEP, 147_181, 26_620_080, un|fifa|south_asia
103
+ lk, Sri Lanka, SRI, 65_610, 20_277_597, un|fifa|south_asia|commonwealth
104
+ bt, Bhutan, BHU, 38_394, 742_737, Thimphu, un|fifa|south_asia
105
+ mv, Maldives, MDV, 298, 328_536, Malé, un|fifa|south_asia|microstate|commonwealth
106
+
107
+ # also add afghanistan here - why? why not?
108
+
109
+ af, Afghanistan, AFG, 647_500, 30_419_928, Kabul, un|fifa|south_asia|central_asia
110
+
111
+
112
+ ########################
99
113
  # southeast asia
114
+ # see http://en.wikipedia.org/wiki/Southeast_Asia
100
115
 
101
116
  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
117
+ my, Malaysia, MAS, 329_847, 28_731_000, un|fifa|southeast_asia|commonwealth
118
+ sg, Singapore, SIN, 724, 5_274_700, un|fifa|southeast_asia|microstate|commonwealth
104
119
  th, Thailand, THA, 513_120, 64_076_000, un|fifa|southeast_asia
105
120
  ph, Philippines, PHI, 300_000, 95_856_000, un|fifa|southeast_asia
106
121
  vn, Vietnam, VIE, 331_210, 89_316_000, un|fifa|southeast_asia
107
-
108
- ####
109
- # south asia
110
-
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
116
-
122
+ bn, Brunei, BRU, 5_765, 408_786, Bandar Seri Begawan, un|fifa|southeast_asia|commonwealth
123
+ mm, Myanmar, MYA, 676_578, 60_280_000, Naypyidaw, un|fifa|southeast_asia
124
+ kh, Cambodia, CAM, 181_035, 14_952_665, Phnom Penh, un|fifa|southeast_asia
125
+ tl, Timor-Leste [East Timor], TLS, 14_874, 1_066_582, Dili, un|fifa|southeast_asia
126
+ la, Laos, LAO, 236_800, 6_500_000, Vientiane, un|fifa|southeast_asia
@@ -1,45 +1,45 @@
1
1
  # Top 10 cities
2
2
 
3
- wien, Wien [Vienna], region:wien, 1_731_236, m:1_724_000
4
- graz, Graz, region:stmk, 265_318
5
- linz, Linz, region:ooe, 191_107
6
- salzburg, Salzburg, region:sbg, 148_521
7
- innsbruck, Innsbruck, region:tirol, 121_329
8
- klagenfurt, Klagenfurt, region:ktn, 94_796
9
- villach, Villach, region:ktn, 59_585
10
- wels, Wels, region:ooe, 58_717
11
- stpoelten, St. Pölten, region:noe, 52_048
12
- dornbirn, Dornbirn, region:vbg, 45_978
3
+ Wien [Vienna], region:wien, 1_731_236, m:1_724_000
4
+ Graz, region:stmk, 265_318
5
+ Linz, region:ooe, 191_107
6
+ Salzburg, region:sbg, 148_521
7
+ Innsbruck, region:tirol, 121_329
8
+ Klagenfurt, region:ktn, 94_796
9
+ Villach, region:ktn, 59_585
10
+ Wels, region:ooe, 58_717
11
+ St. Pölten, region:noe, 52_048
12
+ Dornbirn, region:vbg, 45_978
13
13
 
14
14
  # Top 20 cities
15
15
 
16
- wrneustadt, Wiener Neustadt|Wr. Neustadt, region:noe, 41537
17
- steyr, Steyr, region:ooe, 38248
18
- feldkirch, Feldkirch, region:vbg, 31025
19
- bregenz, Bregenz, region:vbg, 28007
20
- klosterneuburg, Kosterneuburg, region:noe, 25927
21
- leonding, Leonding, region:ooe, 25689
22
- baden, Baden|Baden bei Wien, region:noe, 25142
23
- wolfsberg, Wolfsberg, region:ktn, 24983
24
- leoben, Leoben, region:stmk, 24645
25
- krems, Krems|Krems an der Donau, region:noe, 24110
16
+ Wr. Neustadt|Wiener Neustadt, region:noe, 41537
17
+ Steyr, region:ooe, 38248
18
+ Feldkirch, region:vbg, 31025
19
+ Bregenz, region:vbg, 28007
20
+ Kosterneuburg, region:noe, 25927
21
+ Leonding, region:ooe, 25689
22
+ Baden|Baden bei Wien, region:noe, 25142
23
+ Wolfsberg, region:ktn, 24983
24
+ Leoben, region:stmk, 24645
25
+ Krems|Krems an der Donau, region:noe, 24110
26
26
 
27
27
 
28
28
  # more cities
29
29
 
30
- moedling, Mödling|Moedling, region:noe, 20649
31
- horn, Horn, region:noe, 6411, # < 10000 pop
30
+ Mödling, region:noe, 20649
31
+ Horn, region:noe, 6411, # < 10000 pop
32
32
 
33
- traun, Traun, region:ooe, 23941
34
- ried, Ried im Innkreis, region:ooe, 11585
33
+ Traun, region:ooe, 23941
34
+ Ried|Ried im Innkreis, region:ooe, 11585
35
35
 
36
- eisenstadt, Eisenstadt, region:bgld, 12367
37
- mattersburg, Mattersburg, region:bgld, 6256, # < 10000 pop
36
+ Eisenstadt, region:bgld, 12367
37
+ Mattersburg, region:bgld, 6256, # < 10000 pop
38
38
 
39
- kapfenberg, Kapfenberg, region:stmk, 21928
40
- hartberg, Hartberg, region:stmk, 6547, # < 10000 pop
39
+ Kapfenberg, region:stmk, 21928
40
+ Hartberg, region:stmk, 6547, # < 10000 pop
41
41
 
42
- groedig, Grödig, region:sbg, 6638, # < 10000 pop
42
+ Grödig, region:sbg, 6638, # < 10000 pop
43
43
 
44
- lustenau, Lustenau, region:vbg, 20606
45
- altach, Altach, region:vbg, 5704, # < 10000 pop
44
+ Lustenau, region:vbg, 20606
45
+ Altach, region:vbg, 5704, # < 10000 pop
@@ -14,13 +14,13 @@
14
14
  ## 9 Bundesländer
15
15
 
16
16
  bgld, Bgld.|Burgenland, 3_962, eastern austria
17
- noe, NÖ|Niederösterreich|Lower Austria, 19_186, eastern austria
18
- wien, Wien|Vienna, 415, eastern austria
17
+ noe, NÖ|Niederösterreich [Lower Austria], 19_186, eastern austria
18
+ wien, Wien [Vienna], 415, eastern austria
19
19
 
20
- stmk, Stmk.|Steiermark|Styria, 16_401, southern austria
21
- ktn, Ktn.|Kärnten|Carinthia, 9_538, southern austria
20
+ stmk, Stmk.|Steiermark [Styria], 16_401, southern austria
21
+ ktn, Ktn.|Kärnten [Carinthia], 9_538, southern austria
22
22
 
23
- ooe, OÖ|Oberösterreich|Upper Austria, 11_980, western austria
23
+ ooe, OÖ|Oberösterreich [Upper Austria], 11_980, western austria
24
24
  sbg, Sbg.|Salzburg, 7_156, western austria
25
- tirol, Tirol|Tyrol, 12_640, western austria
25
+ tirol, Tirol [Tyrol], 12_640, western austria
26
26
  vbg, Vbg.|Vorarlberg, 2_601, western austria
@@ -1,15 +1,15 @@
1
1
 
2
2
 
3
- brussel, Brussel|Bruxelles [Brussels], region:bx, 1_048_491, m:1_929_000 , # nl|fr|en
4
- antwerp, Antwerpen|Anvers [Antwerp], region:an, 466_203, m:960_000
5
- ghent, Gent|Gand [Ghent], region:ov, 235_143
6
- charleroi, Charleroi, region:ht, 201_550
7
- liege, Liège|Luik, region:lg, 188_907
8
- bruges, Bruges|Brugge, region:wv, 116_982
9
- namur, Namur|Namen, region:na, 107_653
10
- leuven, Leuven|Louvain, region:br, 91_942
11
- mons, Mons|Bergen, region:ht, 91_196
12
- mechelen, Mechelen|Malines, region:an, 78_900
3
+ Brussel|Bruxelles [Brussels], region:bx, 1_048_491, m:1_929_000 , # nl|fr|en
4
+ Antwerpen|Anvers [Antwerp], region:an, 466_203, m:960_000
5
+ Gent|Gand [Ghent], region:ov, 235_143
6
+ Charleroi, region:ht, 201_550
7
+ Liège|Luik, region:lg, 188_907
8
+ Bruges|Brugge, region:wv, 116_982
9
+ Namur|Namen, region:na, 107_653
10
+ Leuven|Louvain, region:br, 91_942
11
+ Mons|Bergen, region:ht, 91_196
12
+ Mechelen|Malines, region:an, 78_900
13
13
 
14
14
 
15
15
  ## add as city districts? (or cities w/ major or similar flag=false?)
@@ -2,14 +2,27 @@
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
5
+ #####
6
+ # regions
7
+ # northern europe - see http://en.wikipedia.org/wiki/Northern_Europe
8
+ # southern_europe - see http://en.wikipedia.org/wiki/Southern_Europe
9
+ # western_europe - see http://en.wikipedia.org/wiki/Western_Europe
10
+ # eastern_europe - see http://en.wikipedia.org/wiki/Eastern_Europe
11
+ #
12
+ # also see http://en.wikipedia.org/wiki/File:Grossgliederung_Europas-en.svg
13
+ #
14
+ #
15
+ # baltic (states) - see http://en.wikipedia.org/wiki/Baltic_countries
16
+ # scandinavia - see http://en.wikipedia.org/wiki/Scandinavia
17
+ # nordic (countries) - see http://en.wikipedia.org/wiki/Nordic_countries
18
+ # balkans - see http://en.wikipedia.org/wiki/Balkans
19
+ # southeastern_europe
20
+
11
21
 
12
22
 
23
+ #####
24
+ # mark as microstate (if area < 1000)
25
+ # see http://en.wikipedia.org/wiki/Microstate
13
26
 
14
27
 
15
28
 
@@ -44,62 +57,67 @@ eu, European Union, EUR, 4_324_782, 503_492_041, supra, g20 # NB: no FIFA c
44
57
 
45
58
  ## todo: auto-add tag eu?? for supra:eu?
46
59
 
47
- at, Austria, AUT, 83_871, 8_414_638, supra:eu, un|fifa|de| eu|euro|schengen|uefa|central europe
48
- be, Belgium, BEL, 30_528, 11_007_020, supra:eu, un|fifa|nl|fr|de| eu|euro|schengen|uefa|benelux
49
- cy, Cyprus, CYP, 9_251, 1_099_341, supra:eu, un|fifa|eu|euro|uefa|asia|western asia
50
- 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)
51
- ee, Estonia, EST, 45_226, 1_340_194, supra:eu, un|fifa|eu|euro|schengen|uefa
52
- es, Spain, ESP, 506_030, 46_030_109, supra:eu, un|fifa|eu|euro|schengen|uefa
53
- fi, Finland, FIN, 338_145, 5_391_700, supra:eu, un|fifa|eu|euro|schengen|uefa
54
- fr, France, FRA, 674_843, 65_821_885, supra:eu, un|fifa|eu|euro|schengen|uefa|g8|g20
55
- gr, Greece, GRE, 131_990, 10_787_690, supra:eu, un|fifa|eu|euro|schengen|uefa # NB: ISO (GRC) <> FIFA (GRE)
56
- ie, Irland, IRL, 70_273, 4_722_028, supra:eu, un|fifa|eu|euro|uefa
57
- it, Italy, ITA, 301_318, 60_681_514, supra:eu, un|fifa|eu|euro|schengen|uefa|g8|g20
58
- lu, Luxembourg, LUX, 2_586, 511_840, supra:eu, un|fifa|eu|euro|schengen|uefa|un|benelux
59
- mt, Malta, MLT, 316, 417_608, supra:eu, un|fifa|eu|euro|schengen|uefa
60
- nl, Netherlands, NED, 41_526, 16_703_700, supra:eu, un|fifa|eu|euro|schengen|uefa|un|benelux # NB: ISO (NLD) <> FIFA (NED)
61
- pt, Portugal, POR, 92_391, 10_647_763, supra:eu, un|fifa|eu|euro|schengen # NB: ISO (PRT) <> FIFA (POR)
62
- sk, Slovakia, SVK, 49_037, 5_440_078, supra:eu, un|fifa|eu|euro|schengen
63
- si, Slovenia, SVN, 20_273, 2_048_951, supra:eu, un|fifa|eu|euro|schengen
64
-
65
- bg, Bulgaria, BUL, 110_994, 7_364_570, supra:eu, un|fifa|eu|uefa # NB: ISO (BGR) <> FIFA (BUL)
66
- dk, Denmark, DEN, 43_094, 5_564_219, supra:eu, un|fifa|eu|uefa|schengen # NB: ISO (DNK) <> FIFA (DEN)
67
- lv, Latvija [Latvia], LVA, 64_589, 2_245_357, supra:eu, un|fifa|eu|uefa|schengen
68
- lt, Lithuania, LTU, 65_303, 3_207_060, supra:eu, un|fifa|eu|uefa|schengen
69
- pl, Poland, POL, 312_683, 38_186_860, supra:eu, un|fifa|eu|uefa|schengen
70
- ro, Romania, ROU, 238_391, 19_042_936, supra:eu, un|fifa|eu|uefa
71
- se, Sweden, SWE, 449_964, 9_415_570, supra:eu, un|fifa|eu|uefa|schengen
72
- cz, Czech Republic, CZE, 78_866, 10_535_811, supra:eu, un|fifa|cs|sk| eu|uefa|schengen
73
- hu, Hungary, HUN, 93_030, 9_979_000, supra:eu, un|fifa|eu|uefa|schengen
60
+ at, Austria, AUT, 83_871, 8_414_638, supra:eu, un|fifa|uefa|de| eu|euro|schengen|central_europe|western_europe
61
+ be, Belgium, BEL, 30_528, 11_007_020, supra:eu, un|fifa|uefa|nl|fr|de| eu|euro|schengen|benelux
62
+ cy, Cyprus, CYP, 9_251, 1_099_341, supra:eu, un|fifa|uefa|eu|euro|asia|western asia|middle_east|mediterranean|southern_europe|commonwealth
63
+ de, Germany, GER, 357_050, 81_799_600, supra:eu, un|fifa|uefa|de| eu|euro|schengen|g8|g20|western europe|central_europe
64
+ ee, Estonia, EST, 45_226, 1_340_194, supra:eu, un|fifa|uefa|eu|euro|schengen|uefa|northern europe|baltic|eastern_europe
65
+ es, Spain, ESP, 506_030, 46_030_109, supra:eu, un|fifa|uefa|eu|euro|schengen|southern_europe
66
+ fi, Finland, FIN, 338_145, 5_391_700, supra:eu, un|fifa|uefa|eu|euro|schengen|northern europe|nordic
67
+ fr, France, FRA, 674_843, 65_821_885, supra:eu, un|fifa|uefa|eu|euro|schengen|g8|g20|western_europe
68
+ gr, Greece, GRE, 131_990, 10_787_690, supra:eu, un|fifa|uefa|eu|euro|schengen|southern_europe # NB: ISO (GRC) <> FIFA (GRE)
69
+ ie, Irland, IRL, 70_273, 4_722_028, supra:eu, un|fifa|uefa|eu|euro|northern europe|western_europe
70
+ it, Italy, ITA, 301_318, 60_681_514, supra:eu, un|fifa|uefa|eu|euro|schengen|g8|g20|southern_europe
71
+ lu, Luxembourg, LUX, 2_586, 511_840, supra:eu, un|fifa|uefa|eu|euro|schengen|benelux|western_europe
72
+ mt, Malta, MLT, 316, 417_608, supra:eu, un|fifa|uefa|eu|euro|schengen|microstate|mediterranean|southern_europe|commonwealth
73
+ nl, Netherlands, NED, 41_526, 16_703_700, supra:eu, un|fifa|uefa|eu|euro|schengen|benelux|western_europe
74
+ pt, Portugal, POR, 92_391, 10_647_763, supra:eu, un|fifa|uefa|eu|euro|schengen|southern_europe # NB: ISO (PRT) <> FIFA (POR)
75
+ sk, Slovakia, SVK, 49_037, 5_440_078, supra:eu, un|fifa|uefa|eu|euro|schengen|central_europe
76
+ si, Slovenia, SVN, 20_273, 2_048_951, supra:eu, un|fifa|uefa|eu|euro|schengen|southern_europe|central_europe
77
+
78
+ bg, Bulgaria, BUL, 110_994, 7_364_570, supra:eu, un|fifa|uefa|eu|eastern_europe|southeastern_europe
79
+ dk, Denmark, DEN, 43_094, 5_564_219, supra:eu, un|fifa|uefa|eu|schengen|northern europe|scandinavia|nordic
80
+ lv, Latvija [Latvia], LVA, 64_589, 2_245_357, supra:eu, un|fifa|uefa|eu|schengen|northern europe|baltic
81
+ lt, Lithuania, LTU, 65_303, 3_207_060, supra:eu, un|fifa|uefa|eu|schengen|northern europe|baltic
82
+ pl, Poland, POL, 312_683, 38_186_860, supra:eu, un|fifa|uefa|eu|schengen|central_europe
83
+ ro, Romania, ROU, 238_391, 19_042_936, supra:eu, un|fifa|uefa|eu|eastern_europe|southeastern_europe
84
+ se, Sweden, SWE, 449_964, 9_415_570, supra:eu, un|fifa|uefa|eu|schengen|northern europe|scandinavia|nordic
85
+ cz, Czech Republic, CZE, 78_866, 10_535_811, supra:eu, un|fifa|uefa|cs|sk| eu|schengen|central_europe
86
+ hu, Hungary, HUN, 93_030, 9_979_000, supra:eu, un|fifa|uefa|eu|schengen|central_europe
74
87
 
75
88
  ## todo/check: make a distinction between uk and gb?
76
89
  ##
77
90
  ## uk, United Kingdown (of Great Britain and Northern Irleland), UKI, 243_610, London, supra:eu, un|fifa|eu|g8|g20
78
91
 
79
- gb, Great Britain, GBR, 243_610, 63_047_162, supra:eu, un|eu|g8|g20
80
- 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?
92
+ gb, Great Britain, GBR, 243_610, 63_047_162, supra:eu, un|eu|g8|g20|northern europe|western_europe|commonwealth
93
+ en, England, ENG, 130_395, 53_013_000, country:gb, fifa|uefa|northern europe|western_europe # NB: FIFA (ENG); not a valid iso country n internet domain / its uk - what to use - anything better?
81
94
 
82
- sc, 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?
83
- wa, Wales, WAL, 20_779, 3_064_000, country:gb, fifa
84
- nd, Northern Ireland, NIR, 13_843, 1_810_900, Belfast, country:gb, fifa
95
+ sc, Scotland, SCO, 78_387, 5_254_800, country:gb, fifa|uefa|northern europe|western_europe # NB: FIFA (SCO); not a valid iso country/internet domain - its uk - what to use - anything better?
96
+ wa, Wales, WAL, 20_779, 3_064_000, country:gb, fifa|uefa|northern europe|western_europe
97
+ nd, Northern Ireland, NIR, 13_843, 1_810_900, Belfast, country:gb, fifa|uefa|northern europe|western_europe
85
98
 
86
99
 
87
- fo, Faroe Islands, FRO, 1_399, 49_267, country:dk
100
+ fo, Faroe Islands, FRO, 1_399, 49_267, country:dk, fifa|uefa|northern europe|nordic
88
101
 
89
- ad, Andorra, AND, 468, 85_082, un|fifa
90
- al, Albania, ALB, 28_748, 3_002_859, un|fifa
91
- by, Belarus, BLR, 207_600, 9_643_566, un|fifa
92
- ch, Switzerland, SUI, 41_285, 7_866_500, un|fifa|de|fr|it|rm| schengen|uefa|un # NB: ISO (CHE) <> FIFA (SUI)
93
- hr, Croatia, CRO, 56_594, 4_290_612, un|fifa # NB: ISO (HRV) <> FIFA (CRO); local name: Hrvatska
94
- rs, Serbia, SRB, 88_361, 7_276_604, un|fifa
95
- ru, Russia, RUS, 17_098_242, 142_517_670, un|fifa|asia|north asia|g8|g20
96
- tr, Turkey, TUR, 783_562, 79_749_461, un|fifa| asia|western asia|g20
97
- ua, Ukraine, UKR, 603_550, 44_854_065, un|fifa
98
- mk, Macedonia, MKD, 25_713, 2_082_370, un|fifa
99
- no, Norway, NOR, 385_155, 4_993_300, un|fifa|schengen|uefa
100
- is, Iceland, ISL, 103_000, 318_452, un|fifa|schengen|uefa
102
+ ad, Andorra, AND, 468, 85_082, un|fifa|uefa|microstate|western_europe
103
+ al, Albania, ALB, 28_748, 3_002_859, un|fifa|uefa|southern_europe|balkans|southeastern_europe
104
+ by, Belarus, BLR, 207_600, 9_643_566, un|fifa|uefa|eastern_europe
105
+ ch, Switzerland, SUI, 41_285, 7_866_500, un|fifa|uefa|de|fr|it|rm| schengen|western_europe|central_europe
106
+ hr, Croatia, CRO, 56_594, 4_290_612, un|fifa|uefa|southern_europe|balkans|southeastern_europe # NB: ISO (HRV) <> FIFA (CRO); local name: Hrvatska
107
+ rs, Serbia, SRB, 88_361, 7_276_604, un|fifa|uefa|southern_europe|balkans|southeastern_europe
108
+ ru, Russia, RUS, 17_098_242, 142_517_670, un|fifa|uefa|asia|north asia|g8|g20
109
+ tr, Turkey, TUR, 783_562, 79_749_461, un|fifa|uefa|asia|western asia|g20
110
+ ua, Ukraine, UKR, 603_550, 44_854_065, un|fifa|uefa|eastern_europe
111
+ mk, Macedonia, MKD, 25_713, 2_082_370, un|fifa|uefa|southern_europe|balkans|southeastern_europe
112
+ no, Norway, NOR, 385_155, 4_993_300, un|fifa|uefa|schengen|uefa|northern europe|scandinavia|nordic
113
+ is, Iceland, ISL, 103_000, 318_452, un|fifa|uefa|schengen|uefa|northern europe|nordic
101
114
 
102
- va, Vatican City, VAT, 1, 836, Vatican City
103
115
 
104
- ## todo/fix: add missing countries
116
+ va, Vatican City, VAT, 1, 836, Vatican City, microstate|southern_europe # NB: not fifa member; use ISO code
105
117
 
118
+ ba, Bosnia and Herzegovina, BIH, 51_197, 3_839_737, Sarajevo, un|fifa|uefa|southern_europe|balkans|southeastern_europe
119
+ li, Liechtenstein, LIE, 160, 36281, Vaduz, un|fifa|uefa|microstate|western_europe
120
+ mc, Monaco, MCO, 2, 36371, Monaco, un|microstate|western_europe # nb: use ISO code; not fifa member
121
+ me, Montenegro, MNE, 13_812, 625_266, Podgorica, un|fifa|uefa|southern_europe|balkans|southeastern_europe
122
+ md, Moldova, MDA, 33_846, 3_559_500, Chișinău, un|fifa|uefa|eastern_europe
123
+ sm, San Marino, SMR, 61, 32_404, City of San Marino, un|fifa|uefa|microstate|southern_europe
@@ -2,25 +2,25 @@
2
2
 
3
3
  # top 10 cities
4
4
 
5
- praha, Praha [Prague], region:pr, 1_290_846, m:1_265_000
6
- brno, Brno, region:jm, 384_277
7
- ostrava, Ostrava, region:mo, 302_456
8
- plzen, Plzeň [Pilsen], region:pl, 169_688
9
- liberec, Liberec, region:li, 102_247
10
- olomouc, Olomouc, region:ol, 100_043
11
- ustinadlabem, Ústí nad Labem, region:us, 95_003
12
- hradeckralove, Hradec Králové, region:kr, 94_242
13
- budejovice, České Budějovice [Budweis], region:jc, 93_883
14
- pardubice, Pardubice, region:pa, 91_073
5
+ Praha [Prague], region:pr, 1_290_846, m:1_265_000
6
+ Brno, region:jm, 384_277
7
+ Ostrava, region:mo, 302_456
8
+ Plzeň [Pilsen], region:pl, 169_688
9
+ Liberec, region:li, 102_247
10
+ Olomouc, region:ol, 100_043
11
+ Ústí nad Labem, region:us, 95_003
12
+ Hradec Králové, region:kr, 94_242
13
+ Budějovice [Budweis]|České Budějovice, region:jc, 93_883
14
+ Pardubice, region:pa, 91_073
15
15
 
16
16
 
17
17
  # more cities/towns
18
18
 
19
- karlovyvary, Karlovy Vary [Carlsbad], region:ka, 53_737
20
- kutnahora, Kutná Hora, region:st, 20_839
19
+ Karlovy Vary [Carlsbad], region:ka, 53_737
20
+ Kutná Hora, region:st, 20_839
21
21
 
22
- tabor, Tábor, region:jc, 35_769
23
- krumlov, Český Krumlov, region:jc, 13_752
24
- trebon, Třeboň, region:jc, 8_840
22
+ Tábor, region:jc, 35_769
23
+ Krumlov|Český Krumlov, region:jc, 13_752
24
+ Třeboň, region:jc, 8_840
25
25
 
26
- mikulov, Mikulov, region:jm, 7_624
26
+ Mikulov, region:jm, 7_624
@@ -5,40 +5,40 @@
5
5
  ## - http://en.wikipedia.org/wiki/Largest_urban_areas_of_the_European_Union
6
6
 
7
7
 
8
- ruhr, Ruhrgebiet [Ruhr area], region:nw, m:7_304_000, metro # includes essen, bochum, dortmund, gelsenkirchen
9
- koelnbonn, Köln/Bonn [Cologne-Bonn], region:nw, m:2_063_000, metro # includes koeln, leverkusen, bergischgladbach, bonn
8
+ ruhr, Ruhrgebiet [Ruhr area], region:nw, m:7_304_000, metro # includes essen, bochum, dortmund, gelsenkirchen
9
+ Köln/Bonn [Cologne-Bonn], region:nw, m:2_063_000, metro # includes koeln, leverkusen, bergischgladbach, bonn
10
10
 
11
11
 
12
12
  # Top 10 cities
13
13
 
14
- berlin, Berlin, region:be, 3_501_872, m:3_453_000
15
- hamburg, Hamburg, region:hh, 1_798_836, m:1_794_000
16
- muenchen, München [Munich], region:by, 1_378_176, m:1_355_000
17
- koeln, Köln, region:nw, 1_017_155, metro:koelnbonn,
18
- frankfurt, Frankfurt, region:he, 691_518 m:2_300_000 # frankfurt metro includes wiesbaden, darmstadt
19
- stuttgart, Stuttgart, region:bw, 613_392, m:1_272_000
20
- duesseldorf, Düsseldorf, region:nw, 592_393
21
- dortmund, Dortmund, region:nw, 580_956, metro:ruhr
22
- essen, Essen, region:nw, 573_468, metro:ruhr
23
- bremen, Bremen, region:hb, 548_319
14
+ Berlin, region:be, 3_501_872, m:3_453_000
15
+ Hamburg, region:hh, 1_798_836, m:1_794_000
16
+ München [Munich], region:by, 1_378_176, m:1_355_000
17
+ Köln, region:nw, 1_017_155, metro:koelnbonn,
18
+ Frankfurt, region:he, 691_518 m:2_300_000 # frankfurt metro includes wiesbaden, darmstadt
19
+ Stuttgart, region:bw, 613_392, m:1_272_000
20
+ Düsseldorf, region:nw, 592_393
21
+ Dortmund, region:nw, 580_956, metro:ruhr
22
+ Essen, region:nw, 573_468, metro:ruhr
23
+ Bremen, region:hb, 548_319
24
24
 
25
25
 
26
- duisburg, Duisburg, region:nw, 513_400, metro:ruhr
27
- leipzig, Leipzig, region:sn, 486_100
28
- dresden, Dresden, region:sn, 473_300
29
- bochum, Bochum, region:nw, 388_100, metro:ruhr
30
- bonn, Bonn, region:nw, 307_500, metro:koelnbonn
26
+ Duisburg, region:nw, 513_400, metro:ruhr
27
+ Leipzig, region:sn, 486_100
28
+ Dresden, region:sn, 473_300
29
+ Bochum, region:nw, 388_100, metro:ruhr
30
+ Bonn, region:nw, 307_500, metro:koelnbonn
31
31
 
32
32
  # more cities
33
33
 
34
- nuernberg, Nürnberg [Nuremberg], region:by, 510_602, m:1_020_000
35
- augsburg, Augsburg, region:by, 266_647
36
- fuerth, Fürth, region:by, 116_317
37
- hoffenheim, Hoffenheim, region:bw, 3_272
38
- freiburg, Freiburg, region:bw, 229_144
39
- hannover, Hannover, region:ni, 525_875
40
- wolfsburg, Wolfsburg, region:ni, 122_583
41
- gelsenkirchen, Gelsenkirchen, region:nw, 256_652, metro:ruhr
42
- leverkusen, Leverkusen, region:nw, 161_195, metro:koelnbonn
43
- mgladbach, Mönchengladbach|M'gladbach, region:nw, 257_208
44
- mainz, Mainz, region:rp, 200_957
34
+ Nürnberg [Nuremberg], region:by, 510_602, m:1_020_000
35
+ Augsburg, region:by, 266_647
36
+ Fürth, region:by, 116_317
37
+ Hoffenheim, region:bw, 3_272
38
+ Freiburg, region:bw, 229_144
39
+ Hannover, region:ni, 525_875
40
+ Wolfsburg, region:ni, 122_583
41
+ Gelsenkirchen, region:nw, 256_652, metro:ruhr
42
+ Leverkusen, region:nw, 161_195, metro:koelnbonn
43
+ M'gladbach|Mönchengladbach, region:nw, 257_208
44
+ Mainz, region:rp, 200_957
@@ -1,30 +1,32 @@
1
1
  # metros
2
2
 
3
- leedsbradford, Leeds-Bradford, region:yh, m:1_541_000, metro
3
+ Leeds-Bradford, region:yh, m:1_541_000, metro
4
4
 
5
5
 
6
6
  # top cities
7
7
 
8
- london, London, region:gl, 7_619_800, m:8_586_000
9
- birmingham, Birmingham, region:wm, 1_010_400, m:2_294_000
10
- liverpool, Liverpool, region:nw, 469_017, m:819_000
11
- leeds, Leeds, region:yh, 443_247, metro:leedsbradford
12
- sheffield, Sheffield, region:yh, 439_866
13
- bristol, Bristol, region:sw, 420_556
14
- manchester, Manchester, region:nw, 394_269, m:2_244_000
15
- leicester, Leicester, region:em, 330_574
16
- coventry, Coventry, region:wm, 303_475
17
- kingston, Kingston upon Hull, region:yh, 301_416
18
- bradford, Bradford, region:yh, 293_717, metro:leedsbradford
8
+ London, region:gl, 7_619_800, m:8_586_000
9
+ Birmingham, region:wm, 1_010_400, m:2_294_000
10
+ Liverpool, region:nw, 469_017, m:819_000
11
+ Leeds, region:yh, 443_247, metro:leedsbradford
12
+ Sheffield, region:yh, 439_866
13
+ Bristol, region:sw, 420_556
14
+ Manchester, region:nw, 394_269, m:2_244_000
15
+ Leicester, region:em, 330_574
16
+ Coventry, region:wm, 303_475
17
+ Kingston|Kingston upon Hull, region:yh, 301_416
18
+ Bradford, region:yh, 293_717, metro:leedsbradford
19
19
 
20
20
 
21
21
  # more cities
22
22
 
23
+ ## change key to westbromwich in sport.db
23
24
  westbrom, West Bromwich, region:wm, 136940
24
- newcastle, Newcastle upon Tyne, region:ne, 280200, m:892_000
25
- stoke, Stoke-on-Trent, region:wm, 249000
26
- sunderland, Sunderland, region:ne, 177739
27
- wigan, Wigan, region:nw, 81203
28
- southampton, Southampton, region:se, 239700
29
- reading, Reading, region:se, 155700
30
- norwich, Norwich, region:ee, 140200
25
+
26
+ Newcastle|Newcastle upon Tyne, region:ne, 280200, m:892_000
27
+ Stoke|Stoke-on-Trent, region:wm, 249000
28
+ Sunderland, region:ne, 177739
29
+ Wigan, region:nw, 81203
30
+ Southampton, region:se, 239700
31
+ Reading, region:se, 155700
32
+ Norwich, region:ee, 140200