use un_world from sane-topojson

archmoj · archmoj · commit 8b5de735e2e9 · 2024-12-17T10:36:39.000-05:00
diff --git a/src/lib/topojson_utils.js b/src/lib/topojson_utils.js
@@ -13,7 +13,15 @@ topojsonUtils.getTopojsonName = function(geoLayout) {
 };
 
 topojsonUtils.getTopojsonPath = function(topojsonURL, topojsonName) {
-    return topojsonURL + topojsonName + '.json';
+    var path = topojsonURL;
+
+    if(topojsonName.startsWith('un_')) {
+        path += 'un';
+    } else {
+        path += topojsonName;
+    }
+
+    return path + '.json';
 };
 
 topojsonUtils.getTopojsonFeatures = function(trace, topojson) {
diff --git a/src/plots/geo/constants.js b/src/plots/geo/constants.js
@@ -141,14 +141,17 @@ exports.lataxisSpan = {
     '*': 180
 };
 
+var world = {
+    lonaxisRange: [-180, 180],
+    lataxisRange: [-90, 90],
+    projType: 'equirectangular',
+    projRotate: [0, 0, 0]
+};
+
 // defaults for each scope
 exports.scopeDefaults = {
-    world: {
-        lonaxisRange: [-180, 180],
-        lataxisRange: [-90, 90],
-        projType: 'equirectangular',
-        projRotate: [0, 0, 0]
-    },
+    un: world,
+    world: world,
     usa: {
         lonaxisRange: [-180, -50],
         lataxisRange: [15, 80],
diff --git a/src/plots/geo/layout_attributes.js b/src/plots/geo/layout_attributes.js
@@ -104,7 +104,7 @@ var attrs = module.exports = overrideAll({
     scope: {
         valType: 'enumerated',
         values: sortObjectKeys(constants.scopeDefaults),
-        dflt: 'world',
+        dflt: 'un',
         description: 'Set the scope of the map.'
     },
     projection: {
diff --git a/test/plot-schema.json b/test/plot-schema.json
@@ -2540,7 +2540,7 @@
     "role": "object",
     "scope": {
      "description": "Set the scope of the map.",
-     "dflt": "world",
+     "dflt": "un",
      "editType": "plot",
      "valType": "enumerated",
      "values": [
@@ -2549,6 +2549,7 @@
       "europe",
       "north america",
       "south america",
+      "un",
       "usa",
       "world"
      ]
