diff --git a/data/World.mwm b/data/World.mwm index 275bd9cb2f..27b4c29401 100644 Binary files a/data/World.mwm and b/data/World.mwm differ diff --git a/data/WorldCoasts.mwm b/data/WorldCoasts.mwm index 41ce5db47a..6daf977d81 100644 Binary files a/data/WorldCoasts.mwm and b/data/WorldCoasts.mwm differ diff --git a/data/countries.txt b/data/countries.txt index 58a8060949..ae5e0f724a 100644 --- a/data/countries.txt +++ b/data/countries.txt @@ -1,5 +1,5 @@ { - "v":141021, + "v":141024, "n":"World", "g":[ { @@ -8,43 +8,43 @@ { "n":"Algeria", "c":"dz", - "s":19876051, + "s":19847551, "rs":40089753 }, { "n":"Angola", "c":"ao", - "s":6128118, + "s":6089910, "rs":6634252 }, { "n":"Benin", "c":"bj", - "s":1611856, + "s":1608326, "rs":2420295 }, { "n":"Botswana", "c":"bw", - "s":3767289, + "s":3765082, "rs":3583472 }, { "n":"Burkina Faso", "c":"bf", - "s":5262525, + "s":5258199, "rs":7370370 }, { "n":"Burundi", "c":"bi", - "s":2787403, + "s":2787609, "rs":1264415 }, { "n":"Cameroon", "c":"cm", - "s":35072697, + "s":35045108, "rs":5222715 }, { @@ -56,152 +56,152 @@ { "n":"Chad", "c":"td", - "s":3885242, + "s":3885243, "rs":2749616 }, { "n":"Congo-Brazzaville", "c":"cg", - "s":1472753, + "s":1467349, "rs":1447591 }, { "n":"Congo-Kinshasa", "c":"cd", - "s":26342386, + "s":26295839, "rs":10190021 }, { "n":"Côte d'Ivoire", "c":"ci", "f":"Ivory Coast", - "s":4650379, + "s":4649709, "rs":4311904 }, { "n":"Djibouti", "c":"dj", - "s":595698, + "s":561782, "rs":296074 }, { "n":"Egypt", "c":"eg", - "s":15873718, + "s":15860046, "rs":15844381 }, { "n":"Equatorial Guinea", "c":"gq", - "s":785474, + "s":734718, "rs":229378 }, { "n":"Eritrea", "c":"er", - "s":1556929, + "s":1355673, "rs":894827 }, { "n":"Ethiopia", "c":"et", - "s":10853976, + "s":10792419, "rs":14105497 }, { "n":"Gabon", "c":"ga", - "s":1541709, + "s":1517680, "rs":463574 }, { "n":"Gambia", "c":"gm", - "s":1208104, + "s":1208584, "rs":1407659 }, { "n":"Ghana", "c":"gh", - "s":4680924, + "s":4673986, "rs":4741025 }, { "n":"Guinea", "c":"gn", - "s":12804821, + "s":12790932, "rs":4224214 }, { "n":"Guinea-Bissau", "c":"gw", - "s":3128800, + "s":3076718, "rs":386290 }, { "n":"Kenya", "c":"ke", - "s":8312693, + "s":8252137, "rs":4945623 }, { "n":"Liberia", "c":"lr", - "s":11040617, + "s":11027846, "rs":2081329 }, { "n":"Libya", "c":"ly", - "s":5335831, + "s":5318719, "rs":8795081 }, { "n":"Malawi", "c":"mw", - "s":4243387, + "s":4400290, "rs":1255783 }, { "n":"Mali", "c":"ml", - "s":12681557, + "s":12681558, "rs":9858373 }, { "n":"Mauritania", "c":"mr", - "s":2474044, + "s":2469382, "rs":1672343 }, { "n":"Morocco", "c":"ma", - "s":32319621, + "s":32310362, "rs":26050825 }, { "n":"Mozambique", "c":"mz", - "s":5244057, + "s":5389189, "rs":3299164 }, { "n":"Namibia", "c":"na", - "s":5195806, + "s":5189650, "rs":2074091 }, { "n":"Niger", "c":"ne", - "s":3624168, + "s":3624150, "rs":5334385 }, { "n":"Nigeria", "c":"ng", - "s":21544992, + "s":21511707, "rs":22141789 }, { @@ -213,43 +213,43 @@ { "n":"Sahrawi", "c":"eh", - "s":936258, + "s":928813, "rs":630227 }, { "n":"Senegal", "c":"sn", - "s":6692590, + "s":6673563, "rs":14638343 }, { "n":"Sierra Leone", "c":"sl", - "s":13780304, + "s":13765827, "rs":2592570 }, { "n":"Somalia", "c":"so", - "s":8282781, + "s":8235273, "rs":8117249 }, { "n":"South Africa", "c":"za", - "s":58800253, + "s":58770042, "rs":73194141 }, { "n":"South Sudan", "c":"ss", - "s":10078835, + "s":10078803, "rs":4309396 }, { "n":"Sudan", "c":"sd", - "s":7747705, + "s":7698961, "rs":25447497 }, { @@ -261,25 +261,25 @@ { "n":"Tanzania", "c":"tz", - "s":8757059, + "s":8664472, "rs":4380163 }, { "n":"Togo", "c":"tg", - "s":3402104, + "s":3398570, "rs":3098736 }, { "n":"Tunisia", "c":"tn", - "s":13155981, + "s":13129034, "rs":20991745 }, { "n":"Uganda", "c":"ug", - "s":10068569, + "s":10059064, "rs":3240168 }, { @@ -302,61 +302,61 @@ { "n":"Afghanistan", "c":"af", - "s":5677967, + "s":5676015, "rs":3007912 }, { "n":"Bangladesh", "c":"bd", - "s":6679608, + "s":6558164, "rs":1768729 }, { "n":"Bhutan", "c":"bt", - "s":703634, + "s":703635, "rs":65921 }, { "n":"Brunei", "c":"bn", - "s":369223, + "s":350199, "rs":233890 }, { "n":"Burma", "c":"mm", - "s":14801904, + "s":14347800, "rs":11959687 }, { "n":"Cambodia", "c":"kh", - "s":4531379, + "s":4576551, "rs":3629784 }, { "n":"China", "c":"cn", - "s":154294257, + "s":153969651, "rs":86635921 }, { "n":"East Timor", "c":"tl", - "s":2474425, + "s":2434585, "rs":206442 }, { "n":"India", "c":"in", - "s":132585418, + "s":132211861, "rs":156139558 }, { "n":"Indonesia", "c":"id", - "s":93457213, + "s":91938921, "rs":52128669 }, { @@ -366,49 +366,49 @@ { "n":"Chūbu", "f":"Japan_Chubu", - "s":102976672, + "s":102865194, "rs":179048850 }, { "n":"Chūgoku", "f":"Japan_Chugoku", - "s":47549645, + "s":47389032, "rs":43042649 }, { "n":"Hokkaidō", "f":"Japan_Hokkaido", - "s":52287318, + "s":52192859, "rs":47034173 }, { "n":"Tokyo & Kantō", "f":"Japan_Kanto", - "s":92106315, + "s":91996742, "rs":208707986 }, { "n":"Kinki", "f":"Japan_Kinki", - "s":65848450, + "s":65688835, "rs":91568657 }, { "n":"Kyūshū", "f":"Japan_Kyushu", - "s":71812199, + "s":71529118, "rs":94813629 }, { "n":"Shikoku", "f":"Japan_Shikoku", - "s":24733917, + "s":24539735, "rs":19941745 }, { "n":"Tōhoku", "f":"Japan_Tohoku", - "s":77081651, + "s":76895164, "rs":74712037 } ] @@ -416,13 +416,13 @@ { "n":"Kazakhstan", "c":"kz", - "s":32158301, + "s":32144194, "rs":19802685 }, { "n":"Kyrgyzstan", "c":"kg", - "s":11524241, + "s":11524243, "rs":8152657 }, { @@ -434,91 +434,91 @@ { "n":"Malaysia", "c":"my", - "s":17454183, + "s":17269940, "rs":23319809 }, { "n":"Mongolia", "c":"mn", - "s":6416922, + "s":6417011, "rs":2397327 }, { "n":"Nepal", "c":"np", - "s":10810310, + "s":10810316, "rs":4212110 }, { "n":"North Korea", "c":"kp", - "s":10598596, + "s":10462697, "rs":5614707 }, { "n":"Pakistan", "c":"pk", - "s":15639241, + "s":15489179, "rs":19497497 }, { "n":"Philippines", "c":"ph", - "s":70590409, + "s":69706851, "rs":56057881 }, { "n":"Singapore", "c":"sg", - "s":4397458, + "s":4359014, "rs":1684163 }, { "n":"South Korea", "c":"kr", - "s":46998495, + "s":46499200, "rs":34885033 }, { "n":"Sri Lanka", "c":"lk", - "s":6558308, + "s":6530236, "rs":5221351 }, { "n":"Taiwan", "c":"tw", - "s":22999504, + "s":23218227, "rs":31152949 }, { "n":"Tajikistan", "c":"tj", - "s":3066236, + "s":3066238, "rs":1627151 }, { "n":"Thailand", "c":"th", - "s":41979245, + "s":41868907, "rs":49125437 }, { "n":"Turkmenistan", "c":"tm", - "s":2903784, + "s":2862761, "rs":2155575 }, { "n":"Uzbekistan", "c":"uz", - "s":15456082, + "s":15442450, "rs":17939265 }, { "n":"Vietnam", "c":"vn", - "s":17413564, + "s":17051047, "rs":16183869 } ] @@ -529,43 +529,43 @@ { "n":"Belize", "c":"bz", - "s":1634658, + "s":1566872, "rs":1189719 }, { "n":"Costa Rica", "c":"cr", - "s":5421101, + "s":5549959, "rs":6875940 }, { "n":"El Salvador", "c":"sv", - "s":2710392, + "s":2675508, "rs":4204880 }, { "n":"Guatemala", "c":"gt", - "s":4673680, + "s":4643219, "rs":9580705 }, { "n":"Honduras", "c":"hn", - "s":3062106, + "s":3090817, "rs":5978108 }, { "n":"Nicaragua", "c":"ni", - "s":4914107, + "s":4874591, "rs":5360867 }, { "n":"Panama", "c":"pa", - "s":5823729, + "s":5666662, "rs":2905252 } ] @@ -576,7 +576,7 @@ { "n":"Albania", "c":"al", - "s":6892726, + "s":6883324, "rs":3616698 }, { @@ -588,79 +588,79 @@ { "n":"Armenia", "c":"am", - "s":6661881, + "s":6622367, "rs":4662973 }, { "n":"Austria", "c":"at", - "s":217225729, + "s":217224365, "rs":63947597 }, { "n":"Azerbaijan", "c":"az", - "s":7267332, + "s":7227114, "rs":7016684 }, { "n":"Belarus", "c":"by", - "s":85570460, + "s":85569969, "rs":29647933 }, { "n":"Belgium", "c":"be", - "s":149570217, + "s":149568639, "rs":41832629 }, { "n":"Bosnia and Herzegovina", "c":"ba", - "s":55217200, + "s":55266540, "rs":7455128 }, { "n":"Bulgaria", "c":"bg", - "s":35958066, + "s":35952503, "rs":27214125 }, { "n":"Croatia", "c":"hr", - "s":38961761, + "s":38760128, "rs":14067769 }, { "n":"Cyprus", "c":"cy", - "s":5256072, + "s":5250206, "rs":6797848 }, { "n":"Czech Republic", "c":"cz", - "s":259712659, + "s":259711569, "rs":43459529 }, { "n":"Denmark", "c":"dk", - "s":113906255, + "s":113723439, "rs":46006541 }, { "n":"Estonia", "c":"ee", - "s":58301641, + "s":57968412, "rs":9316742 }, { "n":"Finland", "c":"fi", - "s":175240687, + "s":172479963, "rs":39494673 }, { @@ -678,56 +678,56 @@ "n":"Aquitaine", "c":"fr", "f":"France_Aquitaine", - "s":98437741, + "s":98429960, "rs":22552993 }, { "n":"Auvergne", "c":"fr", "f":"France_Auvergne", - "s":56639640, + "s":56639644, "rs":12967084 }, { "n":"Basse-Normandie", "c":"fr", "f":"France_Basse-Normandie", - "s":44917880, + "s":44927498, "rs":12416069 }, { "n":"Bourgogne", "c":"fr", "f":"France_Bourgogne", - "s":68806561, + "s":68806471, "rs":14257133 }, { "n":"Bretagne", "c":"fr", "f":"France_Bretagne", - "s":114614991, + "s":114489269, "rs":28853025 }, { "n":"Centre", "c":"fr", "f":"France_Centre", - "s":73828063, + "s":73827932, "rs":18003381 }, { "n":"Champagne-Ardenne", "c":"fr", "f":"France_Champagne-Ardenne", - "s":31069609, + "s":31069540, "rs":7464868 }, { "n":"Corsica", "c":"fr", "f":"France_Corsica", - "s":8147627, + "s":8119134, "rs":910039 }, { @@ -741,84 +741,84 @@ "n":"Haute-Normandie", "c":"fr", "f":"France_Haute-Normandie", - "s":31734523, + "s":31733624, "rs":9324426 }, { "n":"Languedoc-Roussillon", "c":"fr", "f":"France_Languedoc-Roussillon", - "s":84876340, + "s":84871943, "rs":18395657 }, { "n":"Limousin", "c":"fr", "f":"France_Limousin", - "s":34472899, + "s":34472897, "rs":9792958 }, { "n":"Lorraine", "c":"fr", "f":"France_Lorraine", - "s":65288177, + "s":65288178, "rs":11783976 }, { "n":"Midi-Pyrénées", "c":"fr", "f":"France_Midi-Pyrenees", - "s":119858588, + "s":119851670, "rs":24923025 }, { "n":"Nord-Pas-de-Calais", "c":"fr", "f":"France_Nord-Pas-de-Calais", - "s":87804548, + "s":87803670, "rs":17372913 }, { "n":"Paris & Île-de-France", "c":"fr", "f":"France_Paris & Ile-de-France", - "s":108769409, + "s":108768358, "rs":22259753 }, { "n":"Pays de la Loire", "c":"fr", "f":"France_Pays de la Loire", - "s":131914952, + "s":131904935, "rs":29035265 }, { "n":"Picardie", "c":"fr", "f":"France_Picardie", - "s":47884097, + "s":47883205, "rs":10093851 }, { "n":"Poitou-Charentes", "c":"fr", "f":"France_Poitou-Charentes", - "s":87493333, + "s":87490641, "rs":21402417 }, { "n":"Provence-Alpes-Côte d'Azur", "c":"fr", "f":"France_Provence-Alpes-Cote d'Azur", - "s":119970502, + "s":119938687, "rs":19644917 }, { "n":"Rhône-Alpes", "c":"fr", "f":"France_Rhone-Alpes", - "s":162187351, + "s":162187386, "rs":33161337 } ] @@ -826,7 +826,7 @@ { "n":"Georgia", "c":"ge", - "s":21740732, + "s":21740448, "rs":15985813 }, { @@ -837,98 +837,98 @@ "n":"Baden-Württemberg", "c":"de", "f":"Germany_Baden-Wurttemberg", - "s":172034111, + "s":172030782, "rs":58152189 }, { "n":"Bavaria", "c":"de", "f":"Germany_Bavaria", - "s":237078247, + "s":237078124, "rs":84880645 }, { "n":"Berlin & Brandenburg", "c":"de", "f":"Germany_Berlin & Brandenburg", - "s":73297310, + "s":73291150, "rs":20211653 }, { "n":"Bremen & Lower Saxony", "c":"de", "f":"Germany_Bremen & Lower Saxony", - "s":140391484, + "s":140362132, "rs":47622581 }, { "n":"Hamburg", "c":"de", "f":"Germany_Hamburg", - "s":13125015, + "s":13174757, "rs":3078758 }, { "n":"Hesse", "c":"de", "f":"Germany_Hesse", - "s":91598861, + "s":91598655, "rs":28433241 }, { "n":"Mecklenburg-Vorpommern", "c":"de", "f":"Germany_Mecklenburg-Vorpommern", - "s":39869893, + "s":39888664, "rs":9920592 }, { "n":"North Rhine-Westphalia", "c":"de", "f":"Germany_North Rhine-Westphalia", - "s":269818929, + "s":269818576, "rs":80005725 }, { "n":"Rhineland-Palatinate", "c":"de", "f":"Germany_Rhineland-Palatinate", - "s":60033183, + "s":60032276, "rs":21476669 }, { "n":"Saarland", "c":"de", "f":"Germany_Saarland", - "s":13160582, + "s":13160581, "rs":4403683 }, { "n":"Saxony-Anhalt", "c":"de", "f":"Germany_Saxony-Anhalt", - "s":44247842, + "s":44235151, "rs":12324084 }, { "n":"Saxony", "c":"de", "f":"Germany_Saxony", - "s":72828526, + "s":72828441, "rs":23116877 }, { "n":"Schleswig-Holstein", "c":"de", "f":"Germany_Schleswig-Holstein", - "s":47142133, + "s":47303190, "rs":14883941 }, { "n":"Thuringia", "c":"de", "f":"Germany_Thuringia", - "s":43889366, + "s":43889114, "rs":12894088 } ] @@ -936,37 +936,37 @@ { "n":"Gibraltar", "c":"gi", - "s":227548, + "s":223984, "rs":49527 }, { "n":"Greece", "c":"gr", - "s":69061493, + "s":68620661, "rs":58124057 }, { "n":"Hungary", "c":"hu", - "s":62863315, + "s":62861969, "rs":34669065 }, { "n":"Iceland", "c":"is", - "s":12543215, + "s":12368423, "rs":2641546 }, { "n":"Ireland", "c":"ie", - "s":53744590, + "s":53610379, "rs":26028641 }, { "n":"Italy", "c":"it", - "s":568809320, + "s":568723752, "rs":214908254 }, { @@ -978,85 +978,85 @@ { "n":"Latvia", "c":"lv", - "s":37160932, + "s":37153781, "rs":9658262 }, { "n":"Liechtenstein", "c":"li", - "s":618047, + "s":618046, "rs":172638 }, { "n":"Lithuania", "c":"lt", - "s":45326750, + "s":45318817, "rs":16328389 }, { "n":"Luxembourg", "c":"lu", - "s":8771226, + "s":8771228, "rs":2209985 }, { "n":"Macedonia", "c":"mk", - "s":11829029, + "s":11828769, "rs":3598518 }, { "n":"Malta", "c":"mt", - "s":1241074, + "s":1230453, "rs":1537599 }, { "n":"Moldova", "c":"md", - "s":14430713, + "s":14428413, "rs":11173030 }, { "n":"Monaco", "c":"mc", - "s":163250, + "s":162710, "rs":21651 }, { "n":"Montenegro", "c":"me", - "s":5779799, + "s":5775447, "rs":1610067 }, { "n":"Netherlands", "c":"nl", - "s":604357539, + "s":604349042, "rs":77226765 }, { "n":"Norway", "c":"no", - "s":175392630, + "s":171227857, "rs":26790025 }, { "n":"Poland", "c":"pl", - "s":361561700, + "s":361545076, "rs":96036957 }, { "n":"Portugal", "c":"pt", - "s":57854480, + "s":57786214, "rs":46320129 }, { "n":"Romania", "c":"ro", - "s":147806477, + "s":147800019, "rs":42485881 }, { @@ -1066,54 +1066,54 @@ { "n":"Moscow & Central", "f":"Russia_Central", - "s":246099376, + "s":246099681, "rs":86281597 }, { "n":"Crimea", - "s":14271972, + "s":14309116, "rs":6071016 }, { "n":"Far Eastern", "f":"Russia_Far Eastern", - "s":86809739, + "s":85546442, "rs":13618680 }, { "n":"North Caucasian", "f":"Russia_North Caucasian", - "s":19225522, + "s":19211192, "rs":12936653 }, { "n":"Saint Petersburg & Northwestern", "f":"Russia_Northwestern", - "s":255355805, + "s":253962944, "rs":43988005 }, { "n":"Siberian", "f":"Russia_Siberian", - "s":138523509, + "s":137824725, "rs":46185705 }, { "n":"Southern", "f":"Russia_Southern", - "s":90923188, + "s":90894989, "rs":45047761 }, { "n":"Urals", "f":"Russia_Urals", - "s":132091020, + "s":131761354, "rs":38007425 }, { "n":"Volga", "f":"Russia_Volga", - "s":207974036, + "s":207959658, "rs":71649297 } ] @@ -1121,49 +1121,49 @@ { "n":"Serbia", "c":"rs", - "s":26848708, + "s":26848686, "rs":10515634 }, { "n":"Slovakia", "c":"sk", - "s":95222295, + "s":95222205, "rs":14312728 }, { "n":"Slovenia", "c":"si", - "s":23035254, + "s":23020180, "rs":6180320 }, { "n":"Spain", "c":"es", - "s":340468462, + "s":340360208, "rs":191294490 }, { "n":"Svalbard and Jan Mayen", "c":"sj", - "s":705793, + "s":634827, "rs":19941 }, { "n":"Sweden", "c":"se", - "s":189551858, + "s":185266769, "rs":57510689 }, { "n":"Switzerland", "c":"ch", - "s":134598251, + "s":134598243, "rs":38071361 }, { "n":"Turkey", "c":"tr", - "s":88835069, + "s":88717166, "rs":160081334 }, { @@ -1173,47 +1173,47 @@ { "n":"Guernsey", "c":"gg", - "s":442993, + "s":427772, "rs":225262 }, { "n":"Isle of Man", "c":"im", - "s":1509888, + "s":1496767, "rs":474890 }, { "n":"Jersey", "c":"je", - "s":1036753, + "s":901006, "rs":423082 }, { "n":"England", "c":"uk_england", "f":"UK_England", - "s":371770252, + "s":371383144, "rs":193248790 }, { "n":"Northern Ireland", "c":"uk_northern_ireland", "f":"UK_Northern Ireland", - "s":8336460, + "s":8362588, "rs":6103240 }, { "n":"Scotland", "c":"uk_scotland", "f":"UK_Scotland", - "s":70313882, + "s":69728332, "rs":23727809 }, { "n":"Wales", "c":"uk_wales", "f":"UK_Wales", - "s":28712433, + "s":28670696, "rs":13404108 } ] @@ -1224,12 +1224,12 @@ "g":[ { "n":"Crimea", - "s":14271972, + "s":14309116, "rs":6071016 }, { "n":"Ukraine", - "s":169145680, + "s":169123346, "rs":85593253 } ] @@ -1242,97 +1242,97 @@ { "n":"Bahrain", "c":"bh", - "s":997086, + "s":1109713, "rs":2553492 }, { "n":"Cyprus", "c":"cy", - "s":5256072, + "s":5250206, "rs":6797848 }, { "n":"Iran", "c":"ir", - "s":24635034, + "s":24529412, "rs":38810481 }, { "n":"Iraq", "c":"iq", - "s":25695033, + "s":25653126, "rs":20696145 }, { "n":"Israel", "c":"il", - "s":23296389, + "s":23383620, "rs":9416216 }, { "n":"Jordan", "c":"jo", - "s":5129282, + "s":5237149, "rs":13345997 }, { "n":"Kuwait", "c":"kw", - "s":1326708, + "s":1298977, "rs":2572826 }, { "n":"Lebanon", "c":"lb", - "s":10067392, + "s":10061423, "rs":2222691 }, { "n":"Oman", "c":"om", - "s":6259561, + "s":6185234, "rs":4265691 }, { "n":"Palestine", "c":"ps", - "s":10263535, + "s":10354694, "rs":7156892 }, { "n":"Qatar", "c":"qa", - "s":1834378, + "s":1805682, "rs":2985816 }, { "n":"Saudi Arabia", "c":"sa", - "s":18446532, + "s":18250486, "rs":30512309 }, { "n":"Syria", "c":"sy", - "s":13899864, + "s":13895156, "rs":19324133 }, { "n":"Turkey", "c":"tr", - "s":88835069, + "s":88717166, "rs":160081334 }, { "n":"United Arab Emirates", "c":"ae", - "s":8321504, + "s":8250738, "rs":11687784 }, { "n":"Yemen", "c":"ye", - "s":13646351, + "s":13565905, "rs":3179604 } ] @@ -1346,56 +1346,56 @@ { "n":"Bermuda", "c":"bm", - "s":416386, + "s":396802, "rs":204686 }, { "n":"Bouvet Island", "c":"bv", - "s":12147, + "s":11150, "rs":0 }, { "n":"Cape Verde", "c":"cv", - "s":838491, + "s":804719, "rs":479054 }, { "n":"Falkland Islands", "c":"fk", - "s":1693345, + "s":1702444, "rs":57426 }, { "n":"Faroe Islands", "c":"fo", - "s":1085952, + "s":1064743, "rs":255818 }, { "n":"Saint Helena, Ascension and Tristan da Cunha", "c":"sh", - "s":248599, + "s":239292, "rs":39940 }, { "n":"Saint Pierre and Miquelon", "c":"pm", - "s":340180, + "s":306825, "rs":66463 }, { "n":"São Tomé and Príncipe", "c":"st", "f":"Sao Tome and Principe", - "s":324555, + "s":317852, "rs":91301 }, { "n":"South Georgia and the South Sandwich Islands", "c":"gs", - "s":279582, + "s":239702, "rs":1167 } ] @@ -1406,165 +1406,165 @@ { "n":"Anguilla", "c":"ai", - "s":241419, + "s":196789, "rs":46166 }, { "n":"Antigua and Barbuda", "c":"ag", - "s":351922, + "s":322017, "rs":507946 }, { "n":"Aruba", "c":"aw", - "s":392748, + "s":389360, "rs":535650 }, { "n":"Bahamas", "c":"bs", - "s":4094582, + "s":3492201, "rs":1359791 }, { "n":"Barbados", "c":"bb", - "s":381579, + "s":515700, "rs":619914 }, { "n":"British Virgin Islands", "c":"vg", - "s":234962, + "s":245643, "rs":33976 }, { "n":"Cayman Islands", "c":"ky", - "s":354731, + "s":436294, "rs":194298 }, { "n":"Cuba", "c":"cu", - "s":12178132, + "s":11602818, "rs":17228305 }, { "n":"Curaçao", "c":"cw", "f":"Curacao", - "s":503327, + "s":491463, "rs":798399 }, { "n":"Dominica", "c":"dm", - "s":822388, + "s":806215, "rs":194378 }, { "n":"Dominican Republic", "c":"do", - "s":5760916, + "s":5730911, "rs":14127609 }, { "n":"Grenada", "c":"gd", - "s":300984, + "s":369971, "rs":81737 }, { "n":"Guadeloupe", "c":"gp", - "s":8336383, + "s":8318087, "rs":1362335 }, { "n":"Haiti", "c":"ht", - "s":13433200, + "s":13421332, "rs":4555543 }, { "n":"Jamaica", "c":"jm", - "s":1905191, + "s":1902726, "rs":2329539 }, { "n":"Martinique", "c":"mq", - "s":7317595, + "s":7308585, "rs":951891 }, { "n":"Montserrat", "c":"ms", - "s":102759, + "s":81281, "rs":22361 }, { "n":"Netherlands Antilles", "c":"an", - "s":311472, + "s":277076, "rs":184194 }, { "n":"Puerto Rico", "c":"pr", - "s":9305068, + "s":9300566, "rs":15725321 }, { "n":"Saint Barthélemy", "c":"bl", "f":"Saint Barthelemy", - "s":98877, + "s":77384, "rs":43079 }, { "n":"Saint Kitts and Nevis", "c":"kn", - "s":172710, + "s":151040, "rs":174646 }, { "n":"Saint Lucia", "c":"lc", - "s":291797, + "s":361047, "rs":131134 }, { "n":"Saint Martin", "c":"sx", - "s":264328, + "s":247216, "rs":132642 }, { "n":"Saint Vincent and the Grenadines", "c":"vc", - "s":289812, + "s":285378, "rs":62313 }, { "n":"Trinidad and Tobago", "c":"tt", - "s":5902570, + "s":5937970, "rs":3439184 }, { "n":"Turks and Caicos Islands", "c":"tc", - "s":256887, + "s":231937, "rs":148722 }, { "n":"United States Virgin Islands", "c":"vi", - "s":703447, + "s":643153, "rs":462142 } ] @@ -1575,62 +1575,62 @@ { "n":"British Indian Ocean Territory", "c":"io", - "s":100073, + "s":77756, "rs":21613 }, { "n":"Comoros", "c":"km", - "s":175253, + "s":173262, "rs":78625 }, { "n":"French Southern Territories", "c":"tf", - "s":1435568, + "s":1288505, "rs":2051 }, { "n":"Heard Island and McDonald Islands", "c":"hm", - "s":93907, + "s":87446, "rs":0 }, { "n":"Madagascar", "c":"mg", - "s":23384727, + "s":23274578, "rs":4076182 }, { "n":"Maldives", "c":"mv", - "s":955401, + "s":772090, "rs":551386 }, { "n":"Mauritius", "c":"mu", - "s":687389, + "s":665676, "rs":811663 }, { "n":"Mayotte", "c":"yt", - "s":341364, + "s":337069, "rs":182274 }, { "n":"Réunion", "c":"re", "f":"Reunion", - "s":12760689, + "s":12760380, "rs":2311095 }, { "n":"Seychelles", "c":"sc", - "s":360010, + "s":325675, "rs":76989 } ] @@ -1640,38 +1640,38 @@ "g":[ { "n":"Clarion Island", - "s":31943, + "s":27295, "rs":0 }, { "n":"Clipperton Island", - "s":21707, + "s":17277, "rs":0 }, { "n":"Cocos Island", - "s":21707, + "s":17277, "rs":0 }, { "n":"Galápagos Islands", "f":"Galapagos Islands", - "s":499996, + "s":458671, "rs":116778 }, { "n":"Guadalupe Island", - "s":89295, + "s":79610, "rs":1927 }, { "n":"Malpelo Island", - "s":73389, + "s":62093, "rs":0 }, { "n":"Socorro Island", - "s":41384, + "s":182792, "rs":891 } ] @@ -1696,84 +1696,84 @@ "n":"British Columbia", "c":"ca", "f":"Canada_British Columbia", - "s":230417964, + "s":227941809, "rs":21269609 }, { "n":"Manitoba", "c":"ca", "f":"Canada_Manitoba", - "s":137998951, + "s":138001985, "rs":11375374 }, { "n":"New Brunswick", "c":"ca", "f":"Canada_New Brunswick", - "s":44625635, + "s":44562305, "rs":4240011 }, { "n":"Newfoundland and Labrador", "c":"ca", "f":"Canada_Newfoundland and Labrador", - "s":206061381, + "s":204758181, "rs":2482626 }, { "n":"Northwest Territories", "c":"ca", "f":"Canada_Northwest Territories", - "s":75238680, + "s":74972110, "rs":248638 }, { "n":"Nova Scotia", "c":"ca", "f":"Canada_Nova Scotia", - "s":53018156, + "s":52721521, "rs":3952187 }, { "n":"Nunavut", "c":"ca", "f":"Canada_Nunavut", - "s":62115162, + "s":55783113, "rs":264826 }, { "n":"Ontario", "c":"ca", "f":"Canada_Ontario", - "s":340710178, + "s":339395010, "rs":49877805 }, { "n":"Prince Edward Island", "c":"ca", "f":"Canada_Prince Edward Island", - "s":6494457, + "s":6471785, "rs":924629 }, { "n":"Quebec", "c":"ca", "f":"Canada_Quebec", - "s":265385060, + "s":264393819, "rs":29437397 }, { "n":"Saskatchewan", "c":"ca", "f":"Canada_Saskatchewan", - "s":76901316, + "s":76901318, "rs":23888665 }, { "n":"Yukon", "c":"ca", "f":"Canada_Yukon", - "s":61457344, + "s":61378729, "rs":320910 } ] @@ -1781,13 +1781,13 @@ { "n":"Greenland", "c":"gl", - "s":22925809, + "s":20599354, "rs":158518 }, { "n":"Mexico", "c":"mx", - "s":62028675, + "s":61643172, "rs":199566794 }, { @@ -1798,168 +1798,168 @@ "n":"Alabama", "c":"us", "f":"USA_Alabama", - "s":39296183, + "s":39273708, "rs":51232425 }, { "n":"Alaska", "c":"us", "f":"USA_Alaska", - "s":34175945, + "s":33200035, "rs":4707461 }, { "n":"Arizona", "c":"us", "f":"USA_Arizona", - "s":47289623, + "s":47247399, "rs":49226393 }, { "n":"Arkansas", "c":"us", "f":"USA_Arkansas", - "s":28813582, + "s":28813583, "rs":34612937 }, { "n":"California", "c":"us", "f":"USA_California", - "s":262673222, + "s":262581294, "rs":171989278 }, { "n":"Colorado", "c":"us", "f":"USA_Colorado", - "s":79571006, + "s":79571001, "rs":48858817 }, { "n":"Connecticut", "c":"us", "f":"USA_Connecticut", - "s":13187489, + "s":13161233, "rs":14480093 }, { "n":"Delaware", "c":"us", "f":"USA_Delaware", - "s":4555703, + "s":4595774, "rs":5103395 }, { "n":"Florida", "c":"us", "f":"USA_Florida", - "s":86069722, + "s":85027423, "rs":113343814 }, { "n":"Georgia", "c":"us", "f":"USA_Georgia", - "s":105935235, + "s":105884834, "rs":66920509 }, { "n":"Hawaii", "c":"us", "f":"USA_Hawaii", - "s":5162753, + "s":5172684, "rs":3844242 }, { "n":"Idaho", "c":"us", "f":"USA_Idaho", - "s":28308849, + "s":28308850, "rs":29054425 }, { "n":"Illinois", "c":"us", "f":"USA_Illinois", - "s":87026371, + "s":87023370, "rs":105024194 }, { "n":"Indiana", "c":"us", "f":"USA_Indiana", - "s":33471333, + "s":33471275, "rs":66097945 }, { "n":"Iowa", "c":"us", "f":"USA_Iowa", - "s":46514076, + "s":46514079, "rs":49602013 }, { "n":"Kansas", "c":"us", "f":"USA_Kansas", - "s":29573945, + "s":29573944, "rs":60034425 }, { "n":"Kentucky", "c":"us", "f":"USA_Kentucky", - "s":37086108, + "s":37086107, "rs":32176201 }, { "n":"Louisiana", "c":"us", "f":"USA_Louisiana", - "s":47223405, + "s":46820965, "rs":36995445 }, { "n":"Maine", "c":"us", "f":"USA_Maine", - "s":22048449, + "s":21810280, "rs":11496092 }, { "n":"Maryland", "c":"us", "f":"USA_Maryland", - "s":44243693, + "s":44191105, "rs":42096485 }, { "n":"Massachusetts", "c":"us", "f":"USA_Massachusetts", - "s":114873408, + "s":114811104, "rs":37242301 }, { "n":"Michigan", "c":"us", "f":"USA_Michigan", - "s":65742719, + "s":65449769, "rs":76025973 }, { "n":"Minnesota", "c":"us", "f":"USA_Minnesota", - "s":89575730, + "s":89655855, "rs":58595073 }, { "n":"Mississippi", "c":"us", "f":"USA_Mississippi", - "s":33990703, + "s":33963724, "rs":32300153 }, { @@ -1973,112 +1973,112 @@ "n":"Montana", "c":"us", "f":"USA_Montana", - "s":32123043, + "s":32123034, "rs":21134717 }, { "n":"Nebraska", "c":"us", "f":"USA_Nebraska", - "s":28356365, + "s":28356362, "rs":42521737 }, { "n":"Nevada", "c":"us", "f":"USA_Nevada", - "s":19305216, + "s":19305214, "rs":13399329 }, { "n":"New Hampshire", "c":"us", "f":"USA_New Hampshire", - "s":17675175, + "s":17669447, "rs":10872584 }, { "n":"New Jersey", "c":"us", "f":"USA_New Jersey", - "s":47003432, + "s":46902066, "rs":40360645 }, { "n":"New Mexico", "c":"us", "f":"USA_New Mexico", - "s":31651701, + "s":31626330, "rs":37207445 }, { "n":"New York", "c":"us", "f":"USA_New York", - "s":91206452, + "s":91062038, "rs":72637177 }, { "n":"North Carolina", "c":"us", "f":"USA_North Carolina", - "s":119603842, + "s":119440139, "rs":64553825 }, { "n":"North Dakota", "c":"us", "f":"USA_North Dakota", - "s":45053011, + "s":45083529, "rs":29459277 }, { "n":"Ohio", "c":"us", "f":"USA_Ohio", - "s":53425074, + "s":53408754, "rs":90427157 }, { "n":"Oklahoma", "c":"us", "f":"USA_Oklahoma", - "s":54516355, + "s":54516356, "rs":59585801 }, { "n":"Oregon", "c":"us", "f":"USA_Oregon", - "s":52401935, + "s":52389050, "rs":41682605 }, { "n":"Pennsylvania", "c":"us", "f":"USA_Pennsylvania", - "s":68475229, + "s":68458847, "rs":93502829 }, { "n":"Rhode Island", "c":"us", "f":"USA_Rhode Island", - "s":4659312, + "s":4633150, "rs":5774601 }, { "n":"South Carolina", "c":"us", "f":"USA_South Carolina", - "s":51543165, + "s":51589716, "rs":40479081 }, { "n":"South Dakota", "c":"us", "f":"USA_South Dakota", - "s":17738094, + "s":17738082, "rs":19144553 }, { @@ -2092,63 +2092,63 @@ "n":"Texas", "c":"us", "f":"USA_Texas", - "s":136254419, + "s":135676543, "rs":243472754 }, { "n":"Utah", "c":"us", "f":"USA_Utah", - "s":25262184, + "s":25262178, "rs":19919573 }, { "n":"Vermont", "c":"us", "f":"USA_Vermont", - "s":10389266, + "s":10378791, "rs":5439315 }, { "n":"Virginia", "c":"us", "f":"USA_Virginia", - "s":94419701, + "s":94328203, "rs":71583465 }, { "n":"Washington", "c":"us", "f":"USA_Washington", - "s":62328359, + "s":62335132, "rs":54932125 }, { "n":"Washington, District of Columbia", "c":"us", "f":"USA_District of Columbia", - "s":7055518, + "s":7055521, "rs":2115147 }, { "n":"West Virginia", "c":"us", "f":"USA_West Virginia", - "s":16403586, + "s":16403594, "rs":16507737 }, { "n":"Wisconsin", "c":"us", "f":"USA_Wisconsin", - "s":57912834, + "s":57877712, "rs":53453341 }, { "n":"Wyoming", "c":"us", "f":"USA_Wyoming", - "s":22634878, + "s":22634877, "rs":14416385 } ] @@ -2161,67 +2161,67 @@ { "n":"American Samoa", "c":"as", - "s":152964, + "s":146362, "rs":120225 }, { "n":"Australia", "c":"au", - "s":163111612, + "s":162180950, "rs":109364298 }, { "n":"Christmas Island", "c":"cx", - "s":22353, + "s":176059, "rs":3572 }, { "n":"Cocos Islands", "c":"cc", - "s":46802, + "s":40198, "rs":9048 }, { "n":"Cook Islands", "c":"ck", - "s":356789, + "s":300393, "rs":49583 }, { "n":"Fiji", "c":"fj", - "s":1499511, + "s":1458148, "rs":301110 }, { "n":"French Polynesia", "c":"pf", - "s":2725202, + "s":2236032, "rs":181910 }, { "n":"Guam", "c":"gu", - "s":676999, + "s":732202, "rs":691855 }, { "n":"Kiribati", "c":"ki", - "s":844153, + "s":828827, "rs":20461 }, { "n":"Marshall Islands", "c":"mh", - "s":900717, + "s":831757, "rs":32956 }, { "n":"Micronesia", "c":"fm", - "s":927799, + "s":670373, "rs":22375 }, { @@ -2233,91 +2233,91 @@ { "n":"New Caledonia", "c":"nc", - "s":4264717, + "s":4153452, "rs":713263 }, { "n":"New Zealand", "c":"nz", - "s":127007523, + "s":126655359, "rs":14888845 }, { "n":"Niue", "c":"nu", - "s":244638, + "s":229576, "rs":7828 }, { "n":"Norfolk Island", "c":"nf", - "s":35080, + "s":34367, "rs":9640 }, { "n":"Northern Mariana Islands", "c":"mp", - "s":408641, + "s":395797, "rs":332090 }, { "n":"Palau", "c":"pw", - "s":327764, + "s":278642, "rs":27716 }, { "n":"Papua New Guinea", "c":"pg", - "s":5136115, + "s":4627499, "rs":471466 }, { "n":"Pitcairn Islands", "c":"pn", - "s":77573, + "s":60175, "rs":835 }, { "n":"Samoa", "c":"ws", - "s":613200, + "s":598561, "rs":175746 }, { "n":"Solomon Islands", "c":"sb", - "s":1306998, + "s":1322238, "rs":60192 }, { "n":"Tokelau", "c":"tk", - "s":85299, + "s":59590, "rs":0 }, { "n":"Tonga", "c":"to", - "s":658499, + "s":669694, "rs":301898 }, { "n":"Tuvalu", "c":"tv", - "s":134367, + "s":184186, "rs":8088 }, { "n":"Vanuatu", "c":"vu", - "s":852298, + "s":735958, "rs":100053 }, { "n":"Wallis and Futuna", "c":"wf", - "s":85756, + "s":70384, "rs":19551 } ] @@ -2328,13 +2328,13 @@ { "n":"Argentina", "c":"ar", - "s":79725349, + "s":79627505, "rs":185906278 }, { "n":"Bolivia", "c":"bo", - "s":19695241, + "s":19783805, "rs":27244413 }, { @@ -2344,31 +2344,31 @@ { "n":"Central-West", "f":"Brazil_Central-West", - "s":22361719, + "s":22362316, "rs":53103909 }, { "n":"North", "f":"Brazil_North", - "s":19747647, + "s":19613142, "rs":24334521 }, { "n":"Northeast", "f":"Brazil_Northeast", - "s":28597553, + "s":28414603, "rs":66155257 }, { "n":"South", "f":"Brazil_South", - "s":39934014, + "s":39874950, "rs":75390361 }, { "n":"Rio & Southeast", "f":"Brazil_Southeast", - "s":79995508, + "s":79924222, "rs":174359802 } ] @@ -2376,64 +2376,64 @@ { "n":"Chile", "c":"cl", - "s":63188015, + "s":60974396, "rs":44751313 }, { "n":"Colombia", "c":"co", - "s":49058710, + "s":49052359, "rs":48476433 }, { "n":"Ecuador", "c":"ec", - "s":16075429, + "s":15971536, "rs":29785389 }, { "n":"French Guiana", "c":"gf", - "s":3640949, + "s":3633034, "rs":522666 }, { "n":"Guyana", "c":"gy", - "s":1158598, + "s":1158022, "rs":1040063 }, { "n":"Paraguay", "c":"py", - "s":9485203, + "s":9485204, "rs":14254171 }, { "n":"Peru", "c":"pe", - "s":26672168, + "s":26776600, "rs":46675253 }, { "n":"Suriname", "c":"sr", - "s":2405127, + "s":2396783, "rs":1231495 }, { "n":"Uruguay", "c":"uy", - "s":13100168, + "s":13098993, "rs":13412627 }, { "n":"Venezuela", "c":"ve", - "s":17359298, + "s":17235388, "rs":23535253 } ] } ] -} \ No newline at end of file +} diff --git a/data/external_resources.txt b/data/external_resources.txt index 78dcbf4ad6..6f51896c83 100644 --- a/data/external_resources.txt +++ b/data/external_resources.txt @@ -1,5 +1,5 @@ World.mwm 23046799 -WorldCoasts.mwm 5373369 +WorldCoasts.mwm 4788440 01_dejavusans.ttf 633604 02_wqy-microhei.ttf 5177387 03_jomolhari-id-a3d.ttf 1817160