Merge pull request #1392 from plotly/country-regex-update

Country regex update

Author: etpinard

package.json

@@ -53,7 +53,7 @@
     "alpha-shape": "^1.0.0",
     "arraytools": "^1.0.0",
     "convex-hull": "^1.0.3",
-    "country-regex": "^1.0.0",
+    "country-regex": "^1.1.0",
     "d3": "^3.5.12",
     "delaunay-triangulate": "^1.1.6",
     "es6-promise": "^3.0.2",

src/lib/geo_location_utils.js

@@ -51,7 +51,7 @@ function countryNameToISO3(countryName) {
         var iso3 = countryIds[i],
             regex = new RegExp(countryRegex[iso3]);
 
-        if(regex.test(countryName.toLowerCase())) return iso3;
+        if(regex.test(countryName.trim().toLowerCase())) return iso3;
     }
 
     Lib.warn('Unrecognized country name: ' + countryName + '.');

test/jasmine/tests/geo_test.js

@@ -380,6 +380,25 @@ describe('geojson / topojson utils', function() {
             expect(out).toEqual(false);
         });
     });
+
+    describe('should distinguish between US and US Virgin Island', function() {
+
+        // N.B. Virgin Island don't appear at the 'world_110m' resolution
+        var topojsonName = 'world_50m';
+        var topojson = GeoAssets.topojson[topojsonName];
+
+        var shouldPass = [
+            'Virgin Islands (U.S.)',
+            ' Virgin   Islands (U.S.) '
+        ];
+
+        shouldPass.forEach(function(str) {
+            it('(case ' + str + ')', function() {
+                var out = _locationToFeature(topojson, str, 'country names');
+                expect(out.id).toEqual('VIR');
+            });
+        });
+    });
 });
 
 describe('Test geo interactions', function() {