Refs #1652 Adding Continent+ Country codes to Live API output for easier plotting

1 files changed, 15 insertions, 3 deletions

diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index 599dcdae6b..c42ff66233 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -72,7 +72,9 @@ class Piwik_Live_Visitor
 			'daysSinceFirstVisit' => $this->getDaysSinceFirstVisit(),
 			'daysSinceLastEcommerceOrder' => $this->getDaysSinceLastEcommerceOrder(),
 			'continent' => $this->getContinent(),
+			'continentCode' => $this->getContinentCode(),
 			'country' => $this->getCountryName(),
+			'countryCode' => $this->getCountryCode(),
 			'countryFlag' => $this->getCountryFlag(),
 			'region' => $this->getRegionName(),
 			'city' => $this->getCityName(),
@@ -213,19 +215,29 @@ class Piwik_Live_Visitor
 		return strtotime($this->details['visit_last_action_time']);
 	}
 
+	function getCountryCode()
+	{
+		return $this->details['location_country'];
+	}
+
 	function getCountryName()
 	{
-		return Piwik_CountryTranslate($this->details['location_country']);
+		return Piwik_CountryTranslate($this->getCountryCode());
 	}
 
 	function getCountryFlag()
 	{
-		return Piwik_getFlagFromCode($this->details['location_country']);
+		return Piwik_getFlagFromCode($this->getCountryCode());
 	}
 
 	function getContinent()
 	{
-		return Piwik_ContinentTranslate(Piwik_Common::getContinent($this->details['location_country']));
+		return Piwik_ContinentTranslate($this->getContinentCode());
+	}
+
+	function getContinentCode()
+	{
+		return Piwik_Common::getContinent($this->details['location_country']);
 	}
 
 	function getCityName()