swap country-name_to_iso3 file for country-regex package

coopy · Apr 21, 2016 · 0d12595 · 0d12595
1 parent 3180b12
commit 0d12595
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 273 deletions.
diff --git a/package.json b/package.json
@@ -48,6 +48,7 @@
     "alpha-shape": "^1.0.0",
     "arraytools": "^1.0.0",
     "convex-hull": "^1.0.3",
+    "country-regex": "^1.0.0",
     "d3": "^3.5.12",
     "delaunay-triangulate": "^1.1.6",
     "es6-promise": "^3.0.2",

diff --git a/src/constants/country-name_to_iso3.js b/src/constants/country-name_to_iso3.js
diff --git a/src/lib/geo_location_utils.js b/src/lib/geo_location_utils.js
@@ -9,15 +9,13 @@
 
 'use strict';
 
+var countryRegex = require('country-regex');
 var locationUtils = module.exports = {};
 
 var Plotly = require('../plotly');
 
-// an hash object iso3 to regex string
-var countryNameData = require('../constants/country-name_to_iso3');
-
 // make list of all country iso3 ids from at runtime
-var countryIds = Object.keys(countryNameData);
+var countryIds = Object.keys(countryRegex);
 
 var locationmodeToIdFinder = {
     'ISO-3': Plotly.Lib.identity,
@@ -51,7 +49,7 @@ function countryNameToISO3(countryName) {
 
     for(var i = 0; i < countryIds.length; i++) {
         iso3 = countryIds[i];
-        regex = new RegExp(countryNameData[iso3]);
+        regex = new RegExp(countryRegex[iso3]);
 
         if(regex.test(countryName.toLowerCase())) return iso3;
     }