Feb 13, 2025 · Feb 13, 2025 · Aug 1, 2025 · Aug 1, 2025 · Aug 1, 2025 · Aug 4, 2025
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
    "color-normalize": "1.5.0",
    "color-parse": "2.0.0",
    "color-rgba": "2.1.1",
    "country-regex": "^1.1.0",
    "css-loader": "^7.1.2",
    "d3-force": "^1.2.1",
    "d3-format": "^1.4.5",
    "gl-text": "^1.4.0",
    "has-hover": "^1.0.1",
    "has-passive-events": "^1.0.0",
    "i18n-iso-countries": "^7.13.0",
    "is-mobile": "^4.0.0",
    "maplibre-gl": "^4.7.1",
    "mouse-change": "^1.4.0",
diff --git a/src/lib/geo_location_utils.js b/src/lib/geo_location_utils.js
 'use strict';

 var d3 = require('@plotly/d3');
 var countryRegex = require('country-regex');
 var { area: turfArea } = require('@turf/area');
 var { centroid: turfCentroid } = require('@turf/centroid');
 var { bbox: turfBbox } = require('@turf/bbox');
 var nestedProperty = require('./nested_property');
 var polygon = require('./polygon');

 // make list of all country iso3 ids from at runtime
 var countryIds = Object.keys(countryRegex);
 const countries = require("i18n-iso-countries");
 countries.registerLocale(require("i18n-iso-countries/langs/en.json"));

 var locationmodeToIdFinder = {
    'ISO-3': identity,
 };

 function countryNameToISO3(countryName) {
    for(var i = 0; i < countryIds.length; i++) {
        var iso3 = countryIds[i];
        var regex = new RegExp(countryRegex[iso3]);

        if(regex.test(countryName.trim().toLowerCase())) return iso3;
    // remove sequences of whitespaces
    var cleanName = countryName.replace(/\s+/g, ' ').trim();
    var alpha3Code = countries.getAlpha3Code(cleanName, "en")

    if (alpha3Code !== undefined) {
        return alpha3Code;
    }

    loggers.log('Unrecognized country name: ' + countryName + '.');
diff --git a/test/jasmine/tests/geo_test.js b/test/jasmine/tests/geo_test.js
        var topojson = GeoAssets.topojson[topojsonName];

        var shouldPass = [
            'Virgin Islands (U.S.)',
            ' Virgin   Islands (U.S.) '
            'Virgin Islands,U.S.',
            ' Virgin   Islands,U.S. '
        ];

        shouldPass.forEach(function(str) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -81,7 +81,6 @@
		"color-normalize": "1.5.0",
		"color-parse": "2.0.0",
		"color-rgba": "2.1.1",
		"country-regex": "^1.1.0",
		"css-loader": "^7.1.2",
		"d3-force": "^1.2.1",
		"d3-format": "^1.4.5",
Expand All		@@ -97,6 +96,7 @@
		"gl-text": "^1.4.0",
		"has-hover": "^1.0.1",
		"has-passive-events": "^1.0.0",
		"i18n-iso-countries": "^7.13.0",
		"is-mobile": "^4.0.0",
		"maplibre-gl": "^4.7.1",
		"mouse-change": "^1.4.0",
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,7 +1,6 @@
		'use strict';

		var d3 = require('@plotly/d3');
		var countryRegex = require('country-regex');
		var { area: turfArea } = require('@turf/area');
		var { centroid: turfCentroid } = require('@turf/centroid');
		var { bbox: turfBbox } = require('@turf/bbox');
Expand All		@@ -12,8 +11,8 @@ var isPlainObject = require('./is_plain_object');
		var nestedProperty = require('./nested_property');
		var polygon = require('./polygon');

		// make list of all country iso3 ids from at runtime
		var countryIds = Object.keys(countryRegex);
		const countries = require("i18n-iso-countries");
Copy link Contributor camdecosterJul 30, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Could you please move this`require` statement above with the others?
		countries.registerLocale(require("i18n-iso-countries/langs/en.json"));

		var locationmodeToIdFinder = {
		'ISO-3': identity,
Expand All		@@ -22,11 +21,12 @@ var locationmodeToIdFinder = {
		};

		function countryNameToISO3(countryName) {
		for(var i = 0; i < countryIds.length; i++) {
		var iso3 = countryIds[i];
		var regex = new RegExp(countryRegex[iso3]);

		if(regex.test(countryName.trim().toLowerCase())) return iso3;
		// remove sequences of whitespaces
		var cleanName = countryName.replace(/\s+/g, ' ').trim();
		var alpha3Code = countries.getAlpha3Code(cleanName, "en")

		if (alpha3Code !== undefined) {
		return alpha3Code;
		}

		loggers.log('Unrecognized country name: ' + countryName + '.');
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -819,8 +819,8 @@ describe('geojson / topojson utils', function() {
		var topojson = GeoAssets.topojson[topojsonName];

		var shouldPass = [
		'Virgin Islands (U.S.)',
		' Virgin Islands (U.S.) '
		'Virgin Islands,U.S.',
		' Virgin Islands,U.S. '
		];

		shouldPass.forEach(function(str) {
Expand Down