Renamed worldGeoData to dxccInfo

package.nw/lib/callsigns.js

@@ -848,28 +848,28 @@ function processCtyDat(buffer)
     if (fs.existsSync(file))
     {
       var fileBuf = fs.readFileSync(file, "UTF-8");
-      var worldGeoData = JSON.parse(fileBuf);
+      var dxccInfo = JSON.parse(fileBuf);
-      for (const key in worldGeoData)
+      for (const key in dxccInfo)
       {
-        worldGeoData[key].ituzone = null;
+        dxccInfo[key].ituzone = null;
-        worldGeoData[key].cqzone = null;
+        dxccInfo[key].cqzone = null;
-        worldGeoData[key].prefixITU = {};
+        dxccInfo[key].prefixITU = {};
-        worldGeoData[key].prefixCQ = {};
+        dxccInfo[key].prefixCQ = {};
-        worldGeoData[key].directITU = {};
+        dxccInfo[key].directITU = {};
-        worldGeoData[key].directCQ = {};
+        dxccInfo[key].directCQ = {};
 
-        if (worldGeoData[key].dxcc in ctydata)
+        if (key in ctydata)
         {
-          worldGeoData[key].cqzone = Number(ctydata[worldGeoData[key].dxcc].cqzone).pad(2);
+          dxccInfo[key].cqzone = Number(ctydata[key].cqzone).pad(2);
-          worldGeoData[key].ituzone = Number(ctydata[worldGeoData[key].dxcc].ituzone).pad(2);
+          dxccInfo[key].ituzone = Number(ctydata[key].ituzone).pad(2);
 
           // Skip Guantanamo Bay, hand crafted with love
-          if (worldGeoData[key].dxcc != "105")
+          if (key != "105")
           {
-            worldGeoData[key].prefix = [];
+            dxccInfo[key].prefix = [];
-            worldGeoData[key].direct = [];
+            dxccInfo[key].direct = [];
 
-            var arr = ctydata[worldGeoData[key].dxcc].prefix.substr(0, ctydata[worldGeoData[key].dxcc].prefix.length - 1).split(" ");
+            var arr = ctydata[key].prefix.substr(0, ctydata[key].prefix.length - 1).split(" ");
             for (const x in arr)
             {
               var test = arr[x];
@@ -921,37 +921,37 @@ function processCtyDat(buffer)
               
               if (direct)
               {
-                worldGeoData[key].direct.push(test);
+                dxccInfo[key].direct.push(test);
                 if (cq)
                 {
-                  worldGeoData[key].directCQ[test] = cq;
+                  dxccInfo[key].directCQ[test] = cq;
                 }
                 if (itu)
                 {
-                  worldGeoData[key].directITU[test] = itu;
+                  dxccInfo[key].directITU[test] = itu;
                 }
               }
               else
               {
-                worldGeoData[key].prefix.push(test);
+                dxccInfo[key].prefix.push(test);
                 if (cq)
                 {
-                  worldGeoData[key].prefixCQ[test] = cq;
+                  dxccInfo[key].prefixCQ[test] = cq;
                 }
                 if (itu)
                 {
-                  worldGeoData[key].prefixITU[test] = itu;
+                  dxccInfo[key].prefixITU[test] = itu;
                 }
               }
             }
-            worldGeoData[key].prefix = uniqueArrayFromArray(worldGeoData[key].prefix);
+            dxccInfo[key].prefix = uniqueArrayFromArray(dxccInfo[key].prefix);
-            worldGeoData[key].prefix.sort();
+            dxccInfo[key].prefix.sort();
-            worldGeoData[key].direct = uniqueArrayFromArray(worldGeoData[key].direct);
+            dxccInfo[key].direct = uniqueArrayFromArray(dxccInfo[key].direct);
-            worldGeoData[key].direct.sort();
+            dxccInfo[key].direct.sort();
           }
         }
       }
-      fs.writeFileSync(file, JSON.stringify(worldGeoData, null, 2));
+      fs.writeFileSync(file, JSON.stringify(dxccInfo, null, 2));
       ctyDatFinal.innerHTML = file + " updated!";
     }
   }

package.nw/lib/gt.js

@@ -9410,7 +9410,7 @@ function renderStatsBox()
   var scoreSection = "Initial";
   try
   {
-    var worldGeoData = {};
+    var dxccInfo = {};
     var cqZones = {};
     var ituZones = {};
     var wasZones = {};
@@ -9657,10 +9657,10 @@ function renderStatsBox()
 
       if (finalDxcc > 0)
       {
-        if (!(g_dxccToAltName[finalDxcc] in worldGeoData)) { worldGeoData[g_dxccToAltName[finalDxcc]] = newStatObject(); }
+        if (!(g_dxccToAltName[finalDxcc] in dxccInfo)) { dxccInfo[g_dxccToAltName[finalDxcc]] = newStatObject(); }
 
         workObject(
-          worldGeoData[g_dxccToAltName[finalDxcc]],
+          dxccInfo[g_dxccToAltName[finalDxcc]],
           false,
           band,
           mode,
@@ -9699,8 +9699,8 @@ function renderStatsBox()
     var stats = {};
     var output = {};
 
-    worldGeoData.order = 1;
+    dxccInfo.order = 1;
-    stats.DXCC = worldGeoData;
+    stats.DXCC = dxccInfo;
     stats.GRID = gridData;
     stats.CQ = cqZones;
     stats.ITU = ituZones;