fixes #1726 - add Antarctica and Central America; use MaxMind's country-to-continent mapping (with the exception of Central America which it groups with North America).

git-svn-id: http://dev.piwik.org/svn/trunk@3174 59fd770c-687e-43c8-a1e3-f5a4ff64c105

5 files changed, 33 insertions, 0 deletions

diff --git a/plugins/UserCountry/flags/a1.png b/plugins/UserCountry/flags/a1.png
new file mode 100644
index 0000000000..c322a28550
--- /dev/null
+++ b/plugins/UserCountry/flags/a1.png
diff --git a/plugins/UserCountry/flags/a2.png b/plugins/UserCountry/flags/a2.png
new file mode 100644
index 0000000000..c322a28550
--- /dev/null
+++ b/plugins/UserCountry/flags/a2.png
diff --git a/plugins/UserCountry/flags/ap.png b/plugins/UserCountry/flags/ap.png
new file mode 100644
index 0000000000..c322a28550
--- /dev/null
+++ b/plugins/UserCountry/flags/ap.png
diff --git a/plugins/UserCountry/flags/o1.png b/plugins/UserCountry/flags/o1.png
new file mode 100644
index 0000000000..c322a28550
--- /dev/null
+++ b/plugins/UserCountry/flags/o1.png
diff --git a/plugins/UserCountry/tests/UserCountry.test.php b/plugins/UserCountry/tests/UserCountry.test.php
index fa6b743ec5..92efe066ac 100644
--- a/plugins/UserCountry/tests/UserCountry.test.php
+++ b/plugins/UserCountry/tests/UserCountry.test.php
@@ -19,5 +19,38 @@ class Test_Piwik_UserCountry extends UnitTestCase
 		$flag = Piwik_getFlagFromCode("foo");
 		$this->assertEqual( basename($flag), "xx.png" );
 	}
+
+	public function test_flagsAndContinents()
+	{
+		require_once PIWIK_PATH_TEST_TO_ROOT . '/core/DataFiles/Countries.php';
+
+		$continents = array('unk', 'afr', 'amn', 'amc', 'ams', 'ant', 'asi', 'eur', 'oce');
+
+		// Get list of existing flag icons
+		$flags = scandir(PIWIK_PATH_TEST_TO_ROOT . '/plugins/UserCountry/flags/');
+
+		// Get list of countries
+		foreach($GLOBALS['Piwik_CountryList'] as $country => $continent)
+		{
+			// test continent
+			$this->assertTrue(in_array($continent, $continents), "$country => $continent");
+
+			// test flag
+			$this->assertTrue(in_array($country . '.png', $flags), $country);
+		}
+
+		foreach($flags as $filename)
+		{
+			if($filename == '.' || $filename == '..' || $filename == '.svn')
+			{
+				continue;
+			}
+
+			$country = substr($filename, 0, strpos($filename, '.png'));
+
+			// test country
+			$this->assertTrue(array_key_exists($country, $GLOBALS['Piwik_CountryList']), $filename);
+		}
+	}
 }