Updated mil-sym renderer to latest release and added new PointConvert…

…er file to base manifest.

manifest.js

@@ -351,6 +351,7 @@ var manifest = {
     "src/mapengine/leaflet/js/utils/leaflet-eng.utils.kml.js",
     "src/mapengine/leaflet/js/utils/leaflet-eng.utils.airspace.js",
     "src/mapengine/leaflet/js/utils/leaflet-eng.utils.oval.js",
+    "src/mapengine/leaflet/js/utils/leaflet-eng-renderer-PointConverter.js",
 
     "src/mapengine/leaflet/js/editor/leaflet-eng.editor.controlpoint.js",
     "src/mapengine/leaflet/js/editor/leaflet-eng.editor.AbstractEditor.js",

src/app/vendor/mil-sym/savm-bc.js

@@ -159357,69 +159357,7 @@ sec.web.renderer.MultiPointHandlerSVG = (function () {
             texture += '</defs>'; 
             return texture;  
         },
-
-        /**
-         * @param Number fillType - forward diagonal (fillStyle=2), backward diagonal (3). We also have capabilities for vertical (4), horizontal (5), and cross (8).
-         * @param String color "hexString like '#00FF00'";
-         */
-        MakeHatchFillTextureSVG:function(fillType, color)
-        {
-            if(!armyc2.c2sd.renderer.MilStdSVGRenderer)
-            {
-                return null;
-            }
-            //needs to return {dataURI, width, height}
-            var texture = "";
-            var symbolIDs = symbolFillIds.split(","); 
-            var symbols = [];
-            var width = 0, height = 0, spacerW = 0, spacerH = 0;
-            //calculate texture dimensions
-            for(var i = 0; i < symbolIDs.length; i++)
-            {
-                symbols.push(armyc2.c2sd.renderer.MilStdSVGRenderer.Render(symbolIDs[i],{"SIZE":symbolFillSize}));
-                var rect = symbols[i].getSVGBounds();
-                if(rect.getWidth() > width)
-                    width = rect.getWidth();
-                if(rect.getHeight() > height)
-                    height = rect.getHeight();
-            }
-            spacerW = width / 3;
-            spacerH = 10; //width / 2;
-
-
-            //create texture
-            //texture = _document.createElement('canvas');
-            svgWidth = (width * symbols.length) + (spacerW * symbols.length);
-            svgHeight = height + spacerH;
-
-            //draw to texture
-            var x = spacerW;
-            var y = spacerH;
-            //var ctx = texture.getContext('2d');
-            var pattern = "";
-            for(var j = 0; j < symbols.length; j++)
-            {
-                var sym = symbols[j];
-                var center = sym.getAnchorPoint();
-                pattern += '<g transform="translate(' + (x + width/2 - center.getX()) + ' ' + (y + height/2 - center.getY()) + ')" >';
 
-                var paths = sym.getSVG();
-                paths = paths.substr(paths.indexOf("<g"));
-                paths = paths.replace("</svg>","");
-
-                pattern += paths;
-                pattern += '</g>';
-                x += spacerW + width;
-            }
-
-            texture = '<defs>';
-            texture += '<pattern id="fillPattern" patternUnits="userSpaceOnUse" width="' + svgWidth + '" height="' + svgHeight + '" >';
-            texture += pattern;
-            texture += '</pattern>';
-            texture += '</defs>'; 
-            return texture;  
-        },
-
         /**
          * 
          * @param {armyc2.c2sd.renderer.so.Rectangle} rectangle

src/app/vendor/mil-sym/savm-bc.min.js

@@ -9424,15 +9424,6 @@ width=rect.getWidth();if(rect.getHeight()>height)
 height=rect.getHeight();}
 spacerW=width/3;spacerH=10;svgWidth=(width*symbols.length)+(spacerW*symbols.length);svgHeight=height+spacerH;var x=spacerW;var y=spacerH;var pattern="";for(var j=0;j<symbols.length;j++)
 {var sym=symbols[j];var center=sym.getAnchorPoint();pattern+='<g transform="translate('+(x+width/2-center.getX())+' '+(y+height/2-center.getY())+')" >';var paths=sym.getSVG();paths=paths.substr(paths.indexOf("<g"));paths=paths.replace("</svg>","");pattern+=paths;pattern+='</g>';x+=spacerW+width;}
-texture='<defs>';texture+='<pattern id="fillPattern" patternUnits="userSpaceOnUse" width="'+svgWidth+'" height="'+svgHeight+'" >';texture+=pattern;texture+='</pattern>';texture+='</defs>';return texture;},MakeHatchFillTextureSVG:function(fillType,color)
-{if(!armyc2.c2sd.renderer.MilStdSVGRenderer)
-{return null;}
-var texture="";var symbolIDs=symbolFillIds.split(",");var symbols=[];var width=0,height=0,spacerW=0,spacerH=0;for(var i=0;i<symbolIDs.length;i++)
-{symbols.push(armyc2.c2sd.renderer.MilStdSVGRenderer.Render(symbolIDs[i],{"SIZE":symbolFillSize}));var rect=symbols[i].getSVGBounds();if(rect.getWidth()>width)
-width=rect.getWidth();if(rect.getHeight()>height)
-height=rect.getHeight();}
-spacerW=width/3;spacerH=10;svgWidth=(width*symbols.length)+(spacerW*symbols.length);svgHeight=height+spacerH;var x=spacerW;var y=spacerH;var pattern="";for(var j=0;j<symbols.length;j++)
-{var sym=symbols[j];var center=sym.getAnchorPoint();pattern+='<g transform="translate('+(x+width/2-center.getX())+' '+(y+height/2-center.getY())+')" >';var paths=sym.getSVG();paths=paths.substr(paths.indexOf("<g"));paths=paths.replace("</svg>","");pattern+=paths;pattern+='</g>';x+=spacerW+width;}
 texture='<defs>';texture+='<pattern id="fillPattern" patternUnits="userSpaceOnUse" width="'+svgWidth+'" height="'+svgHeight+'" >';texture+=pattern;texture+='</pattern>';texture+='</defs>';return texture;},GetRotatedRectangleBounds:function(rectangle,pointOfRotation,angle)
 {try{var degrees=angle;var location=pointOfRotation;var bounds=rectangle;var radius=bounds.width+bounds.height;bounds=new armyc2.c2sd.renderer.so.Rectangle(location.x-radius,location.y-radius,radius*2,radius*2);return bounds;}catch(err){ErrorLogger.LogException("MultiPointHandler","AdjustModifierPointToCenter",err);return null;}}};}());var sec=sec||{};sec.web=sec.web||{};sec.web.renderer=sec.web.renderer||{};sec.web.renderer.MultiPointHandler=(function(){var ErrorLogger=armyc2.c2sd.renderer.utilities.ErrorLogger;var SymbolUtilities=armyc2.c2sd.renderer.utilities.SymbolUtilities;var ModifiersTG=armyc2.c2sd.renderer.utilities.ModifiersTG;var MilStdAttributes=armyc2.c2sd.renderer.utilities.MilStdAttributes;var SymbolDefTable=armyc2.c2sd.renderer.utilities.SymbolDefTable;var RendererSettings=armyc2.c2sd.renderer.utilities.RendererSettings;var RendererUtilities=armyc2.c2sd.renderer.utilities.RendererUtilities;var MPHC=sec.web.renderer.MultiPointHandlerCanvas;var MPHS=sec.web.renderer.MultiPointHandlerSVG;var _appletChecked=false;var _appletUrl=null;var baseURL="http:"+"//"+location.hostname+":8080/",baseSURL=location.protocol+"//"+location.host+"/";var _decimalAccuracy=7;var _maxWidthInPixels=1600;var _minWidthInPixels=160;function hasRequiredModifiers(symbolID,dc,AM,AN)
 {var message="";if((dc>=16&&dc<=20))