diff --git a/libs/ui/src/lib/world-map-chart/world-map-chart.component.ts b/libs/ui/src/lib/world-map-chart/world-map-chart.component.ts index 75afd0ec5a..29c66267a1 100644 --- a/libs/ui/src/lib/world-map-chart/world-map-chart.component.ts +++ b/libs/ui/src/lib/world-map-chart/world-map-chart.component.ts @@ -23,10 +23,10 @@ import svgMap from 'svgmap'; templateUrl: './world-map-chart.component.html' }) export class GfWorldMapChartComponent implements OnChanges, OnDestroy { - @Input() public countries?: { + @Input() public countries: { [code: string]: { name?: string; value: number }; }; - @Input() public format?: string; + @Input() public format: string; @Input() public isInPercentage?: boolean = false; @Input() public locale?: string = getLocale(); @@ -53,28 +53,24 @@ export class GfWorldMapChartComponent implements OnChanges, OnDestroy { } private initialize() { - if (!this.countries) { - return; - } - - const countries = this.countries; - if (this.isInPercentage) { // Convert value of countries to percentage let sum = 0; - Object.keys(countries).map((country) => { - sum += countries[country].value; + Object.keys(this.countries).map((country) => { + sum += this.countries[country].value; }); - Object.keys(countries).map((country) => { - countries[country].value = Number( - ((countries[country].value * 100) / sum).toFixed(2) + Object.keys(this.countries).map((country) => { + this.countries[country].value = Number( + ((this.countries[country].value * 100) / sum).toFixed(2) ); }); } else { // Convert value to fixed-point notation - Object.keys(countries).map((country) => { - countries[country].value = Number(countries[country].value.toFixed(2)); + Object.keys(this.countries).map((country) => { + this.countries[country].value = Number( + this.countries[country].value.toFixed(2) + ); }); } @@ -90,7 +86,7 @@ export class GfWorldMapChartComponent implements OnChanges, OnDestroy { thousandSeparator: getNumberFormatGroup(this.locale) } }, - values: countries + values: this.countries }, hideFlag: true, minZoom: 1.06,