update geo module

This commit is contained in:
rolux 2011-11-17 02:15:03 +01:00
parent 21b505b4c8
commit 1503901e81
39 changed files with 3945 additions and 1685 deletions

View file

@ -0,0 +1,11 @@
<!DOCTYPE html>
<html>
<head>
<title>OxJS Countries Demo</title
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<script type="text/javascript" src="../../build/Ox.js"></script>
<script type="text/javascript" src="js/countries.js"></script>
</head>
<body>
</body>
</html>

View file

@ -0,0 +1,41 @@
Ox.load({UI: {}, Geo: {}}, function() {
var $list = Ox.IconList({
//borderRadius: 32,
item: function(data, sort, size) {
return {
height: size,
id: data.code,
info: data.code,
title: data.name,
url: Ox.getImageByGeoname('icon', 256, data.name),
width: size
}
},
items: Ox.COUNTRIES.sort(function(a, b) {
return a.code < b.code ? -1 : a.code > b.code ? 1 : 0;
}),
sort: [{key: 'code', operator: '+'}]
});
Ox.SplitPanel({
elements: [
{
element: Ox.Bar(),
size: 24
},
{
element: $list
}
],
orientation: 'vertical'
})
.appendTo(Ox.UI.$body)
/*
Ox.UI.$window.resize(function() {
$list.size();
});
*/
});

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1,005 B

After

Width:  |  Height:  |  Size: 1,021 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 655 B

After

Width:  |  Height:  |  Size: 592 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 516 B

After

Width:  |  Height:  |  Size: 515 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 554 B

After

Width:  |  Height:  |  Size: 572 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 745 B

After

Width:  |  Height:  |  Size: 812 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1,005 B

After

Width:  |  Height:  |  Size: 999 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 183 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 825 B

After

Width:  |  Height:  |  Size: 819 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 863 B

After

Width:  |  Height:  |  Size: 858 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 571 B

After

Width:  |  Height:  |  Size: 570 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 192 B

After

Width:  |  Height:  |  Size: 186 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 955 B

After

Width:  |  Height:  |  Size: 876 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 709 B

After

Width:  |  Height:  |  Size: 708 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 518 B

After

Width:  |  Height:  |  Size: 511 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 640 B

After

Width:  |  Height:  |  Size: 572 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 496 B

After

Width:  |  Height:  |  Size: 496 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 380 B

After

Width:  |  Height:  |  Size: 398 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 516 B

After

Width:  |  Height:  |  Size: 543 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 338 B

After

Width:  |  Height:  |  Size: 335 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 705 B

After

Width:  |  Height:  |  Size: 689 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 157 B

After

Width:  |  Height:  |  Size: 158 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 411 B

After

Width:  |  Height:  |  Size: 404 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 738 B

After

Width:  |  Height:  |  Size: 743 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 600 B

After

Width:  |  Height:  |  Size: 589 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 552 B

After

Width:  |  Height:  |  Size: 533 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 519 B

After

Width:  |  Height:  |  Size: 515 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 287 B

After

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 B

After

Width:  |  Height:  |  Size: 163 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 322 B

After

Width:  |  Height:  |  Size: 316 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 663 B

After

Width:  |  Height:  |  Size: 620 B

View file

@ -99,11 +99,15 @@
JSON.stringify(json, null, 4)
);
window.status = json.length + '/' + countries.length + ' ' + country.name;
Ox.print(logs);
if (countries.length) {
setTimeout(callGetData, timeout);
} else {
alert('Done');
if (logs.length) {
Ox.print('Errors:', logs);
alert('Done, see console for errors.');
} else {
alert('Done, no errors.');
}
}
});
}

File diff suppressed because it is too large Load diff

View file

@ -247,6 +247,7 @@
{"code": "xko", "name": "Korea"},
{"code": "xkv", "name": "Kosovo"},
{"code": "xnv", "name": "North Vietnam"},
{"code": "xpi", "name": "Palestine"},
{"code": "xsi", "name": "Siam"},
{"code": "xsm", "name": "Serbia and Montenegro"},
{"code": "xsu", "name": "Soviet Union"},

View file

@ -47,7 +47,6 @@
{"code": "BUMM", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/1/1d/Flag_of_Myanmar_%281974-2010%29.svg", "name": "Burma", "wikipediaURL": "http://en.wikipedia.org/wiki/Burma"},
{"code": "BI", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/5/50/Flag_of_Burundi.svg", "name": "Burundi", "wikipediaURL": "http://en.wikipedia.org/wiki/Burundi"},
{"code": "BYAA", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/46/Flag_of_Byelorussian_SSR.svg", "name": "Byelorussian Soviet Socialist Republic", "wikipediaURL": "http://en.wikipedia.org/wiki/Byelorussian_Soviet_Socialist_Republic"},
{"code": "CI", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/8/86/Flag_of_Cote_d%27Ivoire.svg", "name": "C\u00f4te d'Ivoire", "wikipediaURL": "http://en.wikipedia.org/wiki/C%C3%B4te_d%27Ivoire"},
{"code": "KH", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/8/83/Flag_of_Cambodia.svg", "name": "Cambodia", "wikipediaURL": "http://en.wikipedia.org/wiki/Cambodia"},
{"code": "CM", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/4f/Flag_of_Cameroon.svg", "name": "Cameroon", "wikipediaURL": "http://en.wikipedia.org/wiki/Cameroon"},
{"code": "CA", "flagURL": "http://upload.wikimedia.org/wikipedia/en/c/cf/Flag_of_Canada.svg", "name": "Canada", "wikipediaURL": "http://en.wikipedia.org/wiki/Canada"},
@ -60,10 +59,10 @@
{"code": "TD", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/4b/Flag_of_Chad.svg", "name": "Chad", "wikipediaURL": "http://en.wikipedia.org/wiki/Chad"},
{"code": "CL", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/7/78/Flag_of_Chile.svg", "name": "Chile", "wikipediaURL": "http://en.wikipedia.org/wiki/Chile"},
{"code": "CN", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/fa/Flag_of_the_People%27s_Republic_of_China.svg", "name": "China", "wikipediaURL": "http://en.wikipedia.org/wiki/China"},
{"code": "CN", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/fa/Flag_of_the_People%27s_Republic_of_China.svg", "name": "China", "wikipediaURL": "http://en.wikipedia.org/wiki/People%27s_Republic_of_China"},
{"code": "CX", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/6/67/Flag_of_Christmas_Island.svg", "name": "Christmas Island", "wikipediaURL": "http://en.wikipedia.org/wiki/Christmas_Island"},
{"code": "CP", "flagURL": "http://upload.wikimedia.org/wikipedia/en/c/c3/Flag_of_France.svg", "name": "Clipperton Island", "wikipediaURL": "http://en.wikipedia.org/wiki/Clipperton_Island"},
{"code": "CC", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/7/74/Flag_of_the_Cocos_%28Keeling%29_Islands.svg", "name": "Cocos Islands", "wikipediaURL": "http://en.wikipedia.org/wiki/Cocos_Islands"},
{"code": "MF", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/e/ec/Flag_of_Saint-Martin_%28local%29.svg", "name": "Saint Martin", "wikipediaURL": "http://en.wikipedia.org/wiki/Collectivity_of_Saint_Martin"},
{"code": "CO", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/21/Flag_of_Colombia.svg", "name": "Colombia", "wikipediaURL": "http://en.wikipedia.org/wiki/Colombia"},
{"code": "KM", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/94/Flag_of_the_Comoros.svg", "name": "Comoros", "wikipediaURL": "http://en.wikipedia.org/wiki/Comoros"},
{"code": "CK", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/3/35/Flag_of_the_Cook_Islands.svg", "name": "Cook Islands", "wikipediaURL": "http://en.wikipedia.org/wiki/Cook_Islands"},
@ -75,6 +74,8 @@
{"code": "CY", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/d4/Flag_of_Cyprus.svg", "name": "Cyprus", "wikipediaURL": "http://en.wikipedia.org/wiki/Cyprus"},
{"code": "CZ", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/c/cb/Flag_of_the_Czech_Republic.svg", "name": "Czech Republic", "wikipediaURL": "http://en.wikipedia.org/wiki/Czech_Republic"},
{"code": "CSHH", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/2d/Flag_of_Czechoslovakia.svg", "name": "Czechoslovakia", "wikipediaURL": "http://en.wikipedia.org/wiki/Czechoslovakia"},
{"code": "CI", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/8/86/Flag_of_Cote_d%27Ivoire.svg", "name": "C\u00f4te d'Ivoire", "wikipediaURL": "http://en.wikipedia.org/wiki/C%C3%B4te_d%27Ivoire"},
{"code": "DYBJ", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/0a/Flag_of_Benin.svg", "name": "Dahomey", "wikipediaURL": "http://en.wikipedia.org/wiki/Republic_of_Dahomey"},
{"code": "CD", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/6/6f/Flag_of_the_Democratic_Republic_of_the_Congo.svg", "name": "Democratic Republic of the Congo", "wikipediaURL": "http://en.wikipedia.org/wiki/Democratic_Republic_of_the_Congo"},
{"code": "DK", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/9c/Flag_of_Denmark.svg", "name": "Denmark", "wikipediaURL": "http://en.wikipedia.org/wiki/Denmark"},
{"code": "DG", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/6/6e/Flag_of_the_British_Indian_Ocean_Territory.svg", "name": "Diego Garcia", "wikipediaURL": "http://en.wikipedia.org/wiki/Diego_Garcia"},
@ -94,15 +95,14 @@
{"code": "EU", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/b/b7/Flag_of_Europe.svg", "name": "European Union", "wikipediaURL": "http://en.wikipedia.org/wiki/European_Union"},
{"code": "FK", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/8/83/Flag_of_the_Falkland_Islands.svg", "name": "Falkland Islands", "wikipediaURL": "http://en.wikipedia.org/wiki/Falkland_Islands"},
{"code": "FO", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/3/3c/Flag_of_the_Faroe_Islands.svg", "name": "Faroe Islands", "wikipediaURL": "http://en.wikipedia.org/wiki/Faroe_Islands"},
{"code": "FM", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/e/e4/Flag_of_the_Federated_States_of_Micronesia.svg", "name": "Micronesia", "wikipediaURL": "http://en.wikipedia.org/wiki/Federated_States_of_Micronesia"},
{"code": "FJ", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/b/ba/Flag_of_Fiji.svg", "name": "Fiji", "wikipediaURL": "http://en.wikipedia.org/wiki/Fiji"},
{"code": "FI", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/b/bc/Flag_of_Finland.svg", "name": "Finland", "wikipediaURL": "http://en.wikipedia.org/wiki/Finland"},
{"code": "FR", "flagURL": "http://upload.wikimedia.org/wikipedia/en/c/c3/Flag_of_France.svg", "name": "France", "wikipediaURL": "http://en.wikipedia.org/wiki/France"},
{"code": "AIDJ", "flagURL": "http://upload.wikimedia.org/wikipedia/en/c/c3/Flag_of_France.svg", "name": "French Afar and Issas", "wikipediaURL": "http://en.wikipedia.org/wiki/French_Territory_of_the_Afars_and_the_Issas"},
{"code": "GF", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/29/Flag_of_French_Guiana.svg", "name": "French Guiana", "wikipediaURL": "http://en.wikipedia.org/wiki/French_Guiana"},
{"code": "PF", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/db/Flag_of_French_Polynesia.svg", "name": "French Polynesia", "wikipediaURL": "http://en.wikipedia.org/wiki/French_Polynesia"},
{"code": "TF", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/a/a7/Flag_of_the_French_Southern_and_Antarctic_Lands.svg", "name": "French Southern Territories", "wikipediaURL": "http://en.wikipedia.org/wiki/French_Southern_Territories"},
{"code": "FQHH", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/a/a7/Flag_of_the_French_Southern_and_Antarctic_Lands.svg", "name": "French Southern and Antarctic Territories", "wikipediaURL": "http://en.wikipedia.org/wiki/French_Southern_and_Antarctic_Territories"},
{"code": "AIDJ", "flagURL": "http://upload.wikimedia.org/wikipedia/en/c/c3/Flag_of_France.svg", "name": "French Afar and Issas", "wikipediaURL": "http://en.wikipedia.org/wiki/French_Territory_of_the_Afars_and_the_Issas"},
{"code": "GA", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/04/Flag_of_Gabon.svg", "name": "Gabon", "wikipediaURL": "http://en.wikipedia.org/wiki/Gabon"},
{"code": "GM", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/7/77/Flag_of_The_Gambia.svg", "name": "Gambia", "wikipediaURL": "http://en.wikipedia.org/wiki/Gambia"},
{"code": "GE", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/0f/Flag_of_Georgia.svg", "name": "Georgia", "wikipediaURL": "http://en.wikipedia.org/wiki/Georgia_(country)"},
@ -121,7 +121,7 @@
{"code": "GW", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/01/Flag_of_Guinea-Bissau.svg", "name": "Guinea-Bissau", "wikipediaURL": "http://en.wikipedia.org/wiki/Guinea-Bissau"},
{"code": "GY", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/99/Flag_of_Guyana.svg", "name": "Guyana", "wikipediaURL": "http://en.wikipedia.org/wiki/Guyana"},
{"code": "HT", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/5/56/Flag_of_Haiti.svg", "name": "Haiti", "wikipediaURL": "http://en.wikipedia.org/wiki/Haiti"},
{"code": "HM", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/fa/Flag_of_Antarctica.svg", "name": "Heard Island and McDonald Islands", "wikipediaURL": "http://en.wikipedia.org/wiki/Heard_Island_and_McDonald_Islands"},
{"code": "HM", "flagURL": "http://upload.wikimedia.org/wikipedia/en/b/b9/Flag_of_Australia.svg", "name": "Heard Island and McDonald Islands", "wikipediaURL": "http://en.wikipedia.org/wiki/Heard_Island_and_McDonald_Islands"},
{"code": "HN", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/8/82/Flag_of_Honduras.svg", "name": "Honduras", "wikipediaURL": "http://en.wikipedia.org/wiki/Honduras"},
{"code": "HK", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/5/5b/Flag_of_Hong_Kong.svg", "name": "Hong Kong", "wikipediaURL": "http://en.wikipedia.org/wiki/Hong_Kong"},
{"code": "HU", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/c/c1/Flag_of_Hungary.svg", "name": "Hungary", "wikipediaURL": "http://en.wikipedia.org/wiki/Hungary"},
@ -130,6 +130,7 @@
{"code": "ID", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/9f/Flag_of_Indonesia.svg", "name": "Indonesia", "wikipediaURL": "http://en.wikipedia.org/wiki/Indonesia"},
{"code": "IR", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/c/ca/Flag_of_Iran.svg", "name": "Iran", "wikipediaURL": "http://en.wikipedia.org/wiki/Iran"},
{"code": "IQ", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/f6/Flag_of_Iraq.svg", "name": "Iraq", "wikipediaURL": "http://en.wikipedia.org/wiki/Iraq"},
{"code": "IE", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/45/Flag_of_Ireland.svg", "name": "Ireland", "wikipediaURL": "http://en.wikipedia.org/wiki/Republic_of_Ireland"},
{"code": "IM", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/b/bc/Flag_of_the_Isle_of_Man.svg", "name": "Isle of Man", "wikipediaURL": "http://en.wikipedia.org/wiki/Isle_of_Man"},
{"code": "IL", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/d4/Flag_of_Israel.svg", "name": "Israel", "wikipediaURL": "http://en.wikipedia.org/wiki/Israel"},
{"code": "IT", "flagURL": "http://upload.wikimedia.org/wikipedia/en/0/03/Flag_of_Italy.svg", "name": "Italy", "wikipediaURL": "http://en.wikipedia.org/wiki/Italy"},
@ -142,6 +143,7 @@
{"code": "KE", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/49/Flag_of_Kenya.svg", "name": "Kenya", "wikipediaURL": "http://en.wikipedia.org/wiki/Kenya"},
{"code": "KI", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/d3/Flag_of_Kiribati.svg", "name": "Kiribati", "wikipediaURL": "http://en.wikipedia.org/wiki/Kiribati"},
{"code": "KOHH", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/90/Flag_of_Korea_1882.svg", "name": "Korea", "wikipediaURL": "http://en.wikipedia.org/wiki/Korea"},
{"code": "RS-KO", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/1/1f/Flag_of_Kosovo.svg", "name": "Kosovo", "wikipediaURL": "http://en.wikipedia.org/wiki/Republic_of_Kosovo"},
{"code": "KW", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/a/aa/Flag_of_Kuwait.svg", "name": "Kuwait", "wikipediaURL": "http://en.wikipedia.org/wiki/Kuwait"},
{"code": "KG", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/c/c7/Flag_of_Kyrgyzstan.svg", "name": "Kyrgyzstan", "wikipediaURL": "http://en.wikipedia.org/wiki/Kyrgyzstan"},
{"code": "LA", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/5/56/Flag_of_Laos.svg", "name": "Laos", "wikipediaURL": "http://en.wikipedia.org/wiki/Laos"},
@ -149,11 +151,12 @@
{"code": "LB", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/5/59/Flag_of_Lebanon.svg", "name": "Lebanon", "wikipediaURL": "http://en.wikipedia.org/wiki/Lebanon"},
{"code": "LS", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/4a/Flag_of_Lesotho.svg", "name": "Lesotho", "wikipediaURL": "http://en.wikipedia.org/wiki/Lesotho"},
{"code": "LR", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/b/b8/Flag_of_Liberia.svg", "name": "Liberia", "wikipediaURL": "http://en.wikipedia.org/wiki/Liberia"},
{"code": "LY", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/f5/Flag_of_Libya_%281951%29.svg", "name": "Libya", "wikipediaURL": "http://en.wikipedia.org/wiki/Libya"},
{"code": "LY", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/05/Flag_of_Libya.svg", "name": "Libya", "wikipediaURL": "http://en.wikipedia.org/wiki/Libya"},
{"code": "LI", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/47/Flag_of_Liechtenstein.svg", "name": "Liechtenstein", "wikipediaURL": "http://en.wikipedia.org/wiki/Liechtenstein"},
{"code": "LT", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/1/11/Flag_of_Lithuania.svg", "name": "Lithuania", "wikipediaURL": "http://en.wikipedia.org/wiki/Lithuania"},
{"code": "LU", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/da/Flag_of_Luxembourg.svg", "name": "Luxembourg", "wikipediaURL": "http://en.wikipedia.org/wiki/Luxembourg"},
{"code": "MO", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/6/63/Flag_of_Macau.svg", "name": "Macau", "wikipediaURL": "http://en.wikipedia.org/wiki/Macau"},
{"code": "MK", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/f8/Flag_of_Macedonia.svg", "name": "Macedonia", "wikipediaURL": "http://en.wikipedia.org/wiki/Republic_of_Macedonia"},
{"code": "MG", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/b/bc/Flag_of_Madagascar.svg", "name": "Madagascar", "wikipediaURL": "http://en.wikipedia.org/wiki/Madagascar"},
{"code": "MW", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/d1/Flag_of_Malawi.svg", "name": "Malawi", "wikipediaURL": "http://en.wikipedia.org/wiki/Malawi"},
{"code": "MY", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/6/66/Flag_of_Malaysia.svg", "name": "Malaysia", "wikipediaURL": "http://en.wikipedia.org/wiki/Malaysia"},
@ -167,6 +170,7 @@
{"code": "YT", "flagURL": "http://upload.wikimedia.org/wikipedia/en/c/c3/Flag_of_France.svg", "name": "Mayotte", "wikipediaURL": "http://en.wikipedia.org/wiki/Mayotte"},
{"code": "FXFR", "flagURL": "http://upload.wikimedia.org/wikipedia/en/c/c3/Flag_of_France.svg", "name": "Metropolitan France", "wikipediaURL": "http://en.wikipedia.org/wiki/Metropolitan_France"},
{"code": "MX", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/fc/Flag_of_Mexico.svg", "name": "Mexico", "wikipediaURL": "http://en.wikipedia.org/wiki/Mexico"},
{"code": "FM", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/e/e4/Flag_of_the_Federated_States_of_Micronesia.svg", "name": "Micronesia", "wikipediaURL": "http://en.wikipedia.org/wiki/Federated_States_of_Micronesia"},
{"code": "MIUM", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/2a/Flag_of_the_Midway_Islands_%28local%29.svg", "name": "Midway Islands", "wikipediaURL": "http://en.wikipedia.org/wiki/Midway_Islands"},
{"code": "MD", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/27/Flag_of_Moldova.svg", "name": "Moldova", "wikipediaURL": "http://en.wikipedia.org/wiki/Moldova"},
{"code": "MC", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/e/ea/Flag_of_Monaco.svg", "name": "Monaco", "wikipediaURL": "http://en.wikipedia.org/wiki/Monaco"},
@ -182,6 +186,7 @@
{"code": "NP", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/9b/Flag_of_Nepal.svg", "name": "Nepal", "wikipediaURL": "http://en.wikipedia.org/wiki/Nepal"},
{"code": "NL", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/20/Flag_of_the_Netherlands.svg", "name": "Netherlands", "wikipediaURL": "http://en.wikipedia.org/wiki/Netherlands"},
{"code": "ANHH", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/0f/Flag_of_the_Netherlands_Antilles_%281959-1986%29.svg", "name": "Netherlands Antilles", "wikipediaURL": "http://en.wikipedia.org/wiki/Netherlands_Antilles"},
{"code": "NTHH", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/2f/Flag_of_the_United_Nations.svg", "name": "Neutral Zone", "wikipediaURL": "http://en.wikipedia.org/wiki/Saudi-Iraqi_neutral_zone"},
{"code": "NC", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/23/Flag_of_New_Caledonia.svg", "name": "New Caledonia", "wikipediaURL": "http://en.wikipedia.org/wiki/New_Caledonia"},
{"code": "NHVU", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/42/Flag_of_Anglo-French_Joint_Naval_Commission.svg", "name": "New Hebrides", "wikipediaURL": "http://en.wikipedia.org/wiki/New_Hebrides"},
{"code": "NZ", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/3/3e/Flag_of_New_Zealand.svg", "name": "New Zealand", "wikipediaURL": "http://en.wikipedia.org/wiki/New_Zealand"},
@ -197,13 +202,14 @@
{"code": "MP", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/e/e0/Flag_of_the_Northern_Mariana_Islands.svg", "name": "Northern Mariana Islands", "wikipediaURL": "http://en.wikipedia.org/wiki/Northern_Mariana_Islands"},
{"code": "NO", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/d9/Flag_of_Norway.svg", "name": "Norway", "wikipediaURL": "http://en.wikipedia.org/wiki/Norway"},
{"code": "OM", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/dd/Flag_of_Oman.svg", "name": "Oman", "wikipediaURL": "http://en.wikipedia.org/wiki/Oman"},
{"code": "PCHH", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/41/Flag_of_the_Trust_Territory_of_the_Pacific_Islands.svg", "name": "Pacific Islands", "wikipediaURL": "http://en.wikipedia.org/wiki/Trust_Territory_of_the_Pacific_Islands"},
{"code": "PK", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/3/32/Flag_of_Pakistan.svg", "name": "Pakistan", "wikipediaURL": "http://en.wikipedia.org/wiki/Pakistan"},
{"code": "PW", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/48/Flag_of_Palau.svg", "name": "Palau", "wikipediaURL": "http://en.wikipedia.org/wiki/Palau"},
{"code": "PS", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/00/Flag_of_Palestine.svg", "name": "Palestine", "wikipediaURL": "http://en.wikipedia.org/wiki/State_of_Palestine"},
{"code": "PA", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/a/ab/Flag_of_Panama.svg", "name": "Panama", "wikipediaURL": "http://en.wikipedia.org/wiki/Panama"},
{"code": "PZPA", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/b/b0/Panama_Canal_Zone_Flag.png", "name": "Panama Canal Zone", "wikipediaURL": "http://en.wikipedia.org/wiki/Panama_Canal_Zone"},
{"code": "PG", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/e/e3/Flag_of_Papua_New_Guinea.svg", "name": "Papua New Guinea", "wikipediaURL": "http://en.wikipedia.org/wiki/Papua_New_Guinea"},
{"code": "PY", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/27/Flag_of_Paraguay.svg", "name": "Paraguay", "wikipediaURL": "http://en.wikipedia.org/wiki/Paraguay"},
{"code": "CN", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/fa/Flag_of_the_People%27s_Republic_of_China.svg", "name": "China", "wikipediaURL": "http://en.wikipedia.org/wiki/People%27s_Republic_of_China"},
{"code": "PE", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/c/cf/Flag_of_Peru.svg", "name": "Peru", "wikipediaURL": "http://en.wikipedia.org/wiki/Peru"},
{"code": "NO-PI", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/d9/Flag_of_Norway.svg", "name": "Peter I Island", "wikipediaURL": "http://en.wikipedia.org/wiki/Peter_I_Island"},
{"code": "PH", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/99/Flag_of_the_Philippines.svg", "name": "Philippines", "wikipediaURL": "http://en.wikipedia.org/wiki/Philippines"},
@ -213,36 +219,29 @@
{"code": "PR", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/28/Flag_of_Puerto_Rico.svg", "name": "Puerto Rico", "wikipediaURL": "http://en.wikipedia.org/wiki/Puerto_Rico"},
{"code": "QA", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/6/65/Flag_of_Qatar.svg", "name": "Qatar", "wikipediaURL": "http://en.wikipedia.org/wiki/Qatar"},
{"code": "NQAQ", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/d9/Flag_of_Norway.svg", "name": "Queen Maud Land", "wikipediaURL": "http://en.wikipedia.org/wiki/Queen_Maud_Land"},
{"code": "RE", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/9a/Drapeau_Reunion_APDR.png", "name": "R\u00e9union", "wikipediaURL": "http://en.wikipedia.org/wiki/R%C3%A9union"},
{"code": "TW", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/7/72/Flag_of_the_Republic_of_China.svg", "name": "Taiwan", "wikipediaURL": "http://en.wikipedia.org/wiki/Republic_of_China"},
{"code": "DYBJ", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/0a/Flag_of_Benin.svg", "name": "Dahomey", "wikipediaURL": "http://en.wikipedia.org/wiki/Republic_of_Dahomey"},
{"code": "IE", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/45/Flag_of_Ireland.svg", "name": "Ireland", "wikipediaURL": "http://en.wikipedia.org/wiki/Republic_of_Ireland"},
{"code": "RS-KO", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/1/1f/Flag_of_Kosovo.svg", "name": "Kosovo", "wikipediaURL": "http://en.wikipedia.org/wiki/Republic_of_Kosovo"},
{"code": "MK", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/f8/Flag_of_Macedonia.svg", "name": "Macedonia", "wikipediaURL": "http://en.wikipedia.org/wiki/Republic_of_Macedonia"},
{"code": "HVBF", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/4a/Flag_of_Upper_Volta.svg", "name": "Upper Volta", "wikipediaURL": "http://en.wikipedia.org/wiki/Republic_of_Upper_Volta"},
{"code": "CG", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/92/Flag_of_the_Republic_of_the_Congo.svg", "name": "Republic of the Congo", "wikipediaURL": "http://en.wikipedia.org/wiki/Republic_of_the_Congo"},
{"code": "RHZW", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/e/e1/Flag_of_Rhodesia.svg", "name": "Rhodesia", "wikipediaURL": "http://en.wikipedia.org/wiki/Rhodesia"},
{"code": "RO", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/7/73/Flag_of_Romania.svg", "name": "Romania", "wikipediaURL": "http://en.wikipedia.org/wiki/Romania"},
{"code": "NZ-AQ", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/3/3e/Flag_of_New_Zealand.svg", "name": "Ross Dependency", "wikipediaURL": "http://en.wikipedia.org/wiki/Ross_Dependency"},
{"code": "RU", "flagURL": "http://upload.wikimedia.org/wikipedia/en/f/f3/Flag_of_Russia.svg", "name": "Russia", "wikipediaURL": "http://en.wikipedia.org/wiki/Russia"},
{"code": "RW", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/1/17/Flag_of_Rwanda.svg", "name": "Rwanda", "wikipediaURL": "http://en.wikipedia.org/wiki/Rwanda"},
{"code": "ST", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/4f/Flag_of_Sao_Tome_and_Principe.svg", "name": "S\u00e3o Tom\u00e9 and Pr\u00edncipe", "wikipediaURL": "http://en.wikipedia.org/wiki/S%C3%A3o_Tom%C3%A9_and_Pr%C3%ADncipe"},
{"code": "RE", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/9a/Drapeau_Reunion_APDR.png", "name": "R\u00e9union", "wikipediaURL": "http://en.wikipedia.org/wiki/R%C3%A9union"},
{"code": "EH", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/26/Flag_of_the_Sahrawi_Arab_Democratic_Republic.svg", "name": "Sahrawi", "wikipediaURL": "http://en.wikipedia.org/wiki/Sahrawi_Arab_Democratic_Republic"},
{"code": "BL", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/df/Flag_of_Saint_Barthelemy_%28local%29.svg", "name": "Saint Barth\u00e9lemy", "wikipediaURL": "http://en.wikipedia.org/wiki/Saint_Barth%C3%A9lemy"},
{"code": "SH", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/00/Flag_of_Saint_Helena.svg", "name": "Saint Helena", "wikipediaURL": "http://en.wikipedia.org/wiki/Saint_Helena"},
{"code": "KN", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/fe/Flag_of_Saint_Kitts_and_Nevis.svg", "name": "Saint Kitts and Nevis", "wikipediaURL": "http://en.wikipedia.org/wiki/Saint_Kitts_and_Nevis"},
{"code": "LC", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/9f/Flag_of_Saint_Lucia.svg", "name": "Saint Lucia", "wikipediaURL": "http://en.wikipedia.org/wiki/Saint_Lucia"},
{"code": "MF", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/e/ec/Flag_of_Saint-Martin_%28local%29.svg", "name": "Saint Martin", "wikipediaURL": "http://en.wikipedia.org/wiki/Collectivity_of_Saint_Martin"},
{"code": "PM", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/7/74/Flag_of_Saint-Pierre_and_Miquelon.svg", "name": "Saint Pierre and Miquelon", "wikipediaURL": "http://en.wikipedia.org/wiki/Saint_Pierre_and_Miquelon"},
{"code": "VC", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/6/6d/Flag_of_Saint_Vincent_and_the_Grenadines.svg", "name": "Saint Vincent and the Grenadines", "wikipediaURL": "http://en.wikipedia.org/wiki/Saint_Vincent_and_the_Grenadines"},
{"code": "WS", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/3/31/Flag_of_Samoa.svg", "name": "Samoa", "wikipediaURL": "http://en.wikipedia.org/wiki/Samoa"},
{"code": "SM", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/b/b1/Flag_of_San_Marino.svg", "name": "San Marino", "wikipediaURL": "http://en.wikipedia.org/wiki/San_Marino"},
{"code": "NTHH", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/2f/Flag_of_the_United_Nations.svg", "name": "Neutral Zone", "wikipediaURL": "http://en.wikipedia.org/wiki/Saudi-Iraqi_neutral_zone"},
{"code": "SA", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/0d/Flag_of_Saudi_Arabia.svg", "name": "Saudi Arabia", "wikipediaURL": "http://en.wikipedia.org/wiki/Saudi_Arabia"},
{"code": "GB-SCT", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/1/10/Flag_of_Scotland.svg", "name": "Scotland", "wikipediaURL": "http://en.wikipedia.org/wiki/Scotland"},
{"code": "SN", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/fd/Flag_of_Senegal.svg", "name": "Senegal", "wikipediaURL": "http://en.wikipedia.org/wiki/Senegal"},
{"code": "RS", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/ff/Flag_of_Serbia.svg", "name": "Serbia", "wikipediaURL": "http://en.wikipedia.org/wiki/Serbia"},
{"code": "CSXX", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/90/Flag_of_Serbia_and_Montenegro.svg", "name": "Serbia and Montenegro", "wikipediaURL": "http://en.wikipedia.org/wiki/Serbia_and_Montenegro"},
{"code": "SC", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/92/Flag_of_the_Seychelles.svg", "name": "Seychelles", "wikipediaURL": "http://en.wikipedia.org/wiki/Seychelles"},
{"code": "SC", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/fc/Flag_of_Seychelles.svg", "name": "Seychelles", "wikipediaURL": "http://en.wikipedia.org/wiki/Seychelles"},
{"code": "SITH", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/dd/State_Flag_of_Thailand_%281916%29.svg", "name": "Siam", "wikipediaURL": "http://en.wikipedia.org/wiki/Siam"},
{"code": "SL", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/1/17/Flag_of_Sierra_Leone.svg", "name": "Sierra Leone", "wikipediaURL": "http://en.wikipedia.org/wiki/Sierra_Leone"},
{"code": "SKIN", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/1/1e/Flag_of_Sikkim_monarchy.svg", "name": "Sikkim", "wikipediaURL": "http://en.wikipedia.org/wiki/Sikkim"},
@ -262,7 +261,6 @@
{"code": "SUHH", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/a/a9/Flag_of_the_Soviet_Union.svg", "name": "Soviet Union", "wikipediaURL": "http://en.wikipedia.org/wiki/Soviet_Union"},
{"code": "ES", "flagURL": "http://upload.wikimedia.org/wikipedia/en/9/9a/Flag_of_Spain.svg", "name": "Spain", "wikipediaURL": "http://en.wikipedia.org/wiki/Spain"},
{"code": "LK", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/1/11/Flag_of_Sri_Lanka.svg", "name": "Sri Lanka", "wikipediaURL": "http://en.wikipedia.org/wiki/Sri_Lanka"},
{"code": "PS", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/00/Flag_of_Palestine.svg", "name": "Palestine", "wikipediaURL": "http://en.wikipedia.org/wiki/State_of_Palestine"},
{"code": "SD", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/01/Flag_of_Sudan.svg", "name": "Sudan", "wikipediaURL": "http://en.wikipedia.org/wiki/Sudan"},
{"code": "SR", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/6/60/Flag_of_Suriname.svg", "name": "Suriname", "wikipediaURL": "http://en.wikipedia.org/wiki/Suriname"},
{"code": "SJ", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/d9/Flag_of_Norway.svg", "name": "Svalbard and Jan Mayen", "wikipediaURL": "http://en.wikipedia.org/wiki/Svalbard_and_Jan_Mayen"},
@ -270,6 +268,8 @@
{"code": "SE", "flagURL": "http://upload.wikimedia.org/wikipedia/en/4/4c/Flag_of_Sweden.svg", "name": "Sweden", "wikipediaURL": "http://en.wikipedia.org/wiki/Sweden"},
{"code": "CH", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/08/Flag_of_Switzerland_%28Pantone%29.svg", "name": "Switzerland", "wikipediaURL": "http://en.wikipedia.org/wiki/Switzerland"},
{"code": "SY", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/5/53/Flag_of_Syria.svg", "name": "Syria", "wikipediaURL": "http://en.wikipedia.org/wiki/Syria"},
{"code": "ST", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/4f/Flag_of_Sao_Tome_and_Principe.svg", "name": "S\u00e3o Tom\u00e9 and Pr\u00edncipe", "wikipediaURL": "http://en.wikipedia.org/wiki/S%C3%A3o_Tom%C3%A9_and_Pr%C3%ADncipe"},
{"code": "TW", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/7/72/Flag_of_the_Republic_of_China.svg", "name": "Taiwan", "wikipediaURL": "http://en.wikipedia.org/wiki/Republic_of_China"},
{"code": "TJ", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/d0/Flag_of_Tajikistan.svg", "name": "Tajikistan", "wikipediaURL": "http://en.wikipedia.org/wiki/Tajikistan"},
{"code": "TZ", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/3/38/Flag_of_Tanzania.svg", "name": "Tanzania", "wikipediaURL": "http://en.wikipedia.org/wiki/Tanzania"},
{"code": "TH", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/a/a9/Flag_of_Thailand.svg", "name": "Thailand", "wikipediaURL": "http://en.wikipedia.org/wiki/Thailand"},
@ -280,7 +280,6 @@
{"code": "MD-TR", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/93/Transnistria_State_Flag.svg", "name": "Transnistria", "wikipediaURL": "http://en.wikipedia.org/wiki/Transnistria"},
{"code": "TT", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/6/64/Flag_of_Trinidad_and_Tobago.svg", "name": "Trinidad and Tobago", "wikipediaURL": "http://en.wikipedia.org/wiki/Trinidad_and_Tobago"},
{"code": "TA", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/8/89/Flag_of_Tristan_da_Cunha.svg", "name": "Tristan da Cunha", "wikipediaURL": "http://en.wikipedia.org/wiki/Tristan_da_Cunha"},
{"code": "PCHH", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/41/Flag_of_the_Trust_Territory_of_the_Pacific_Islands.svg", "name": "Pacific Islands", "wikipediaURL": "http://en.wikipedia.org/wiki/Trust_Territory_of_the_Pacific_Islands"},
{"code": "TN", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/c/ce/Flag_of_Tunisia.svg", "name": "Tunisia", "wikipediaURL": "http://en.wikipedia.org/wiki/Tunisia"},
{"code": "TR", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/b/b4/Flag_of_Turkey.svg", "name": "Turkey", "wikipediaURL": "http://en.wikipedia.org/wiki/Turkey"},
{"code": "TM", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/1/1b/Flag_of_Turkmenistan.svg", "name": "Turkmenistan", "wikipediaURL": "http://en.wikipedia.org/wiki/Turkmenistan"},
@ -295,6 +294,7 @@
{"code": "UM", "flagURL": "http://upload.wikimedia.org/wikipedia/en/a/a4/Flag_of_the_United_States.svg", "name": "United States Minor Outlying Islands", "wikipediaURL": "http://en.wikipedia.org/wiki/United_States_Minor_Outlying_Islands"},
{"code": "PUUM", "flagURL": "http://upload.wikimedia.org/wikipedia/en/a/a4/Flag_of_the_United_States.svg", "name": "United States Miscellaneous Pacific Islands", "wikipediaURL": "http://en.wikipedia.org/wiki/United_States_Miscellaneous_Pacific_Islands"},
{"code": "VI", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/f8/Flag_of_the_United_States_Virgin_Islands.svg", "name": "United States Virgin Islands", "wikipediaURL": "http://en.wikipedia.org/wiki/United_States_Virgin_Islands"},
{"code": "HVBF", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/4a/Flag_of_Upper_Volta.svg", "name": "Upper Volta", "wikipediaURL": "http://en.wikipedia.org/wiki/Republic_of_Upper_Volta"},
{"code": "UY", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/fe/Flag_of_Uruguay.svg", "name": "Uruguay", "wikipediaURL": "http://en.wikipedia.org/wiki/Uruguay"},
{"code": "UZ", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/8/84/Flag_of_Uzbekistan.svg", "name": "Uzbekistan", "wikipediaURL": "http://en.wikipedia.org/wiki/Uzbekistan"},
{"code": "VU", "flagURL": "http://upload.wikimedia.org/wikipedia/commons/b/bc/Flag_of_Vanuatu.svg", "name": "Vanuatu", "wikipediaURL": "http://en.wikipedia.org/wiki/Vanuatu"},

View file

@ -223,6 +223,7 @@ geo = {
'Coral Sea Islands': 'Flag_of_Australia.svg',
'Diego Garcia': 'Flag_of_the_British_Indian_Ocean_Territory.svg',
'French Guiana': 'Flag_of_French_Guiana.svg',
'Heard Island and McDonald Islands': 'Flag_of_Australia.svg',
'Korea': 'Flag_of_Korea_1882.svg',
# 'Libya': 'Flag_of_the_Libyan_Jamahiriya_1977.svg',
'Metropolitan France': 'Flag_of_France.svg',
@ -260,7 +261,6 @@ geo = {
'Byelorussian Soviet Socialist Republic': ['Belarus'],
'Canton and Enderbury Islands': ['Canton Island', 'Enderbury Island'],
'Ceuta and Melilla': ['Ceuta', 'Melilla'],
'Clipperton Island': ['Île de la Passion'],
'Curaçao': ['Banda Abou, Curaçao'],
'Czechoslovakia': ['Czech Republic', 'Slovakia'],
'East Germany': [
@ -281,8 +281,7 @@ geo = {
'Korea': ['North Korea', 'South Korea'],
'Lebanon': ['Lebanon, Asia'], # in case results are us-biased
'Metropolitan France': ['France'],
'Midway Islands': ['Midway Atoll'],
'Neutral Zone': ['Neutral Zone, Saudi Arabia'],
'Neutral Zone': ['39944, Saudi Arabia', '76611, Saudi Arabia'],
'New Hebrides': ['Vanuatu'],
'North Vietnam': ['Ha Giang, Vietnam', 'Lai Chau, Vietnam', 'Thua Thien-Hue, Vietnam'],
'Northern Cyprus': ['Karpass, Cyprus', 'Kokkina, Cyprus', 'Lympia, Cyprus'],
@ -308,10 +307,14 @@ geo = {
'Russia', 'Tajikistan', 'Turkmenistan', 'Ukraine', 'Uzbekistan'
],
'United Kingdom': ['England', 'Northern Ireland', 'Scotland', 'Wales, United Kingdom'],
'United States Minor Outlying Islands': ['Midway Islands'],
# Baker Island, Howland Island, Jarvis Island, Kingman Reef, Palmyra Atoll --
# but the first three each return the full United States Minor Outlying Islands
'United States Miscellaneous Pacific Islands': ['Kingman Reef', 'Palmyra Atoll'],
'United States Minor Outlying Islands': [
'Baker Island, UM', 'Howland Island', 'Jarvis Island', 'Johnston Atoll', 'Kingman Reef',
'Midway Islands', 'Palmyra Atoll', 'Wake Island'
],
# see http://en.wikipedia.org/wiki/United_States_Miscellaneous_Pacific_Islands
'United States Miscellaneous Pacific Islands': [
'Baker Island, UM', 'Howland Island', 'Jarvis Island', 'Kingman Reef', 'Palmyra Atoll'
],
'UK': ['England', 'Northern Ireland', 'Scotland', 'Wales, United Kingdom'],
'Upper Volta': ['Burkina Faso'],
'Wake Island': ['Wake Atoll'],
@ -579,7 +582,7 @@ geo = {
'SI': 'crop(left)',
'SITH': 'crop()',
'SJ': 'crop(left)',
'SK': 'crop(679)',
'SK': 'crop(left)',
'SKIN': 'border(165)',
'SL': 'crop()',
'SM': 'crop()',
@ -1110,7 +1113,9 @@ def get_country_flag(code, url):
if update_image:
write_file('../svg/flags/' + code + '.svg', img)
if not os.path.exists(png_file) or update_image:
png = read_url(url.replace('/commons/', '/commons/thumb/') + '/' + str(width) + 'px-.png')
url = url.replace('/wikipedia/commons/', '/wikipedia/commons/thumb/')
url = url.replace('/wikipedia/en/', '/wikipedia/en/thumb/')
png = read_url(url + '/' + str(width) + 'px-.png')
write_file(png_file, png)
png = Image.open(png_file)
else:
@ -1122,7 +1127,7 @@ def get_country_flag(code, url):
write_image(png_file, png)
else:
png = Image.open(png_file)
for width in [256, 32]:
for width in [512, 128, 32]:
file = '../png/flags/' + str(width) + '/' + code + '.png'
if not os.path.exists(file) or update_image:
png_ = png.resize((width, int(round(width / png.size[0] * png.size[1]))), Image.ANTIALIAS)
@ -1253,8 +1258,8 @@ def get_country_icon(code):
if len(args) == 0:
args = [int(flag.size[0] / 4)]
width = int(flag.size[1] / 2)
left = int(args[0] - width / 2)
right = int(args[0] + width / 2)
left = int(args[0] - flag.size[1] / 4)
right = int(args[0] + flag.size[1] / 4)
crop_left = flag.crop((left, 0, right, flag.size[1]))
crop_right = flag.crop((flag.size[0] - right, 0, flag.size[0] - left, flag.size[1]))
icon.paste(crop_left, (0, 0))
@ -1298,7 +1303,7 @@ def get_country_icon(code):
write_image(file, icon.resize((1024, 1024), Image.ANTIALIAS))
else:
icon = Image.open(file)
for width in [256, 16]:
for width in [256, 64, 16]:
file = '../png/icons/' + str(width) + '/' + code + '.png'
if not os.path.exists(file) or True:
write_image(file, icon.resize((width, width), Image.ANTIALIAS))

View file

@ -295,7 +295,7 @@ def get_countries():
countries = []
for url in get_country_urls():
countries.append(get_country_data(url))
return countries
return sorted(countries, key=lambda x: x['name'])
def get_country_data(url):
data = {'wikipediaURL': url}