Merge pull request plotly#461 from plotly/country-regex

etpinard · etpinard · commit 30b9cc62a6ba · 2016-04-21T17:06:09.000-04:00
Use country-regex instead of constants file
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,23 +9,20 @@
 
 'use strict';
 
-var locationUtils = module.exports = {};
+var countryRegex = require('country-regex');
+var Lib = require('./');
 
-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,
-    'USA-states': Plotly.Lib.identity,
+    'ISO-3': Lib.identity,
+    'USA-states': Lib.identity,
     'country names': countryNameToISO3
 };
 
-locationUtils.locationToFeature = function(locationmode, location, features) {
+exports.locationToFeature = function(locationmode, location, features) {
     var locationId = getLocationId(locationmode, location);
     var feature;
 
@@ -51,7 +48,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;
     }
