Merge pull request #391 from Esri/dev

October, 2019 Release
Esri · Oct 3, 2019 · f9b158e · f9b158e
2 parents 0c60731 + 644bdb7
commit f9b158e
Show file tree

Hide file tree

Showing 103 changed files with 1,673 additions and 1,307 deletions.
diff --git a/military-overlay/app6b/geodatabase/MilitaryOverlayAPP6B.gdb.zip b/military-overlay/app6b/geodatabase/MilitaryOverlayAPP6B.gdb.zip
diff --git a/military-overlay/app6b/lpkx/MilitaryOverlay-APP6B.lpkx b/military-overlay/app6b/lpkx/MilitaryOverlay-APP6B.lpkx
diff --git a/military-overlay/app6d/geodatabase/militaryoverlayapp6d.gdb.zip b/military-overlay/app6d/geodatabase/militaryoverlayapp6d.gdb.zip
diff --git a/military-overlay/app6d/lpkx/MilitaryOverlay-APP6D.lpkx b/military-overlay/app6d/lpkx/MilitaryOverlay-APP6D.lpkx
diff --git a/military-overlay/mil2525b2/geodatabase/militaryoverlay2525b2.gdb.zip b/military-overlay/mil2525b2/geodatabase/militaryoverlay2525b2.gdb.zip
diff --git a/military-overlay/mil2525b2/lpkx/MilitaryOverlay-2525BChange2.lpkx b/military-overlay/mil2525b2/lpkx/MilitaryOverlay-2525BChange2.lpkx
diff --git a/military-overlay/mil2525c/geodatabase/militaryoverlay2525c.gdb.zip b/military-overlay/mil2525c/geodatabase/militaryoverlay2525c.gdb.zip
diff --git a/military-overlay/mil2525c/lpkx/MilitaryOverlay-2525C.lpkx b/military-overlay/mil2525c/lpkx/MilitaryOverlay-2525C.lpkx
diff --git a/military-overlay/mil2525d/geodatabase/militaryoverlay2525d.gdb.zip b/military-overlay/mil2525d/geodatabase/militaryoverlay2525d.gdb.zip
diff --git a/military-overlay/mil2525d/lpkx/MilitaryOverlay-2525D.lpkx b/military-overlay/mil2525d/lpkx/MilitaryOverlay-2525D.lpkx
diff --git a/...ce-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Activities.csv b/...ce-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Activities.csv
@@ -22,7 +22,7 @@ y,Double,8,Y Location,NULLABLE,,,FALSE,,
 z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,FALSE,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,String,2,Country Code,NULLABLE,CountryCodes,,FALSE,,
 countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,

diff --git a/...ls-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Air.csv b/...ls-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Air.csv
@@ -10,6 +10,7 @@ credibility,SmallInteger,2,Credibility,NULLABLE,Credibility,,FALSE,,
 reliability,String,2,Reliability,NULLABLE,Reliability,,FALSE,,
 idmode,String,15,IFF/SIF/AIS,NULLABLE,,,FALSE,,
 type,String,24,Type of Equipment,NULLABLE,,,FALSE,,
+signatureequipment,String,1,Signature Equipment (hostile),NULLABLE,SigEquip,,FALSE,,
 direction,SmallInteger,2,Direction,NULLABLE,Direction,,FALSE,,
 speed,SmallInteger,2,Speed,NULLABLE,,,FALSE,,
 speedunit,String,3,Speed Unit,NULLABLE,SpeedUnits,,FALSE,,
@@ -18,7 +19,7 @@ y,Double,8,Y Location,NULLABLE,,,FALSE,,
 z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,FALSE,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,String,2,Country Code,NULLABLE,CountryCodes,,FALSE,,
 countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,

diff --git a/...t-data/schema-source-files/app6b/military_feature_schemas/Fields_ControlMeasuresAreas.csv b/...t-data/schema-source-files/app6b/military_feature_schemas/Fields_ControlMeasuresAreas.csv
@@ -11,7 +11,8 @@ y,Double,8,Y Location,NULLABLE,,,FALSE,,
 z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 distance,Double,8,Distance (meters),NULLABLE,,,FALSE,,
 distance2,Double,8,Distance 2 (meters),NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,String,2,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,

diff --git a/...t-data/schema-source-files/app6b/military_feature_schemas/Fields_ControlMeasuresLines.csv b/...t-data/schema-source-files/app6b/military_feature_schemas/Fields_ControlMeasuresLines.csv
@@ -12,7 +12,8 @@ z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 distance,Double,8,Distance (meters),NULLABLE,,,FALSE,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,FALSE,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,String,2,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,

diff --git a/...-data/schema-source-files/app6b/military_feature_schemas/Fields_ControlMeasuresPoints.csv b/...-data/schema-source-files/app6b/military_feature_schemas/Fields_ControlMeasuresPoints.csv
@@ -14,7 +14,8 @@ y,Double,8,Y Location,NULLABLE,,,FALSE,,
 z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,FALSE,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,String,2,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,
 createdtime,Date,8,Created Time,NULLABLE,,,FALSE,,

diff --git a/...and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Installations.csv b/...and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Installations.csv
@@ -19,7 +19,7 @@ y,Double,8,Y Location,NULLABLE,,,FALSE,,
 z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,FALSE,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,String,2,Country Code,NULLABLE,CountryCodes,,FALSE,,
 countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,

diff --git a/...and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_LandEquipment.csv b/...and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_LandEquipment.csv
@@ -10,7 +10,7 @@ credibility,SmallInteger,2,Credibility,NULLABLE,Credibility,,FALSE,,
 reliability,String,2,Reliability,NULLABLE,Reliability,,FALSE,,
 idmode,String,15,IFF/SIF/AIS,NULLABLE,,,FALSE,,
 hostile,String,3,Hostile (ENY),NULLABLE,,,FALSE,,
-signatureequipment,String,1,Signature Equipment (hostile),NULLABLE,,,FALSE,,
+signatureequipment,String,1,Signature Equipment (hostile),NULLABLE,SigEquip,,FALSE,,
 type,String,24,Type of Equipment,NULLABLE,,,FALSE,,
 direction,SmallInteger,2,Direction,NULLABLE,Direction,,FALSE,,
 speed,SmallInteger,2,Speed,NULLABLE,,,FALSE,,
@@ -20,7 +20,7 @@ y,Double,8,Y Location,NULLABLE,,,FALSE,,
 z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,FALSE,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,String,2,Country Code,NULLABLE,CountryCodes,,FALSE,,
 countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,

diff --git a/...and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_SeaSubsurface.csv b/...and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_SeaSubsurface.csv
@@ -10,6 +10,7 @@ credibility,SmallInteger,2,Credibility,NULLABLE,Credibility,,FALSE,,
 reliability,String,2,Reliability,NULLABLE,Reliability,,FALSE,,
 idmode,String,15,IFF/SIF/AIS,NULLABLE,,,FALSE,,
 type,String,24,Type of Equipment,NULLABLE,,,FALSE,,
+signatureequipment,String,1,Signature Equipment (hostile),NULLABLE,SigEquip,,FALSE,,
 direction,SmallInteger,2,Direction,NULLABLE,Direction,,FALSE,,
 speed,SmallInteger,2,Speed,NULLABLE,,,FALSE,,
 speedunit,String,3,Speed Unit,NULLABLE,SpeedUnits,,FALSE,,
@@ -18,7 +19,7 @@ y,Double,8,Y Location,NULLABLE,,,FALSE,,
 z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,FALSE,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,String,2,Country Code,NULLABLE,CountryCodes,,FALSE,,
 countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,

diff --git a/...ce-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_SeaSurface.csv b/...ce-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_SeaSurface.csv
@@ -10,6 +10,7 @@ credibility,SmallInteger,2,Credibility,NULLABLE,Credibility,,FALSE,,
 reliability,String,2,Reliability,NULLABLE,Reliability,,FALSE,,
 idmode,String,15,IFF/SIF/AIS,NULLABLE,,,FALSE,,
 type,String,24,Type of Equipment,NULLABLE,,,FALSE,,
+signatureequipment,String,1,Signature Equipment (hostile),NULLABLE,SigEquip,,FALSE,,
 direction,SmallInteger,2,Direction,NULLABLE,Direction,,FALSE,,
 speed,SmallInteger,2,Speed,NULLABLE,,,FALSE,,
 speedunit,String,3,Speed Unit,NULLABLE,SpeedUnits,,FALSE,,
@@ -18,7 +19,7 @@ y,Double,8,Y Location,NULLABLE,,,FALSE,,
 z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,FALSE,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,String,2,Country Code,NULLABLE,CountryCodes,,FALSE,,
 countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,

diff --git a/...-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Space.csv b/...-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Space.csv
@@ -10,6 +10,7 @@ credibility,SmallInteger,2,Credibility,NULLABLE,Credibility,,FALSE,,
 reliability,String,2,Reliability,NULLABLE,Reliability,,FALSE,,
 idmode,String,15,IFF/SIF/AIS,NULLABLE,,,FALSE,,
 type,String,24,Type of Equipment,NULLABLE,,,FALSE,,
+signatureequipment,String,1,Signature Equipment (hostile),NULLABLE,SigEquip,,FALSE,,
 direction,SmallInteger,2,Direction,NULLABLE,Direction,,FALSE,,
 speed,SmallInteger,2,Speed,NULLABLE,,,FALSE,,
 speedunit,String,3,Speed Unit,NULLABLE,SpeedUnits,,FALSE,,
@@ -18,7 +19,7 @@ y,Double,8,Y Location,NULLABLE,,,FALSE,,
 z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,FALSE,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,String,2,Country Code,NULLABLE,CountryCodes,,FALSE,,
 countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,

diff --git a/...-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Units.csv b/...-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Units.csv
@@ -22,7 +22,7 @@ y,Double,8,Y Location,NULLABLE,,,FALSE,,
 z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,FALSE,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,String,2,Country Code,NULLABLE,CountryCodes,,FALSE,,
 countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,

diff --git a/...rce-and-test-data/schema-source-files/app6b/name_domains_values/Coded_Domain_SigEquip.csv b/...rce-and-test-data/schema-source-files/app6b/name_domains_values/Coded_Domain_SigEquip.csv
@@ -0,0 +1,2 @@
+Name,Value
+Detectable Electronic Signature,!
diff --git a/...ce-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Activities.csv b/...ce-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Activities.csv
@@ -21,7 +21,8 @@ y,Double,8,Y Location,NULLABLE,,,False,,
 z,Double,8,Altitude/Depth,NULLABLE,,,False,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,False,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,False,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrycode,Integer,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,False,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,False,,
 createdby,String,50,Created By,NULLABLE,,,False,,

diff --git a/...ls-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Air.csv b/...ls-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Air.csv
@@ -22,7 +22,8 @@ y,Double,8,Y Location,NULLABLE,,,FALSE,,
 z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,FALSE,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,Integer,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,

diff --git a/...ce-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_AirMissile.csv b/...ce-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_AirMissile.csv
@@ -22,7 +22,8 @@ y,Double,8,Y Location,NULLABLE,,,FALSE,,
 z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,FALSE,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,Integer,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,

diff --git a/...urce-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Civilian.csv b/...urce-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Civilian.csv
@@ -26,7 +26,8 @@ y,Double,8,Y Location,NULLABLE,,,False,,
 z,Double,8,Altitude/Depth,NULLABLE,,,False,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,False,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,False,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrycode,Integer,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,False,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,False,,
 createdby,String,50,Created By,NULLABLE,,,False,,

diff --git a/...t-data/schema-source-files/app6d/military_feature_schemas/Fields_ControlMeasuresAreas.csv b/...t-data/schema-source-files/app6d/military_feature_schemas/Fields_ControlMeasuresAreas.csv
@@ -19,7 +19,8 @@ z,Double,8,Altitude/Depth,NULLABLE,,,False,,
 x2,Double,8,X Location 2,NULLABLE,,,False,,
 y2,Double,8,Y Location 2,NULLABLE,,,False,,
 z2,Double,8,Altitude/Depth 2,NULLABLE,,,False,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrycode,Integer,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,False,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,False,,
 createdby,String,50,Created By,NULLABLE,,,False,,

diff --git a/...t-data/schema-source-files/app6d/military_feature_schemas/Fields_ControlMeasuresLines.csv b/...t-data/schema-source-files/app6d/military_feature_schemas/Fields_ControlMeasuresLines.csv
@@ -18,7 +18,8 @@ x,Double,8,X Location,NULLABLE,,,False,,
 y,Double,8,Y Location,NULLABLE,,,False,,
 z,Double,8,Altitude/Depth,NULLABLE,,,False,,
 z2,Double,8,Altitude/Depth 2,NULLABLE,,,False,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrycode,Integer,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,False,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,False,,
 createdby,String,50,Created By,NULLABLE,,,False,,

diff --git a/...-data/schema-source-files/app6d/military_feature_schemas/Fields_ControlMeasuresPoints.csv b/...-data/schema-source-files/app6d/military_feature_schemas/Fields_ControlMeasuresPoints.csv
@@ -21,7 +21,8 @@ y,Double,8,Y Location,NULLABLE,,,False,,
 z,Double,8,Altitude/Depth,NULLABLE,,,False,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,False,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,False,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrycode,Integer,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,False,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,False,,
 createdby,String,50,Created By,NULLABLE,,,False,,

diff --git a/...ce-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Cyberspace.csv b/...ce-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Cyberspace.csv
@@ -15,7 +15,7 @@ credibility,SmallInteger,2,Credibility,NULLABLE,Credibility,,False,,
 reliability,String,2,Reliability,NULLABLE,Reliability,,False,,
 idmode,String,15,IFF/SIF/AIS,NULLABLE,,,False,,
 hostile,String,3,Hostile (ENY),NULLABLE,,,False,,
-signatureequipment,String,1,Signature Equipment (hostile),NULLABLE,,,False,,
+signatureequipment,String,1,Signature Equipment (hostile),NULLABLE,SigEquip,,False,,
 type,String,24,Type of Equipment,NULLABLE,,,False,,
 quantity,SmallInteger,2,Quantity,NULLABLE,,,False,,
 specialdesignator,String,3,Special Track Designator,NULLABLE,,,False,,
@@ -28,7 +28,8 @@ y,Double,8,Y Location,NULLABLE,,,False,,
 z,Double,8,Altitude/Depth,NULLABLE,,,False,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,False,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,False,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrycode,Integer,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,False,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,False,,
 createdby,String,50,Created By,NULLABLE,,,False,,

diff --git a/...ce-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Dismounted.csv b/...ce-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Dismounted.csv
@@ -26,7 +26,8 @@ y,Double,8,Y Location,NULLABLE,,,FALSE,,
 z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,FALSE,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,Integer,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,

diff --git a/...and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Installations.csv b/...and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Installations.csv
@@ -22,7 +22,8 @@ y,Double,8,Y Location,NULLABLE,,,False,,
 z,Double,8,Altitude/Depth,NULLABLE,,,False,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,False,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,False,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrycode,Integer,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,False,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,False,,
 createdby,String,50,Created By,NULLABLE,,,False,,

diff --git a/...and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_LandEquipment.csv b/...and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_LandEquipment.csv
@@ -14,7 +14,7 @@ credibility,SmallInteger,2,Credibility,NULLABLE,Credibility,,False,,
 reliability,String,2,Reliability,NULLABLE,Reliability,,False,,
 idmode,String,15,IFF/SIF/AIS,NULLABLE,,,False,,
 hostile,String,3,Hostile (ENY),NULLABLE,,,False,,
-signatureequipment,String,1,Signature Equipment (hostile),NULLABLE,,,False,,
+signatureequipment,String,1,Signature Equipment (hostile),NULLABLE,SigEquip,,False,,
 type,String,24,Type of Equipment,NULLABLE,,,False,,
 quantity,SmallInteger,2,Quantity,NULLABLE,,,False,,
 direction,SmallInteger,2,Direction,NULLABLE,Direction,,False,,
@@ -25,7 +25,8 @@ y,Double,8,Y Location,NULLABLE,,,False,,
 z,Double,8,Altitude/Depth,NULLABLE,,,False,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,False,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,False,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrycode,Integer,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,False,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,False,,
 createdby,String,50,Created By,NULLABLE,,,False,,

diff --git a/...e-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_MineWarfare.csv b/...e-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_MineWarfare.csv
@@ -13,7 +13,7 @@ credibility,SmallInteger,2,Credibility,NULLABLE,Credibility,,FALSE,,
 reliability,String,2,Reliability,NULLABLE,Reliability,,FALSE,,
 idmode,String,15,IFF/SIF/AIS,NULLABLE,,,FALSE,,
 hostile,String,3,Hostile (ENY),NULLABLE,,,FALSE,,
-signatureequipment,String,1,Signature Equipment (hostile),NULLABLE,,,FALSE,,
+signatureequipment,String,1,Signature Equipment (hostile),NULLABLE,SigEquip,,FALSE,,
 type,String,24,Type of Equipment,NULLABLE,,,FALSE,,
 specialheadquarters,String,10,Special C2 Headquarters,NULLABLE,,,FALSE,,
 quantity,SmallInteger,2,Quantity,NULLABLE,,,FALSE,,
@@ -25,7 +25,8 @@ y,Double,8,Y Location,NULLABLE,,,FALSE,,
 z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,FALSE,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,Integer,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,

diff --git a/...source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SIGINT.csv b/...source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SIGINT.csv
@@ -14,7 +14,7 @@ equipmentteardown,SmallInteger,2,Equipment Teardown Time (min),NULLABLE,,,FALSE,
 commonidentifier,String,12,Common Identifier,NULLABLE,,,FALSE,,
 credibility,SmallInteger,2,Credibility,NULLABLE,Credibility,,FALSE,,
 reliability,String,2,Reliability,NULLABLE,Reliability,,FALSE,,
-signatureequipment,String,1,Signature Equipment (hostile),NULLABLE,,,FALSE,,
+signatureequipment,String,1,Signature Equipment (hostile),NULLABLE,SigEquip,,FALSE,,
 type,String,24,Type of Equipment,NULLABLE,,,FALSE,,
 quantity,SmallInteger,2,Quantity,NULLABLE,,,FALSE,,
 specialdesignator,String,3,Special Track Designator,NULLABLE,,,FALSE,,
@@ -27,7 +27,8 @@ y,Double,8,Y Location,NULLABLE,,,FALSE,,
 z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,FALSE,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,Integer,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,

diff --git a/...and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SeaSubsurface.csv b/...and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SeaSubsurface.csv
@@ -15,7 +15,7 @@ credibility,SmallInteger,2,Credibility,NULLABLE,Credibility,,FALSE,,
 reliability,String,2,Reliability,NULLABLE,Reliability,,FALSE,,
 idmode,String,15,IFF/SIF/AIS,NULLABLE,,,FALSE,,
 hostile,String,3,Hostile (ENY),NULLABLE,,,FALSE,,
-signatureequipment,String,1,Signature Equipment (hostile),NULLABLE,,,FALSE,,
+signatureequipment,String,1,Signature Equipment (hostile),NULLABLE,SigEquip,,FALSE,,
 type,String,24,Type of Equipment,NULLABLE,,,FALSE,,
 specialheadquarters,String,10,Special C2 Headquarters,NULLABLE,,,FALSE,,
 quantity,SmallInteger,2,Quantity,NULLABLE,,,FALSE,,
@@ -27,7 +27,8 @@ y,Double,8,Y Location,NULLABLE,,,FALSE,,
 z,Double,8,Altitude/Depth,NULLABLE,,,FALSE,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,FALSE,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,FALSE,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrycode,Integer,3,Country Code,NULLABLE,CountryCodes,,FALSE,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,FALSE,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,,
 createdby,String,50,Created By,NULLABLE,,,FALSE,,

diff --git a/...ce-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SeaSurface.csv b/...ce-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SeaSurface.csv
@@ -24,7 +24,8 @@ y,Double,8,Y Location,NULLABLE,,,False,,
 z,Double,8,Altitude/Depth,NULLABLE,,,False,,
 size,SmallInteger,2,Symbol Size,NULLABLE,,,False,,
 rotation,SmallInteger,2,Symbol Rotation,NULLABLE,,,False,,
-countrycode,String,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrycode,Integer,3,Country Code,NULLABLE,CountryCodes,,False,,
+countrylabel,String,30,Country Label,NULLABLE,,,FALSE,,
 datetimevalid,Date,8,Date Time Valid,NULLABLE,,,False,,
 datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,False,,
 createdby,String,50,Created By,NULLABLE,,,False,,