diff --git a/data/World.mwm b/data/World.mwm index e2d7366cc8..d2a3203dca 100644 Binary files a/data/World.mwm and b/data/World.mwm differ diff --git a/data/WorldCoasts.mwm b/data/WorldCoasts.mwm index f3366c553c..e7121d1471 100644 Binary files a/data/WorldCoasts.mwm and b/data/WorldCoasts.mwm differ diff --git a/data/countries.txt b/data/countries.txt index 83dc2baa83..1e891ba148 100644 --- a/data/countries.txt +++ b/data/countries.txt @@ -8,290 +8,290 @@ { "n":"Algeria", "c":"dz", - "s":23758875, + "s":23771379, "rs":48099385 }, { "n":"Angola", "c":"ao", - "s":6132112, + "s":6603160, "rs":8390740 }, { "n":"Benin", "c":"bj", - "s":2124656, + "s":2331417, "rs":3278804 }, { "n":"Botswana", "c":"bw", - "s":4501863, + "s":4921503, "rs":5419181 }, { "n":"Burkina Faso", "c":"bf", - "s":6111235, + "s":6657995, "rs":8018927 }, { "n":"Burundi", "c":"bi", - "s":3621009, + "s":3622681, "rs":1680041 }, { "n":"Cameroon", "c":"cm", - "s":37968732, + "s":41741500, "rs":8534713 }, { "n":"Central African Republic", "c":"cf", - "s":11955505, + "s":13113040, "rs":1522154 }, { "n":"Chad", "c":"td", - "s":4534379, + "s":5010203, "rs":3032104 }, { "n":"Congo-Brazzaville", "c":"cg", - "s":2183063, + "s":2339832, "rs":3808619 }, { "n":"Congo-Kinshasa", "c":"cd", - "s":29299834, + "s":29303475, "rs":11422842 }, { "n":"Côte d'Ivoire", "c":"ci", "f":"Ivory Coast", - "s":6681078, + "s":6685230, "rs":5414391 }, { "n":"Djibouti", "c":"dj", - "s":526686, + "s":557278, "rs":296788 }, { "n":"Egypt", "c":"eg", - "s":17132924, + "s":17147157, "rs":16323668 }, { "n":"Equatorial Guinea", "c":"gq", - "s":721202, + "s":762610, "rs":288504 }, { "n":"Eritrea", "c":"er", - "s":1397097, + "s":1467057, "rs":963125 }, { "n":"Ethiopia", "c":"et", - "s":11853500, + "s":11861541, "rs":14779557 }, { "n":"Gabon", "c":"ga", - "s":1546452, + "s":1632252, "rs":474072 }, { "n":"Gambia", "c":"gm", - "s":1167231, + "s":1222399, "rs":1438973 }, { "n":"Ghana", "c":"gh", - "s":5287665, + "s":5291602, "rs":6718216 }, { "n":"Guinea", "c":"gn", - "s":18854148, + "s":20367836, "rs":5815091 }, { "n":"Guinea-Bissau", "c":"gw", - "s":2894749, + "s":3027876, "rs":391584 }, { "n":"Kenya", "c":"ke", - "s":9997027, + "s":10014227, "rs":6015224 }, { "n":"Liberia", "c":"lr", - "s":11239159, + "s":12351367, "rs":2153053 }, { "n":"Libya", "c":"ly", - "s":5112664, + "s":5852976, "rs":9324148 }, { "n":"Malawi", "c":"mw", - "s":5236072, + "s":5633664, "rs":1520813 }, { "n":"Mali", "c":"ml", - "s":18143660, + "s":19770572, "rs":14975309 }, { "n":"Mauritania", "c":"mr", - "s":2713140, + "s":2713220, "rs":2072417 }, { "n":"Morocco", "c":"ma", - "s":36798226, + "s":36814186, "rs":28641636 }, { "n":"Mozambique", "c":"mz", - "s":5397155, + "s":5772147, "rs":3531755 }, { "n":"Namibia", "c":"na", - "s":6261512, + "s":6267793, "rs":2447074 }, { "n":"Niger", "c":"ne", - "s":6101435, + "s":6663827, "rs":5903950 }, { "n":"Nigeria", "c":"ng", - "s":21438801, + "s":23248361, "rs":24536345 }, { "n":"Rwanda", "c":"rw", - "s":2500491, + "s":2668787, "rs":1315274 }, { "n":"Sahrawi", "c":"eh", - "s":896598, + "s":993014, "rs":706249 }, { "n":"Senegal", "c":"sn", - "s":6979804, + "s":7541180, "rs":15746277 }, { "n":"Sierra Leone", "c":"sl", - "s":18041949, + "s":18042854, "rs":2981050 }, { "n":"Somalia", "c":"so", - "s":7380437, + "s":8248581, "rs":8624332 }, { "n":"South Africa", "c":"za", - "s":64653206, + "s":64691214, "rs":74662677 }, { "n":"South Sudan", "c":"ss", - "s":11796403, + "s":12992819, "rs":4872397 }, { "n":"Sudan", "c":"sd", - "s":8740791, + "s":9419799, "rs":31330672 }, { "n":"Swaziland", "c":"sz", - "s":973287, + "s":1051607, "rs":355500 }, { "n":"Tanzania", "c":"tz", - "s":8926667, + "s":9575507, "rs":5210443 }, { "n":"Togo", "c":"tg", - "s":3972359, + "s":3975088, "rs":3719428 }, { "n":"Tunisia", "c":"tn", - "s":13873458, + "s":13894514, "rs":21838148 }, { "n":"Uganda", "c":"ug", - "s":10211961, + "s":11167249, "rs":4365665 }, { "n":"Zambia", "c":"zm", - "s":4795963, + "s":5151475, "rs":5735021 }, { "n":"Zimbabwe", "c":"zw", - "s":6989607, + "s":7594479, "rs":7105703 } ] @@ -302,61 +302,61 @@ { "n":"Afghanistan", "c":"af", - "s":5312580, + "s":5770228, "rs":3149423 }, { "n":"Bangladesh", "c":"bd", - "s":7679192, + "s":8218601, "rs":2279753 }, { "n":"Bhutan", "c":"bt", - "s":746187, + "s":747068, "rs":71163 }, { "n":"Brunei", "c":"bn", - "s":582150, + "s":622214, "rs":439124 }, { "n":"Burma", "c":"mm", - "s":14474365, + "s":15406245, "rs":14290949 }, { "n":"Cambodia", "c":"kh", - "s":4695170, + "s":5029834, "rs":4240976 }, { "n":"China", "c":"cn", - "s":175197099, + "s":175249659, "rs":104035985 }, { "n":"East Timor", "c":"tl", - "s":2342299, + "s":2436725, "rs":207316 }, { "n":"India", "c":"in", - "s":147611784, + "s":147663872, "rs":175052974 }, { "n":"Indonesia", "c":"id", - "s":104698718, + "s":104727334, "rs":58880444 }, { @@ -366,49 +366,49 @@ { "n":"Chūbu", "f":"Japan_Chubu", - "s":104990357, + "s":105080373, "rs":182302482 }, { "n":"Chūgoku", "f":"Japan_Chugoku", - "s":47558088, + "s":47571233, "rs":44277040 }, { "n":"Hokkaidō", "f":"Japan_Hokkaido", - "s":53234411, + "s":53277764, "rs":47284835 }, { "n":"Tokyo & Kantō", "f":"Japan_Kanto", - "s":94963997, + "s":95280093, "rs":220625398 }, { "n":"Kinki", "f":"Japan_Kinki", - "s":68804178, + "s":68860090, "rs":93706473 }, { "n":"Kyūshū", "f":"Japan_Kyushu", - "s":69339084, + "s":69359485, "rs":95815847 }, { "n":"Shikoku", "f":"Japan_Shikoku", - "s":28827038, + "s":28859534, "rs":21801916 }, { "n":"Tōhoku", "f":"Japan_Tohoku", - "s":77396960, + "s":77418985, "rs":76631040 } ] @@ -416,109 +416,109 @@ { "n":"Kazakhstan", "c":"kz", - "s":37433317, + "s":37453518, "rs":21765973 }, { "n":"Kyrgyzstan", "c":"kg", - "s":12455332, + "s":12462380, "rs":9318157 }, { "n":"Laos", "c":"la", - "s":5916789, + "s":5923710, "rs":1532114 }, { "n":"Malaysia", "c":"my", - "s":19467617, + "s":19487089, "rs":25524129 }, { "n":"Mongolia", "c":"mn", - "s":6080525, + "s":6778925, "rs":2551060 }, { "n":"Nepal", "c":"np", - "s":14853552, + "s":14880048, "rs":5066307 }, { "n":"North Korea", "c":"kp", - "s":10207930, + "s":10880394, "rs":5845339 }, { "n":"Pakistan", "c":"pk", - "s":15179699, + "s":16387315, "rs":22537584 }, { "n":"Philippines", "c":"ph", - "s":77276232, + "s":77344344, "rs":57842023 }, { "n":"Singapore", "c":"sg", - "s":4513209, + "s":4525266, "rs":1728688 }, { "n":"South Korea", "c":"kr", - "s":48204984, + "s":48221056, "rs":37046904 }, { "n":"Sri Lanka", "c":"lk", - "s":7603573, + "s":7613110, "rs":6928562 }, { "n":"Taiwan", "c":"tw", - "s":27140106, + "s":27214994, "rs":35725631 }, { "n":"Tajikistan", "c":"tj", - "s":3426916, + "s":3430285, "rs":2014734 }, { "n":"Thailand", "c":"th", - "s":46688360, + "s":46892192, "rs":53518925 }, { "n":"Turkmenistan", "c":"tm", - "s":2853851, + "s":3184987, "rs":2717095 }, { "n":"Uzbekistan", "c":"uz", - "s":17111146, + "s":17121858, "rs":21058941 }, { "n":"Vietnam", "c":"vn", - "s":18678529, + "s":18691465, "rs":18567229 } ] @@ -529,43 +529,43 @@ { "n":"Belize", "c":"bz", - "s":1515504, + "s":1601864, "rs":1197477 }, { "n":"Costa Rica", "c":"cr", - "s":6288286, + "s":6311222, "rs":7387284 }, { "n":"El Salvador", "c":"sv", - "s":2796066, + "s":2943906, "rs":4718344 }, { "n":"Guatemala", "c":"gt", - "s":5015745, + "s":5018537, "rs":9817033 }, { "n":"Honduras", "c":"hn", - "s":4200699, + "s":4203164, "rs":7472623 }, { "n":"Nicaragua", "c":"ni", - "s":5454362, + "s":5466954, "rs":5548802 }, { "n":"Panama", "c":"pa", - "s":5660407, + "s":5898951, "rs":3074087 } ] @@ -576,91 +576,91 @@ { "n":"Albania", "c":"al", - "s":7278581, + "s":7675325, "rs":3893097 }, { "n":"Andorra", "c":"ad", - "s":453200, + "s":478840, "rs":93815 }, { "n":"Armenia", "c":"am", - "s":6884224, + "s":6889824, "rs":4801888 }, { "n":"Austria", "c":"at", - "s":231791800, + "s":232814521, "rs":66387529 }, { "n":"Azerbaijan", "c":"az", - "s":8610593, + "s":8619482, "rs":10163974 }, { "n":"Belarus", "c":"by", - "s":88970823, + "s":89115799, "rs":31466009 }, { "n":"Belgium", "c":"be", - "s":162107762, + "s":162586722, "rs":45903434 }, { "n":"Bosnia and Herzegovina", "c":"ba", - "s":55560031, + "s":55579480, "rs":7794516 }, { "n":"Bulgaria", "c":"bg", - "s":37794850, + "s":37858682, "rs":28690824 }, { "n":"Croatia", "c":"hr", - "s":42458049, + "s":42535561, "rs":15182817 }, { "n":"Cyprus", "c":"cy", - "s":5436274, + "s":5455219, "rs":6898458 }, { "n":"Czech Republic", "c":"cz", - "s":338975523, + "s":340169963, "rs":44748981 }, { "n":"Denmark", "c":"dk", - "s":117721022, + "s":117944910, "rs":48010928 }, { "n":"Estonia", "c":"ee", - "s":59626828, + "s":59662701, "rs":9700829 }, { "n":"Finland", "c":"fi", - "s":181702771, + "s":181990363, "rs":41499468 }, { @@ -671,154 +671,154 @@ "n":"Alsace", "c":"fr", "f":"France_Alsace", - "s":53691332, + "s":53873020, "rs":8696921 }, { "n":"Aquitaine", "c":"fr", "f":"France_Aquitaine", - "s":101677384, + "s":101866144, "rs":26395377 }, { "n":"Auvergne", "c":"fr", "f":"France_Auvergne", - "s":57917621, + "s":58098102, "rs":14841581 }, { "n":"Basse-Normandie", "c":"fr", "f":"France_Basse-Normandie", - "s":49001892, + "s":49213061, "rs":13456625 }, { "n":"Bourgogne", "c":"fr", "f":"France_Bourgogne", - "s":74190990, + "s":74355406, "rs":16279241 }, { "n":"Bretagne", "c":"fr", "f":"France_Bretagne", - "s":123156696, + "s":123417816, "rs":30458737 }, { "n":"Centre", "c":"fr", "f":"France_Centre", - "s":78546233, + "s":78704681, "rs":21605918 }, { "n":"Champagne-Ardenne", "c":"fr", "f":"France_Champagne-Ardenne", - "s":32332443, + "s":32492364, "rs":8605200 }, { "n":"Corsica", "c":"fr", "f":"France_Corsica", - "s":8236141, + "s":8282318, "rs":939764 }, { "n":"Franche-Comté", "c":"fr", "f":"France_Franche-Comte", - "s":43459570, + "s":43636891, "rs":8820221 }, { "n":"Haute-Normandie", "c":"fr", "f":"France_Haute-Normandie", - "s":35399814, + "s":35517007, "rs":10424130 }, { "n":"Languedoc-Roussillon", "c":"fr", "f":"France_Languedoc-Roussillon", - "s":89319898, + "s":89535594, "rs":19393793 }, { "n":"Limousin", "c":"fr", "f":"France_Limousin", - "s":35663571, + "s":35742660, "rs":11512516 }, { "n":"Lorraine", "c":"fr", "f":"France_Lorraine", - "s":69715145, + "s":69935257, "rs":12956060 }, { "n":"Midi-Pyrénées", "c":"fr", "f":"France_Midi-Pyrenees", - "s":130305799, + "s":130638951, "rs":28915530 }, { "n":"Nord-Pas-de-Calais", "c":"fr", "f":"France_Nord-Pas-de-Calais", - "s":90364524, + "s":90567700, "rs":19322681 }, { "n":"Paris & Île-de-France", "c":"fr", "f":"France_Paris & Ile-de-France", - "s":111999634, + "s":112305026, "rs":23335437 }, { "n":"Pays de la Loire", "c":"fr", "f":"France_Pays de la Loire", - "s":141393954, + "s":141605202, "rs":32624878 }, { "n":"Picardie", "c":"fr", "f":"France_Picardie", - "s":52318000, + "s":52533097, "rs":11933372 }, { "n":"Poitou-Charentes", "c":"fr", "f":"France_Poitou-Charentes", - "s":88921435, + "s":89050940, "rs":24059109 }, { "n":"Provence-Alpes-Côte d'Azur", "c":"fr", "f":"France_Provence-Alpes-Cote d'Azur", - "s":122441429, + "s":122687309, "rs":20323549 }, { "n":"Rhône-Alpes", "c":"fr", "f":"France_Rhone-Alpes", - "s":169325394, + "s":169746794, "rs":36351197 } ] @@ -826,7 +826,7 @@ { "n":"Georgia", "c":"ge", - "s":22673714, + "s":22687250, "rs":16120676 }, { @@ -837,98 +837,98 @@ "n":"Baden-Württemberg", "c":"de", "f":"Germany_Baden-Wurttemberg", - "s":185527366, + "s":186853103, "rs":60765549 }, { "n":"Bavaria", "c":"de", "f":"Germany_Bavaria", - "s":251475630, + "s":252784999, "rs":88042685 }, { "n":"Berlin & Brandenburg", "c":"de", "f":"Germany_Berlin & Brandenburg", - "s":80416552, + "s":81127352, "rs":20897825 }, { "n":"Bremen & Lower Saxony", "c":"de", "f":"Germany_Bremen & Lower Saxony", - "s":151453158, + "s":152558591, "rs":50362701 }, { "n":"Hamburg", "c":"de", "f":"Germany_Hamburg", - "s":13922518, + "s":14057902, "rs":3300118 }, { "n":"Hesse", "c":"de", "f":"Germany_Hesse", - "s":98190270, + "s":98832046, "rs":29594849 }, { "n":"Mecklenburg-Vorpommern", "c":"de", "f":"Germany_Mecklenburg-Vorpommern", - "s":42935770, + "s":43201258, "rs":10291300 }, { "n":"North Rhine-Westphalia", "c":"de", "f":"Germany_North Rhine-Westphalia", - "s":302566284, + "s":304191564, "rs":85568454 }, { "n":"Rhineland-Palatinate", "c":"de", "f":"Germany_Rhineland-Palatinate", - "s":64419560, + "s":64761720, "rs":22515021 }, { "n":"Saarland", "c":"de", "f":"Germany_Saarland", - "s":14101773, + "s":14187037, "rs":4534235 }, { "n":"Saxony-Anhalt", "c":"de", "f":"Germany_Saxony-Anhalt", - "s":46547030, + "s":46703366, "rs":12890364 }, { "n":"Saxony", "c":"de", "f":"Germany_Saxony", - "s":78185795, + "s":78684171, "rs":24606677 }, { "n":"Schleswig-Holstein", "c":"de", "f":"Germany_Schleswig-Holstein", - "s":51020988, + "s":51306452, "rs":15312813 }, { "n":"Thuringia", "c":"de", "f":"Germany_Thuringia", - "s":47045901, + "s":47278069, "rs":13810208 } ] @@ -936,127 +936,127 @@ { "n":"Gibraltar", "c":"gi", - "s":232585, + "s":233202, "rs":49468 }, { "n":"Greece", "c":"gr", - "s":73144092, + "s":73348172, "rs":60321032 }, { "n":"Hungary", "c":"hu", - "s":70336535, + "s":70506447, "rs":35651697 }, { "n":"Iceland", "c":"is", - "s":12655012, + "s":12672596, "rs":2702640 }, { "n":"Ireland", "c":"ie", - "s":60710077, + "s":60840509, "rs":26999545 }, { "n":"Italy", "c":"it", - "s":599999754, + "s":601122683, "rs":223127018 }, { "n":"Kosovo", "c":"xk", - "s":4784787, + "s":4975995, "rs":2991291 }, { "n":"Latvia", "c":"lv", - "s":38128510, + "s":38156863, "rs":10031919 }, { "n":"Liechtenstein", "c":"li", - "s":607372, + "s":651372, "rs":179712 }, { "n":"Lithuania", "c":"lt", - "s":49449896, + "s":49555624, "rs":17299973 }, { "n":"Luxembourg", "c":"lu", - "s":9298456, + "s":9328896, "rs":2598606 }, { "n":"Macedonia", "c":"mk", - "s":11505658, + "s":11834418, "rs":3575493 }, { "n":"Malta", "c":"mt", - "s":1383132, + "s":1477092, "rs":1602612 }, { "n":"Moldova", "c":"md", - "s":15562978, + "s":15580587, "rs":11658772 }, { "n":"Monaco", "c":"mc", - "s":158953, + "s":169473, "rs":28605 }, { "n":"Montenegro", "c":"me", - "s":5607932, + "s":5858244, "rs":1662053 }, { "n":"Netherlands", "c":"nl", - "s":607494975, + "s":608199287, "rs":79100729 }, { "n":"Norway", "c":"no", - "s":193400387, + "s":193604979, "rs":29650501 }, { "n":"Poland", "c":"pl", - "s":412477901, + "s":413638518, "rs":101743293 }, { "n":"Portugal", "c":"pt", - "s":62740580, + "s":62856596, "rs":48588705 }, { "n":"Romania", "c":"ro", - "s":151458272, + "s":151565960, "rs":44394476 }, { @@ -1066,54 +1066,54 @@ { "n":"Moscow & Central", "f":"Russia_Central", - "s":268934712, + "s":269733064, "rs":91164425 }, { "n":"Crimea", - "s":14870739, + "s":14887963, "rs":6241499 }, { "n":"Far Eastern", "f":"Russia_Far Eastern", - "s":101048807, + "s":101098711, "rs":14446196 }, { "n":"North Caucasian", "f":"Russia_North Caucasian", - "s":21793632, + "s":21810888, "rs":13840216 }, { "n":"Saint Petersburg & Northwestern", "f":"Russia_Northwestern", - "s":271506211, + "s":272028011, "rs":46053061 }, { "n":"Siberian", "f":"Russia_Siberian", - "s":148662631, + "s":148825135, "rs":49133365 }, { "n":"Southern", "f":"Russia_Southern", - "s":98813177, + "s":98971897, "rs":47528117 }, { "n":"Urals", "f":"Russia_Urals", - "s":143252006, + "s":143407934, "rs":40253509 }, { "n":"Volga", "f":"Russia_Volga", - "s":227287304, + "s":227614408, "rs":79537929 } ] @@ -1121,49 +1121,49 @@ { "n":"Serbia", "c":"rs", - "s":28578226, + "s":28614659, "rs":11374904 }, { "n":"Slovakia", "c":"sk", - "s":99877415, + "s":100015679, "rs":14891425 }, { "n":"Slovenia", "c":"si", - "s":26017089, + "s":26094529, "rs":7110960 }, { "n":"Spain", "c":"es", - "s":362196954, + "s":363357874, "rs":195613422 }, { "n":"Svalbard and Jan Mayen", "c":"sj", - "s":621457, + "s":792897, "rs":20339 }, { "n":"Sweden", "c":"se", - "s":202317781, + "s":202702421, "rs":60296201 }, { "n":"Switzerland", "c":"ch", - "s":147382582, + "s":148054782, "rs":40464061 }, { "n":"Turkey", "c":"tr", - "s":94978746, + "s":95041402, "rs":170512666 }, { @@ -1173,47 +1173,47 @@ { "n":"Guernsey", "c":"gg", - "s":394883, + "s":418643, "rs":232183 }, { "n":"Isle of Man", "c":"im", - "s":1423232, + "s":1539825, "rs":477107 }, { "n":"Jersey", "c":"je", - "s":864826, + "s":913866, "rs":426747 }, { "n":"England", "c":"uk_england", "f":"UK_England", - "s":395437372, + "s":396951349, "rs":196712606 }, { "n":"Northern Ireland", "c":"uk_northern_ireland", "f":"UK_Northern Ireland", - "s":10620769, + "s":10635474, "rs":6577136 }, { "n":"Scotland", "c":"uk_scotland", "f":"UK_Scotland", - "s":72575512, + "s":72758096, "rs":24150900 }, { "n":"Wales", "c":"uk_wales", "f":"UK_Wales", - "s":30877921, + "s":30925962, "rs":13957864 } ] @@ -1224,12 +1224,12 @@ "g":[ { "n":"Crimea", - "s":14870739, + "s":14887963, "rs":6241499 }, { "n":"Ukraine", - "s":187142792, + "s":187362920, "rs":92910957 } ] @@ -1242,97 +1242,97 @@ { "n":"Bahrain", "c":"bh", - "s":1074072, + "s":1136160, "rs":2574582 }, { "n":"Cyprus", "c":"cy", - "s":5436274, + "s":5455219, "rs":6898458 }, { "n":"Iran", "c":"ir", - "s":31509518, + "s":31517639, "rs":49509641 }, { "n":"Iraq", "c":"iq", - "s":26294017, + "s":27326889, "rs":24603741 }, { "n":"Israel", "c":"il", - "s":24423341, + "s":24475758, "rs":9910060 }, { "n":"Jordan", "c":"jo", - "s":4867438, + "s":5246398, "rs":13451824 }, { "n":"Kuwait", "c":"kw", - "s":1203042, + "s":1329098, "rs":2595809 }, { "n":"Lebanon", "c":"lb", - "s":9974339, + "s":10232819, "rs":2839239 }, { "n":"Oman", "c":"om", - "s":5883487, + "s":6291871, "rs":4671335 }, { "n":"Palestine", "c":"ps", - "s":10148161, + "s":10844793, "rs":7589920 }, { "n":"Qatar", "c":"qa", - "s":1888186, + "s":2057402, "rs":3492951 }, { "n":"Saudi Arabia", "c":"sa", - "s":18755656, + "s":20243800, "rs":35452416 }, { "n":"Syria", "c":"sy", - "s":13955905, + "s":14869217, "rs":20942873 }, { "n":"Turkey", "c":"tr", - "s":94978746, + "s":95041402, "rs":170512666 }, { "n":"United Arab Emirates", "c":"ae", - "s":8752988, + "s":8766301, "rs":12212116 }, { "n":"Yemen", "c":"ye", - "s":13136675, + "s":13524331, "rs":3196427 } ] @@ -1346,56 +1346,56 @@ { "n":"Bermuda", "c":"bm", - "s":385517, + "s":417973, "rs":212211 }, { "n":"Bouvet Island", "c":"bv", - "s":4310, + "s":9661, "rs":0 }, { "n":"Cape Verde", "c":"cv", - "s":1135778, + "s":1137531, "rs":559387 }, { "n":"Falkland Islands", "c":"fk", - "s":1444851, + "s":1505674, "rs":58016 }, { "n":"Faroe Islands", "c":"fo", - "s":938362, + "s":1055754, "rs":257147 }, { "n":"Saint Helena, Ascension and Tristan da Cunha", "c":"sh", - "s":251813, + "s":251917, "rs":39941 }, { "n":"Saint Pierre and Miquelon", "c":"pm", - "s":329091, + "s":339258, "rs":66416 }, { "n":"São Tomé and Príncipe", "c":"st", "f":"Sao Tome and Principe", - "s":293415, + "s":309774, "rs":93642 }, { "n":"South Georgia and the South Sandwich Islands", "c":"gs", - "s":250235, + "s":281555, "rs":1199 } ] @@ -1406,165 +1406,165 @@ { "n":"Anguilla", "c":"ai", - "s":192262, + "s":198646, "rs":54878 }, { "n":"Antigua and Barbuda", "c":"ag", - "s":305610, + "s":330618, "rs":513443 }, { "n":"Aruba", "c":"aw", - "s":370637, + "s":395701, "rs":538243 }, { "n":"Bahamas", "c":"bs", - "s":3485085, + "s":3624069, "rs":1416724 }, { "n":"Barbados", "c":"bb", - "s":508163, + "s":539371, "rs":633123 }, { "n":"British Virgin Islands", "c":"vg", - "s":244605, + "s":251844, "rs":49094 }, { "n":"Cayman Islands", "c":"ky", - "s":423660, + "s":446884, "rs":195227 }, { "n":"Cuba", "c":"cu", - "s":13170006, + "s":13181351, "rs":17812727 }, { "n":"Curaçao", "c":"cw", "f":"Curacao", - "s":562669, + "s":602149, "rs":915236 }, { "n":"Dominica", "c":"dm", - "s":763969, + "s":808009, "rs":194051 }, { "n":"Dominican Republic", "c":"do", - "s":6180993, + "s":6186457, "rs":14525692 }, { "n":"Grenada", "c":"gd", - "s":360364, + "s":376828, "rs":84346 }, { "n":"Guadeloupe", "c":"gp", - "s":7688083, + "s":8420115, "rs":1372892 }, { "n":"Haiti", "c":"ht", - "s":13941300, + "s":13946476, "rs":4613686 }, { "n":"Jamaica", "c":"jm", - "s":1997314, + "s":2126842, "rs":2377765 }, { "n":"Martinique", "c":"mq", - "s":6705207, + "s":7332215, "rs":951860 }, { "n":"Montserrat", "c":"ms", - "s":78297, + "s":82032, "rs":22394 }, { "n":"Netherlands Antilles", "c":"an", - "s":321534, + "s":342726, "rs":221019 }, { "n":"Puerto Rico", "c":"pr", - "s":9671276, + "s":9677556, "rs":15484455 }, { "n":"Saint Barthélemy", "c":"bl", "f":"Saint Barthelemy", - "s":91966, + "s":95277, "rs":43108 }, { "n":"Saint Kitts and Nevis", "c":"kn", - "s":145977, + "s":153448, "rs":175019 }, { "n":"Saint Lucia", "c":"lc", - "s":363841, + "s":364234, "rs":132251 }, { "n":"Saint Martin", "c":"sx", - "s":443582, + "s":477998, "rs":164523 }, { "n":"Saint Vincent and the Grenadines", "c":"vc", - "s":272869, + "s":282621, "rs":62346 }, { "n":"Trinidad and Tobago", "c":"tt", - "s":5978565, + "s":5981709, "rs":3453302 }, { "n":"Turks and Caicos Islands", "c":"tc", - "s":220373, + "s":235541, "rs":148139 }, { "n":"United States Virgin Islands", "c":"vi", - "s":631638, + "s":665286, "rs":469851 } ] @@ -1575,62 +1575,62 @@ { "n":"British Indian Ocean Territory", "c":"io", - "s":76058, + "s":90049, "rs":22178 }, { "n":"Comoros", "c":"km", - "s":177149, + "s":188725, "rs":90994 }, { "n":"French Southern Territories", "c":"tf", - "s":1779663, + "s":1877911, "rs":2135 }, { "n":"Heard Island and McDonald Islands", "c":"hm", - "s":73381, + "s":81341, "rs":0 }, { "n":"Madagascar", "c":"mg", - "s":23721818, + "s":23726866, "rs":4213857 }, { "n":"Maldives", "c":"mv", - "s":801029, + "s":807942, "rs":555651 }, { "n":"Mauritius", "c":"mu", - "s":636299, + "s":684971, "rs":837324 }, { "n":"Mayotte", "c":"yt", - "s":332207, + "s":357007, "rs":205699 }, { "n":"Réunion", "c":"re", "f":"Reunion", - "s":12984801, + "s":13012346, "rs":2340965 }, { "n":"Seychelles", "c":"sc", - "s":329368, + "s":358448, "rs":78626 } ] @@ -1640,38 +1640,38 @@ "g":[ { "n":"Clarion Island", - "s":18876, + "s":24203, "rs":0 }, { "n":"Clipperton Island", - "s":15591, + "s":17711, "rs":0 }, { "n":"Cocos Island", - "s":15591, + "s":17711, "rs":0 }, { "n":"Galápagos Islands", "f":"Galapagos Islands", - "s":428811, + "s":462331, "rs":117771 }, { "n":"Guadalupe Island", - "s":74449, + "s":81352, "rs":1967 }, { "n":"Malpelo Island", - "s":60555, + "s":62674, "rs":0 }, { "n":"Socorro Island", - "s":178301, + "s":184932, "rs":1383 } ] @@ -1689,91 +1689,91 @@ "n":"Alberta", "c":"ca", "f":"Canada_Alberta", - "s":79132490, + "s":79229098, "rs":33016381 }, { "n":"British Columbia", "c":"ca", "f":"Canada_British Columbia", - "s":232052880, + "s":232146176, "rs":21568881 }, { "n":"Manitoba", "c":"ca", "f":"Canada_Manitoba", - "s":138923884, + "s":138946276, "rs":11725078 }, { "n":"New Brunswick", "c":"ca", "f":"Canada_New Brunswick", - "s":43354154, + "s":44672978, "rs":4348126 }, { "n":"Newfoundland and Labrador", "c":"ca", "f":"Canada_Newfoundland and Labrador", - "s":195980362, + "s":205159698, "rs":2497745 }, { "n":"Northwest Territories", "c":"ca", "f":"Canada_Northwest Territories", - "s":79171090, + "s":81397290, "rs":263496 }, { "n":"Nova Scotia", "c":"ca", "f":"Canada_Nova Scotia", - "s":51176636, + "s":52836036, "rs":3985886 }, { "n":"Nunavut", "c":"ca", "f":"Canada_Nunavut", - "s":58447965, + "s":60917212, "rs":266560 }, { "n":"Ontario", "c":"ca", "f":"Canada_Ontario", - "s":387154351, + "s":387470183, "rs":50745248 }, { "n":"Prince Edward Island", "c":"ca", "f":"Canada_Prince Edward Island", - "s":6473117, + "s":6475078, "rs":924278 }, { "n":"Quebec", "c":"ca", "f":"Canada_Quebec", - "s":285220948, + "s":285319828, "rs":29895517 }, { "n":"Saskatchewan", "c":"ca", "f":"Canada_Saskatchewan", - "s":77469054, + "s":77484055, "rs":23474557 }, { "n":"Yukon", "c":"ca", "f":"Canada_Yukon", - "s":59749346, + "s":61654922, "rs":328212 } ] @@ -1781,13 +1781,13 @@ { "n":"Greenland", "c":"gl", - "s":19399377, + "s":20686841, "rs":166603 }, { "n":"Mexico", "c":"mx", - "s":69259916, + "s":69312148, "rs":221714250 }, { @@ -1798,357 +1798,357 @@ "n":"Alabama", "c":"us", "f":"USA_Alabama", - "s":39531161, + "s":39551617, "rs":53512610 }, { "n":"Alaska", "c":"us", "f":"USA_Alaska", - "s":33717459, + "s":33730868, "rs":4834992 }, { "n":"Arizona", "c":"us", "f":"USA_Arizona", - "s":53516683, + "s":53668019, "rs":50894061 }, { "n":"Arkansas", "c":"us", "f":"USA_Arkansas", - "s":29054821, + "s":29065422, "rs":36843513 }, { "n":"California", "c":"us", "f":"USA_California", - "s":269048502, + "s":269567030, "rs":173101574 }, { "n":"Colorado", "c":"us", "f":"USA_Colorado", - "s":82542787, + "s":82763227, "rs":51009089 }, { "n":"Connecticut", "c":"us", "f":"USA_Connecticut", - "s":13449279, + "s":13495263, "rs":15119737 }, { "n":"Delaware", "c":"us", "f":"USA_Delaware", - "s":4801054, + "s":4810710, "rs":5512167 }, { "n":"Florida", "c":"us", "f":"USA_Florida", - "s":87024322, + "s":87207826, "rs":115540630 }, { "n":"Georgia", "c":"us", "f":"USA_Georgia", - "s":106880425, + "s":106987993, "rs":68870449 }, { "n":"Hawaii", "c":"us", "f":"USA_Hawaii", - "s":5017272, + "s":5304432, "rs":3918992 }, { "n":"Idaho", "c":"us", "f":"USA_Idaho", - "s":29041641, + "s":29052633, "rs":29682661 }, { "n":"Illinois", "c":"us", "f":"USA_Illinois", - "s":88218006, + "s":88351990, "rs":107002238 }, { "n":"Indiana", "c":"us", "f":"USA_Indiana", - "s":34694837, + "s":34733478, "rs":69374114 }, { "n":"Iowa", "c":"us", "f":"USA_Iowa", - "s":48015940, + "s":48064261, "rs":51510221 }, { "n":"Kansas", "c":"us", "f":"USA_Kansas", - "s":30038138, + "s":30110163, "rs":65753526 }, { "n":"Kentucky", "c":"us", "f":"USA_Kentucky", - "s":40791006, + "s":40829894, "rs":33497989 }, { "n":"Louisiana", "c":"us", "f":"USA_Louisiana", - "s":52763986, + "s":52784219, "rs":37813913 }, { "n":"Maine", "c":"us", "f":"USA_Maine", - "s":22546208, + "s":22561944, "rs":11643432 }, { "n":"Maryland", "c":"us", "f":"USA_Maryland", - "s":45236505, + "s":45411601, "rs":45028942 }, { "n":"Massachusetts", "c":"us", "f":"USA_Massachusetts", - "s":116120943, + "s":116260967, "rs":39091673 }, { "n":"Michigan", "c":"us", "f":"USA_Michigan", - "s":67197552, + "s":67439528, "rs":77210021 }, { "n":"Minnesota", "c":"us", "f":"USA_Minnesota", - "s":91867458, + "s":91963522, "rs":60275277 }, { "n":"Mississippi", "c":"us", "f":"USA_Mississippi", - "s":34679035, + "s":34697532, "rs":33898065 }, { "n":"Missouri", "c":"us", "f":"USA_Missouri", - "s":47969862, + "s":48032334, "rs":70785562 }, { "n":"Montana", "c":"us", "f":"USA_Montana", - "s":33951309, + "s":33971077, "rs":21638121 }, { "n":"Nebraska", "c":"us", "f":"USA_Nebraska", - "s":28609741, + "s":28638525, "rs":44862842 }, { "n":"Nevada", "c":"us", "f":"USA_Nevada", - "s":19651474, + "s":19677034, "rs":13780589 }, { "n":"New Hampshire", "c":"us", "f":"USA_New Hampshire", - "s":18128851, + "s":18270299, "rs":11257092 }, { "n":"New Jersey", "c":"us", "f":"USA_New Jersey", - "s":47915159, + "s":47956208, "rs":40670249 }, { "n":"New Mexico", "c":"us", "f":"USA_New Mexico", - "s":32330745, + "s":32373209, "rs":38700725 }, { "n":"New York", "c":"us", "f":"USA_New York", - "s":93822067, + "s":94033219, "rs":75064293 }, { "n":"North Carolina", "c":"us", "f":"USA_North Carolina", - "s":126631698, + "s":126779306, "rs":70068098 }, { "n":"North Dakota", "c":"us", "f":"USA_North Dakota", - "s":45706300, + "s":45712012, "rs":30404657 }, { "n":"Ohio", "c":"us", "f":"USA_Ohio", - "s":54770927, + "s":54890791, "rs":92691197 }, { "n":"Oklahoma", "c":"us", "f":"USA_Oklahoma", - "s":55377997, + "s":55402261, "rs":61718406 }, { "n":"Oregon", "c":"us", "f":"USA_Oregon", - "s":56510938, + "s":56643954, "rs":40202025 }, { "n":"Pennsylvania", "c":"us", "f":"USA_Pennsylvania", - "s":70118146, + "s":70247306, "rs":97345214 }, { "n":"Rhode Island", "c":"us", "f":"USA_Rhode Island", - "s":4757392, + "s":4765176, "rs":6061341 }, { "n":"South Carolina", "c":"us", "f":"USA_South Carolina", - "s":52648596, + "s":52702156, "rs":41744245 }, { "n":"South Dakota", "c":"us", "f":"USA_South Dakota", - "s":18084970, + "s":18106195, "rs":20660241 }, { "n":"Tennessee", "c":"us", "f":"USA_Tennessee", - "s":44238334, + "s":44283518, "rs":49331458 }, { "n":"Texas", "c":"us", "f":"USA_Texas", - "s":138004335, + "s":138135935, "rs":247872083 }, { "n":"Utah", "c":"us", "f":"USA_Utah", - "s":27328603, + "s":27358267, "rs":20278141 }, { "n":"Vermont", "c":"us", "f":"USA_Vermont", - "s":10537390, + "s":10554167, "rs":5574475 }, { "n":"Virginia", "c":"us", "f":"USA_Virginia", - "s":100210209, + "s":100363985, "rs":77154238 }, { "n":"Washington", "c":"us", "f":"USA_Washington", - "s":65078604, + "s":65261580, "rs":55334473 }, { "n":"Washington, District of Columbia", "c":"us", "f":"USA_District of Columbia", - "s":7149396, + "s":7197380, "rs":2328111 }, { "n":"West Virginia", "c":"us", "f":"USA_West Virginia", - "s":16914529, + "s":16927458, "rs":18037317 }, { "n":"Wisconsin", "c":"us", "f":"USA_Wisconsin", - "s":60210788, + "s":60299548, "rs":54894157 }, { "n":"Wyoming", "c":"us", "f":"USA_Wyoming", - "s":23367056, + "s":23403225, "rs":13820345 } ] @@ -2161,163 +2161,163 @@ { "n":"American Samoa", "c":"as", - "s":140212, + "s":151140, "rs":116522 }, { "n":"Australia", "c":"au", - "s":177016292, + "s":177703988, "rs":111782080 }, { "n":"Christmas Island", "c":"cx", - "s":178504, + "s":178616, "rs":6872 }, { "n":"Cocos Islands", "c":"cc", - "s":50496, + "s":57095, "rs":9080 }, { "n":"Cook Islands", "c":"ck", - "s":263983, + "s":304647, "rs":49572 }, { "n":"Fiji", "c":"fj", - "s":1480847, + "s":1554871, "rs":313507 }, { "n":"French Polynesia", "c":"pf", - "s":2239333, + "s":2243910, "rs":207579 }, { "n":"Guam", "c":"gu", - "s":702664, + "s":744976, "rs":699084 }, { "n":"Kiribati", "c":"ki", - "s":835327, + "s":835391, "rs":21762 }, { "n":"Marshall Islands", "c":"mh", - "s":784250, + "s":834010, "rs":33365 }, { "n":"Micronesia", "c":"fm", - "s":764991, + "s":767320, "rs":30757 }, { "n":"Nauru", "c":"nr", - "s":36926, + "s":43021, "rs":8288 }, { "n":"New Caledonia", "c":"nc", - "s":4120731, + "s":4365627, "rs":719780 }, { "n":"New Zealand", "c":"nz", - "s":129658739, + "s":129760091, "rs":15204135 }, { "n":"Niue", "c":"nu", - "s":246660, + "s":256196, "rs":8240 }, { "n":"Norfolk Island", "c":"nf", - "s":31512, + "s":35575, "rs":10096 }, { "n":"Northern Mariana Islands", "c":"mp", - "s":376119, + "s":400991, "rs":334539 }, { "n":"Palau", "c":"pw", - "s":268737, + "s":281585, "rs":27757 }, { "n":"Papua New Guinea", "c":"pg", - "s":4811496, + "s":4811961, "rs":512955 }, { "n":"Pitcairn Islands", "c":"pn", - "s":48942, + "s":59589, "rs":863 }, { "n":"Samoa", "c":"ws", - "s":866042, + "s":943610, "rs":164459 }, { "n":"Solomon Islands", "c":"sb", - "s":1398900, + "s":1476620, "rs":61193 }, { "n":"Tokelau", "c":"tk", - "s":55296, + "s":61807, "rs":1239 }, { "n":"Tonga", "c":"to", - "s":1369091, + "s":1473091, "rs":430523 }, { "n":"Tuvalu", "c":"tv", - "s":173535, + "s":185550, "rs":8120 }, { "n":"Vanuatu", "c":"vu", - "s":737140, + "s":781348, "rs":102138 }, { "n":"Wallis and Futuna", "c":"wf", - "s":104246, + "s":111917, "rs":19588 } ] @@ -2328,13 +2328,13 @@ { "n":"Argentina", "c":"ar", - "s":88486116, + "s":88625924, "rs":190496258 }, { "n":"Bolivia", "c":"bo", - "s":28221433, + "s":28288177, "rs":30419625 }, { @@ -2344,31 +2344,31 @@ { "n":"Central-West", "f":"Brazil_Central-West", - "s":26088463, + "s":26140488, "rs":58477421 }, { "n":"North", "f":"Brazil_North", - "s":19754631, + "s":21217168, "rs":26326301 }, { "n":"Northeast", "f":"Brazil_Northeast", - "s":32098211, + "s":32187356, "rs":71803861 }, { "n":"South", "f":"Brazil_South", - "s":45542927, + "s":45691815, "rs":82900609 }, { "n":"Rio & Southeast", "f":"Brazil_Southeast", - "s":88381481, + "s":88597377, "rs":186156462 } ] @@ -2376,61 +2376,61 @@ { "n":"Chile", "c":"cl", - "s":63836576, + "s":63877944, "rs":45317277 }, { "n":"Colombia", "c":"co", - "s":51484371, + "s":51524523, "rs":50287784 }, { "n":"Ecuador", "c":"ec", - "s":17401618, + "s":17420067, "rs":30921004 }, { "n":"French Guiana", "c":"gf", - "s":3454722, + "s":3722962, "rs":530259 }, { "n":"Guyana", "c":"gy", - "s":1167030, + "s":1169063, "rs":1048228 }, { "n":"Paraguay", "c":"py", - "s":9843741, + "s":9857582, "rs":14915972 }, { "n":"Peru", "c":"pe", - "s":29198654, + "s":29225414, "rs":49092272 }, { "n":"Suriname", "c":"sr", - "s":2787465, + "s":2970257, "rs":1294068 }, { "n":"Uruguay", "c":"uy", - "s":13568965, + "s":13586549, "rs":13531271 }, { "n":"Venezuela", "c":"ve", - "s":18063602, + "s":18136994, "rs":25470868 } ] diff --git a/data/external_resources.txt b/data/external_resources.txt index 821c2bf9ed..f138979ee5 100644 --- a/data/external_resources.txt +++ b/data/external_resources.txt @@ -1,5 +1,5 @@ -World.mwm 22049058 -WorldCoasts.mwm 4790098 +World.mwm 22174914 +WorldCoasts.mwm 4790089 01_dejavusans.ttf 633604 02_wqy-microhei.ttf 5177387 03_jomolhari-id-a3d.ttf 1817160