From 3cb7169cef259efe922912364c3c8479a986619c Mon Sep 17 00:00:00 2001
From: Stefan Giehl <stefan@piwik.org>
Date: Tue, 12 Sep 2017 23:20:38 +0200
Subject: Show Tibet as part of China on map (#11930)

* Revert "free tibet!"

This reverts commit 4e47c8aba3bf146292f6e9d38aa0151c383e6c33.

* Remove unneeded translations

* adjust API

* fix tests

* update screenshots

* update tests files

* update screenshot

* Do not change detected location

* update tests

* Fix continent detection for old records

* submodule update

* update screenshots

* Cleanup

* use group by filters only if needed

* make filter work for datatable maps
---
 ...estAPITest__Live.getLastVisitsDetails_range.xml | 24 +++++-----
 ...untryCode__API.getSuggestedValuesForSegment.xml |  2 +-
 ...egionCode__API.getSuggestedValuesForSegment.xml |  2 +-
 ...rsOneWebsiteTest__UserCountry.getCity_month.xml | 14 +++---
 ...neWebsiteTest__UserCountry.getCountry_month.xml | 56 +++++++++++-----------
 ...OneWebsiteTest__UserCountry.getRegion_month.xml | 14 +++---
 6 files changed, 56 insertions(+), 56 deletions(-)

(limited to 'tests/PHPUnit/System/expected')

diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
index 982d316f0c..27cd927334 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
@@ -2245,13 +2245,13 @@
 		<events>1</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
-		<country>Tibet</country>
-		<countryCode>ti</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/ti.png</countryFlag>
-		<region>Unknown</region>
-		<regionCode>1</regionCode>
+		<country>China</country>
+		<countryCode>cn</countryCode>
+		<countryFlag>plugins/Morpheus/icons/dist/flags/cn.png</countryFlag>
+		<region>Xizang</region>
+		<regionCode>14</regionCode>
 		<city>Lhasa</city>
-		<location>Lhasa, Unknown, Tibet</location>
+		<location>Lhasa, Xizang, China</location>
 		<latitude>29.650000</latitude>
 		<longitude>91.100000</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
@@ -2525,13 +2525,13 @@
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
-		<country>Tibet</country>
-		<countryCode>ti</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/ti.png</countryFlag>
-		<region>Unknown</region>
-		<regionCode>1</regionCode>
+		<country>China</country>
+		<countryCode>cn</countryCode>
+		<countryFlag>plugins/Morpheus/icons/dist/flags/cn.png</countryFlag>
+		<region>Xizang</region>
+		<regionCode>14</regionCode>
 		<city>Lhasa</city>
-		<location>Lhasa, Unknown, Tibet</location>
+		<location>Lhasa, Xizang, China</location>
 		<latitude>29.650000</latitude>
 		<longitude>91.100000</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml
index 84baa921c6..57ad401634 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml
@@ -7,7 +7,7 @@
 	<row>it</row>
 	<row>fr</row>
 	<row>id</row>
-	<row>ti</row>
+	<row>cn</row>
 	<row>mk</row>
 	<row>xx</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml
index 68a8855109..9e28c098ed 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml
@@ -5,7 +5,7 @@
 	<row>P3</row>
 	<row>A6</row>
 	<row>H9</row>
-	<row>1</row>
+	<row>14</row>
 	<row>G5</row>
 	<row>CA</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
index 7df3efc479..8cc2b0f386 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
@@ -162,7 +162,7 @@
 		<logo>plugins/Morpheus/icons/dist/flags/ru.png</logo>
 	</row>
 	<row>
-		<label>Lhasa, Unknown, Tibet</label>
+		<label>Lhasa, Xizang, China</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>5</nb_actions>
 		<max_actions>4</max_actions>
@@ -186,13 +186,13 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>29.65</lat>
 		<long>91.1</long>
-		<segment>city==Lhasa;regionCode==1;countryCode==ti</segment>
+		<segment>city==Lhasa;regionCode==14;countryCode==cn</segment>
 		<city_name>Lhasa</city_name>
-		<region>1</region>
-		<country>ti</country>
-		<country_name>Tibet</country_name>
-		<region_name>Unknown</region_name>
-		<logo>plugins/Morpheus/icons/dist/flags/ti.png</logo>
+		<region>14</region>
+		<country>cn</country>
+		<country_name>China</country_name>
+		<region_name>Xizang</region_name>
+		<logo>plugins/Morpheus/icons/dist/flags/cn.png</logo>
 	</row>
 	<row>
 		<label>London, London, City of, United Kingdom</label>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
index 3e1bd4e2cc..c4558671c1 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
@@ -113,10 +113,10 @@
 		<logoHeight>16</logoHeight>
 	</row>
 	<row>
-		<label>France</label>
+		<label>China</label>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>5</nb_actions>
+		<max_actions>4</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
@@ -135,16 +135,16 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<code>fr</code>
-		<logo>plugins/Morpheus/icons/dist/flags/fr.png</logo>
-		<segment>countryCode==fr</segment>
+		<code>cn</code>
+		<logo>plugins/Morpheus/icons/dist/flags/cn.png</logo>
+		<segment>countryCode==cn</segment>
 		<logoHeight>16</logoHeight>
 	</row>
 	<row>
-		<label>Indonesia</label>
+		<label>France</label>
 		<nb_visits>2</nb_visits>
-		<nb_actions>5</nb_actions>
-		<max_actions>4</max_actions>
+		<nb_actions>6</nb_actions>
+		<max_actions>5</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
@@ -163,16 +163,16 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<code>id</code>
-		<logo>plugins/Morpheus/icons/dist/flags/id.png</logo>
-		<segment>countryCode==id</segment>
+		<code>fr</code>
+		<logo>plugins/Morpheus/icons/dist/flags/fr.png</logo>
+		<segment>countryCode==fr</segment>
 		<logoHeight>16</logoHeight>
 	</row>
 	<row>
-		<label>Italy</label>
+		<label>Indonesia</label>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>5</nb_actions>
+		<max_actions>4</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
@@ -191,16 +191,16 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<code>it</code>
-		<logo>plugins/Morpheus/icons/dist/flags/it.png</logo>
-		<segment>countryCode==it</segment>
+		<code>id</code>
+		<logo>plugins/Morpheus/icons/dist/flags/id.png</logo>
+		<segment>countryCode==id</segment>
 		<logoHeight>16</logoHeight>
 	</row>
 	<row>
-		<label>Macedonia</label>
+		<label>Italy</label>
 		<nb_visits>2</nb_visits>
-		<nb_actions>5</nb_actions>
-		<max_actions>4</max_actions>
+		<nb_actions>6</nb_actions>
+		<max_actions>5</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
@@ -219,13 +219,13 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<code>mk</code>
-		<logo>plugins/Morpheus/icons/dist/flags/mk.png</logo>
-		<segment>countryCode==mk</segment>
+		<code>it</code>
+		<logo>plugins/Morpheus/icons/dist/flags/it.png</logo>
+		<segment>countryCode==it</segment>
 		<logoHeight>16</logoHeight>
 	</row>
 	<row>
-		<label>Tibet</label>
+		<label>Macedonia</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>5</nb_actions>
 		<max_actions>4</max_actions>
@@ -247,9 +247,9 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<code>ti</code>
-		<logo>plugins/Morpheus/icons/dist/flags/ti.png</logo>
-		<segment>countryCode==ti</segment>
+		<code>mk</code>
+		<logo>plugins/Morpheus/icons/dist/flags/mk.png</logo>
+		<segment>countryCode==mk</segment>
 		<logoHeight>16</logoHeight>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
index 8e963544ee..9e358630a1 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
@@ -240,7 +240,7 @@
 		<logo>plugins/Morpheus/icons/dist/flags/mk.png</logo>
 	</row>
 	<row>
-		<label>Unknown, Tibet</label>
+		<label>Xizang, China</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>5</nb_actions>
 		<max_actions>4</max_actions>
@@ -262,12 +262,12 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<segment>regionCode==1;countryCode==ti</segment>
-		<region>1</region>
-		<country>ti</country>
-		<country_name>Tibet</country_name>
-		<region_name>Unknown</region_name>
-		<logo>plugins/Morpheus/icons/dist/flags/ti.png</logo>
+		<segment>regionCode==14;countryCode==cn</segment>
+		<region>14</region>
+		<country>cn</country>
+		<country_name>China</country_name>
+		<region_name>Xizang</region_name>
+		<logo>plugins/Morpheus/icons/dist/flags/cn.png</logo>
 	</row>
 	<row>
 		<label>California, United States</label>
-- 
cgit v1.2.3