Merge branch 'master' of https://github.com/missioncommand/mil-sym-js

missioncommand · Feb 24, 2017 · 7b8392b · 7b8392b
2 parents 710b414 + 876956c
commit 7b8392b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git 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.16";
+    var _Version = "0.3.17";
 //outline approach.  none, filled rectangle, outline (default),
     //outline quick (outline will not exceed 1 pixels).
     var _SymbologyStandard = 0,

diff --git a/web/js/src/multiPointTester1.html b/web/js/src/multiPointTester1.html
@@ -132,6 +132,7 @@
                 break;
             case 4://Boundary
                 symbolCode = "GFGPGLB----A**X";//boundary
+                symbolCode = "GFGPGLB----D**X";//boundary
                 controlPoints = "66.27555681517738,30.64727776502703 66.25654247497746,30.64632704801704";
                 break;
             case 5://Dummy Minefield Dynamic
@@ -150,6 +151,14 @@
                 modifiers[mtg.AM_DISTANCE] = [100];
                 modifiers["FILLCOLOR"] = "BBFF0000";
                 break;
+            case 7://BS Rectangle
+                symbolCode = "BS_RECTANGLE---";//
+                controlPoints = "66.26700036208742,30.62755038706961";
+                modifiers = {};
+                var mtg = armyc2.c2sd.renderer.utilities.ModifiersTG;
+                modifiers[mtg.AM_DISTANCE] = [100, 200];
+                modifiers["FILLCOLOR"] = "BBFF0000";
+                break;
             default:
                 break;
         } 
@@ -255,6 +264,7 @@
       <option value=4>Boundary</option>
       <option value=5>Dummy Minefield Dynamic</option>
       <option value=6>BBS_RECTANGLE--</option>
+      <option value=7>BS_RECTANGLE---</option>
     </select>
     <button type='button' onclick='testRender()'>Test Multipoint</button>
 	<button type='button' onclick='cleartext()'>Clear</button>