Fix Tibetan cities display on China's city map (#12103)

* Fix Tibetan cities missing from the Chinese city map

* Apply the filter without checking every city

1 files changed, 19 insertions, 0 deletions

diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php
index 76acdbb8f1..9fe7cfdcb1 100644
--- a/plugins/UserCountry/API.php
+++ b/plugins/UserCountry/API.php
@@ -160,6 +160,25 @@ class API extends \Piwik\Plugin\API
 
         $separator = Archiver::LOCATION_SEPARATOR;
         $unk = Visit::UNKNOWN_CODE;
+        
+        // show visits from "1|ti" cities to "14|cn"
+        $dataTables = [$dataTable];
+
+        if ($dataTable instanceof DataTable\Map) {
+            $dataTables = $dataTable->getDataTables();
+        }
+
+        foreach ($dataTables as $dt) {
+            $dt->filter('GroupBy', array(
+                'label',
+                function ($label) {
+                    if (substr($label, -5) == '|1|ti') {
+                        return substr($label, 0, -5) . '|14|cn';
+                    }
+                    return $label;
+                }
+            ));
+        }
 
         // split the label and put the elements into the 'city_name', 'region', 'country',
         // 'lat' & 'long' metadata fields