Skip to content
This repository has been archived by the owner on Sep 19, 2024. It is now read-only.

APP-6D Dismounted Individual Update #396

Open
wants to merge 18 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ arc.dir
*Copy.*
*-master
xsd.exe
xsd.bat

#############
## Python
Expand Down
4 changes: 2 additions & 2 deletions documentation/core.html
Original file line number Diff line number Diff line change
Expand Up @@ -2818,7 +2818,7 @@ <h3>Simple Type: <a name="type_ShapeType" class="name">ShapeType</a>
<ul><li>Base XSD Type: token</li></ul>
<ul>
<li>
<em>value</em> comes from list: {'NA'|'CIRCLE'|'CLOVER'|'CURVE'|'DIAMOND'|'RECTANGLE'|'SQUARE'}</li>
<em>value</em> comes from list: {'NA'|'CIRCLE'|'HEXAGON'|'CLOVER'|'CURVE'|'DIAMOND'|'RECTANGLE'|'SQUARE'}</li>
</ul>
</td>
</tr>
Expand All @@ -2828,7 +2828,7 @@ <h3>Simple Type: <a name="type_ShapeType" class="name">ShapeType</a>
<input type="button" id="type_ShapeType_scbox_button" class="control" onclick="switchState('type_ShapeType_scbox'); return false;" style="display: none" /> <span class="caption">Schema Component Representation</span>
</div>
<div id="type_ShapeType_scbox" class="contents">
<div style="margin-left: 0em">&lt;<span class="scTag">xs:simpleType</span> <span class="scTag">name</span>="<span class="scContent">ShapeType</span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:restriction</span> <span class="scTag">base</span>="<span class="scContent"><span class="type"><a href="#ns_xs" title="Find out namespace of 'xs' prefix">xs</a>:token</span></span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">NA</span>"/&gt;</div><div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">CIRCLE</span>"/&gt;</div><div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">CLOVER</span>"/&gt;</div><div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">CURVE</span>"/&gt;</div><div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">DIAMOND</span>"/&gt;</div><div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">RECTANGLE</span>"/&gt;</div><div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">SQUARE</span>"/&gt;</div>&lt;/<span class="scTag">xs:restriction</span>&gt;</div>&lt;/<span class="scTag">xs:simpleType</span>&gt;</div>
<div style="margin-left: 0em">&lt;<span class="scTag">xs:simpleType</span> <span class="scTag">name</span>="<span class="scContent">ShapeType</span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:restriction</span> <span class="scTag">base</span>="<span class="scContent"><span class="type"><a href="#ns_xs" title="Find out namespace of 'xs' prefix">xs</a>:token</span></span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">NA</span>"/&gt;</div><div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">CIRCLE</span>"/&gt;</div><div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">HEXAGON</span>"/&gt;</div><div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">CLOVER</span>"/&gt;</div><div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">CURVE</span>"/&gt;</div><div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">DIAMOND</span>"/&gt;</div><div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">RECTANGLE</span>"/&gt;</div><div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">SQUARE</span>"/&gt;</div>&lt;/<span class="scTag">xs:restriction</span>&gt;</div>&lt;/<span class="scTag">xs:simpleType</span>&gt;</div>
</div>
<script type="text/javascript">
<!--
Expand Down
85 changes: 82 additions & 3 deletions instance/Base.xml

Large diffs are not rendered by default.

859 changes: 859 additions & 0 deletions instance/Dismounted.xml

Large diffs are not rendered by default.

38 changes: 38 additions & 0 deletions samples/name_domains_values/Coded_Domain_Dismounted_Entities.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
Name,Value
Unspecified,000000
Military : Service Branch : Infantry,110101
Military : Service Branch : Medical,110102
Military : Service Branch : Reconnaissance,110103
Military : Service Branch : Signal,110104
Military : Activity/Task : Explosive Ordnance Disposal,110201
Military : Activity/Task : Field Artillery Observer,110202
Military : Activity/Task : Joint Fire Support,110203
Military : Activity/Task : Liaison,110204
Military : Activity/Task : Messenger,110205
Military : Activity/Task : Military Police,110206
Military : Activity/Task : Observer,110207
Military : Activity/Task : Security,110208
Military : Activity/Task : Sniper,110209
Military : Activity/Task : Special Operations Forces (SOF),110210
Military : Lethal Weapons : Rifle,110301
Military : Lethal Weapons : Single-Shot Rifle,110302
Military : Lethal Weapons : Semiautomatic Rifle,110303
Military : Lethal Weapons : Automatic Rifle,110304
Military : Lethal Weapons : Machine Gun,110305
Military : Lethal Weapons : Machine Gun-Light,110306
Military : Lethal Weapons : Machine Gun-Medium,110307
Military : Lethal Weapons : Machine Gun-Heavy,110308
Military : Lethal Weapons : Grenade Launcher,110309
Military : Lethal Weapons : Grenade Launcher-Light,110310
Military : Lethal Weapons : Grenade Launcher-Medium,110311
Military : Lethal Weapons : Grenade Launcher-Heavy,110312
Military : Lethal Weapons : Flamethrower,110313
Military : Lethal Weapons : Mortar,110314
Military : Lethal Weapons : Rocket Launcher-Single,110315
Military : Lethal Weapons : Rocket Launcher-Antitank,110316
Military : Non-Lethal Weapons : Non-Lethal Weapon,110401
Military : Non-Lethal Weapons : Non-Lethal Grenade Launcher,110402
Military : Non-Lethal Weapons : Taser,110403
Civilian,120000
Civilian : Activity,120100
Civilian : Activity : Police,120101
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
Name,Value
Unspecified,00
Task : Close Protection,01
Task : Crowd and Riot Control,02
Task : Explosive Ordnance Disposal (EOD),03
Task : Security,04
Task : Sniper,05
Task : Special Weapons and Tactics,06
Organization : Non-Governmental Organization Member,07
Organization : Multinational,08
Organization : Multinational Specialized Unit,09
Organization : Governmental Organization Member,10
Task : Video Imagery (Combat Camera),11
Functional Staff Area : J1,12
Functional Staff Area : J2,13
Functional Staff Area : J3,14
Functional Staff Area : J4,15
Functional Staff Area : J5,16
Functional Staff Area : J6,17
Functional Staff Area : J7,18
Functional Staff Area : J8,19
Functional Staff Area : J9,20
Rank : OF-1,21
Rank : OF-2,22
Rank : OF-3,23
Rank : OF-4,24
Rank : OF-5,25
Rank : OF-6,26
Rank : OF-7,27
Rank : OF-8,28
Rank : OF-9,29
Rank : OF-10,30
Rank : OF-D,31
Rank : OR-1,32
Rank : OR-2,33
Rank : OR-3,34
Rank : OR-4,35
Rank : OR-5,36
Rank : OR-6,37
Rank : OR-7,38
Rank : OR-8,39
Rank : OR-9,40
Rank : WO-1,41
Rank : WO-2,42
Rank : WO-3,43
Rank : WO-4,44
Rank : WO-5,45
Echelon : Individual,46
Echelon : Team/Crew,47
Echelon : Squad,48
Echelon : Section,49
Echelon : Platoon/Detachment,50
Echelon : Company,51
Echelon : Battalion,52
Echelon : Regiment/Group,53
Echelon : Brigade,54
Echelon : Division,55
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
Name,Value
Unspecified,00
Task : Airborne,01
Task : Bicycle Equipped,02
Task : Demolition,03
Functional Staff Area : J1,04
Functional Staff Area : J2,05
Functional Staff Area : J3,06
Functional Staff Area : J4,07
Functional Staff Area : J5,08
Functional Staff Area : J6,09
Functional Staff Area : J7,10
Functional Staff Area : J8,11
Functional Staff Area : J9,12
Other : Mountain,13
Rank : OF-1,14
Rank : OF-2,15
Rank : OF-3,16
Rank : OF-4,17
Rank : OF-5,18
Rank : OF-6,19
Rank : OF-7,20
Rank : OF-8,21
Rank : OF-9,22
Rank : OF-10,23
Rank : OF-D,24
Rank : OR-1,25
Rank : OR-2,26
Rank : OR-3,27
Rank : OR-4,28
Rank : OR-5,29
Rank : OR-6,30
Rank : OR-7,31
Rank : OR-8,32
Rank : OR-9,33
Rank : WO-1,34
Rank : WO-2,35
Rank : WO-3,36
Rank : WO-4,37
Rank : WO-5,38
Other : Ski,39
4 changes: 4 additions & 0 deletions samples/name_domains_values/exportAll.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ jmsml.exe /xe="../../../../../samples/name_domains_values/Coded_Domain_Sea_Subsu
jmsml.exe /xe="../../../../../samples/name_domains_values/Coded_Domain_Sea_Subsurface_Mine_Warfare" /s="^Mine Warfare$" /xas="DOMAIN"
jmsml.exe /xe="../../../../../samples/name_domains_values/Coded_Domain_Activities" /s="^Activities$" /xas="DOMAIN"
jmsml.exe /xe="../../../../../samples/name_domains_values/Coded_Domain_Cyberspace" /s="^Cyberspace$" /xas="DOMAIN"

REM Added Dismounted for App6
jmsml.exe /xe="../../../../../samples/name_domains_values/Coded_Domain_Dismounted" /s="^Dismounted" /xas="DOMAIN"

jmsml.exe /xe="../../../../../samples/name_domains_values/Coded_Domain_Control_Measure_Point" /p /s="^Control Measure$" /xas="DOMAIN"
jmsml.exe /xe="../../../../../samples/name_domains_values/Coded_Domain_Control_Measure_Line" /l /s="^Control Measure$" /xas="DOMAIN"
jmsml.exe /xe="../../../../../samples/name_domains_values/Coded_Domain_Control_Measure_Area" /a /s="^Control Measure$" /xas="DOMAIN"
Expand Down
4 changes: 4 additions & 0 deletions samples/name_domains_values/exportDismounted.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
setlocal
cd ..\..\source\JointMilitarySymbologyLibraryCS\jmsml\bin\Debug
jmsml.exe /xe="../../../../../samples/name_domains_values/Dismounted_Coded_Domain_Sample" /s="^Dismounted" /xas="DOMAIN" /+
endlocal
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
SymbolSet,Entity,EntityType,EntitySubType,StandardIdentity,Code,GeometryType,IconType,UniqueName
27,Unspecified,,,,000000,NotValid,NA,Unspecified
27,Military,Service Branch,Infantry,,110101,Point,FULL_OCTAGON,Military : Service Branch : Infantry
27,Military,Service Branch,Medical,,110102,Point,FULL_OCTAGON,Military : Service Branch : Medical
27,Military,Service Branch,Reconnaissance,,110103,Point,FULL_OCTAGON,Military : Service Branch : Reconnaissance
27,Military,Service Branch,Signal,,110104,Point,FULL_OCTAGON,Military : Service Branch : Signal
27,Military,Activity/Task,Explosive Ordnance Disposal,,110201,Point,MAIN,Military : Activity/Task : Explosive Ordnance Disposal
27,Military,Activity/Task,Field Artillery Observer,,110202,Point,MAIN,Military : Activity/Task : Field Artillery Observer
27,Military,Activity/Task,Joint Fire Support,,110203,Point,MAIN,Military : Activity/Task : Joint Fire Support
27,Military,Activity/Task,Liaison,,110204,Point,MAIN,Military : Activity/Task : Liaison
27,Military,Activity/Task,Messenger,,110205,Point,MAIN,Military : Activity/Task : Messenger
27,Military,Activity/Task,Military Police,,110206,Point,MAIN,Military : Activity/Task : Military Police
27,Military,Activity/Task,Observer,,110207,Point,MAIN,Military : Activity/Task : Observer
27,Military,Activity/Task,Security,,110208,Point,MAIN,Military : Activity/Task : Security
27,Military,Activity/Task,Sniper,,110209,Point,MAIN,Military : Activity/Task : Sniper
27,Military,Activity/Task,Special Operations Forces (SOF),,110210,Point,MAIN,Military : Activity/Task : Special Operations Forces (SOF)
27,Military,Lethal Weapons,Rifle,,110301,Point,MAIN,Military : Lethal Weapons : Rifle
27,Military,Lethal Weapons,Single-Shot Rifle,,110302,Point,MAIN,Military : Lethal Weapons : Single-Shot Rifle
27,Military,Lethal Weapons,Semiautomatic Rifle,,110303,Point,MAIN,Military : Lethal Weapons : Semiautomatic Rifle
27,Military,Lethal Weapons,Automatic Rifle,,110304,Point,MAIN,Military : Lethal Weapons : Automatic Rifle
27,Military,Lethal Weapons,Machine Gun,,110305,Point,MAIN,Military : Lethal Weapons : Machine Gun
27,Military,Lethal Weapons,Machine Gun-Light,,110306,Point,MAIN,Military : Lethal Weapons : Machine Gun-Light
27,Military,Lethal Weapons,Machine Gun-Medium,,110307,Point,MAIN,Military : Lethal Weapons : Machine Gun-Medium
27,Military,Lethal Weapons,Machine Gun-Heavy,,110308,Point,MAIN,Military : Lethal Weapons : Machine Gun-Heavy
27,Military,Lethal Weapons,Grenade Launcher,,110309,Point,MAIN,Military : Lethal Weapons : Grenade Launcher
27,Military,Lethal Weapons,Grenade Launcher-Light,,110310,Point,MAIN,Military : Lethal Weapons : Grenade Launcher-Light
27,Military,Lethal Weapons,Grenade Launcher-Medium,,110311,Point,MAIN,Military : Lethal Weapons : Grenade Launcher-Medium
27,Military,Lethal Weapons,Grenade Launcher-Heavy,,110312,Point,MAIN,Military : Lethal Weapons : Grenade Launcher-Heavy
27,Military,Lethal Weapons,Flamethrower,,110313,Point,MAIN,Military : Lethal Weapons : Flamethrower
27,Military,Lethal Weapons,Mortar,,110314,Point,MAIN,Military : Lethal Weapons : Mortar
27,Military,Lethal Weapons,Rocket Launcher-Single,,110315,Point,MAIN,Military : Lethal Weapons : Rocket Launcher-Single
27,Military,Lethal Weapons,Rocket Launcher-Antitank,,110316,Point,MAIN,Military : Lethal Weapons : Rocket Launcher-Antitank
27,Military,Non-Lethal Weapons,Non-Lethal Weapon,,110401,Point,MAIN,Military : Non-Lethal Weapons : Non-Lethal Weapon
27,Military,Non-Lethal Weapons,Non-Lethal Grenade Launcher,,110402,Point,MAIN,Military : Non-Lethal Weapons : Non-Lethal Grenade Launcher
27,Military,Non-Lethal Weapons,Taser,,110403,Point,MAIN,Military : Non-Lethal Weapons : Taser
27,Civilian,,,,120000,Point,NA,Civilian
27,Civilian,Activity,,,120100,Point,NA,Civilian : Activity
27,Civilian,Activity,Police,,120101,Point,MAIN,Civilian : Activity : Police
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
SymbolSet,ModifierNumber,Category,Name,Code,UniqueName
27,1,,Unspecified,00,Unspecified
27,1,Task,Close Protection,01,Task : Close Protection
27,1,Task,Crowd and Riot Control,02,Task : Crowd and Riot Control
27,1,Task,Explosive Ordnance Disposal (EOD),03,Task : Explosive Ordnance Disposal (EOD)
27,1,Task,Security,04,Task : Security
27,1,Task,Sniper,05,Task : Sniper
27,1,Task,Special Weapons and Tactics,06,Task : Special Weapons and Tactics
27,1,Organization,Non-Governmental Organization Member,07,Organization : Non-Governmental Organization Member
27,1,Organization,Multinational,08,Organization : Multinational
27,1,Organization,Multinational Specialized Unit,09,Organization : Multinational Specialized Unit
27,1,Organization,Governmental Organization Member,10,Organization : Governmental Organization Member
27,1,Task,Video Imagery (Combat Camera),11,Task : Video Imagery (Combat Camera)
27,1,Functional Staff Area,J1,12,Functional Staff Area : J1
27,1,Functional Staff Area,J2,13,Functional Staff Area : J2
27,1,Functional Staff Area,J3,14,Functional Staff Area : J3
27,1,Functional Staff Area,J4,15,Functional Staff Area : J4
27,1,Functional Staff Area,J5,16,Functional Staff Area : J5
27,1,Functional Staff Area,J6,17,Functional Staff Area : J6
27,1,Functional Staff Area,J7,18,Functional Staff Area : J7
27,1,Functional Staff Area,J8,19,Functional Staff Area : J8
27,1,Functional Staff Area,J9,20,Functional Staff Area : J9
27,1,Rank,OF-1,21,Rank : OF-1
27,1,Rank,OF-2,22,Rank : OF-2
27,1,Rank,OF-3,23,Rank : OF-3
27,1,Rank,OF-4,24,Rank : OF-4
27,1,Rank,OF-5,25,Rank : OF-5
27,1,Rank,OF-6,26,Rank : OF-6
27,1,Rank,OF-7,27,Rank : OF-7
27,1,Rank,OF-8,28,Rank : OF-8
27,1,Rank,OF-9,29,Rank : OF-9
27,1,Rank,OF-10,30,Rank : OF-10
27,1,Rank,OF-D,31,Rank : OF-D
27,1,Rank,OR-1,32,Rank : OR-1
27,1,Rank,OR-2,33,Rank : OR-2
27,1,Rank,OR-3,34,Rank : OR-3
27,1,Rank,OR-4,35,Rank : OR-4
27,1,Rank,OR-5,36,Rank : OR-5
27,1,Rank,OR-6,37,Rank : OR-6
27,1,Rank,OR-7,38,Rank : OR-7
27,1,Rank,OR-8,39,Rank : OR-8
27,1,Rank,OR-9,40,Rank : OR-9
27,1,Rank,WO-1,41,Rank : WO-1
27,1,Rank,WO-2,42,Rank : WO-2
27,1,Rank,WO-3,43,Rank : WO-3
27,1,Rank,WO-4,44,Rank : WO-4
27,1,Rank,WO-5,45,Rank : WO-5
27,1,Echelon,Individual,46,Echelon : Individual
27,1,Echelon,Team/Crew,47,Echelon : Team/Crew
27,1,Echelon,Squad,48,Echelon : Squad
27,1,Echelon,Section,49,Echelon : Section
27,1,Echelon,Platoon/Detachment,50,Echelon : Platoon/Detachment
27,1,Echelon,Company,51,Echelon : Company
27,1,Echelon,Battalion,52,Echelon : Battalion
27,1,Echelon,Regiment/Group,53,Echelon : Regiment/Group
27,1,Echelon,Brigade,54,Echelon : Brigade
27,1,Echelon,Division,55,Echelon : Division
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
SymbolSet,ModifierNumber,Category,Name,Code,UniqueName
27,2,,Unspecified,00,Unspecified
27,2,Task,Airborne,01,Task : Airborne
27,2,Task,Bicycle Equipped,02,Task : Bicycle Equipped
27,2,Task,Demolition,03,Task : Demolition
27,2,Functional Staff Area,J1,04,Functional Staff Area : J1
27,2,Functional Staff Area,J2,05,Functional Staff Area : J2
27,2,Functional Staff Area,J3,06,Functional Staff Area : J3
27,2,Functional Staff Area,J4,07,Functional Staff Area : J4
27,2,Functional Staff Area,J5,08,Functional Staff Area : J5
27,2,Functional Staff Area,J6,09,Functional Staff Area : J6
27,2,Functional Staff Area,J7,10,Functional Staff Area : J7
27,2,Functional Staff Area,J8,11,Functional Staff Area : J8
27,2,Functional Staff Area,J9,12,Functional Staff Area : J9
27,2,Other,Mountain,13,Other : Mountain
27,2,Rank,OF-1,14,Rank : OF-1
27,2,Rank,OF-2,15,Rank : OF-2
27,2,Rank,OF-3,16,Rank : OF-3
27,2,Rank,OF-4,17,Rank : OF-4
27,2,Rank,OF-5,18,Rank : OF-5
27,2,Rank,OF-6,19,Rank : OF-6
27,2,Rank,OF-7,20,Rank : OF-7
27,2,Rank,OF-8,21,Rank : OF-8
27,2,Rank,OF-9,22,Rank : OF-9
27,2,Rank,OF-10,23,Rank : OF-10
27,2,Rank,OF-D,24,Rank : OF-D
27,2,Rank,OR-1,25,Rank : OR-1
27,2,Rank,OR-2,26,Rank : OR-2
27,2,Rank,OR-3,27,Rank : OR-3
27,2,Rank,OR-4,28,Rank : OR-4
27,2,Rank,OR-5,29,Rank : OR-5
27,2,Rank,OR-6,30,Rank : OR-6
27,2,Rank,OR-7,31,Rank : OR-7
27,2,Rank,OR-8,32,Rank : OR-8
27,2,Rank,OR-9,33,Rank : OR-9
27,2,Rank,WO-1,34,Rank : WO-1
27,2,Rank,WO-2,35,Rank : WO-2
27,2,Rank,WO-3,36,Rank : WO-3
27,2,Rank,WO-4,37,Rank : WO-4
27,2,Rank,WO-5,38,Rank : WO-5
27,2,Other,Ski,39,Other : Ski
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
setlocal
cd ..\..\source\JointMilitarySymbologyLibraryCS\jmsml\bin\Debug
jmsml.exe /xe="../../../../../samples/simple_symbolset_entity_modifier_codes/Dismounted" /s="^Dismounted" /xas="SIMPLE"
endlocal
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Code,Value
15,Land Equipment
20,Land Installation
25,Control Measure
27,Dismounted Individual
30,Sea Surface
35,Sea Subsurface
36,Mine Warfare
Expand Down
1 change: 1 addition & 0 deletions schema/core.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<xs:restriction base="xs:token">
<xs:enumeration value="NA"/>
<xs:enumeration value="CIRCLE"/>
<xs:enumeration value="HEXAGON"/>
<xs:enumeration value="CLOVER"/>
<xs:enumeration value="CURVE"/>
<xs:enumeration value="DIAMOND"/>
Expand Down
9 changes: 9 additions & 0 deletions schema/xsd.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
REM Purpose: Used to recreate .NET source code binding when schema changes

REM IMPORTANT: Change Path below to your version/location of xsd.exe

SET FXTOOLS_PATH=C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools

"%FXTOOLS_PATH%\xsd.exe" base.xsd /c /l:CS /n:JointMilitarySymbologyLibrary /o:"..\source\JointMilitarySymbologyLibraryCS"

pause
2 changes: 1 addition & 1 deletion source/JointMilitarySymbologyLibraryCS/EntityExport.cs
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ public string CodeIt(LibraryStandardIdentityGroup sig, SymbolSet ss, SymbolSetEn
{
string code = "";

if (ss != null); // && (e != null || (e == null && eType == null)))
if (ss != null) // && (e != null || (e == null && eType == null)))
code = BuildEntityCode(sig, ss, e, eType, eSubType);

return code;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
..\..\instance\Control_Measure.xml = ..\..\instance\Control_Measure.xml
..\..\schema\core.xsd = ..\..\schema\core.xsd
..\..\instance\Cyberspace.xml = ..\..\instance\Cyberspace.xml
..\..\instance\Dismounted.xml = ..\..\instance\Dismounted.xml
..\..\instance\Internal.xml = ..\..\instance\Internal.xml
JointMilitarySymbologyLibrary.vsmdi = JointMilitarySymbologyLibrary.vsmdi
..\..\instance\Land_Civilian.xml = ..\..\instance\Land_Civilian.xml
Expand Down
Loading