Merge pull request #224 from ilri/enhancements-Oct-2023

Fix map chart countries mapping

frontend/package.json

@@ -30,6 +30,7 @@
     "@auth0/angular-jwt": "^5.2.0",
     "@highcharts/map-collection": "^2.1.0",
     "@material-extended/mde": "^3.0.3",
+    "@mohammad231/iso_3166-1": "^1.0.2",
     "@ng-select/ng-select": "^10.0.4",
     "@ngrx/effects": "^15.4.0",
     "@ngrx/store": "^15.4.0",

frontend/src/app/explorer/dashboard/components/map/map.component.ts

@@ -9,14 +9,15 @@ const mapWorld = require('@highcharts/map-collection/custom/world-robinson-highr
 import * as Highcharts from 'highcharts';
 import { ParentChart } from '../parent-chart';
 import { Bucket } from 'src/app/explorer/filters/services/interfaces';
-import { getCountryCode } from '../services/countryList.helper';
 import { ComponentLookup } from '../dynamic/lookup.registry';
 import { SelectService } from 'src/app/explorer/filters/services/select/select.service';
 import { BodyBuilderService } from 'src/app/explorer/filters/services/bodyBuilder/body-builder.service';
 import { Store } from '@ngrx/store';
 import * as fromStore from '../../../store';
 import { ComponentFilterConfigs } from 'src/app/explorer/configs/generalConfig.interface';
 import { ActivatedRoute } from '@angular/router';
+import CountryISO from '@mohammad231/iso_3166-1';
+import { Country } from '@mohammad231/iso_3166-1/iso_3166-1';
 @ComponentLookup('MapComponent')
 @Component({
   selector: 'app-map',
@@ -96,7 +97,7 @@ export class MapComponent extends ParentChart implements OnInit {
       series: [
         {
           data: buckets.map((b: Bucket) => [
-            getCountryCode(b.key),
+            this.mapCountryToIsoAlpha2(b.key),
             b.doc_count,
           ]),
           mapData: mapWorld,
@@ -126,4 +127,13 @@ export class MapComponent extends ParentChart implements OnInit {
       ...this.cms.commonProperties(),
     } as Highcharts.Options;
   }
+
+  mapCountryToIsoAlpha2(value: string) {
+    const country = CountryISO.get({
+      name: value,
+      common_name: value,
+      official_name: value,
+    }) as Country;
+    return country ? country.alpha_2.toLowerCase() : undefined;
+  }
 }