Fix for: If 2525B is not loaded, getBasicSymbolID errors out when cal…

…led with no symStd parameter #29
missioncommand · Mar 16, 2018 · c35965e · c35965e
1 parent 7cbca12
commit c35965e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 22 deletions.
diff --git a/web/js/src/armyc2/c2sd/renderer/utilities/SymbolDefTable.js b/web/js/src/armyc2/c2sd/renderer/utilities/SymbolDefTable.js
@@ -232,7 +232,7 @@ armyc2.c2sd.renderer.utilities.SymbolDefTable = (function () {
             else
                 symbolMap = symbolMapC;
 
-            if(symbolMap[symbolID] !== undefined)
+            if(symbolMap && symbolMap[symbolID] !== undefined)
             {
                 return symbolMap[symbolID];
             }
@@ -259,7 +259,7 @@ armyc2.c2sd.renderer.utilities.SymbolDefTable = (function () {
             else
                 symbolMap = symbolMapC;
 
-            if(symbolMap[symbolID] !== undefined)
+            if(symbolMap && symbolMap[symbolID] !== undefined)
             {
                 return true;
             }

diff --git a/web/js/src/armyc2/c2sd/renderer/utilities/SymbolUtilities.js b/web/js/src/armyc2/c2sd/renderer/utilities/SymbolUtilities.js
@@ -28,36 +28,31 @@ armyc2.c2sd.renderer.utilities.SymbolUtilities.rendererSettings = armyc2.c2sd.re
                 {
                     basic = scheme + '*' + basic.charAt(2) + '*' + basic.substring(4, 10) + "*****";
 
-                    var i = symStd || 0;
-                    for(; i < 2; i++)
+                    var std = armyc2.c2sd.renderer.utilities.RendererSettings.getSymbologyStandard();
+                    if(symStd !== undefined)
+                        std = symStd;
+
+                    var has = armyc2.c2sd.renderer.utilities.UnitDefTable.hasUnitDef(basic, std);
+                    var temp = null;
+                    if(!has)
                     {
-                        var has = armyc2.c2sd.renderer.utilities.UnitDefTable.hasUnitDef(basic, i);
-                        var temp = null;
+                        temp = basic.substr(0,10) + "H****";
+                        has = armyc2.c2sd.renderer.utilities.UnitDefTable.hasUnitDef(temp, std);
                         if(has)
                         {
-                            i=3;
+                            basic = temp;
                         }
                         else
                         {
-                            temp = basic.substr(0,10) + "H****";
-                            has = armyc2.c2sd.renderer.utilities.UnitDefTable.hasUnitDef(temp, i);
+                            temp = basic.substr(0,10) + "MO***";
+                            has = armyc2.c2sd.renderer.utilities.UnitDefTable.hasUnitDef(temp, std);
                             if(has)
                             {
                                 basic = temp;
-                                i=3;
-                            }
-                            else
-                            {
-                                temp = basic.substr(0,10) + "MO***";
-                                has = armyc2.c2sd.renderer.utilities.UnitDefTable.hasUnitDef(temp, i);
-                                if(has)
-                                {
-                                    basic = temp;
-                                    i=3;
-                                }
                             }
                         }
                     }
+
                 }
                 else if (scheme === 'G') //tactical graphic
                 {

diff --git a/web/js/src/armyc2/c2sd/renderer/utilities/UnitDefTable.js b/web/js/src/armyc2/c2sd/renderer/utilities/UnitDefTable.js
@@ -140,7 +140,7 @@ armyc2.c2sd.renderer.utilities.UnitDefTable = (function () {
             else
                 symbolMap = symbolMapC;
 
-            if(symbolMap[symbolID] !== undefined)
+            if(symbolMap && symbolMap[symbolID] !== undefined)
             {
                 return symbolMap[symbolID];
             }
@@ -167,7 +167,7 @@ armyc2.c2sd.renderer.utilities.UnitDefTable = (function () {
             else
                 symbolMap = symbolMapC;
 
-            if(symbolMap[symbolID] !== undefined)
+            if(symbolMap && symbolMap[symbolID] !== undefined)
             {
                 return true;
             }