diff --git a/web/js/src/armyc2/c2sd/renderer/SinglePointRenderer.js b/web/js/src/armyc2/c2sd/renderer/SinglePointRenderer.js index 4d5275d3..d5c11c97 100644 --- a/web/js/src/armyc2/c2sd/renderer/SinglePointRenderer.js +++ b/web/js/src/armyc2/c2sd/renderer/SinglePointRenderer.js @@ -3869,9 +3869,20 @@ return{ pt2 = null, pt3 = null; + var affiliation = symbolID.charAt(1); var length = 40; if(SymbolUtilities.isNBC(symbolID)) length = Math.round(bounds.getHeight() / 2); + else if((SymbolUtilities.isHQ(symbolID)) && + (affiliation===("F") || + affiliation===("A") || + affiliation===("D") || + affiliation===("M") || + affiliation===("J") || + affiliation===("K") || + affiliation===("N") || + affiliation===("L"))===false) + length = Math.round(bounds.getHeight() * 0.7); else length = bounds.getHeight(); @@ -3885,9 +3896,9 @@ return{ pt1 = new SO.Point(x1,y1); var scheme = symbolID.charAt(0); - if(SymbolUtilities.isNBC(symbolID) || + if(SymbolUtilities.isHQ(symbolID)==false && (SymbolUtilities.isNBC(symbolID) || (scheme === 'S' && symbolID.charAt(2)===("G")) || - scheme === 'O' || scheme === 'E') + scheme === 'O' || scheme === 'E')) { y1 = bounds.getY() + bounds.getHeight(); pt1 = new SO.Point(x1,y1); diff --git a/web/js/src/armyc2/c2sd/renderer/SinglePointSVGRenderer.js b/web/js/src/armyc2/c2sd/renderer/SinglePointSVGRenderer.js index d0d090f6..7c745e00 100644 --- a/web/js/src/armyc2/c2sd/renderer/SinglePointSVGRenderer.js +++ b/web/js/src/armyc2/c2sd/renderer/SinglePointSVGRenderer.js @@ -3520,9 +3520,20 @@ return{ pt2 = null, pt3 = null; + var affiliation = symbolID.charAt(1); var length = 40; if(SymbolUtilities.isNBC(symbolID)) length = Math.round(bounds.getHeight() / 2); + else if((SymbolUtilities.isHQ(symbolID)) && + (affiliation===("F") || + affiliation===("A") || + affiliation===("D") || + affiliation===("M") || + affiliation===("J") || + affiliation===("K") || + affiliation===("N") || + affiliation===("L"))===false) + length = Math.round(bounds.getHeight() * 0.7); else length = bounds.getHeight(); @@ -3536,9 +3547,9 @@ return{ pt1 = new SO.Point(x1,y1); var scheme = symbolID.charAt(0); - if(SymbolUtilities.isNBC(symbolID) || + if(SymbolUtilities.isHQ(symbolID)==false && (SymbolUtilities.isNBC(symbolID) || (scheme === 'S' && symbolID.charAt(2)===("G")) || - scheme === 'O' || scheme === 'E') + scheme === 'O' || scheme === 'E')) { y1 = bounds.getY() + bounds.getHeight(); pt1 = new SO.Point(x1,y1); diff --git a/web/js/src/armyc2/c2sd/renderer/utilities/RendererSettings.js b/web/js/src/armyc2/c2sd/renderer/utilities/RendererSettings.js index 80b09258..c6e3810b 100644 --- a/web/js/src/armyc2/c2sd/renderer/utilities/RendererSettings.js +++ b/web/js/src/armyc2/c2sd/renderer/utilities/RendererSettings.js @@ -6,7 +6,7 @@ armyc2.c2sd.renderer.utilities = armyc2.c2sd.renderer.utilities || {}; /** @class */ armyc2.c2sd.renderer.utilities.RendererSettings = (function () { - var _Version = "0.3.36"; + var _Version = "0.3.37"; //outline approach. none, filled rectangle, outline (default), //outline quick (outline will not exceed 1 pixels). var _SymbologyStandard = 0,