From 615cffaf59894984f13a7b79e11e6be217d5b16b Mon Sep 17 00:00:00 2001 From: joshwapiano Date: Mon, 3 Aug 2015 15:46:27 +0100 Subject: [PATCH 01/20] Create datastart.csv --- datastart.csv | 243 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 243 insertions(+) create mode 100644 datastart.csv diff --git a/datastart.csv b/datastart.csv new file mode 100644 index 0000000..5b20a8c --- /dev/null +++ b/datastart.csv @@ -0,0 +1,243 @@ +Country,Population +China,"1,360,760,000" +India,"1,235,740,000" +United States,"316,955,000" +Indonesia,"237,641,326" +Brazil,"201,032,714" +Pakistan,"184,644,000" +Nigeria,"173,615,000" +Bangladesh,"152,518,015" +Russian Federation,"143,500,000" +Japan,"127,300,000" +Mexico,"118,395,054" +Philippines,"98,571,000" +Vietnam,"88,780,000" +Ethiopia,"86,613,986" +Egypt,"83,661,000" +Germany,"80,523,700" +Iran,"77,012,000" +Turkey,"75,627,384" +Congo,"67,514,000" +Thailand,"65,926,261" +France,"65,806,000" +United Kingdom,"63,705,000" +Italy,"59,772,978" +Burma,"53,259,000" +South Africa,"52,981,991" +South Korea,"50,219,669" +Colombia,"47,298,000" +Spain,"46,704,314" +Ukraine,"45,461,627" +"Tanzania, United Republic of","44,928,923" +Kenya,"44,354,000" +Argentina,"40,117,096" +Poland,"38,533,299" +Sudan,"37,964,000" +Algeria,"37,900,000" +Uganda,"35,357,000" +Canada,"35,158,304" +Iraq,"34,035,000" +Morocco,"33,066,400" +Peru,"30,475,144" +Uzbekistan,"30,183,400" +Malaysia,"29,791,700" +Saudi Arabia,"29,195,895" +Venezuela,"28,946,101" +Nepal,"26,494,504" +Afghanistan,"25,500,100" +North Korea,"24,895,000" +Ghana,"24,658,823" +Yemen,"24,527,000" +Mozambique,"23,700,715" +Taiwan,"23,356,588" +Australia,"23,230,382" +Ivory Coast,"23,202,000" +Syria,"21,898,000" +Madagascar,"20,696,070" +Angola,"20,609,294" +Cameroon,"20,386,799" +Sri Lanka,"20,277,597" +Romania,"20,121,641" +Burkina Faso,"17,322,796" +Niger,"17,129,076" +Kazakhstan,"17,076,000" +Netherlands,"16,804,700" +Chile,"16,634,603" +Malawi,"16,363,000" +Ecuador,"15,602,600" +Guatemala,"15,438,384" +Mali,"15,302,000" +Cambodia,"15,135,000" +Senegal,"13,567,338" +Zambia,"13,092,666" +Zimbabwe,"12,973,808" +Chad,"12,825,000" +South Sudan,"11,296,000" +Belgium,"11,167,578" +Cuba,"11,163,934" +Guinea,"10,824,200" +Greece,"10,815,197" +Tunisia,"10,777,500" +Portugal,"10,562,178" +Rwanda,"10,537,222" +Czech Republic,"10,512,900" +Somalia,"10,496,000" +Haiti,"10,413,211" +Benin,"10,323,000" +Burundi,"10,163,000" +Bolivia,"10,027,254" +Hungary,"9,906,000" +Sweden,"9,616,429" +Belarus,"9,464,400" +Dominican Republic,"9,445,281" +Azerbaijan,"9,235,100" +Honduras,"8,555,072" +Austria,"8,464,554" +United Arab Emirates,"8,264,070" +Switzerland,"8,085,300" +Israel,"8,081,000" +Tajikistan,"8,000,000" +Bulgaria,"7,282,041" +Serbia,"7,181,505" +Hong Kong,"7,173,900" +Papua New Guinea,"7,059,653" +Paraguay,"6,600,284" +Laos,"6,580,800" +Jordan,"6,504,200" +El Salvador,"6,340,000" +Eritrea,"6,333,000" +Libya,"6,202,000" +Togo,"6,191,155" +Sierra Leone,"6,190,280" +Nicaragua,"6,071,045" +Denmark,"5,608,784" +Kyrgyzstan,"5,551,900" +Finland,"5,445,883" +Slovakia,"5,412,008" +Singapore,"5,399,200" +Turkmenistan,"5,240,000" +Norway,"5,077,798" +Lebanon,"4,822,000" +Costa Rica,"4,667,096" +Central African Republic,"4,616,000" +Ireland,"4,585,400" +Georgia,"4,483,800" +New Zealand,"4,477,430" +"Congo, the Democratic Republic of","4,448,000" +Palestine,"4,420,549" +Liberia,"4,294,000" +Croatia,"4,290,612" +Oman,"3,897,000" +Bosnia and Herzegovina,"3,839,737" +Puerto Rico,"3,667,084" +Kuwait,"3,582,054" +Moldova,"3,559,500" +Mauritania,"3,461,041" +Panama,"3,405,813" +Uruguay,"3,286,314" +Armenia,"3,024,100" +Lithuania,"2,950,684" +Albania,"2,821,977" +Mongolia,"2,754,685" +Jamaica,"2,711,476" +Namibia,"2,113,077" +Lesotho,"2,074,000" +Slovenia,"2,061,229" +Macedonia,"2,062,294" +Qatar,"2,035,106" +Botswana,"2,024,904" +Latvia,"2,014,000" +Gambia,"1,849,000" +Guinea-Bissau,"1,704,000" +Gabon,"1,672,000" +Equatorial Guinea,"1,622,000" +Trinidad and Tobago,"1,328,019" +Estonia,"1,286,540" +Mauritius,"1,257,900" +Swaziland,"1,250,000" +Bahrain,"1,234,571" +Timor-Leste,"1,066,409" +Djibouti,"864,618" +Cyprus,"862,000" +Fiji,"858,038" +Réunion,"821,136" +Guyana,"784,894" +Bhutan,"740,200" +Comoros,"724,300" +Montenegro,"620,029" +Macau,"582,000" +Western Sahara,"567,000" +Solomon Islands,"561,000" +Luxembourg,"537,000" +Suriname,"534,189" +Cape Verde,"491,875" +Malta,"416,055" +Guadeloupe,"403,355" +Martinique,"394,173" +Brunei,"393,162" +Bahamas,"351,461" +Iceland,"325,010" +Maldives,"317,280" +Belize,"312,971" +Barbados,"274,200" +French Polynesia,"268,270" +Vanuatu,"264,652" +New Caledonia,"258,958" +French Guiana,"229,040" +Mayotte,"212,600" +Samoa,"187,820" +São Tomé and Príncipe,"187,356" +Saint Lucia,"166,526" +Guam,"159,358" +Curaçao,"150,563" +Saint Vincent and the Grenadines,"109,000" +Kiribati,"106,461" +United States Virgin Islands,"106,405" +Grenada,"103,328" +Tonga,"103,036" +Aruba,"101,484" +Federated States of Micronesia,"101,351" +Jersey,"97,857" +Seychelles,"90,945" +Antigua and Barbuda,"86,295" +Isle of Man,"84,497" +Andorra,"76,246" +Dominica,"71,293" +Bermuda,"64,237" +Guernsey,"62,431" +Greenland,"56,370" +Marshall Islands,"56,086" +American Samoa,"55,519" +Cayman Islands,"55,456" +Saint Kitts and Nevis,"54,000" +Northern Mariana Islands,"53,883" +Faroe Islands,"48,509" +Sint Maarten,"37,429" +Saint Martin,"36,979" +Liechtenstein,"36,842" +Monaco,"36,136" +San Marino,"32,509" +Turks and Caicos Islands,"31,458" +Gibraltar,"29,752" +British Virgin Islands,"29,537" +Åland Islands,"28,502" +Caribbean Netherlands,"21,133" +Palau,"20,901" +Cook Islands,"14,974" +Anguilla,"13,452" +Wallis and Futuna,"13,135" +Tuvalu,"11,323" +Nauru,"9,945" +Saint Barthélemy,"8,938" +Saint Pierre and Miquelon,"6,081" +Montserrat,"4,922" +"Saint Helena, Ascension and Tristan da Cunha","4,000" +Svalbard and Jan Mayen,"2,655" +Falkland Islands,"2,563" +Norfolk Island,"2,302" +Christmas Island,"2,072" +Niue,"1,613" +Tokelau,"1,411" +Vatican City,800 +"Cocos, Islands",550 +Pitcairn Islands,56 From 3f2d509e68ea1ec3f3444337c9eaff014a8356d1 Mon Sep 17 00:00:00 2001 From: LuckyLiam Date: Mon, 3 Aug 2015 15:47:11 +0100 Subject: [PATCH 02/20] Create popdata.csv --- popdata.csv | 243 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 243 insertions(+) create mode 100644 popdata.csv diff --git a/popdata.csv b/popdata.csv new file mode 100644 index 0000000..0513da0 --- /dev/null +++ b/popdata.csv @@ -0,0 +1,243 @@ +Country Population +China 1,360,760,000 +India 1,235,740,000 +United States 316,955,000 +Indonesia 237,641,326 +Brazil 201,032,714 +Pakistan 184,644,000 +Nigeria 173,615,000 +Bangladesh 152,518,015 +Russian Federation 143,500,000 +Japan 127,300,000 +Mexico 118,395,054 +Philippines 98,571,000 +Vietnam 88,780,000 +Ethiopia 86,613,986 +Egypt 83,661,000 +Germany 80,523,700 +Iran 77,012,000 +Turkey 75,627,384 +Congo 67,514,000 +Thailand 65,926,261 +France 65,806,000 +United Kingdom 63,705,000 +Italy 59,772,978 +Burma 53,259,000 +South Africa 52,981,991 +South Korea 50,219,669 +Colombia 47,298,000 +Spain 46,704,314 +Ukraine 45,461,627 +Tanzania, United Republic of 44,928,923 +Kenya 44,354,000 +Argentina 40,117,096 +Poland 38,533,299 +Sudan 37,964,000 +Algeria 37,900,000 +Uganda 35,357,000 +Canada 35,158,304 +Iraq 34,035,000 +Morocco 33,066,400 +Peru 30,475,144 +Uzbekistan 30,183,400 +Malaysia 29,791,700 +Saudi Arabia 29,195,895 +Venezuela 28,946,101 +Nepal 26,494,504 +Afghanistan 25,500,100 +North Korea 24,895,000 +Ghana 24,658,823 +Yemen 24,527,000 +Mozambique 23,700,715 +Taiwan 23,356,588 +Australia 23,230,382 +Ivory Coast 23,202,000 +Syria 21,898,000 +Madagascar 20,696,070 +Angola 20,609,294 +Cameroon 20,386,799 +Sri Lanka 20,277,597 +Romania 20,121,641 +Burkina Faso 17,322,796 +Niger 17,129,076 +Kazakhstan 17,076,000 +Netherlands 16,804,700 +Chile 16,634,603 +Malawi 16,363,000 +Ecuador 15,602,600 +Guatemala 15,438,384 +Mali 15,302,000 +Cambodia 15,135,000 +Senegal 13,567,338 +Zambia 13,092,666 +Zimbabwe 12,973,808 +Chad 12,825,000 +South Sudan 11,296,000 +Belgium 11,167,578 +Cuba 11,163,934 +Guinea 10,824,200 +Greece 10,815,197 +Tunisia 10,777,500 +Portugal 10,562,178 +Rwanda 10,537,222 +Czech Republic 10,512,900 +Somalia 10,496,000 +Haiti 10,413,211 +Benin 10,323,000 +Burundi 10,163,000 +Bolivia 10,027,254 +Hungary 9,906,000 +Sweden 9,616,429 +Belarus 9,464,400 +Dominican Republic 9,445,281 +Azerbaijan 9,235,100 +Honduras 8,555,072 +Austria 8,464,554 +United Arab Emirates 8,264,070 +Switzerland 8,085,300 +Israel 8,081,000 +Tajikistan 8,000,000 +Bulgaria 7,282,041 +Serbia 7,181,505 +Hong Kong 7,173,900 +Papua New Guinea 7,059,653 +Paraguay 6,600,284 +Laos 6,580,800 +Jordan 6,504,200 +El Salvador 6,340,000 +Eritrea 6,333,000 +Libya 6,202,000 +Togo 6,191,155 +Sierra Leone 6,190,280 +Nicaragua 6,071,045 +Denmark 5,608,784 +Kyrgyzstan 5,551,900 +Finland 5,445,883 +Slovakia 5,412,008 +Singapore 5,399,200 +Turkmenistan 5,240,000 +Norway 5,077,798 +Lebanon 4,822,000 +Costa Rica 4,667,096 +Central African Republic 4,616,000 +Ireland 4,585,400 +Georgia 4,483,800 +New Zealand 4,477,430 +Congo, the Democratic Republic of 4,448,000 +Palestine 4,420,549 +Liberia 4,294,000 +Croatia 4,290,612 +Oman 3,897,000 +Bosnia and Herzegovina 3,839,737 +Puerto Rico 3,667,084 +Kuwait 3,582,054 +Moldova 3,559,500 +Mauritania 3,461,041 +Panama 3,405,813 +Uruguay 3,286,314 +Armenia 3,024,100 +Lithuania 2,950,684 +Albania 2,821,977 +Mongolia 2,754,685 +Jamaica 2,711,476 +Namibia 2,113,077 +Lesotho 2,074,000 +Slovenia 2,061,229 +Macedonia 2,062,294 +Qatar 2,035,106 +Botswana 2,024,904 +Latvia 2,014,000 +Gambia 1,849,000 +Guinea-Bissau 1,704,000 +Gabon 1,672,000 +Equatorial Guinea 1,622,000 +Trinidad and Tobago 1,328,019 +Estonia 1,286,540 +Mauritius 1,257,900 +Swaziland 1,250,000 +Bahrain 1,234,571 +Timor-Leste 1,066,409 +Djibouti 864,618 +Cyprus 862,000 +Fiji 858,038 +Réunion 821,136 +Guyana 784,894 +Bhutan 740,200 +Comoros 724,300 +Montenegro 620,029 +Macau 582,000 +Western Sahara 567,000 +Solomon Islands 561,000 +Luxembourg 537,000 +Suriname 534,189 +Cape Verde 491,875 +Malta 416,055 +Guadeloupe 403,355 +Martinique 394,173 +Brunei 393,162 +Bahamas 351,461 +Iceland 325,010 +Maldives 317,280 +Belize 312,971 +Barbados 274,200 +French Polynesia 268,270 +Vanuatu 264,652 +New Caledonia 258,958 +French Guiana 229,040 +Mayotte 212,600 +Samoa 187,820 +São Tomé and Príncipe 187,356 +Saint Lucia 166,526 +Guam 159,358 +Curaçao 150,563 +Saint Vincent and the Grenadines 109,000 +Kiribati 106,461 +United States Virgin Islands 106,405 +Grenada 103,328 +Tonga 103,036 +Aruba 101,484 +Federated States of Micronesia 101,351 +Jersey 97,857 +Seychelles 90,945 +Antigua and Barbuda 86,295 +Isle of Man 84,497 +Andorra 76,246 +Dominica 71,293 +Bermuda 64,237 +Guernsey 62,431 +Greenland 56,370 +Marshall Islands 56,086 +American Samoa 55,519 +Cayman Islands 55,456 +Saint Kitts and Nevis 54,000 +Northern Mariana Islands 53,883 +Faroe Islands 48,509 +Sint Maarten 37,429 +Saint Martin 36,979 +Liechtenstein 36,842 +Monaco 36,136 +San Marino 32,509 +Turks and Caicos Islands 31,458 +Gibraltar 29,752 +British Virgin Islands 29,537 +Ã…land Islands 28,502 +Caribbean Netherlands 21,133 +Palau 20,901 +Cook Islands 14,974 +Anguilla 13,452 +Wallis and Futuna 13,135 +Tuvalu 11,323 +Nauru 9,945 +Saint Barthélemy 8,938 +Saint Pierre and Miquelon 6,081 +Montserrat 4,922 +Saint Helena, Ascension and Tristan da Cunha 4,000 +Svalbard and Jan Mayen 2,655 +Falkland Islands 2,563 +Norfolk Island 2,302 +Christmas Island 2,072 +Niue 1,613 +Tokelau 1,411 +Vatican City 800 +Cocos, Islands 550 +Pitcairn Islands 56 From 10b79dbe430a42751419ce9033f7aaa9b164b852 Mon Sep 17 00:00:00 2001 From: joshwapiano Date: Mon, 3 Aug 2015 15:49:03 +0100 Subject: [PATCH 03/20] Adding global population data Added data. Closes https://github.com/ukodi-training/ODP-Group3/issues/3 --- datastart.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datastart.csv b/datastart.csv index 5b20a8c..67eeeb6 100644 --- a/datastart.csv +++ b/datastart.csv @@ -26,7 +26,7 @@ Burma,"53,259,000" South Africa,"52,981,991" South Korea,"50,219,669" Colombia,"47,298,000" -Spain,"46,704,314" +Spain,"46,704,314" Ukraine,"45,461,627" "Tanzania, United Republic of","44,928,923" Kenya,"44,354,000" From e468e1ff88c4f76ef25a4a3e6efd22af655f251e Mon Sep 17 00:00:00 2001 From: LuckyLiam Date: Mon, 3 Aug 2015 15:51:42 +0100 Subject: [PATCH 04/20] Delete popdata.csv --- popdata.csv | 243 ---------------------------------------------------- 1 file changed, 243 deletions(-) delete mode 100644 popdata.csv diff --git a/popdata.csv b/popdata.csv deleted file mode 100644 index 0513da0..0000000 --- a/popdata.csv +++ /dev/null @@ -1,243 +0,0 @@ -Country Population -China 1,360,760,000 -India 1,235,740,000 -United States 316,955,000 -Indonesia 237,641,326 -Brazil 201,032,714 -Pakistan 184,644,000 -Nigeria 173,615,000 -Bangladesh 152,518,015 -Russian Federation 143,500,000 -Japan 127,300,000 -Mexico 118,395,054 -Philippines 98,571,000 -Vietnam 88,780,000 -Ethiopia 86,613,986 -Egypt 83,661,000 -Germany 80,523,700 -Iran 77,012,000 -Turkey 75,627,384 -Congo 67,514,000 -Thailand 65,926,261 -France 65,806,000 -United Kingdom 63,705,000 -Italy 59,772,978 -Burma 53,259,000 -South Africa 52,981,991 -South Korea 50,219,669 -Colombia 47,298,000 -Spain 46,704,314 -Ukraine 45,461,627 -Tanzania, United Republic of 44,928,923 -Kenya 44,354,000 -Argentina 40,117,096 -Poland 38,533,299 -Sudan 37,964,000 -Algeria 37,900,000 -Uganda 35,357,000 -Canada 35,158,304 -Iraq 34,035,000 -Morocco 33,066,400 -Peru 30,475,144 -Uzbekistan 30,183,400 -Malaysia 29,791,700 -Saudi Arabia 29,195,895 -Venezuela 28,946,101 -Nepal 26,494,504 -Afghanistan 25,500,100 -North Korea 24,895,000 -Ghana 24,658,823 -Yemen 24,527,000 -Mozambique 23,700,715 -Taiwan 23,356,588 -Australia 23,230,382 -Ivory Coast 23,202,000 -Syria 21,898,000 -Madagascar 20,696,070 -Angola 20,609,294 -Cameroon 20,386,799 -Sri Lanka 20,277,597 -Romania 20,121,641 -Burkina Faso 17,322,796 -Niger 17,129,076 -Kazakhstan 17,076,000 -Netherlands 16,804,700 -Chile 16,634,603 -Malawi 16,363,000 -Ecuador 15,602,600 -Guatemala 15,438,384 -Mali 15,302,000 -Cambodia 15,135,000 -Senegal 13,567,338 -Zambia 13,092,666 -Zimbabwe 12,973,808 -Chad 12,825,000 -South Sudan 11,296,000 -Belgium 11,167,578 -Cuba 11,163,934 -Guinea 10,824,200 -Greece 10,815,197 -Tunisia 10,777,500 -Portugal 10,562,178 -Rwanda 10,537,222 -Czech Republic 10,512,900 -Somalia 10,496,000 -Haiti 10,413,211 -Benin 10,323,000 -Burundi 10,163,000 -Bolivia 10,027,254 -Hungary 9,906,000 -Sweden 9,616,429 -Belarus 9,464,400 -Dominican Republic 9,445,281 -Azerbaijan 9,235,100 -Honduras 8,555,072 -Austria 8,464,554 -United Arab Emirates 8,264,070 -Switzerland 8,085,300 -Israel 8,081,000 -Tajikistan 8,000,000 -Bulgaria 7,282,041 -Serbia 7,181,505 -Hong Kong 7,173,900 -Papua New Guinea 7,059,653 -Paraguay 6,600,284 -Laos 6,580,800 -Jordan 6,504,200 -El Salvador 6,340,000 -Eritrea 6,333,000 -Libya 6,202,000 -Togo 6,191,155 -Sierra Leone 6,190,280 -Nicaragua 6,071,045 -Denmark 5,608,784 -Kyrgyzstan 5,551,900 -Finland 5,445,883 -Slovakia 5,412,008 -Singapore 5,399,200 -Turkmenistan 5,240,000 -Norway 5,077,798 -Lebanon 4,822,000 -Costa Rica 4,667,096 -Central African Republic 4,616,000 -Ireland 4,585,400 -Georgia 4,483,800 -New Zealand 4,477,430 -Congo, the Democratic Republic of 4,448,000 -Palestine 4,420,549 -Liberia 4,294,000 -Croatia 4,290,612 -Oman 3,897,000 -Bosnia and Herzegovina 3,839,737 -Puerto Rico 3,667,084 -Kuwait 3,582,054 -Moldova 3,559,500 -Mauritania 3,461,041 -Panama 3,405,813 -Uruguay 3,286,314 -Armenia 3,024,100 -Lithuania 2,950,684 -Albania 2,821,977 -Mongolia 2,754,685 -Jamaica 2,711,476 -Namibia 2,113,077 -Lesotho 2,074,000 -Slovenia 2,061,229 -Macedonia 2,062,294 -Qatar 2,035,106 -Botswana 2,024,904 -Latvia 2,014,000 -Gambia 1,849,000 -Guinea-Bissau 1,704,000 -Gabon 1,672,000 -Equatorial Guinea 1,622,000 -Trinidad and Tobago 1,328,019 -Estonia 1,286,540 -Mauritius 1,257,900 -Swaziland 1,250,000 -Bahrain 1,234,571 -Timor-Leste 1,066,409 -Djibouti 864,618 -Cyprus 862,000 -Fiji 858,038 -Réunion 821,136 -Guyana 784,894 -Bhutan 740,200 -Comoros 724,300 -Montenegro 620,029 -Macau 582,000 -Western Sahara 567,000 -Solomon Islands 561,000 -Luxembourg 537,000 -Suriname 534,189 -Cape Verde 491,875 -Malta 416,055 -Guadeloupe 403,355 -Martinique 394,173 -Brunei 393,162 -Bahamas 351,461 -Iceland 325,010 -Maldives 317,280 -Belize 312,971 -Barbados 274,200 -French Polynesia 268,270 -Vanuatu 264,652 -New Caledonia 258,958 -French Guiana 229,040 -Mayotte 212,600 -Samoa 187,820 -São Tomé and Príncipe 187,356 -Saint Lucia 166,526 -Guam 159,358 -Curaçao 150,563 -Saint Vincent and the Grenadines 109,000 -Kiribati 106,461 -United States Virgin Islands 106,405 -Grenada 103,328 -Tonga 103,036 -Aruba 101,484 -Federated States of Micronesia 101,351 -Jersey 97,857 -Seychelles 90,945 -Antigua and Barbuda 86,295 -Isle of Man 84,497 -Andorra 76,246 -Dominica 71,293 -Bermuda 64,237 -Guernsey 62,431 -Greenland 56,370 -Marshall Islands 56,086 -American Samoa 55,519 -Cayman Islands 55,456 -Saint Kitts and Nevis 54,000 -Northern Mariana Islands 53,883 -Faroe Islands 48,509 -Sint Maarten 37,429 -Saint Martin 36,979 -Liechtenstein 36,842 -Monaco 36,136 -San Marino 32,509 -Turks and Caicos Islands 31,458 -Gibraltar 29,752 -British Virgin Islands 29,537 -Ã…land Islands 28,502 -Caribbean Netherlands 21,133 -Palau 20,901 -Cook Islands 14,974 -Anguilla 13,452 -Wallis and Futuna 13,135 -Tuvalu 11,323 -Nauru 9,945 -Saint Barthélemy 8,938 -Saint Pierre and Miquelon 6,081 -Montserrat 4,922 -Saint Helena, Ascension and Tristan da Cunha 4,000 -Svalbard and Jan Mayen 2,655 -Falkland Islands 2,563 -Norfolk Island 2,302 -Christmas Island 2,072 -Niue 1,613 -Tokelau 1,411 -Vatican City 800 -Cocos, Islands 550 -Pitcairn Islands 56 From 4c923edded50284d187c8dc77ad0abefbc322210 Mon Sep 17 00:00:00 2001 From: LuckyLiam Date: Mon, 3 Aug 2015 15:52:07 +0100 Subject: [PATCH 05/20] Create popdatav2.csv --- popdatav2.csv | 243 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 243 insertions(+) create mode 100644 popdatav2.csv diff --git a/popdatav2.csv b/popdatav2.csv new file mode 100644 index 0000000..0513da0 --- /dev/null +++ b/popdatav2.csv @@ -0,0 +1,243 @@ +Country Population +China 1,360,760,000 +India 1,235,740,000 +United States 316,955,000 +Indonesia 237,641,326 +Brazil 201,032,714 +Pakistan 184,644,000 +Nigeria 173,615,000 +Bangladesh 152,518,015 +Russian Federation 143,500,000 +Japan 127,300,000 +Mexico 118,395,054 +Philippines 98,571,000 +Vietnam 88,780,000 +Ethiopia 86,613,986 +Egypt 83,661,000 +Germany 80,523,700 +Iran 77,012,000 +Turkey 75,627,384 +Congo 67,514,000 +Thailand 65,926,261 +France 65,806,000 +United Kingdom 63,705,000 +Italy 59,772,978 +Burma 53,259,000 +South Africa 52,981,991 +South Korea 50,219,669 +Colombia 47,298,000 +Spain 46,704,314 +Ukraine 45,461,627 +Tanzania, United Republic of 44,928,923 +Kenya 44,354,000 +Argentina 40,117,096 +Poland 38,533,299 +Sudan 37,964,000 +Algeria 37,900,000 +Uganda 35,357,000 +Canada 35,158,304 +Iraq 34,035,000 +Morocco 33,066,400 +Peru 30,475,144 +Uzbekistan 30,183,400 +Malaysia 29,791,700 +Saudi Arabia 29,195,895 +Venezuela 28,946,101 +Nepal 26,494,504 +Afghanistan 25,500,100 +North Korea 24,895,000 +Ghana 24,658,823 +Yemen 24,527,000 +Mozambique 23,700,715 +Taiwan 23,356,588 +Australia 23,230,382 +Ivory Coast 23,202,000 +Syria 21,898,000 +Madagascar 20,696,070 +Angola 20,609,294 +Cameroon 20,386,799 +Sri Lanka 20,277,597 +Romania 20,121,641 +Burkina Faso 17,322,796 +Niger 17,129,076 +Kazakhstan 17,076,000 +Netherlands 16,804,700 +Chile 16,634,603 +Malawi 16,363,000 +Ecuador 15,602,600 +Guatemala 15,438,384 +Mali 15,302,000 +Cambodia 15,135,000 +Senegal 13,567,338 +Zambia 13,092,666 +Zimbabwe 12,973,808 +Chad 12,825,000 +South Sudan 11,296,000 +Belgium 11,167,578 +Cuba 11,163,934 +Guinea 10,824,200 +Greece 10,815,197 +Tunisia 10,777,500 +Portugal 10,562,178 +Rwanda 10,537,222 +Czech Republic 10,512,900 +Somalia 10,496,000 +Haiti 10,413,211 +Benin 10,323,000 +Burundi 10,163,000 +Bolivia 10,027,254 +Hungary 9,906,000 +Sweden 9,616,429 +Belarus 9,464,400 +Dominican Republic 9,445,281 +Azerbaijan 9,235,100 +Honduras 8,555,072 +Austria 8,464,554 +United Arab Emirates 8,264,070 +Switzerland 8,085,300 +Israel 8,081,000 +Tajikistan 8,000,000 +Bulgaria 7,282,041 +Serbia 7,181,505 +Hong Kong 7,173,900 +Papua New Guinea 7,059,653 +Paraguay 6,600,284 +Laos 6,580,800 +Jordan 6,504,200 +El Salvador 6,340,000 +Eritrea 6,333,000 +Libya 6,202,000 +Togo 6,191,155 +Sierra Leone 6,190,280 +Nicaragua 6,071,045 +Denmark 5,608,784 +Kyrgyzstan 5,551,900 +Finland 5,445,883 +Slovakia 5,412,008 +Singapore 5,399,200 +Turkmenistan 5,240,000 +Norway 5,077,798 +Lebanon 4,822,000 +Costa Rica 4,667,096 +Central African Republic 4,616,000 +Ireland 4,585,400 +Georgia 4,483,800 +New Zealand 4,477,430 +Congo, the Democratic Republic of 4,448,000 +Palestine 4,420,549 +Liberia 4,294,000 +Croatia 4,290,612 +Oman 3,897,000 +Bosnia and Herzegovina 3,839,737 +Puerto Rico 3,667,084 +Kuwait 3,582,054 +Moldova 3,559,500 +Mauritania 3,461,041 +Panama 3,405,813 +Uruguay 3,286,314 +Armenia 3,024,100 +Lithuania 2,950,684 +Albania 2,821,977 +Mongolia 2,754,685 +Jamaica 2,711,476 +Namibia 2,113,077 +Lesotho 2,074,000 +Slovenia 2,061,229 +Macedonia 2,062,294 +Qatar 2,035,106 +Botswana 2,024,904 +Latvia 2,014,000 +Gambia 1,849,000 +Guinea-Bissau 1,704,000 +Gabon 1,672,000 +Equatorial Guinea 1,622,000 +Trinidad and Tobago 1,328,019 +Estonia 1,286,540 +Mauritius 1,257,900 +Swaziland 1,250,000 +Bahrain 1,234,571 +Timor-Leste 1,066,409 +Djibouti 864,618 +Cyprus 862,000 +Fiji 858,038 +Réunion 821,136 +Guyana 784,894 +Bhutan 740,200 +Comoros 724,300 +Montenegro 620,029 +Macau 582,000 +Western Sahara 567,000 +Solomon Islands 561,000 +Luxembourg 537,000 +Suriname 534,189 +Cape Verde 491,875 +Malta 416,055 +Guadeloupe 403,355 +Martinique 394,173 +Brunei 393,162 +Bahamas 351,461 +Iceland 325,010 +Maldives 317,280 +Belize 312,971 +Barbados 274,200 +French Polynesia 268,270 +Vanuatu 264,652 +New Caledonia 258,958 +French Guiana 229,040 +Mayotte 212,600 +Samoa 187,820 +São Tomé and Príncipe 187,356 +Saint Lucia 166,526 +Guam 159,358 +Curaçao 150,563 +Saint Vincent and the Grenadines 109,000 +Kiribati 106,461 +United States Virgin Islands 106,405 +Grenada 103,328 +Tonga 103,036 +Aruba 101,484 +Federated States of Micronesia 101,351 +Jersey 97,857 +Seychelles 90,945 +Antigua and Barbuda 86,295 +Isle of Man 84,497 +Andorra 76,246 +Dominica 71,293 +Bermuda 64,237 +Guernsey 62,431 +Greenland 56,370 +Marshall Islands 56,086 +American Samoa 55,519 +Cayman Islands 55,456 +Saint Kitts and Nevis 54,000 +Northern Mariana Islands 53,883 +Faroe Islands 48,509 +Sint Maarten 37,429 +Saint Martin 36,979 +Liechtenstein 36,842 +Monaco 36,136 +San Marino 32,509 +Turks and Caicos Islands 31,458 +Gibraltar 29,752 +British Virgin Islands 29,537 +Ã…land Islands 28,502 +Caribbean Netherlands 21,133 +Palau 20,901 +Cook Islands 14,974 +Anguilla 13,452 +Wallis and Futuna 13,135 +Tuvalu 11,323 +Nauru 9,945 +Saint Barthélemy 8,938 +Saint Pierre and Miquelon 6,081 +Montserrat 4,922 +Saint Helena, Ascension and Tristan da Cunha 4,000 +Svalbard and Jan Mayen 2,655 +Falkland Islands 2,563 +Norfolk Island 2,302 +Christmas Island 2,072 +Niue 1,613 +Tokelau 1,411 +Vatican City 800 +Cocos, Islands 550 +Pitcairn Islands 56 From bf7dc090be188a77385286bde11060e40a119011 Mon Sep 17 00:00:00 2001 From: joshwapiano Date: Mon, 3 Aug 2015 15:54:31 +0100 Subject: [PATCH 06/20] Adding map Fixing issue 2 https://github.com/ukodi-training/ODP-Group3/issues/2 --- map/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/map/index.html b/map/index.html index 9f2cbdb..619c8ff 100644 --- a/map/index.html +++ b/map/index.html @@ -28,6 +28,7 @@

Shaded Map of World

Your challenge. Create a shaded map of the world from some data about each country, get it to display and also dynamically update other content on this page.

+
From ce93f8db0506a7149a7ebbe8fdd0b6772b7f9ef6 Mon Sep 17 00:00:00 2001 From: LuckyLiam Date: Mon, 3 Aug 2015 15:55:42 +0100 Subject: [PATCH 07/20] Delete popdatav2.csv --- popdatav2.csv | 243 -------------------------------------------------- 1 file changed, 243 deletions(-) delete mode 100644 popdatav2.csv diff --git a/popdatav2.csv b/popdatav2.csv deleted file mode 100644 index 0513da0..0000000 --- a/popdatav2.csv +++ /dev/null @@ -1,243 +0,0 @@ -Country Population -China 1,360,760,000 -India 1,235,740,000 -United States 316,955,000 -Indonesia 237,641,326 -Brazil 201,032,714 -Pakistan 184,644,000 -Nigeria 173,615,000 -Bangladesh 152,518,015 -Russian Federation 143,500,000 -Japan 127,300,000 -Mexico 118,395,054 -Philippines 98,571,000 -Vietnam 88,780,000 -Ethiopia 86,613,986 -Egypt 83,661,000 -Germany 80,523,700 -Iran 77,012,000 -Turkey 75,627,384 -Congo 67,514,000 -Thailand 65,926,261 -France 65,806,000 -United Kingdom 63,705,000 -Italy 59,772,978 -Burma 53,259,000 -South Africa 52,981,991 -South Korea 50,219,669 -Colombia 47,298,000 -Spain 46,704,314 -Ukraine 45,461,627 -Tanzania, United Republic of 44,928,923 -Kenya 44,354,000 -Argentina 40,117,096 -Poland 38,533,299 -Sudan 37,964,000 -Algeria 37,900,000 -Uganda 35,357,000 -Canada 35,158,304 -Iraq 34,035,000 -Morocco 33,066,400 -Peru 30,475,144 -Uzbekistan 30,183,400 -Malaysia 29,791,700 -Saudi Arabia 29,195,895 -Venezuela 28,946,101 -Nepal 26,494,504 -Afghanistan 25,500,100 -North Korea 24,895,000 -Ghana 24,658,823 -Yemen 24,527,000 -Mozambique 23,700,715 -Taiwan 23,356,588 -Australia 23,230,382 -Ivory Coast 23,202,000 -Syria 21,898,000 -Madagascar 20,696,070 -Angola 20,609,294 -Cameroon 20,386,799 -Sri Lanka 20,277,597 -Romania 20,121,641 -Burkina Faso 17,322,796 -Niger 17,129,076 -Kazakhstan 17,076,000 -Netherlands 16,804,700 -Chile 16,634,603 -Malawi 16,363,000 -Ecuador 15,602,600 -Guatemala 15,438,384 -Mali 15,302,000 -Cambodia 15,135,000 -Senegal 13,567,338 -Zambia 13,092,666 -Zimbabwe 12,973,808 -Chad 12,825,000 -South Sudan 11,296,000 -Belgium 11,167,578 -Cuba 11,163,934 -Guinea 10,824,200 -Greece 10,815,197 -Tunisia 10,777,500 -Portugal 10,562,178 -Rwanda 10,537,222 -Czech Republic 10,512,900 -Somalia 10,496,000 -Haiti 10,413,211 -Benin 10,323,000 -Burundi 10,163,000 -Bolivia 10,027,254 -Hungary 9,906,000 -Sweden 9,616,429 -Belarus 9,464,400 -Dominican Republic 9,445,281 -Azerbaijan 9,235,100 -Honduras 8,555,072 -Austria 8,464,554 -United Arab Emirates 8,264,070 -Switzerland 8,085,300 -Israel 8,081,000 -Tajikistan 8,000,000 -Bulgaria 7,282,041 -Serbia 7,181,505 -Hong Kong 7,173,900 -Papua New Guinea 7,059,653 -Paraguay 6,600,284 -Laos 6,580,800 -Jordan 6,504,200 -El Salvador 6,340,000 -Eritrea 6,333,000 -Libya 6,202,000 -Togo 6,191,155 -Sierra Leone 6,190,280 -Nicaragua 6,071,045 -Denmark 5,608,784 -Kyrgyzstan 5,551,900 -Finland 5,445,883 -Slovakia 5,412,008 -Singapore 5,399,200 -Turkmenistan 5,240,000 -Norway 5,077,798 -Lebanon 4,822,000 -Costa Rica 4,667,096 -Central African Republic 4,616,000 -Ireland 4,585,400 -Georgia 4,483,800 -New Zealand 4,477,430 -Congo, the Democratic Republic of 4,448,000 -Palestine 4,420,549 -Liberia 4,294,000 -Croatia 4,290,612 -Oman 3,897,000 -Bosnia and Herzegovina 3,839,737 -Puerto Rico 3,667,084 -Kuwait 3,582,054 -Moldova 3,559,500 -Mauritania 3,461,041 -Panama 3,405,813 -Uruguay 3,286,314 -Armenia 3,024,100 -Lithuania 2,950,684 -Albania 2,821,977 -Mongolia 2,754,685 -Jamaica 2,711,476 -Namibia 2,113,077 -Lesotho 2,074,000 -Slovenia 2,061,229 -Macedonia 2,062,294 -Qatar 2,035,106 -Botswana 2,024,904 -Latvia 2,014,000 -Gambia 1,849,000 -Guinea-Bissau 1,704,000 -Gabon 1,672,000 -Equatorial Guinea 1,622,000 -Trinidad and Tobago 1,328,019 -Estonia 1,286,540 -Mauritius 1,257,900 -Swaziland 1,250,000 -Bahrain 1,234,571 -Timor-Leste 1,066,409 -Djibouti 864,618 -Cyprus 862,000 -Fiji 858,038 -Réunion 821,136 -Guyana 784,894 -Bhutan 740,200 -Comoros 724,300 -Montenegro 620,029 -Macau 582,000 -Western Sahara 567,000 -Solomon Islands 561,000 -Luxembourg 537,000 -Suriname 534,189 -Cape Verde 491,875 -Malta 416,055 -Guadeloupe 403,355 -Martinique 394,173 -Brunei 393,162 -Bahamas 351,461 -Iceland 325,010 -Maldives 317,280 -Belize 312,971 -Barbados 274,200 -French Polynesia 268,270 -Vanuatu 264,652 -New Caledonia 258,958 -French Guiana 229,040 -Mayotte 212,600 -Samoa 187,820 -São Tomé and Príncipe 187,356 -Saint Lucia 166,526 -Guam 159,358 -Curaçao 150,563 -Saint Vincent and the Grenadines 109,000 -Kiribati 106,461 -United States Virgin Islands 106,405 -Grenada 103,328 -Tonga 103,036 -Aruba 101,484 -Federated States of Micronesia 101,351 -Jersey 97,857 -Seychelles 90,945 -Antigua and Barbuda 86,295 -Isle of Man 84,497 -Andorra 76,246 -Dominica 71,293 -Bermuda 64,237 -Guernsey 62,431 -Greenland 56,370 -Marshall Islands 56,086 -American Samoa 55,519 -Cayman Islands 55,456 -Saint Kitts and Nevis 54,000 -Northern Mariana Islands 53,883 -Faroe Islands 48,509 -Sint Maarten 37,429 -Saint Martin 36,979 -Liechtenstein 36,842 -Monaco 36,136 -San Marino 32,509 -Turks and Caicos Islands 31,458 -Gibraltar 29,752 -British Virgin Islands 29,537 -Åland Islands 28,502 -Caribbean Netherlands 21,133 -Palau 20,901 -Cook Islands 14,974 -Anguilla 13,452 -Wallis and Futuna 13,135 -Tuvalu 11,323 -Nauru 9,945 -Saint Barthélemy 8,938 -Saint Pierre and Miquelon 6,081 -Montserrat 4,922 -Saint Helena, Ascension and Tristan da Cunha 4,000 -Svalbard and Jan Mayen 2,655 -Falkland Islands 2,563 -Norfolk Island 2,302 -Christmas Island 2,072 -Niue 1,613 -Tokelau 1,411 -Vatican City 800 -Cocos, Islands 550 -Pitcairn Islands 56 From 069b2a5109187e97c0d546ea25f2d9642cf70229 Mon Sep 17 00:00:00 2001 From: LuckyLiam Date: Mon, 3 Aug 2015 15:56:23 +0100 Subject: [PATCH 08/20] Create popdata.csv Added data. Closes ukodi-training/ODP-GroupX#3 --- popdata.csv | 243 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 243 insertions(+) create mode 100644 popdata.csv diff --git a/popdata.csv b/popdata.csv new file mode 100644 index 0000000..0513da0 --- /dev/null +++ b/popdata.csv @@ -0,0 +1,243 @@ +Country Population +China 1,360,760,000 +India 1,235,740,000 +United States 316,955,000 +Indonesia 237,641,326 +Brazil 201,032,714 +Pakistan 184,644,000 +Nigeria 173,615,000 +Bangladesh 152,518,015 +Russian Federation 143,500,000 +Japan 127,300,000 +Mexico 118,395,054 +Philippines 98,571,000 +Vietnam 88,780,000 +Ethiopia 86,613,986 +Egypt 83,661,000 +Germany 80,523,700 +Iran 77,012,000 +Turkey 75,627,384 +Congo 67,514,000 +Thailand 65,926,261 +France 65,806,000 +United Kingdom 63,705,000 +Italy 59,772,978 +Burma 53,259,000 +South Africa 52,981,991 +South Korea 50,219,669 +Colombia 47,298,000 +Spain 46,704,314 +Ukraine 45,461,627 +Tanzania, United Republic of 44,928,923 +Kenya 44,354,000 +Argentina 40,117,096 +Poland 38,533,299 +Sudan 37,964,000 +Algeria 37,900,000 +Uganda 35,357,000 +Canada 35,158,304 +Iraq 34,035,000 +Morocco 33,066,400 +Peru 30,475,144 +Uzbekistan 30,183,400 +Malaysia 29,791,700 +Saudi Arabia 29,195,895 +Venezuela 28,946,101 +Nepal 26,494,504 +Afghanistan 25,500,100 +North Korea 24,895,000 +Ghana 24,658,823 +Yemen 24,527,000 +Mozambique 23,700,715 +Taiwan 23,356,588 +Australia 23,230,382 +Ivory Coast 23,202,000 +Syria 21,898,000 +Madagascar 20,696,070 +Angola 20,609,294 +Cameroon 20,386,799 +Sri Lanka 20,277,597 +Romania 20,121,641 +Burkina Faso 17,322,796 +Niger 17,129,076 +Kazakhstan 17,076,000 +Netherlands 16,804,700 +Chile 16,634,603 +Malawi 16,363,000 +Ecuador 15,602,600 +Guatemala 15,438,384 +Mali 15,302,000 +Cambodia 15,135,000 +Senegal 13,567,338 +Zambia 13,092,666 +Zimbabwe 12,973,808 +Chad 12,825,000 +South Sudan 11,296,000 +Belgium 11,167,578 +Cuba 11,163,934 +Guinea 10,824,200 +Greece 10,815,197 +Tunisia 10,777,500 +Portugal 10,562,178 +Rwanda 10,537,222 +Czech Republic 10,512,900 +Somalia 10,496,000 +Haiti 10,413,211 +Benin 10,323,000 +Burundi 10,163,000 +Bolivia 10,027,254 +Hungary 9,906,000 +Sweden 9,616,429 +Belarus 9,464,400 +Dominican Republic 9,445,281 +Azerbaijan 9,235,100 +Honduras 8,555,072 +Austria 8,464,554 +United Arab Emirates 8,264,070 +Switzerland 8,085,300 +Israel 8,081,000 +Tajikistan 8,000,000 +Bulgaria 7,282,041 +Serbia 7,181,505 +Hong Kong 7,173,900 +Papua New Guinea 7,059,653 +Paraguay 6,600,284 +Laos 6,580,800 +Jordan 6,504,200 +El Salvador 6,340,000 +Eritrea 6,333,000 +Libya 6,202,000 +Togo 6,191,155 +Sierra Leone 6,190,280 +Nicaragua 6,071,045 +Denmark 5,608,784 +Kyrgyzstan 5,551,900 +Finland 5,445,883 +Slovakia 5,412,008 +Singapore 5,399,200 +Turkmenistan 5,240,000 +Norway 5,077,798 +Lebanon 4,822,000 +Costa Rica 4,667,096 +Central African Republic 4,616,000 +Ireland 4,585,400 +Georgia 4,483,800 +New Zealand 4,477,430 +Congo, the Democratic Republic of 4,448,000 +Palestine 4,420,549 +Liberia 4,294,000 +Croatia 4,290,612 +Oman 3,897,000 +Bosnia and Herzegovina 3,839,737 +Puerto Rico 3,667,084 +Kuwait 3,582,054 +Moldova 3,559,500 +Mauritania 3,461,041 +Panama 3,405,813 +Uruguay 3,286,314 +Armenia 3,024,100 +Lithuania 2,950,684 +Albania 2,821,977 +Mongolia 2,754,685 +Jamaica 2,711,476 +Namibia 2,113,077 +Lesotho 2,074,000 +Slovenia 2,061,229 +Macedonia 2,062,294 +Qatar 2,035,106 +Botswana 2,024,904 +Latvia 2,014,000 +Gambia 1,849,000 +Guinea-Bissau 1,704,000 +Gabon 1,672,000 +Equatorial Guinea 1,622,000 +Trinidad and Tobago 1,328,019 +Estonia 1,286,540 +Mauritius 1,257,900 +Swaziland 1,250,000 +Bahrain 1,234,571 +Timor-Leste 1,066,409 +Djibouti 864,618 +Cyprus 862,000 +Fiji 858,038 +Réunion 821,136 +Guyana 784,894 +Bhutan 740,200 +Comoros 724,300 +Montenegro 620,029 +Macau 582,000 +Western Sahara 567,000 +Solomon Islands 561,000 +Luxembourg 537,000 +Suriname 534,189 +Cape Verde 491,875 +Malta 416,055 +Guadeloupe 403,355 +Martinique 394,173 +Brunei 393,162 +Bahamas 351,461 +Iceland 325,010 +Maldives 317,280 +Belize 312,971 +Barbados 274,200 +French Polynesia 268,270 +Vanuatu 264,652 +New Caledonia 258,958 +French Guiana 229,040 +Mayotte 212,600 +Samoa 187,820 +São Tomé and Príncipe 187,356 +Saint Lucia 166,526 +Guam 159,358 +Curaçao 150,563 +Saint Vincent and the Grenadines 109,000 +Kiribati 106,461 +United States Virgin Islands 106,405 +Grenada 103,328 +Tonga 103,036 +Aruba 101,484 +Federated States of Micronesia 101,351 +Jersey 97,857 +Seychelles 90,945 +Antigua and Barbuda 86,295 +Isle of Man 84,497 +Andorra 76,246 +Dominica 71,293 +Bermuda 64,237 +Guernsey 62,431 +Greenland 56,370 +Marshall Islands 56,086 +American Samoa 55,519 +Cayman Islands 55,456 +Saint Kitts and Nevis 54,000 +Northern Mariana Islands 53,883 +Faroe Islands 48,509 +Sint Maarten 37,429 +Saint Martin 36,979 +Liechtenstein 36,842 +Monaco 36,136 +San Marino 32,509 +Turks and Caicos Islands 31,458 +Gibraltar 29,752 +British Virgin Islands 29,537 +Åland Islands 28,502 +Caribbean Netherlands 21,133 +Palau 20,901 +Cook Islands 14,974 +Anguilla 13,452 +Wallis and Futuna 13,135 +Tuvalu 11,323 +Nauru 9,945 +Saint Barthélemy 8,938 +Saint Pierre and Miquelon 6,081 +Montserrat 4,922 +Saint Helena, Ascension and Tristan da Cunha 4,000 +Svalbard and Jan Mayen 2,655 +Falkland Islands 2,563 +Norfolk Island 2,302 +Christmas Island 2,072 +Niue 1,613 +Tokelau 1,411 +Vatican City 800 +Cocos, Islands 550 +Pitcairn Islands 56 From 191a411b8db07ee808a915587cef765b4021e73a Mon Sep 17 00:00:00 2001 From: joshwapiano Date: Mon, 3 Aug 2015 15:58:44 +0100 Subject: [PATCH 09/20] Displaying data Fixing issue 1: https://github.com/ukodi-training/ODP-Group3/issues/1 --- map/js/config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/map/js/config.js b/map/js/config.js index 680d014..ad56925 100644 --- a/map/js/config.js +++ b/map/js/config.js @@ -1,7 +1,7 @@ var config = {}; -config.data_file = "data/somefile.csv"; -config.column_title = "Some_Column"; +config.data_file = "datastart.csv"; +config.column_title = "Population"; config.map_height = "400px"; config.map_width = "800px"; From 78ab433c93712805b08c40a8a54449cf97496126 Mon Sep 17 00:00:00 2001 From: LuckyLiam Date: Mon, 3 Aug 2015 16:01:33 +0100 Subject: [PATCH 10/20] Update index.html added map section to web page, fixes issue https://github.com/ukodi-training/ODP-Group3/issues/2 --- map/index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/map/index.html b/map/index.html index 619c8ff..a645fa6 100644 --- a/map/index.html +++ b/map/index.html @@ -25,10 +25,11 @@

Shaded Map of World

+

Your challenge. Create a shaded map of the world from some data about each country, get it to display and also dynamically update other content on this page.

-
+ From fdf1ce3923227a32fff5fc10a62457e58c3d5330 Mon Sep 17 00:00:00 2001 From: joshwapiano Date: Mon, 3 Aug 2015 16:03:32 +0100 Subject: [PATCH 11/20] Adding data Lets try this --- map/datastart.csv | 243 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 243 insertions(+) create mode 100644 map/datastart.csv diff --git a/map/datastart.csv b/map/datastart.csv new file mode 100644 index 0000000..5b20a8c --- /dev/null +++ b/map/datastart.csv @@ -0,0 +1,243 @@ +Country,Population +China,"1,360,760,000" +India,"1,235,740,000" +United States,"316,955,000" +Indonesia,"237,641,326" +Brazil,"201,032,714" +Pakistan,"184,644,000" +Nigeria,"173,615,000" +Bangladesh,"152,518,015" +Russian Federation,"143,500,000" +Japan,"127,300,000" +Mexico,"118,395,054" +Philippines,"98,571,000" +Vietnam,"88,780,000" +Ethiopia,"86,613,986" +Egypt,"83,661,000" +Germany,"80,523,700" +Iran,"77,012,000" +Turkey,"75,627,384" +Congo,"67,514,000" +Thailand,"65,926,261" +France,"65,806,000" +United Kingdom,"63,705,000" +Italy,"59,772,978" +Burma,"53,259,000" +South Africa,"52,981,991" +South Korea,"50,219,669" +Colombia,"47,298,000" +Spain,"46,704,314" +Ukraine,"45,461,627" +"Tanzania, United Republic of","44,928,923" +Kenya,"44,354,000" +Argentina,"40,117,096" +Poland,"38,533,299" +Sudan,"37,964,000" +Algeria,"37,900,000" +Uganda,"35,357,000" +Canada,"35,158,304" +Iraq,"34,035,000" +Morocco,"33,066,400" +Peru,"30,475,144" +Uzbekistan,"30,183,400" +Malaysia,"29,791,700" +Saudi Arabia,"29,195,895" +Venezuela,"28,946,101" +Nepal,"26,494,504" +Afghanistan,"25,500,100" +North Korea,"24,895,000" +Ghana,"24,658,823" +Yemen,"24,527,000" +Mozambique,"23,700,715" +Taiwan,"23,356,588" +Australia,"23,230,382" +Ivory Coast,"23,202,000" +Syria,"21,898,000" +Madagascar,"20,696,070" +Angola,"20,609,294" +Cameroon,"20,386,799" +Sri Lanka,"20,277,597" +Romania,"20,121,641" +Burkina Faso,"17,322,796" +Niger,"17,129,076" +Kazakhstan,"17,076,000" +Netherlands,"16,804,700" +Chile,"16,634,603" +Malawi,"16,363,000" +Ecuador,"15,602,600" +Guatemala,"15,438,384" +Mali,"15,302,000" +Cambodia,"15,135,000" +Senegal,"13,567,338" +Zambia,"13,092,666" +Zimbabwe,"12,973,808" +Chad,"12,825,000" +South Sudan,"11,296,000" +Belgium,"11,167,578" +Cuba,"11,163,934" +Guinea,"10,824,200" +Greece,"10,815,197" +Tunisia,"10,777,500" +Portugal,"10,562,178" +Rwanda,"10,537,222" +Czech Republic,"10,512,900" +Somalia,"10,496,000" +Haiti,"10,413,211" +Benin,"10,323,000" +Burundi,"10,163,000" +Bolivia,"10,027,254" +Hungary,"9,906,000" +Sweden,"9,616,429" +Belarus,"9,464,400" +Dominican Republic,"9,445,281" +Azerbaijan,"9,235,100" +Honduras,"8,555,072" +Austria,"8,464,554" +United Arab Emirates,"8,264,070" +Switzerland,"8,085,300" +Israel,"8,081,000" +Tajikistan,"8,000,000" +Bulgaria,"7,282,041" +Serbia,"7,181,505" +Hong Kong,"7,173,900" +Papua New Guinea,"7,059,653" +Paraguay,"6,600,284" +Laos,"6,580,800" +Jordan,"6,504,200" +El Salvador,"6,340,000" +Eritrea,"6,333,000" +Libya,"6,202,000" +Togo,"6,191,155" +Sierra Leone,"6,190,280" +Nicaragua,"6,071,045" +Denmark,"5,608,784" +Kyrgyzstan,"5,551,900" +Finland,"5,445,883" +Slovakia,"5,412,008" +Singapore,"5,399,200" +Turkmenistan,"5,240,000" +Norway,"5,077,798" +Lebanon,"4,822,000" +Costa Rica,"4,667,096" +Central African Republic,"4,616,000" +Ireland,"4,585,400" +Georgia,"4,483,800" +New Zealand,"4,477,430" +"Congo, the Democratic Republic of","4,448,000" +Palestine,"4,420,549" +Liberia,"4,294,000" +Croatia,"4,290,612" +Oman,"3,897,000" +Bosnia and Herzegovina,"3,839,737" +Puerto Rico,"3,667,084" +Kuwait,"3,582,054" +Moldova,"3,559,500" +Mauritania,"3,461,041" +Panama,"3,405,813" +Uruguay,"3,286,314" +Armenia,"3,024,100" +Lithuania,"2,950,684" +Albania,"2,821,977" +Mongolia,"2,754,685" +Jamaica,"2,711,476" +Namibia,"2,113,077" +Lesotho,"2,074,000" +Slovenia,"2,061,229" +Macedonia,"2,062,294" +Qatar,"2,035,106" +Botswana,"2,024,904" +Latvia,"2,014,000" +Gambia,"1,849,000" +Guinea-Bissau,"1,704,000" +Gabon,"1,672,000" +Equatorial Guinea,"1,622,000" +Trinidad and Tobago,"1,328,019" +Estonia,"1,286,540" +Mauritius,"1,257,900" +Swaziland,"1,250,000" +Bahrain,"1,234,571" +Timor-Leste,"1,066,409" +Djibouti,"864,618" +Cyprus,"862,000" +Fiji,"858,038" +Réunion,"821,136" +Guyana,"784,894" +Bhutan,"740,200" +Comoros,"724,300" +Montenegro,"620,029" +Macau,"582,000" +Western Sahara,"567,000" +Solomon Islands,"561,000" +Luxembourg,"537,000" +Suriname,"534,189" +Cape Verde,"491,875" +Malta,"416,055" +Guadeloupe,"403,355" +Martinique,"394,173" +Brunei,"393,162" +Bahamas,"351,461" +Iceland,"325,010" +Maldives,"317,280" +Belize,"312,971" +Barbados,"274,200" +French Polynesia,"268,270" +Vanuatu,"264,652" +New Caledonia,"258,958" +French Guiana,"229,040" +Mayotte,"212,600" +Samoa,"187,820" +São Tomé and Príncipe,"187,356" +Saint Lucia,"166,526" +Guam,"159,358" +Curaçao,"150,563" +Saint Vincent and the Grenadines,"109,000" +Kiribati,"106,461" +United States Virgin Islands,"106,405" +Grenada,"103,328" +Tonga,"103,036" +Aruba,"101,484" +Federated States of Micronesia,"101,351" +Jersey,"97,857" +Seychelles,"90,945" +Antigua and Barbuda,"86,295" +Isle of Man,"84,497" +Andorra,"76,246" +Dominica,"71,293" +Bermuda,"64,237" +Guernsey,"62,431" +Greenland,"56,370" +Marshall Islands,"56,086" +American Samoa,"55,519" +Cayman Islands,"55,456" +Saint Kitts and Nevis,"54,000" +Northern Mariana Islands,"53,883" +Faroe Islands,"48,509" +Sint Maarten,"37,429" +Saint Martin,"36,979" +Liechtenstein,"36,842" +Monaco,"36,136" +San Marino,"32,509" +Turks and Caicos Islands,"31,458" +Gibraltar,"29,752" +British Virgin Islands,"29,537" +Åland Islands,"28,502" +Caribbean Netherlands,"21,133" +Palau,"20,901" +Cook Islands,"14,974" +Anguilla,"13,452" +Wallis and Futuna,"13,135" +Tuvalu,"11,323" +Nauru,"9,945" +Saint Barthélemy,"8,938" +Saint Pierre and Miquelon,"6,081" +Montserrat,"4,922" +"Saint Helena, Ascension and Tristan da Cunha","4,000" +Svalbard and Jan Mayen,"2,655" +Falkland Islands,"2,563" +Norfolk Island,"2,302" +Christmas Island,"2,072" +Niue,"1,613" +Tokelau,"1,411" +Vatican City,800 +"Cocos, Islands",550 +Pitcairn Islands,56 From 3092bed1873e60513debd768d3be07eb473ba01f Mon Sep 17 00:00:00 2001 From: LuckyLiam Date: Mon, 3 Aug 2015 16:06:08 +0100 Subject: [PATCH 12/20] Update index.html Adjusted position of map. Fixes issue https://github.com/ukodi-training/ODP-Group3/issues/2 --- map/index.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/map/index.html b/map/index.html index a645fa6..94f4c37 100644 --- a/map/index.html +++ b/map/index.html @@ -25,9 +25,11 @@

Shaded Map of World

-

Your challenge. Create a shaded map of the world from some data about each country, get it to display and also dynamically update other content on this page.

+
+
+ From e7bd8852ad93ef333ccd8f0897a7f38f3fbf3fea Mon Sep 17 00:00:00 2001 From: LuckyLiam Date: Mon, 3 Aug 2015 16:17:50 +0100 Subject: [PATCH 13/20] Update config.js --- map/js/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/map/js/config.js b/map/js/config.js index ad56925..413f22d 100644 --- a/map/js/config.js +++ b/map/js/config.js @@ -1,6 +1,6 @@ var config = {}; -config.data_file = "datastart.csv"; +config.data_file = "data/datastart.csv"; config.column_title = "Population"; config.map_height = "400px"; From 06f90d5216b6ae597df4c2cd2f11d90e591767d2 Mon Sep 17 00:00:00 2001 From: LuckyLiam Date: Mon, 3 Aug 2015 16:19:10 +0100 Subject: [PATCH 14/20] Update config.js --- map/js/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/map/js/config.js b/map/js/config.js index 413f22d..ad56925 100644 --- a/map/js/config.js +++ b/map/js/config.js @@ -1,6 +1,6 @@ var config = {}; -config.data_file = "data/datastart.csv"; +config.data_file = "datastart.csv"; config.column_title = "Population"; config.map_height = "400px"; From 358e13ab2ff89585ace4adaf5903a05358bd0bf5 Mon Sep 17 00:00:00 2001 From: LuckyLiam Date: Mon, 3 Aug 2015 16:20:41 +0100 Subject: [PATCH 15/20] Update map.js --- map/js/map.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/map/js/map.js b/map/js/map.js index 6e65d36..e41526a 100644 --- a/map/js/map.js +++ b/map/js/map.js @@ -15,7 +15,7 @@ var width = config.map_width, // Initialise map projection, in this case mercator. // Lots more projection types are listed on https://github.com/mbostock/d3/wiki/Geo-Projections -var projection = d3.geo.mercator() +var projection = d3.geo.equirectangular() .translate([410, 260]) .scale(140); From ff67977e3eb6d616d43865a60b555ae31cd3b267 Mon Sep 17 00:00:00 2001 From: LuckyLiam Date: Mon, 3 Aug 2015 16:23:53 +0100 Subject: [PATCH 16/20] Update map.js --- map/js/map.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/map/js/map.js b/map/js/map.js index e41526a..bb9bcde 100644 --- a/map/js/map.js +++ b/map/js/map.js @@ -15,7 +15,7 @@ var width = config.map_width, // Initialise map projection, in this case mercator. // Lots more projection types are listed on https://github.com/mbostock/d3/wiki/Geo-Projections -var projection = d3.geo.equirectangular() +var projection = d3.geo.azimuthalEqualArea() .translate([410, 260]) .scale(140); From 6074325ea7177d460d8a6845f5613d28851d8f53 Mon Sep 17 00:00:00 2001 From: LuckyLiam Date: Mon, 3 Aug 2015 16:27:52 +0100 Subject: [PATCH 17/20] Update map.js --- map/js/map.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/map/js/map.js b/map/js/map.js index bb9bcde..d342131 100644 --- a/map/js/map.js +++ b/map/js/map.js @@ -98,6 +98,8 @@ var country = svg.selectAll(".country").data(countries); // Respond to mouse actions country .on("mousemove", function(d,i) { + d3.select(this).style("stroke","black") + .style("stroke-width","1.2px"); }) .on("click", function(d,i) { }) From 593fc1ccb3eb3881ec275f53d08d4a5f4651c555 Mon Sep 17 00:00:00 2001 From: LuckyLiam Date: Mon, 3 Aug 2015 16:29:52 +0100 Subject: [PATCH 18/20] Update map.js --- map/js/map.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/map/js/map.js b/map/js/map.js index d342131..bc29bba 100644 --- a/map/js/map.js +++ b/map/js/map.js @@ -98,12 +98,14 @@ var country = svg.selectAll(".country").data(countries); // Respond to mouse actions country .on("mousemove", function(d,i) { - d3.select(this).style("stroke","black") + d3.select(this).style("stroke","red") .style("stroke-width","1.2px"); }) .on("click", function(d,i) { }) .on("mouseout", function(d,i) { + d3.select(this).style("stroke","#666") + .style("stroke-width","0.4px"); }); } From 3cbea3168a30eea2056ef8882b665289b72d8b9c Mon Sep 17 00:00:00 2001 From: LuckyLiam Date: Mon, 3 Aug 2015 16:32:36 +0100 Subject: [PATCH 19/20] Update index.html --- map/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/map/index.html b/map/index.html index 94f4c37..8cdb63e 100644 --- a/map/index.html +++ b/map/index.html @@ -29,6 +29,8 @@

Shaded Map of World

+
+
From bd0cf42513cc9ed5cec899cc228662372877c7d1 Mon Sep 17 00:00:00 2001 From: LuckyLiam Date: Mon, 3 Aug 2015 16:36:39 +0100 Subject: [PATCH 20/20] Update map.js --- map/js/map.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/map/js/map.js b/map/js/map.js index bc29bba..11eba26 100644 --- a/map/js/map.js +++ b/map/js/map.js @@ -100,6 +100,8 @@ var country = svg.selectAll(".country").data(countries); .on("mousemove", function(d,i) { d3.select(this).style("stroke","red") .style("stroke-width","1.2px"); + $('#info').html("

" + d.name + "

Population: " + + d.value.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + ""); }) .on("click", function(d,i) { })