Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@matomo.org>2019-11-28 23:04:29 +0300
committerThomas Steur <tsteur@users.noreply.github.com>2019-11-28 23:04:29 +0300
commit736afbed9d8f096a7e07bddac17c742bcd8c9194 (patch)
treed6fb7dff2b556c3791a292b112c08593fec2ca94 /plugins/UserCountryMap/javascripts/visitor-map.js
parent6dbd89292ca8de7019d62c45c88fd115b14cff43 (diff)
Fix region mappings for map widget where possible (#15168)
Diffstat (limited to 'plugins/UserCountryMap/javascripts/visitor-map.js')
-rw-r--r--plugins/UserCountryMap/javascripts/visitor-map.js15
1 files changed, 14 insertions, 1 deletions
diff --git a/plugins/UserCountryMap/javascripts/visitor-map.js b/plugins/UserCountryMap/javascripts/visitor-map.js
index 5747fd3d30..9f9f94153c 100644
--- a/plugins/UserCountryMap/javascripts/visitor-map.js
+++ b/plugins/UserCountryMap/javascripts/visitor-map.js
@@ -769,7 +769,20 @@
}
$.each(data.reportData, function (i, row) {
- regionDict[data.reportMetadata[i].region] = $.extend(row, data.reportMetadata[i], {
+
+ var region = data.reportMetadata[i].region;
+
+ if (!regionExistsInMap(region)) {
+ var q = {
+ 'p': region
+ };
+
+ if (map.getLayer('regions').getPaths(q).length) {
+ region = map.getLayer('regions').getPaths(q)[0].data.fips.substr(2);
+ }
+ }
+
+ regionDict[region] = $.extend(row, data.reportMetadata[i], {
curMetric: quantify(row, metric)
});
});