diff --git a/military-overlay/app6b/geodatabase/MilitaryOverlayAPP6B.gdb.zip b/military-overlay/app6b/geodatabase/MilitaryOverlayAPP6B.gdb.zip index 978a460..e54bce2 100644 Binary files a/military-overlay/app6b/geodatabase/MilitaryOverlayAPP6B.gdb.zip and b/military-overlay/app6b/geodatabase/MilitaryOverlayAPP6B.gdb.zip differ diff --git a/military-overlay/app6b/lpkx/MilitaryOverlay-APP6B.lpkx b/military-overlay/app6b/lpkx/MilitaryOverlay-APP6B.lpkx index f052941..5060a29 100644 Binary files a/military-overlay/app6b/lpkx/MilitaryOverlay-APP6B.lpkx and b/military-overlay/app6b/lpkx/MilitaryOverlay-APP6B.lpkx differ diff --git a/military-overlay/app6d/geodatabase/militaryoverlayapp6d.gdb.zip b/military-overlay/app6d/geodatabase/militaryoverlayapp6d.gdb.zip index 1ac3b18..3e10182 100644 Binary files a/military-overlay/app6d/geodatabase/militaryoverlayapp6d.gdb.zip and b/military-overlay/app6d/geodatabase/militaryoverlayapp6d.gdb.zip differ diff --git a/military-overlay/app6d/lpkx/MilitaryOverlay-APP6D.lpkx b/military-overlay/app6d/lpkx/MilitaryOverlay-APP6D.lpkx index b3238d9..caee300 100644 Binary files a/military-overlay/app6d/lpkx/MilitaryOverlay-APP6D.lpkx and b/military-overlay/app6d/lpkx/MilitaryOverlay-APP6D.lpkx differ diff --git a/military-overlay/mil2525b2/geodatabase/militaryoverlay2525b2.gdb.zip b/military-overlay/mil2525b2/geodatabase/militaryoverlay2525b2.gdb.zip index 1c5ca45..936acaa 100644 Binary files a/military-overlay/mil2525b2/geodatabase/militaryoverlay2525b2.gdb.zip and b/military-overlay/mil2525b2/geodatabase/militaryoverlay2525b2.gdb.zip differ diff --git a/military-overlay/mil2525b2/lpkx/MilitaryOverlay-2525BChange2.lpkx b/military-overlay/mil2525b2/lpkx/MilitaryOverlay-2525BChange2.lpkx index 5c1df25..0383182 100644 Binary files a/military-overlay/mil2525b2/lpkx/MilitaryOverlay-2525BChange2.lpkx and b/military-overlay/mil2525b2/lpkx/MilitaryOverlay-2525BChange2.lpkx differ diff --git a/military-overlay/mil2525c/geodatabase/militaryoverlay2525c.gdb.zip b/military-overlay/mil2525c/geodatabase/militaryoverlay2525c.gdb.zip index 0072f31..a00d4c0 100644 Binary files a/military-overlay/mil2525c/geodatabase/militaryoverlay2525c.gdb.zip and b/military-overlay/mil2525c/geodatabase/militaryoverlay2525c.gdb.zip differ diff --git a/military-overlay/mil2525c/lpkx/MilitaryOverlay-2525C.lpkx b/military-overlay/mil2525c/lpkx/MilitaryOverlay-2525C.lpkx index ea81fa3..6bb9c69 100644 Binary files a/military-overlay/mil2525c/lpkx/MilitaryOverlay-2525C.lpkx and b/military-overlay/mil2525c/lpkx/MilitaryOverlay-2525C.lpkx differ diff --git a/military-overlay/mil2525d/geodatabase/militaryoverlay2525d.gdb.zip b/military-overlay/mil2525d/geodatabase/militaryoverlay2525d.gdb.zip index 178fe51..126f659 100644 Binary files a/military-overlay/mil2525d/geodatabase/militaryoverlay2525d.gdb.zip and b/military-overlay/mil2525d/geodatabase/militaryoverlay2525d.gdb.zip differ diff --git a/military-overlay/mil2525d/lpkx/MilitaryOverlay-2525D.lpkx b/military-overlay/mil2525d/lpkx/MilitaryOverlay-2525D.lpkx index 330baaa..3a580d2 100644 Binary files a/military-overlay/mil2525d/lpkx/MilitaryOverlay-2525D.lpkx and b/military-overlay/mil2525d/lpkx/MilitaryOverlay-2525D.lpkx differ diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Activities.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Activities.csv index a8023af..d8cc677 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Activities.csv +++ b/military-overlay/utils-source-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/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Air.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Air.csv index bc16e19..c9ed226 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Air.csv +++ b/military-overlay/utils-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/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_ControlMeasuresAreas.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_ControlMeasuresAreas.csv index e3a260e..67d7866 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_ControlMeasuresAreas.csv +++ b/military-overlay/utils-source-and-test-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/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_ControlMeasuresLines.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_ControlMeasuresLines.csv index e4dac69..ed7e781 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_ControlMeasuresLines.csv +++ b/military-overlay/utils-source-and-test-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/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_ControlMeasuresPoints.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_ControlMeasuresPoints.csv index 2defae8..06a9a6b 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_ControlMeasuresPoints.csv +++ b/military-overlay/utils-source-and-test-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/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Installations.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Installations.csv index 758da9d..8945306 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Installations.csv +++ b/military-overlay/utils-source-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/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_LandEquipment.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_LandEquipment.csv index 3e225c5..b4c2d40 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_LandEquipment.csv +++ b/military-overlay/utils-source-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/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_SeaSubsurface.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_SeaSubsurface.csv index 8382b62..1cd09ba 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_SeaSubsurface.csv +++ b/military-overlay/utils-source-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/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_SeaSurface.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_SeaSurface.csv index b2d8447..d2e564f 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_SeaSurface.csv +++ b/military-overlay/utils-source-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/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Space.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Space.csv index a3d4331..b9fbd90 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Space.csv +++ b/military-overlay/utils-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/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Units.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Units.csv index 08c85b2..d6893f3 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6b/military_feature_schemas/Fields_Units.csv +++ b/military-overlay/utils-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/military-overlay/utils-source-and-test-data/schema-source-files/app6b/name_domains_values/Coded_Domain_SigEquip.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6b/name_domains_values/Coded_Domain_SigEquip.csv new file mode 100644 index 0000000..21d4cd2 --- /dev/null +++ b/military-overlay/utils-source-and-test-data/schema-source-files/app6b/name_domains_values/Coded_Domain_SigEquip.csv @@ -0,0 +1,2 @@ +Name,Value +Detectable Electronic Signature,! \ No newline at end of file diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Activities.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Activities.csv index 20d1b34..2f9649c 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Activities.csv +++ b/military-overlay/utils-source-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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Air.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Air.csv index d6c5049..00a492c 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Air.csv +++ b/military-overlay/utils-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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_AirMissile.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_AirMissile.csv index 312f3e4..f82c34b 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_AirMissile.csv +++ b/military-overlay/utils-source-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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Civilian.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Civilian.csv index 426ed2a..4c2c752 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Civilian.csv +++ b/military-overlay/utils-source-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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_ControlMeasuresAreas.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_ControlMeasuresAreas.csv index 638cf26..5fe408f 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_ControlMeasuresAreas.csv +++ b/military-overlay/utils-source-and-test-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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_ControlMeasuresLines.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_ControlMeasuresLines.csv index 768665a..13f3817 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_ControlMeasuresLines.csv +++ b/military-overlay/utils-source-and-test-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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_ControlMeasuresPoints.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_ControlMeasuresPoints.csv index a988450..959fe93 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_ControlMeasuresPoints.csv +++ b/military-overlay/utils-source-and-test-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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Cyberspace.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Cyberspace.csv index 092426c..b9fa630 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Cyberspace.csv +++ b/military-overlay/utils-source-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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Dismounted.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Dismounted.csv index 4a0894d..aa6a1e6 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Dismounted.csv +++ b/military-overlay/utils-source-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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Installations.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Installations.csv index a538336..54f2365 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Installations.csv +++ b/military-overlay/utils-source-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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_LandEquipment.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_LandEquipment.csv index de823e0..c185dad 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_LandEquipment.csv +++ b/military-overlay/utils-source-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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_MineWarfare.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_MineWarfare.csv index f330ac7..9f8fa10 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_MineWarfare.csv +++ b/military-overlay/utils-source-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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SIGINT.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SIGINT.csv index bd0269e..9a30195 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SIGINT.csv +++ b/military-overlay/utils-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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SeaSubsurface.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SeaSubsurface.csv index 305d363..3678b1f 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SeaSubsurface.csv +++ b/military-overlay/utils-source-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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SeaSurface.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SeaSurface.csv index 56274d4..a7b1264 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SeaSurface.csv +++ b/military-overlay/utils-source-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,, diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Space.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Space.csv index 131724d..930bd38 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Space.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Space.csv @@ -19,7 +19,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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SpaceMissile.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SpaceMissile.csv index d3d5746..2b4c23a 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SpaceMissile.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_SpaceMissile.csv @@ -19,7 +19,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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Units.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Units.csv index 56c77b3..363e46f 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Units.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/military_feature_schemas/Fields_Units.csv @@ -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/military-overlay/utils-source-and-test-data/schema-source-files/app6d/name_domains_values/Coded_Domain_CountryCodes.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/name_domains_values/Coded_Domain_CountryCodes.csv index fa35eef..a347a8d 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/name_domains_values/Coded_Domain_CountryCodes.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/name_domains_values/Coded_Domain_CountryCodes.csv @@ -1,281 +1,239 @@ Name,Value -Afghanistan,AFG -Akrotiri,XQZ -Albania,ALB -Algeria,DZA -American Samoa,ASM -Andorra,AND -Angola,AGO -Anguilla,AIA -Antarctica,ATA -Antigua and Barbuda,ATG -Argentina,ARG -Armenia,ARM -Aruba,ABW -Ashmore and Cartier Islands,XAC -Australia,AUS -Austria,AUT -Azerbaijan,AZE -"Bahamas, The",BHS -Bahrain,BHR -Baker Island,XBK -Bangladesh,BGD -Barbados,BRB -Bassas Da India,XBI -Belarus,BLR -Belgium,BEL -Belize,BLZ -Benin,BEN -Bermuda,BMU -Bhutan,BTN -Bolivia,BOL -"Bonaire, Sint Eustatius, and Saba",BES -Bosnia and Herzegovina,BIH -Botswana,BWA -Bouvet Island,BVT -Brazil,BRA -British Indian Ocean Territory,IOT -Brunei,BRN -Bulgaria,BGR -Burkina Faso,BFA -Burma,MMR -Burundi,BDI -Cabo Verde,CPV -Cambodia,KHM -Cameroon,CMR -Canada,CAN -Cayman Islands,CYM -Central African Republic,CAF -Chad,TCD -Chile,CHL -China,CHN -Christmas Island,CXR -Clipperton Island,CPT -Cocos (Keeling) Islands,CCK -Colombia,COL -Comoros,COM -Congo (Brazzaville),COG -Congo (Kinshasa),COD -Cook Islands,COK -Coral Sea Islands,XCS -Costa Rica,CRI -Côte d’Ivoire,CIV -Croatia,HRV -Cuba,CUB -Curaçao,CUW -Cyprus,CYP -Czech Republic,CZE -Denmark,DNK -Dhekelia,XXD -Diego Garcia,DGA -Djibouti,DJI -Dominica,DMA -Dominican Republic,DOM -Ecuador,ECU -Egypt,EGY -El Salvador,SLV -Entity 1,XAZ -Entity 2,XCR -Entity 3,XCY -Entity 4,XKM -Entity 5,XKN -Entity 6,AX3 -Equatorial Guinea,GNQ -Eritrea,ERI -Estonia,EST -Ethiopia,ETH -Europa Island,XEU -Falkland Islands (Islas Malvinas),FLK -Faroe Islands,FRO -Fiji,FJI -Finland,FIN -France,FRA -French Guiana,GUF -French Polynesia,PYF -French Southern and Antarctic Lands,ATF -Gabon,GAB -"Gambia, The",GMB -Gaza Strip,XGZ -Georgia,GEO -Germany,DEU -Ghana,GHA -Gibraltar,GIB -Glorioso Islands,XGL -Greece,GRC -Greenland,GRL -Grenada,GRD -Guadeloupe,GLP -Guam,GUM -Guantanamo Bay Naval Base,AX2 -Guatemala,GTM -Guernsey,GGY -Guinea,GIN -Guinea-Bissau,GNB -Guyana,GUY -Haiti,HTI -Heard Island and Mcdonald Islands,HMD -Honduras,HND -Hong Kong,HKG -Howland Island,XHO -Hungary,HUN -Iceland,ISL -India,IND -Indonesia,IDN -Iran,IRN -Iraq,IRQ -Ireland,IRL -Isle Of Man,IMN -Israel,ISR -Italy,ITA -Jamaica,JAM -Jan Mayen,XJM -Japan,JPN -Jarvis Island,XJV -Jersey,JEY -Johnston Atoll,XJA -Jordan,JOR -Juan De Nova Island,XJN -Kazakhstan,KAZ -Kenya,KEN -Kingman Reef,XKR -Kiribati,KIR -"Korea, North",PRK -"Korea, South",KOR -Kosovo,XKS -Kuwait,KWT -Kyrgyzstan,KGZ -Laos,LAO -Latvia,LVA -Lebanon,LBN -Lesotho,LSO -Liberia,LBR -Libya,LBY -Liechtenstein,LIE -Lithuania,LTU -Luxembourg,LUX -Macau,MAC -Macedonia,MKD -Madagascar,MDG -Malawi,MWI -Malaysia,MYS -Maldives,MDV -Mali,MLI -Malta,MLT -Marshall Islands,MHL -Martinique,MTQ -Mauritania,MRT -Mauritius,MUS -Mayotte,MYT -Mexico,MEX -"Micronesia, Federated States Of",FSM -Midway Islands,XMW -Moldova,MDA -Monaco,MCO -Mongolia,MNG -Montenegro,MNE -Montserrat,MSR -Morocco,MAR -Mozambique,MOZ -Namibia,NAM -Nauru,NRU -Navassa Island,XNV -Nepal,NPL -Netherlands,NLD -New Caledonia,NCL -New Zealand,NZL -Nicaragua,NIC -Niger,NER -Nigeria,NGA -Niue,NIU -Norfolk Island,NFK -Northern Mariana Islands,MNP -Norway,NOR -Oman,OMN -Pakistan,PAK -Palau,PLW -Palmyra Atoll,XPL -Panama,PAN -Papua New Guinea,PNG -Paracel Islands,XPR -Paraguay,PRY -Peru,PER -Philippines,PHL -Pitcairn Islands,PCN -Poland,POL -Portugal,PRT -Puerto Rico,PRI -Qatar,QAT -Reunion,REU -Romania,ROU -Russia,RUS -Rwanda,RWA -Saint Barthelemy,BLM -"Saint Helena, Ascension, and Tristan Da Cunha",SHN -Saint Kitts and Nevis,KNA -Saint Lucia,LCA -Saint Martin,MAF -Saint Pierre and Miquelon,SPM -Saint Vincent and The Grenadines,VCT -Samoa,WSM -San Marino,SMR -Sao Tome and Principe,STP -Saudi Arabia,SAU -Senegal,SEN -Serbia,SRB -Seychelles,SYC -Sierra Leone,SLE -Singapore,SGP -Sint Maarten,SXM -Slovakia,SVK -Slovenia,SVN -Solomon Islands,SLB -Somalia,SOM -South Africa,ZAF -South Georgia and South Sandwich Islands,SGS -South Sudan,SSD -Spain,ESP -Spratly Islands,XSP -Sri Lanka,LKA -Sudan,SDN -Suriname,SUR -Svalbard,XSV -Swaziland,SWZ -Sweden,SWE -Switzerland,CHE -Syria,SYR -Taiwan,TWN -Tajikistan,TJK -Tanzania,TZA -Thailand,THA -Timor-Leste,TLS -Togo,TGO -Tokelau,TKL -Tonga,TON -Trinidad and Tobago,TTO -Tromelin Island,XTR -Tunisia,TUN -Turkey,TUR -Turkmenistan,TKM -Turks and Caicos Islands,TCA -Tuvalu,TUV -Uganda,UGA -Ukraine,UKR -United Arab Emirates,ARE -United Kingdom,GBR -United States,USA -Unknown,AX1 -Uruguay,URY -Uzbekistan,UZB -Vanuatu,VUT -Vatican City,VAT -Venezuela,VEN -Vietnam,VNM -"Virgin Islands, British",VGB -"Virgin Islands, U.S.",VIR -Wake Island,XWK -Wallis and Futuna,WLF -West Bank,XWB -Western Sahara,ESH -Yemen,YEM -Zambia,ZMB -Zimbabwe,ZWE +United States,840 +Andorra,020 +United Arab Emirates,784 +Afghanistan,004 +Antigua and Barbuda,028 +Anguilla,660 +Albania,008 +Armenia,051 +Angola,024 +Antarctica,010 +Argentina,032 +American Samoa,016 +Austria,040 +Australia,036 +Aruba,533 +Azerbaijan,031 +Bosnia and Herzegovina,070 +Barbados,052 +Bangladesh,050 +Belgium,056 +Burkina Faso,854 +Bulgaria,100 +Bahrain,048 +Burundi,108 +Benin,204 +Bermuda,060 +Brunei Darussalam,096 +"Bolivia, Plurinational State of",068 +Brazil,076 +Bahamas,044 +Bhutan,064 +Bouvet Island,074 +Botswana,072 +Belarus,112 +Belize,084 +Canada,124 +Cocos (Keeling) Islands,166 +"Congo, the Democratic Republic of the",180 +Central African Republic,140 +Congo,178 +Switzerland,756 +Cote d'Ivoire,384 +Cook Islands,184 +Chile,152 +Cameroon,120 +China,156 +Colombia,170 +Costa Rica,188 +Cuba,192 +Cabo Verde,132 +Christmas Island,162 +Cyprus,196 +Czech Republic,203 +Germany,276 +Djibouti,262 +Denmark,208 +Dominica,212 +Dominican Republic,214 +Algeria,012 +Ecuador,218 +Estonia,233 +Egypt,818 +Western Sahara,732 +Eritrea,232 +Spain,724 +Ethiopia,231 +Finland,246 +Fiji,242 +Falkland Islands,238 +"Micronesia, Federated States of",583 +Faroe Islands,234 +France,250 +Gabon,266 +United Kingdom,826 +Grenada,308 +Georgia,268 +French Guiana,254 +Ghana,288 +Gibraltar,292 +Greenland,304 +Gambia,270 +Guinea,324 +Guadeloupe,312 +Equatorial Guinea,226 +Greece,300 +South Georgia and the South Sandwich Islands,239 +Guatemala,320 +Guam,316 +Guinea-Bissau,624 +Guyana,328 +Hong Kong,344 +Heard Island and McDonald Islands,334 +Honduras,340 +Croatia,191 +Haiti,332 +Hungary,348 +Indonesia,360 +Ireland,372 +Israel,376 +India,356 +British Indian Ocean Territory,086 +Iraq,368 +"Iran, Islamic Republic of",364 +Iceland,352 +Italy,380 +Jamaica,388 +Jordan,400 +Japan,392 +Kenya,404 +Kyrgyzstan,417 +Cambodia,116 +Kiribati,296 +Comoros,174 +"Korea, North (the Democratic People's Republic of)",408 +"Korea, South (the Republic of)",410 +Kuwait,414 +Cayman Islands,136 +Kazakhstan,398 +Lao People's Democratic Republic,418 +Lebanon,422 +Saint Lucia,662 +Liechtenstein,438 +Sri Lanka,144 +Liberia,430 +Lesotho,426 +Lithuania,440 +Luxembourg,442 +Latvia,428 +Libya,434 +Morocco,504 +Monaco,492 +"Moldova, Republic of",498 +Montenegro,499 +Madagascar,450 +Marshall Islands,584 +"Macedonia, the former Yugoslav Republic of",807 +Mali,466 +Myanmar,104 +Mongolia,496 +Macao,446 +Northern Mariana Islands,580 +Martinique,474 +Mauritania,478 +Montserrat,500 +Malta,470 +Mauritius,480 +Maldives,462 +Malawi,454 +Mexico,484 +Malaysia,458 +Mozambique,508 +Namibia,516 +New Caledonia,540 +Niger,562 +Norfolk Island,574 +Nigeria,566 +Nicaragua,558 +Netherlands,528 +Norway,578 +Nepal,524 +Nauru,520 +Niue,570 +New Zealand,554 +Oman,512 +Panama,591 +Peru,604 +French Polynesia,258 +Papua New Guinea,598 +Philippines,608 +Pakistan,586 +Poland,616 +Saint Pierre and Miquelon,666 +Pitcairn,612 +Puerto Rico,630 +"Palestine, State of",275 +Portugal,620 +Palau,585 +Paraguay,600 +Qatar,634 +Reunion,638 +Romania,642 +Serbia,688 +Russian Federation,643 +Rwanda,646 +Saudi Arabia,682 +Solomon Islands,090 +Seychelles,690 +Sudan,729 +Sweden,752 +Singapore,702 +"Saint Helena, Ascension and Tristan da Cunha",654 +Slovenia,705 +Svalbard and Jan Mayen,744 +Slovakia,703 +Sierra Leone,694 +San Marino,674 +Senegal,686 +Somalia,706 +Suriname,740 +South Sudan,728 +Sao Tome and Principe,678 +El Salvador,222 +Syrian Arab Republic,760 +Swaziland,748 +Turks and Caicos Islands,796 +Chad,148 +French Southern Territories,260 +Togo,768 +Thailand,764 +Tajikistan,762 +Tokelau,772 +Timor-Leste,626 +Turkmenistan,795 +Tunisia,788 +Tonga,776 +Turkey,792 +Trinidad and Tobago,780 +Tuvalu,798 +"Taiwan, Province of China",158 +"Tanzania, United Republic of ",834 +Ukraine,804 +Uganda,800 +United States Minor Outlying Islands,581 +Uruguay,858 +Uzbekistan,860 +Holy See (Vatican City State),336 +Saint Vincent and the Grenadines,670 +"Venezuela, Bolivarian Republic of",862 +"Virgin Islands, British",092 +"Virgin Islands, U.S.",850 +Viet Nam,704 +Vanuatu,548 +Wallis and Futuna,876 +Samoa,882 +Yemen,887 +South Africa,710 +Zambia,894 +Zimbabwe,716 diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/app6d/name_domains_values/Coded_Domain_SigEquip.csv b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/name_domains_values/Coded_Domain_SigEquip.csv new file mode 100644 index 0000000..21d4cd2 --- /dev/null +++ b/military-overlay/utils-source-and-test-data/schema-source-files/app6d/name_domains_values/Coded_Domain_SigEquip.csv @@ -0,0 +1,2 @@ +Name,Value +Detectable Electronic Signature,! \ No newline at end of file diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Activities.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Activities.csv index ddf4819..b6fa382 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Activities.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Activities.csv @@ -18,7 +18,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,, datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,, createdby,String,50,Created By,NULLABLE,,,FALSE,, diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Air.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Air.csv index 9ac969a..d8a473f 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Air.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Air.csv @@ -19,7 +19,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,, datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,, createdby,String,50,Created By,NULLABLE,,,FALSE,, diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_ControlMeasuresAreas.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_ControlMeasuresAreas.csv index 5f93548..e1f5453 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_ControlMeasuresAreas.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_ControlMeasuresAreas.csv @@ -18,7 +18,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,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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_ControlMeasuresLines.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_ControlMeasuresLines.csv index 2b207e7..1ad3072 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_ControlMeasuresLines.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_ControlMeasuresLines.csv @@ -17,7 +17,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,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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_ControlMeasuresPoints.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_ControlMeasuresPoints.csv index 45925dc..8108a58 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_ControlMeasuresPoints.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/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,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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Installations.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Installations.csv index 2f5daab..b7e7066 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Installations.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Installations.csv @@ -19,7 +19,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,, datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,, createdby,String,50,Created By,NULLABLE,,,FALSE,, diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_LandEquipment.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_LandEquipment.csv index 7634c0c..9008548 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_LandEquipment.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_LandEquipment.csv @@ -11,7 +11,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,, @@ -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,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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_SIGINT.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_SIGINT.csv index 0510378..0080cb5 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_SIGINT.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/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,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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_SeaSubsurface.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_SeaSubsurface.csv index d90ebb7..0ec6711 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_SeaSubsurface.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_SeaSubsurface.csv @@ -11,7 +11,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,, @@ -23,7 +23,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,, datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,, createdby,String,50,Created By,NULLABLE,,,FALSE,, diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_SeaSurface.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_SeaSurface.csv index 85aea19..e7d0395 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_SeaSurface.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_SeaSurface.csv @@ -20,7 +20,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,, datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,, createdby,String,50,Created By,NULLABLE,,,FALSE,, diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Space.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Space.csv index 235cf3d..5d0c2a1 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Space.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Space.csv @@ -16,7 +16,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,, datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,, createdby,String,50,Created By,NULLABLE,,,FALSE,, diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Units.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Units.csv index e1742e2..5085f9f 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Units.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/military_feature_schemas/Fields_Units.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,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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/name_domains_values/Coded_Domain_CountryCodes.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/name_domains_values/Coded_Domain_CountryCodes.csv index fa35eef..81cfa3f 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/name_domains_values/Coded_Domain_CountryCodes.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/name_domains_values/Coded_Domain_CountryCodes.csv @@ -1,281 +1,270 @@ Name,Value -Afghanistan,AFG -Akrotiri,XQZ -Albania,ALB -Algeria,DZA -American Samoa,ASM -Andorra,AND -Angola,AGO -Anguilla,AIA -Antarctica,ATA -Antigua and Barbuda,ATG -Argentina,ARG -Armenia,ARM -Aruba,ABW -Ashmore and Cartier Islands,XAC -Australia,AUS -Austria,AUT -Azerbaijan,AZE -"Bahamas, The",BHS -Bahrain,BHR -Baker Island,XBK -Bangladesh,BGD -Barbados,BRB -Bassas Da India,XBI -Belarus,BLR -Belgium,BEL -Belize,BLZ -Benin,BEN -Bermuda,BMU -Bhutan,BTN -Bolivia,BOL -"Bonaire, Sint Eustatius, and Saba",BES -Bosnia and Herzegovina,BIH -Botswana,BWA -Bouvet Island,BVT -Brazil,BRA -British Indian Ocean Territory,IOT -Brunei,BRN -Bulgaria,BGR -Burkina Faso,BFA -Burma,MMR -Burundi,BDI -Cabo Verde,CPV -Cambodia,KHM -Cameroon,CMR -Canada,CAN -Cayman Islands,CYM -Central African Republic,CAF -Chad,TCD -Chile,CHL -China,CHN -Christmas Island,CXR -Clipperton Island,CPT -Cocos (Keeling) Islands,CCK -Colombia,COL -Comoros,COM -Congo (Brazzaville),COG -Congo (Kinshasa),COD -Cook Islands,COK -Coral Sea Islands,XCS -Costa Rica,CRI -Côte d’Ivoire,CIV -Croatia,HRV -Cuba,CUB -Curaçao,CUW -Cyprus,CYP -Czech Republic,CZE -Denmark,DNK -Dhekelia,XXD -Diego Garcia,DGA -Djibouti,DJI -Dominica,DMA -Dominican Republic,DOM -Ecuador,ECU -Egypt,EGY -El Salvador,SLV -Entity 1,XAZ -Entity 2,XCR -Entity 3,XCY -Entity 4,XKM -Entity 5,XKN -Entity 6,AX3 -Equatorial Guinea,GNQ -Eritrea,ERI -Estonia,EST -Ethiopia,ETH -Europa Island,XEU -Falkland Islands (Islas Malvinas),FLK -Faroe Islands,FRO -Fiji,FJI -Finland,FIN -France,FRA -French Guiana,GUF -French Polynesia,PYF -French Southern and Antarctic Lands,ATF -Gabon,GAB -"Gambia, The",GMB -Gaza Strip,XGZ -Georgia,GEO -Germany,DEU -Ghana,GHA -Gibraltar,GIB -Glorioso Islands,XGL -Greece,GRC -Greenland,GRL -Grenada,GRD -Guadeloupe,GLP -Guam,GUM -Guantanamo Bay Naval Base,AX2 -Guatemala,GTM -Guernsey,GGY -Guinea,GIN -Guinea-Bissau,GNB -Guyana,GUY -Haiti,HTI -Heard Island and Mcdonald Islands,HMD -Honduras,HND -Hong Kong,HKG -Howland Island,XHO -Hungary,HUN -Iceland,ISL -India,IND -Indonesia,IDN -Iran,IRN -Iraq,IRQ -Ireland,IRL -Isle Of Man,IMN -Israel,ISR -Italy,ITA -Jamaica,JAM -Jan Mayen,XJM -Japan,JPN -Jarvis Island,XJV -Jersey,JEY -Johnston Atoll,XJA -Jordan,JOR -Juan De Nova Island,XJN -Kazakhstan,KAZ -Kenya,KEN -Kingman Reef,XKR -Kiribati,KIR -"Korea, North",PRK -"Korea, South",KOR -Kosovo,XKS -Kuwait,KWT -Kyrgyzstan,KGZ -Laos,LAO -Latvia,LVA -Lebanon,LBN -Lesotho,LSO -Liberia,LBR -Libya,LBY -Liechtenstein,LIE -Lithuania,LTU -Luxembourg,LUX -Macau,MAC -Macedonia,MKD -Madagascar,MDG -Malawi,MWI -Malaysia,MYS -Maldives,MDV -Mali,MLI -Malta,MLT -Marshall Islands,MHL -Martinique,MTQ -Mauritania,MRT -Mauritius,MUS -Mayotte,MYT -Mexico,MEX -"Micronesia, Federated States Of",FSM -Midway Islands,XMW -Moldova,MDA -Monaco,MCO -Mongolia,MNG -Montenegro,MNE -Montserrat,MSR -Morocco,MAR -Mozambique,MOZ -Namibia,NAM -Nauru,NRU -Navassa Island,XNV -Nepal,NPL -Netherlands,NLD -New Caledonia,NCL -New Zealand,NZL -Nicaragua,NIC -Niger,NER -Nigeria,NGA -Niue,NIU -Norfolk Island,NFK -Northern Mariana Islands,MNP -Norway,NOR -Oman,OMN -Pakistan,PAK -Palau,PLW -Palmyra Atoll,XPL -Panama,PAN -Papua New Guinea,PNG -Paracel Islands,XPR -Paraguay,PRY -Peru,PER -Philippines,PHL -Pitcairn Islands,PCN -Poland,POL -Portugal,PRT -Puerto Rico,PRI -Qatar,QAT -Reunion,REU -Romania,ROU -Russia,RUS -Rwanda,RWA -Saint Barthelemy,BLM -"Saint Helena, Ascension, and Tristan Da Cunha",SHN -Saint Kitts and Nevis,KNA -Saint Lucia,LCA -Saint Martin,MAF -Saint Pierre and Miquelon,SPM -Saint Vincent and The Grenadines,VCT -Samoa,WSM -San Marino,SMR -Sao Tome and Principe,STP -Saudi Arabia,SAU -Senegal,SEN -Serbia,SRB -Seychelles,SYC -Sierra Leone,SLE -Singapore,SGP -Sint Maarten,SXM -Slovakia,SVK -Slovenia,SVN -Solomon Islands,SLB -Somalia,SOM -South Africa,ZAF -South Georgia and South Sandwich Islands,SGS -South Sudan,SSD -Spain,ESP -Spratly Islands,XSP -Sri Lanka,LKA -Sudan,SDN -Suriname,SUR -Svalbard,XSV -Swaziland,SWZ -Sweden,SWE -Switzerland,CHE -Syria,SYR -Taiwan,TWN -Tajikistan,TJK -Tanzania,TZA -Thailand,THA -Timor-Leste,TLS -Togo,TGO -Tokelau,TKL -Tonga,TON -Trinidad and Tobago,TTO -Tromelin Island,XTR -Tunisia,TUN -Turkey,TUR -Turkmenistan,TKM -Turks and Caicos Islands,TCA -Tuvalu,TUV -Uganda,UGA -Ukraine,UKR -United Arab Emirates,ARE -United Kingdom,GBR -United States,USA -Unknown,AX1 -Uruguay,URY -Uzbekistan,UZB -Vanuatu,VUT -Vatican City,VAT -Venezuela,VEN -Vietnam,VNM -"Virgin Islands, British",VGB -"Virgin Islands, U.S.",VIR -Wake Island,XWK -Wallis and Futuna,WLF -West Bank,XWB -Western Sahara,ESH -Yemen,YEM -Zambia,ZMB -Zimbabwe,ZWE +United States,US +Antigua and Barbuda,AC +United Arab Emirates,AE +Afghanistan,AF +Algeria,AG +Azerbaijan,AJ +Albania,AL +Armenia,AM +Andorra,AN +Angola,AO +American Samoa,AQ +Argentina,AR +Australia,AS +Ashmore and Cartier Islands,AT +Austria,AU +Anguilla,AV +Akrotiri,AX +Antarctica,AY +Bahrain,BA +Barbados,BB +Botswana,BC +Bermuda,BD +Belgium,BE +"Bahamas, The",BF +Bangladesh,BG +Belize,BH +Bosnia and Herzegovina,BK +Bolivia,BL +Burma,BM +Benin,BN +Belarus,BO +Solomon Islands,BP +Navassa Island,BQ +Brazil,BR +Bassas da India,BS +Bhutan,BT +Bulgaria,BU +Bouvet Island,BV +Brunei,BX +Burundi,BY +Canada,CA +Cambodia,CB +Chad,CD +Sri Lanka,CE +Congo (Brazzaville),CF +Congo (Kinshasa),CG +China,CH +Chile,CI +Cayman Islands,CJ +Cocos (Keeling) Islands,CK +Cameroon,CM +Comoros,CN +Colombia,CO +Northern Mariana Islands,CQ +Coral Sea Islands,CR +Costa Rica,CS +Central African Republic,CT +Cuba,CU +Cape Verde,CV +Cook Islands,CW +Cyprus,CY +Denmark,DA +Djibouti,DJ +Dominica,DO +Jarvis Island,DQ +Dominican Republic,DR +Dhekelia,DX +Ecuador,EC +Egypt,EG +Ireland,EI +Equatorial Guinea,EK +Estonia,EN +Eritrea,ER +El Salvador,ES +Ethiopia,ET +Europa Island,EU +Czech Republic,EZ +French Guiana,FG +Finland,FI +Fiji,FJ +Falkland Islands (Islas Malvinas),FK +"Micronesia, Federated States of",FM +Faroe Islands,FO +French Polynesia,FP +Baker Island,FQ +France,FR +French Southern and Antarctic Lands,FS +"Gambia, The",GA +Gabon,GB +Georgia,GG +Ghana,GH +Gibraltar,GI +Grenada,GJ +Guernsey,GK +Greenland,GL +Germany,GM +Glorioso Islands,GO +Guadeloupe,GP +Guam,GQ +Greece,GR +Guatemala,GT +Guinea,GV +Guyana,GY +Gaza Strip,GZ +Haiti,HA +Hong Kong,HK +Heard Island and McDonald Islands,HM +Honduras,HO +Howland Island,HQ +Croatia,HR +Hungary,HU +Iceland,IC +Indonesia,ID +Isle of Man,IM +India,IN +British Indian Ocean Territory,IO +Clipperton Island,IP +Iran,IR +Israel,IS +Italy,IT +Cote d'Ivoire,IV +Iraq,IZ +Japan,JA +Jersey,JE +Jamaica,JM +Jan Mayen,JN +Jordan,JO +Johnston Atoll,JQ +Juan de Nova Island,JU +Kenya,KE +Kyrgyzstan,KG +"Korea, North",KN +Kingman Reef,KQ +Kiribati,KR +"Korea, South",KS +Christmas Island,KT +Kuwait,KU +Kosovo,KV +Kazakhstan,KZ +Laos,LA +Lebanon,LE +Latvia,LG +Lithuania,LH +Liberia,LI +Slovakia,LO +Palmyra Atoll,LQ +Liechtenstein,LS +Lesotho,LT +Luxembourg,LU +Libya,LY +Madagascar,MA +Martinique,MB +Macau,MC +Moldova,MD +Mayotte,MF +Mongolia,MG +Montserrat,MH +Malawi,MI +Montenegro,MJ +North Macedonia,MK +Mali,ML +Monaco,MN +Morocco,MO +Mauritius,MP +Midway Islands,MQ +Mauritania,MR +Malta,MT +Oman,MU +Maldives,MV +Mexico,MX +Malaysia,MY +Mozambique,MZ +New Caledonia,NC +Niue,NE +Norfolk Island,NF +Niger,NG +Vanuatu,NH +Nigeria,NI +Netherlands,NL +Sint Maarten,SX +Norway,NO +Nepal,NP +Nauru,NR +Suriname,NS +Nicaragua,NU +New Zealand,NZ +South Sudan,OD +Paraguay,PA +Pitcairn Islands,PC +Peru,PE +Paracel Islands,PF +Spratly Islands,PG +"Etorofu, Habomai, Kunashiri, and Shikotan Islands",PJ +Pakistan,PK +Poland,PL +Panama,PM +Portugal,PO +Papua New Guinea,PP +Palau,PS +Guinea-Bissau,PU +Qatar,QA +Reunion,RE +Serbia,RI +Marshall Islands,RM +Saint Martin,RN +Romania,RO +Philippines,RP +Puerto Rico,RQ +Russia,RS +Rwanda,RW +Saudi Arabia,SA +Saint Pierre and Miquelon,SB +Saint Kitts and Nevis,SC +Seychelles,SE +South Africa,SF +Senegal,SG +"Saint Helena, Ascension, and Tristan da Cunha",SH +Slovenia,SI +Sierra Leone,SL +San Marino,SM +Singapore,SN +Somalia,SO +Spain,SP +Saint Lucia,ST +Sudan,SU +Svalbard,SV +Sweden,SW +South Georgia and South Sandwich Islands,S2 +Syria,SY +Switzerland,SZ +Saint Barthelemy,TB +Trinidad and Tobago,TD +Tromelin Island,TE +Thailand,TH +Tajikistan,TI +Turks and Caicos Islands,TK +Tokelau,TL +Tonga,TN +Togo,TO +Sao Tome and Principe,TP +Tunisia,TS +Timor-Leste,TT +Turkey,TU +Tuvalu,TV +Taiwan,TW +Turkmenistan,TX +Tanzania,TZ +Ukraine,UP +Curacao,UC +Uganda,UG +United Kingdom,UK +Burkina Faso,UV +Uruguay,UY +Uzbekistan,UZ +Saint Vincent and the Grenadines,VC +Venezuela,VE +British Virgin Islands,VI +Vietnam,VM +United States Virgin Islands,VQ +Vatican City,VT +Namibia,WA +West Bank,WE +Wallis and Futuna,WF +Wake Island,WQ +Samoa,WS +Eswatini,WZ +Yemen,YM +Zambia,ZA +Zimbabwe,ZI diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/name_domains_values/Coded_Domain_SigEquip.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/name_domains_values/Coded_Domain_SigEquip.csv new file mode 100644 index 0000000..21d4cd2 --- /dev/null +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525b2/name_domains_values/Coded_Domain_SigEquip.csv @@ -0,0 +1,2 @@ +Name,Value +Detectable Electronic Signature,! \ No newline at end of file diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Activities.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Activities.csv index b92af40..60ed399 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Activities.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Activities.csv @@ -18,7 +18,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,, datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,, createdby,String,50,Created By,NULLABLE,,,FALSE,, diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Air.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Air.csv index 9ac969a..d8a473f 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Air.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Air.csv @@ -19,7 +19,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,, datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,, createdby,String,50,Created By,NULLABLE,,,FALSE,, diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_ControlMeasuresAreas.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_ControlMeasuresAreas.csv index 5f93548..e1f5453 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_ControlMeasuresAreas.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_ControlMeasuresAreas.csv @@ -18,7 +18,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,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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_ControlMeasuresLines.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_ControlMeasuresLines.csv index 2b207e7..1ad3072 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_ControlMeasuresLines.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_ControlMeasuresLines.csv @@ -17,7 +17,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,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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_ControlMeasuresPoints.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_ControlMeasuresPoints.csv index 45925dc..8108a58 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_ControlMeasuresPoints.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/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,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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Installations.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Installations.csv index 2f5daab..b7e7066 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Installations.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Installations.csv @@ -19,7 +19,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,, datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,, createdby,String,50,Created By,NULLABLE,,,FALSE,, diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_LandEquipment.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_LandEquipment.csv index 7634c0c..9008548 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_LandEquipment.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_LandEquipment.csv @@ -11,7 +11,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,, @@ -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,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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_SIGINT.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_SIGINT.csv index 0510378..0080cb5 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_SIGINT.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/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,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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_SeaSubsurface.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_SeaSubsurface.csv index d90ebb7..0ec6711 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_SeaSubsurface.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_SeaSubsurface.csv @@ -11,7 +11,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,, @@ -23,7 +23,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,, datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,, createdby,String,50,Created By,NULLABLE,,,FALSE,, diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_SeaSurface.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_SeaSurface.csv index 85aea19..e7d0395 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_SeaSurface.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_SeaSurface.csv @@ -20,7 +20,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,, datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,, createdby,String,50,Created By,NULLABLE,,,FALSE,, diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Space.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Space.csv index 235cf3d..5d0c2a1 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Space.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Space.csv @@ -16,7 +16,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,, datetimeexpired,Date,8,Date Time Expired,NULLABLE,,,FALSE,, createdby,String,50,Created By,NULLABLE,,,FALSE,, diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Units.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Units.csv index 7847f6a..f2bc30f 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Units.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/military_feature_schemas/Fields_Units.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,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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/name_domains_values/Coded_Domain_CountryCodes.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/name_domains_values/Coded_Domain_CountryCodes.csv index fa35eef..298fdae 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/name_domains_values/Coded_Domain_CountryCodes.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/name_domains_values/Coded_Domain_CountryCodes.csv @@ -1,281 +1,239 @@ Name,Value -Afghanistan,AFG -Akrotiri,XQZ -Albania,ALB -Algeria,DZA -American Samoa,ASM -Andorra,AND -Angola,AGO -Anguilla,AIA -Antarctica,ATA -Antigua and Barbuda,ATG -Argentina,ARG -Armenia,ARM -Aruba,ABW -Ashmore and Cartier Islands,XAC -Australia,AUS -Austria,AUT -Azerbaijan,AZE -"Bahamas, The",BHS -Bahrain,BHR -Baker Island,XBK -Bangladesh,BGD -Barbados,BRB -Bassas Da India,XBI -Belarus,BLR -Belgium,BEL -Belize,BLZ -Benin,BEN -Bermuda,BMU -Bhutan,BTN -Bolivia,BOL -"Bonaire, Sint Eustatius, and Saba",BES -Bosnia and Herzegovina,BIH -Botswana,BWA -Bouvet Island,BVT -Brazil,BRA -British Indian Ocean Territory,IOT -Brunei,BRN -Bulgaria,BGR -Burkina Faso,BFA -Burma,MMR -Burundi,BDI -Cabo Verde,CPV -Cambodia,KHM -Cameroon,CMR -Canada,CAN -Cayman Islands,CYM -Central African Republic,CAF -Chad,TCD -Chile,CHL -China,CHN -Christmas Island,CXR -Clipperton Island,CPT -Cocos (Keeling) Islands,CCK -Colombia,COL -Comoros,COM -Congo (Brazzaville),COG -Congo (Kinshasa),COD -Cook Islands,COK -Coral Sea Islands,XCS -Costa Rica,CRI -Côte d’Ivoire,CIV -Croatia,HRV -Cuba,CUB -Curaçao,CUW -Cyprus,CYP -Czech Republic,CZE -Denmark,DNK -Dhekelia,XXD -Diego Garcia,DGA -Djibouti,DJI -Dominica,DMA -Dominican Republic,DOM -Ecuador,ECU -Egypt,EGY -El Salvador,SLV -Entity 1,XAZ -Entity 2,XCR -Entity 3,XCY -Entity 4,XKM -Entity 5,XKN -Entity 6,AX3 -Equatorial Guinea,GNQ -Eritrea,ERI -Estonia,EST -Ethiopia,ETH -Europa Island,XEU -Falkland Islands (Islas Malvinas),FLK -Faroe Islands,FRO -Fiji,FJI -Finland,FIN -France,FRA -French Guiana,GUF -French Polynesia,PYF -French Southern and Antarctic Lands,ATF -Gabon,GAB -"Gambia, The",GMB -Gaza Strip,XGZ -Georgia,GEO -Germany,DEU -Ghana,GHA -Gibraltar,GIB -Glorioso Islands,XGL -Greece,GRC -Greenland,GRL -Grenada,GRD -Guadeloupe,GLP -Guam,GUM -Guantanamo Bay Naval Base,AX2 -Guatemala,GTM -Guernsey,GGY -Guinea,GIN -Guinea-Bissau,GNB -Guyana,GUY -Haiti,HTI -Heard Island and Mcdonald Islands,HMD -Honduras,HND -Hong Kong,HKG -Howland Island,XHO -Hungary,HUN -Iceland,ISL -India,IND -Indonesia,IDN -Iran,IRN -Iraq,IRQ -Ireland,IRL -Isle Of Man,IMN -Israel,ISR -Italy,ITA -Jamaica,JAM -Jan Mayen,XJM -Japan,JPN -Jarvis Island,XJV -Jersey,JEY -Johnston Atoll,XJA -Jordan,JOR -Juan De Nova Island,XJN -Kazakhstan,KAZ -Kenya,KEN -Kingman Reef,XKR -Kiribati,KIR -"Korea, North",PRK -"Korea, South",KOR -Kosovo,XKS -Kuwait,KWT -Kyrgyzstan,KGZ -Laos,LAO -Latvia,LVA -Lebanon,LBN -Lesotho,LSO -Liberia,LBR -Libya,LBY -Liechtenstein,LIE -Lithuania,LTU -Luxembourg,LUX -Macau,MAC -Macedonia,MKD -Madagascar,MDG -Malawi,MWI -Malaysia,MYS -Maldives,MDV -Mali,MLI -Malta,MLT -Marshall Islands,MHL -Martinique,MTQ -Mauritania,MRT -Mauritius,MUS -Mayotte,MYT -Mexico,MEX -"Micronesia, Federated States Of",FSM -Midway Islands,XMW -Moldova,MDA -Monaco,MCO -Mongolia,MNG -Montenegro,MNE -Montserrat,MSR -Morocco,MAR -Mozambique,MOZ -Namibia,NAM -Nauru,NRU -Navassa Island,XNV -Nepal,NPL -Netherlands,NLD -New Caledonia,NCL -New Zealand,NZL -Nicaragua,NIC -Niger,NER -Nigeria,NGA -Niue,NIU -Norfolk Island,NFK -Northern Mariana Islands,MNP -Norway,NOR -Oman,OMN -Pakistan,PAK -Palau,PLW -Palmyra Atoll,XPL -Panama,PAN -Papua New Guinea,PNG -Paracel Islands,XPR -Paraguay,PRY -Peru,PER -Philippines,PHL -Pitcairn Islands,PCN -Poland,POL -Portugal,PRT -Puerto Rico,PRI -Qatar,QAT -Reunion,REU -Romania,ROU -Russia,RUS -Rwanda,RWA -Saint Barthelemy,BLM -"Saint Helena, Ascension, and Tristan Da Cunha",SHN -Saint Kitts and Nevis,KNA -Saint Lucia,LCA -Saint Martin,MAF -Saint Pierre and Miquelon,SPM -Saint Vincent and The Grenadines,VCT -Samoa,WSM -San Marino,SMR -Sao Tome and Principe,STP -Saudi Arabia,SAU -Senegal,SEN -Serbia,SRB -Seychelles,SYC -Sierra Leone,SLE -Singapore,SGP -Sint Maarten,SXM -Slovakia,SVK -Slovenia,SVN -Solomon Islands,SLB -Somalia,SOM -South Africa,ZAF -South Georgia and South Sandwich Islands,SGS -South Sudan,SSD -Spain,ESP -Spratly Islands,XSP -Sri Lanka,LKA -Sudan,SDN -Suriname,SUR -Svalbard,XSV -Swaziland,SWZ -Sweden,SWE -Switzerland,CHE -Syria,SYR -Taiwan,TWN -Tajikistan,TJK -Tanzania,TZA -Thailand,THA -Timor-Leste,TLS -Togo,TGO -Tokelau,TKL -Tonga,TON -Trinidad and Tobago,TTO -Tromelin Island,XTR -Tunisia,TUN -Turkey,TUR -Turkmenistan,TKM -Turks and Caicos Islands,TCA -Tuvalu,TUV -Uganda,UGA -Ukraine,UKR -United Arab Emirates,ARE -United Kingdom,GBR -United States,USA -Unknown,AX1 -Uruguay,URY -Uzbekistan,UZB -Vanuatu,VUT -Vatican City,VAT -Venezuela,VEN -Vietnam,VNM -"Virgin Islands, British",VGB -"Virgin Islands, U.S.",VIR -Wake Island,XWK -Wallis and Futuna,WLF -West Bank,XWB -Western Sahara,ESH -Yemen,YEM -Zambia,ZMB -Zimbabwe,ZWE +United States,US +Andorra,AD +United Arab Emirates,AE +Afghanistan,AF +Antigua and Barbuda,AG +Anguilla,AI +Albania,AL +Armenia,AM +Angola,AO +Antarctica,AQ +Argentina,AR +American Samoa,AS +Austria,AT +Australia,AU +Aruba,AW +Azerbaijan,AZ +Bosnia and Herzegovina,BA +Barbados,BB +Bangladesh,BD +Belgium,BE +Burkina Faso,BF +Bulgaria,BG +Bahrain,BH +Burundi,BI +Benin,BJ +Bermuda,BM +Brunei Darussalam,BN +"Bolivia, Plurinational State of",BO +Brazil,BR +Bahamas,BS +Bhutan,BT +Bouvet Island,BV +Botswana,BW +Belarus,BY +Belize,BZ +Canada,CA +Cocos (Keeling) Islands,CC +"Congo, the Democratic Republic of the",CD +Central African Republic,CF +Congo,CG +Switzerland,CH +Cote d'Ivoire,CI +Cook Islands,CK +Chile,CL +Cameroon,CM +China,CN +Colombia,CO +Costa Rica,CR +Cuba,CU +Cabo Verde,CV +Christmas Island,CX +Cyprus,CY +Czech Republic,CZ +Germany,DE +Djibouti,DJ +Denmark,DK +Dominica,DM +Dominican Republic,DO +Algeria,DZ +Ecuador,EC +Estonia,EE +Egypt,EG +Western Sahara,EH +Eritrea,ER +Spain,ES +Ethiopia,ET +Finland,FI +Fiji,FJ +Falkland Islands,FK +"Micronesia, Federated States of",FM +Faroe Islands,FO +France,FR +Gabon,GA +United Kingdom,GB +Grenada,GD +Georgia,GE +French Guiana,GF +Ghana,GH +Gibraltar,GI +Greenland,GL +Gambia,GM +Guinea,GN +Guadeloupe,GP +Equatorial Guinea,GQ +Greece,GR +South Georgia and the South Sandwich Islands,GS +Guatemala,GT +Guam,GU +Guinea-Bissau,GW +Guyana,GY +Hong Kong,HK +Heard Island and McDonald Islands,HM +Honduras,HN +Croatia,HR +Haiti,HT +Hungary,HU +Indonesia,ID +Ireland,IE +Israel,IL +India,IN +British Indian Ocean Territory,IO +Iraq,IQ +"Iran, Islamic Republic of",IR +Iceland,IS +Italy,IT +Jamaica,JM +Jordan,JO +Japan,JP +Kenya,KE +Kyrgyzstan,KG +Cambodia,KH +Kiribati,KI +Comoros,KM +"Korea, North (the Democratic People's Republic of)",KP +"Korea, South (the Republic of)",KR +Kuwait,KW +Cayman Islands,KY +Kazakhstan,KZ +Lao People's Democratic Republic,LA +Lebanon,LB +Saint Lucia,LC +Liechtenstein,LI +Sri Lanka,LK +Liberia,LR +Lesotho,LS +Lithuania,LT +Luxembourg,LU +Latvia,LV +Libya,LY +Morocco,MA +Monaco,MC +"Moldova, Republic of",MD +Montenegro,ME +Madagascar,MG +Marshall Islands,MH +"Macedonia, the former Yugoslav Republic of",MK +Mali,ML +Myanmar,MM +Mongolia,MN +Macao,MO +Northern Mariana Islands,MP +Martinique,MQ +Mauritania,MR +Montserrat,MS +Malta,MT +Mauritius,MU +Maldives,MV +Malawi,MW +Mexico,MX +Malaysia,MY +Mozambique,MZ +Namibia,NA +New Caledonia,NC +Niger,NE +Norfolk Island,NF +Nigeria,NG +Nicaragua,NI +Netherlands,NL +Norway,NO +Nepal,NP +Nauru,NR +Niue,NU +New Zealand,NZ +Oman,OM +Panama,PA +Peru,PE +French Polynesia,PF +Papua New Guinea,PG +Philippines,PH +Pakistan,PK +Poland,PL +Saint Pierre and Miquelon,PM +Pitcairn,PN +Puerto Rico,PR +"Palestine, State of",PS +Portugal,PT +Palau,PW +Paraguay,PY +Qatar,QA +Reunion,RE +Romania,RO +Serbia,RS +Russian Federation,RU +Rwanda,RW +Saudi Arabia,SA +Solomon Islands,SB +Seychelles,SC +Sudan,SD +Sweden,SE +Singapore,SG +"Saint Helena, Ascension and Tristan da Cunha",SH +Slovenia,SI +Svalbard and Jan Mayen,SJ +Slovakia,SK +Sierra Leone,SL +San Marino,SM +Senegal,SN +Somalia,SO +Suriname,SR +South Sudan,SS +Sao Tome and Principe,ST +El Salvador,SV +Syrian Arab Republic,SY +Swaziland,SZ +Turks and Caicos Islands,TC +Chad,TD +French Southern Territories,TF +Togo,TG +Thailand,TH +Tajikistan,TJ +Tokelau,TK +Timor-Leste,TL +Turkmenistan,TM +Tunisia,TN +Tonga,TO +Turkey,TR +Trinidad and Tobago,TT +Tuvalu,TV +"Taiwan, Province of China",TW +"Tanzania, United Republic of ",TZ +Ukraine,UA +Uganda,UG +United States Minor Outlying Islands,UM +Uruguay,UY +Uzbekistan,UZ +Holy See (Vatican City State),VA +Saint Vincent and the Grenadines,VC +"Venezuela, Bolivarian Republic of",VE +"Virgin Islands, British",VG +"Virgin Islands, U.S.",VI +Viet Nam,VN +Vanuatu,VU +Wallis and Futuna,WF +Samoa,WS +Yemen,YE +South Africa,ZA +Zambia,ZM +Zimbabwe,ZW diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/name_domains_values/Coded_Domain_SigEquip.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/name_domains_values/Coded_Domain_SigEquip.csv new file mode 100644 index 0000000..21d4cd2 --- /dev/null +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525c/name_domains_values/Coded_Domain_SigEquip.csv @@ -0,0 +1,2 @@ +Name,Value +Detectable Electronic Signature,! \ No newline at end of file diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Activities.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Activities.csv index 20d1b34..2f9649c 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Activities.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Air.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Air.csv index d6c5049..00a492c 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Air.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_AirMissile.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_AirMissile.csv index 312f3e4..f82c34b 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_AirMissile.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Civilian.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Civilian.csv index 426ed2a..4c2c752 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Civilian.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_ControlMeasuresAreas.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_ControlMeasuresAreas.csv index 638cf26..5fe408f 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_ControlMeasuresAreas.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_ControlMeasuresLines.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_ControlMeasuresLines.csv index 768665a..13f3817 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_ControlMeasuresLines.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_ControlMeasuresPoints.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_ControlMeasuresPoints.csv index a988450..959fe93 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_ControlMeasuresPoints.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Cyberspace.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Cyberspace.csv index 092426c..b9fa630 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Cyberspace.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Installations.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Installations.csv index a538336..54f2365 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Installations.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_LandEquipment.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_LandEquipment.csv index de823e0..c185dad 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_LandEquipment.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_MineWarfare.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_MineWarfare.csv index f330ac7..9f8fa10 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_MineWarfare.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_SIGINT.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_SIGINT.csv index bd0269e..9a30195 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_SIGINT.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_SeaSubsurface.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_SeaSubsurface.csv index 305d363..3678b1f 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_SeaSubsurface.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_SeaSurface.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_SeaSurface.csv index 56274d4..a7b1264 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_SeaSurface.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/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,, diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Space.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Space.csv index 131724d..930bd38 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Space.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Space.csv @@ -19,7 +19,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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_SpaceMissile.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_SpaceMissile.csv index d3d5746..2b4c23a 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_SpaceMissile.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_SpaceMissile.csv @@ -19,7 +19,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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Units.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Units.csv index 56c77b3..363e46f 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Units.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/military_feature_schemas/Fields_Units.csv @@ -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/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/name_domains_values/Coded_Domain_CountryCodes.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/name_domains_values/Coded_Domain_CountryCodes.csv index fa35eef..a347a8d 100644 --- a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/name_domains_values/Coded_Domain_CountryCodes.csv +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/name_domains_values/Coded_Domain_CountryCodes.csv @@ -1,281 +1,239 @@ Name,Value -Afghanistan,AFG -Akrotiri,XQZ -Albania,ALB -Algeria,DZA -American Samoa,ASM -Andorra,AND -Angola,AGO -Anguilla,AIA -Antarctica,ATA -Antigua and Barbuda,ATG -Argentina,ARG -Armenia,ARM -Aruba,ABW -Ashmore and Cartier Islands,XAC -Australia,AUS -Austria,AUT -Azerbaijan,AZE -"Bahamas, The",BHS -Bahrain,BHR -Baker Island,XBK -Bangladesh,BGD -Barbados,BRB -Bassas Da India,XBI -Belarus,BLR -Belgium,BEL -Belize,BLZ -Benin,BEN -Bermuda,BMU -Bhutan,BTN -Bolivia,BOL -"Bonaire, Sint Eustatius, and Saba",BES -Bosnia and Herzegovina,BIH -Botswana,BWA -Bouvet Island,BVT -Brazil,BRA -British Indian Ocean Territory,IOT -Brunei,BRN -Bulgaria,BGR -Burkina Faso,BFA -Burma,MMR -Burundi,BDI -Cabo Verde,CPV -Cambodia,KHM -Cameroon,CMR -Canada,CAN -Cayman Islands,CYM -Central African Republic,CAF -Chad,TCD -Chile,CHL -China,CHN -Christmas Island,CXR -Clipperton Island,CPT -Cocos (Keeling) Islands,CCK -Colombia,COL -Comoros,COM -Congo (Brazzaville),COG -Congo (Kinshasa),COD -Cook Islands,COK -Coral Sea Islands,XCS -Costa Rica,CRI -Côte d’Ivoire,CIV -Croatia,HRV -Cuba,CUB -Curaçao,CUW -Cyprus,CYP -Czech Republic,CZE -Denmark,DNK -Dhekelia,XXD -Diego Garcia,DGA -Djibouti,DJI -Dominica,DMA -Dominican Republic,DOM -Ecuador,ECU -Egypt,EGY -El Salvador,SLV -Entity 1,XAZ -Entity 2,XCR -Entity 3,XCY -Entity 4,XKM -Entity 5,XKN -Entity 6,AX3 -Equatorial Guinea,GNQ -Eritrea,ERI -Estonia,EST -Ethiopia,ETH -Europa Island,XEU -Falkland Islands (Islas Malvinas),FLK -Faroe Islands,FRO -Fiji,FJI -Finland,FIN -France,FRA -French Guiana,GUF -French Polynesia,PYF -French Southern and Antarctic Lands,ATF -Gabon,GAB -"Gambia, The",GMB -Gaza Strip,XGZ -Georgia,GEO -Germany,DEU -Ghana,GHA -Gibraltar,GIB -Glorioso Islands,XGL -Greece,GRC -Greenland,GRL -Grenada,GRD -Guadeloupe,GLP -Guam,GUM -Guantanamo Bay Naval Base,AX2 -Guatemala,GTM -Guernsey,GGY -Guinea,GIN -Guinea-Bissau,GNB -Guyana,GUY -Haiti,HTI -Heard Island and Mcdonald Islands,HMD -Honduras,HND -Hong Kong,HKG -Howland Island,XHO -Hungary,HUN -Iceland,ISL -India,IND -Indonesia,IDN -Iran,IRN -Iraq,IRQ -Ireland,IRL -Isle Of Man,IMN -Israel,ISR -Italy,ITA -Jamaica,JAM -Jan Mayen,XJM -Japan,JPN -Jarvis Island,XJV -Jersey,JEY -Johnston Atoll,XJA -Jordan,JOR -Juan De Nova Island,XJN -Kazakhstan,KAZ -Kenya,KEN -Kingman Reef,XKR -Kiribati,KIR -"Korea, North",PRK -"Korea, South",KOR -Kosovo,XKS -Kuwait,KWT -Kyrgyzstan,KGZ -Laos,LAO -Latvia,LVA -Lebanon,LBN -Lesotho,LSO -Liberia,LBR -Libya,LBY -Liechtenstein,LIE -Lithuania,LTU -Luxembourg,LUX -Macau,MAC -Macedonia,MKD -Madagascar,MDG -Malawi,MWI -Malaysia,MYS -Maldives,MDV -Mali,MLI -Malta,MLT -Marshall Islands,MHL -Martinique,MTQ -Mauritania,MRT -Mauritius,MUS -Mayotte,MYT -Mexico,MEX -"Micronesia, Federated States Of",FSM -Midway Islands,XMW -Moldova,MDA -Monaco,MCO -Mongolia,MNG -Montenegro,MNE -Montserrat,MSR -Morocco,MAR -Mozambique,MOZ -Namibia,NAM -Nauru,NRU -Navassa Island,XNV -Nepal,NPL -Netherlands,NLD -New Caledonia,NCL -New Zealand,NZL -Nicaragua,NIC -Niger,NER -Nigeria,NGA -Niue,NIU -Norfolk Island,NFK -Northern Mariana Islands,MNP -Norway,NOR -Oman,OMN -Pakistan,PAK -Palau,PLW -Palmyra Atoll,XPL -Panama,PAN -Papua New Guinea,PNG -Paracel Islands,XPR -Paraguay,PRY -Peru,PER -Philippines,PHL -Pitcairn Islands,PCN -Poland,POL -Portugal,PRT -Puerto Rico,PRI -Qatar,QAT -Reunion,REU -Romania,ROU -Russia,RUS -Rwanda,RWA -Saint Barthelemy,BLM -"Saint Helena, Ascension, and Tristan Da Cunha",SHN -Saint Kitts and Nevis,KNA -Saint Lucia,LCA -Saint Martin,MAF -Saint Pierre and Miquelon,SPM -Saint Vincent and The Grenadines,VCT -Samoa,WSM -San Marino,SMR -Sao Tome and Principe,STP -Saudi Arabia,SAU -Senegal,SEN -Serbia,SRB -Seychelles,SYC -Sierra Leone,SLE -Singapore,SGP -Sint Maarten,SXM -Slovakia,SVK -Slovenia,SVN -Solomon Islands,SLB -Somalia,SOM -South Africa,ZAF -South Georgia and South Sandwich Islands,SGS -South Sudan,SSD -Spain,ESP -Spratly Islands,XSP -Sri Lanka,LKA -Sudan,SDN -Suriname,SUR -Svalbard,XSV -Swaziland,SWZ -Sweden,SWE -Switzerland,CHE -Syria,SYR -Taiwan,TWN -Tajikistan,TJK -Tanzania,TZA -Thailand,THA -Timor-Leste,TLS -Togo,TGO -Tokelau,TKL -Tonga,TON -Trinidad and Tobago,TTO -Tromelin Island,XTR -Tunisia,TUN -Turkey,TUR -Turkmenistan,TKM -Turks and Caicos Islands,TCA -Tuvalu,TUV -Uganda,UGA -Ukraine,UKR -United Arab Emirates,ARE -United Kingdom,GBR -United States,USA -Unknown,AX1 -Uruguay,URY -Uzbekistan,UZB -Vanuatu,VUT -Vatican City,VAT -Venezuela,VEN -Vietnam,VNM -"Virgin Islands, British",VGB -"Virgin Islands, U.S.",VIR -Wake Island,XWK -Wallis and Futuna,WLF -West Bank,XWB -Western Sahara,ESH -Yemen,YEM -Zambia,ZMB -Zimbabwe,ZWE +United States,840 +Andorra,020 +United Arab Emirates,784 +Afghanistan,004 +Antigua and Barbuda,028 +Anguilla,660 +Albania,008 +Armenia,051 +Angola,024 +Antarctica,010 +Argentina,032 +American Samoa,016 +Austria,040 +Australia,036 +Aruba,533 +Azerbaijan,031 +Bosnia and Herzegovina,070 +Barbados,052 +Bangladesh,050 +Belgium,056 +Burkina Faso,854 +Bulgaria,100 +Bahrain,048 +Burundi,108 +Benin,204 +Bermuda,060 +Brunei Darussalam,096 +"Bolivia, Plurinational State of",068 +Brazil,076 +Bahamas,044 +Bhutan,064 +Bouvet Island,074 +Botswana,072 +Belarus,112 +Belize,084 +Canada,124 +Cocos (Keeling) Islands,166 +"Congo, the Democratic Republic of the",180 +Central African Republic,140 +Congo,178 +Switzerland,756 +Cote d'Ivoire,384 +Cook Islands,184 +Chile,152 +Cameroon,120 +China,156 +Colombia,170 +Costa Rica,188 +Cuba,192 +Cabo Verde,132 +Christmas Island,162 +Cyprus,196 +Czech Republic,203 +Germany,276 +Djibouti,262 +Denmark,208 +Dominica,212 +Dominican Republic,214 +Algeria,012 +Ecuador,218 +Estonia,233 +Egypt,818 +Western Sahara,732 +Eritrea,232 +Spain,724 +Ethiopia,231 +Finland,246 +Fiji,242 +Falkland Islands,238 +"Micronesia, Federated States of",583 +Faroe Islands,234 +France,250 +Gabon,266 +United Kingdom,826 +Grenada,308 +Georgia,268 +French Guiana,254 +Ghana,288 +Gibraltar,292 +Greenland,304 +Gambia,270 +Guinea,324 +Guadeloupe,312 +Equatorial Guinea,226 +Greece,300 +South Georgia and the South Sandwich Islands,239 +Guatemala,320 +Guam,316 +Guinea-Bissau,624 +Guyana,328 +Hong Kong,344 +Heard Island and McDonald Islands,334 +Honduras,340 +Croatia,191 +Haiti,332 +Hungary,348 +Indonesia,360 +Ireland,372 +Israel,376 +India,356 +British Indian Ocean Territory,086 +Iraq,368 +"Iran, Islamic Republic of",364 +Iceland,352 +Italy,380 +Jamaica,388 +Jordan,400 +Japan,392 +Kenya,404 +Kyrgyzstan,417 +Cambodia,116 +Kiribati,296 +Comoros,174 +"Korea, North (the Democratic People's Republic of)",408 +"Korea, South (the Republic of)",410 +Kuwait,414 +Cayman Islands,136 +Kazakhstan,398 +Lao People's Democratic Republic,418 +Lebanon,422 +Saint Lucia,662 +Liechtenstein,438 +Sri Lanka,144 +Liberia,430 +Lesotho,426 +Lithuania,440 +Luxembourg,442 +Latvia,428 +Libya,434 +Morocco,504 +Monaco,492 +"Moldova, Republic of",498 +Montenegro,499 +Madagascar,450 +Marshall Islands,584 +"Macedonia, the former Yugoslav Republic of",807 +Mali,466 +Myanmar,104 +Mongolia,496 +Macao,446 +Northern Mariana Islands,580 +Martinique,474 +Mauritania,478 +Montserrat,500 +Malta,470 +Mauritius,480 +Maldives,462 +Malawi,454 +Mexico,484 +Malaysia,458 +Mozambique,508 +Namibia,516 +New Caledonia,540 +Niger,562 +Norfolk Island,574 +Nigeria,566 +Nicaragua,558 +Netherlands,528 +Norway,578 +Nepal,524 +Nauru,520 +Niue,570 +New Zealand,554 +Oman,512 +Panama,591 +Peru,604 +French Polynesia,258 +Papua New Guinea,598 +Philippines,608 +Pakistan,586 +Poland,616 +Saint Pierre and Miquelon,666 +Pitcairn,612 +Puerto Rico,630 +"Palestine, State of",275 +Portugal,620 +Palau,585 +Paraguay,600 +Qatar,634 +Reunion,638 +Romania,642 +Serbia,688 +Russian Federation,643 +Rwanda,646 +Saudi Arabia,682 +Solomon Islands,090 +Seychelles,690 +Sudan,729 +Sweden,752 +Singapore,702 +"Saint Helena, Ascension and Tristan da Cunha",654 +Slovenia,705 +Svalbard and Jan Mayen,744 +Slovakia,703 +Sierra Leone,694 +San Marino,674 +Senegal,686 +Somalia,706 +Suriname,740 +South Sudan,728 +Sao Tome and Principe,678 +El Salvador,222 +Syrian Arab Republic,760 +Swaziland,748 +Turks and Caicos Islands,796 +Chad,148 +French Southern Territories,260 +Togo,768 +Thailand,764 +Tajikistan,762 +Tokelau,772 +Timor-Leste,626 +Turkmenistan,795 +Tunisia,788 +Tonga,776 +Turkey,792 +Trinidad and Tobago,780 +Tuvalu,798 +"Taiwan, Province of China",158 +"Tanzania, United Republic of ",834 +Ukraine,804 +Uganda,800 +United States Minor Outlying Islands,581 +Uruguay,858 +Uzbekistan,860 +Holy See (Vatican City State),336 +Saint Vincent and the Grenadines,670 +"Venezuela, Bolivarian Republic of",862 +"Virgin Islands, British",092 +"Virgin Islands, U.S.",850 +Viet Nam,704 +Vanuatu,548 +Wallis and Futuna,876 +Samoa,882 +Yemen,887 +South Africa,710 +Zambia,894 +Zimbabwe,716 diff --git a/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/name_domains_values/Coded_Domain_SigEquip.csv b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/name_domains_values/Coded_Domain_SigEquip.csv new file mode 100644 index 0000000..21d4cd2 --- /dev/null +++ b/military-overlay/utils-source-and-test-data/schema-source-files/mil2525d/name_domains_values/Coded_Domain_SigEquip.csv @@ -0,0 +1,2 @@ +Name,Value +Detectable Electronic Signature,! \ No newline at end of file diff --git a/source/ProSymbolEditor/Controls/NumberUpDownControl.xaml.cs b/source/ProSymbolEditor/Controls/NumberUpDownControl.xaml.cs index 214ed49..2921cff 100644 --- a/source/ProSymbolEditor/Controls/NumberUpDownControl.xaml.cs +++ b/source/ProSymbolEditor/Controls/NumberUpDownControl.xaml.cs @@ -55,6 +55,12 @@ private static void OnCurrentValueChanged(DependencyObject d, DependencyProperty numberUpDownControl.NumberUpDownControlTextBox.Text = String.Empty; numberUpDownControl._ignoreTextUpdate = false; } + else + { + numberUpDownControl._ignoreTextUpdate = true; + numberUpDownControl.NumberUpDownControlTextBox.Text = e.NewValue.ToString(); + numberUpDownControl._ignoreTextUpdate = false; + } } public short? CurrentValue diff --git a/source/ProSymbolEditor/Models/MilitaryFieldsInspectorModel.cs b/source/ProSymbolEditor/Models/MilitaryFieldsInspectorModel.cs index 5d388b5..e521beb 100644 --- a/source/ProSymbolEditor/Models/MilitaryFieldsInspectorModel.cs +++ b/source/ProSymbolEditor/Models/MilitaryFieldsInspectorModel.cs @@ -32,6 +32,7 @@ public class MilitaryFieldsInspectorModel : PropertyChangedBase private Visibility _typeFieldExists = Visibility.Collapsed; private Visibility _commonIdentifierFieldExists = Visibility.Collapsed; private Visibility _speedFieldExists = Visibility.Collapsed; //short + private Visibility _directionFieldExists = Visibility.Collapsed; //short private Visibility _staffCommentsFieldExists = Visibility.Collapsed; private Visibility _additionalInformationFieldExists = Visibility.Collapsed; private Visibility _higherFormationFieldExists = Visibility.Collapsed; @@ -39,9 +40,11 @@ public class MilitaryFieldsInspectorModel : PropertyChangedBase #region Mutators //Domains for combo boxes for text labels + public ObservableCollection ReinforcedDomainValues { get; set; } public ObservableCollection CredibilityDomainValues { get; set; } public ObservableCollection ReliabilityDomainValues { get; set; } + public ObservableCollection SignatureEquipmentDomainValues { get; set; } //Domains for attribute combo boxes @@ -136,6 +139,19 @@ public Visibility SpeedFieldExists } } + public Visibility DirectionFieldExists + { + get + { + return _directionFieldExists; + } + set + { + _directionFieldExists = value; + NotifyPropertyChanged(() => DirectionFieldExists); + } + } + public Visibility StaffCommentsFieldExists { get @@ -182,6 +198,8 @@ public MilitaryFieldsInspectorModel() ReinforcedDomainValues = new ObservableCollection(); CredibilityDomainValues = new ObservableCollection(); ReliabilityDomainValues = new ObservableCollection(); + SignatureEquipmentDomainValues = new ObservableCollection(); + ExtendedFunctionCodeValues = new ObservableCollection(); IdentityDomainValues = new ObservableCollection(); EchelonDomainValues = new ObservableCollection(); @@ -234,6 +252,12 @@ public void CheckLabelFieldsExistence(IReadOnlyList fiel SpeedFieldExists = Visibility.Visible; } + DirectionFieldExists = Visibility.Collapsed; + if (fields.FirstOrDefault(field => field.Name == "direction") != null) + { + DirectionFieldExists = Visibility.Visible; + } + StaffCommentsFieldExists = Visibility.Collapsed; if (fields.FirstOrDefault(field => field.Name == "staffcomment") != null) { @@ -259,6 +283,7 @@ public void PopulateDomains(IReadOnlyList fields) GetDomainAndPopulateList(fields, "reinforced", ReinforcedDomainValues); GetDomainAndPopulateList(fields, "credibility", CredibilityDomainValues); GetDomainAndPopulateList(fields, "reliability", ReliabilityDomainValues); + GetDomainAndPopulateList(fields, "signatureequipment", SignatureEquipmentDomainValues); //Get domains for attributes @@ -319,8 +344,29 @@ private void GetDomainAndPopulateList(IReadOnlyList fields, string fieldN // Minor hack to make USA appear first in the list if (fieldName == "countrycode") { - DomainCodedValuePair domainObjectPair = new DomainCodedValuePair("USA", "United States"); - memberCodedValueDomains.Insert(0, domainObjectPair); + // TRICKY: Domains have 3 different formats, old format: "USA" and new format: "US" "840" + // Check the format of the domains to see which format we should use + DomainCodedValuePair testDomainPair = memberCodedValueDomains[0]; + object code = testDomainPair.Code; + + DomainCodedValuePair usaDomainObjectPair = null; + + if (code is int) + { + // New Format + usaDomainObjectPair = new DomainCodedValuePair(840, "United States"); // new format, 2525D/APP6D + } + else if (code is string) + { + string testString = code as string; + if (testString.Length == 2) + usaDomainObjectPair = new DomainCodedValuePair("US", "United States"); // new format, 2525B/C/APP6B + else + usaDomainObjectPair = new DomainCodedValuePair("USA", "United States"); // old format + } + + if (usaDomainObjectPair != null) + memberCodedValueDomains.Insert(0, usaDomainObjectPair); } // Add a "" value to the domain list - so this field can be cleared with this flag diff --git a/source/ProSymbolEditor/Models/SymbolAttributes/DisplayAttributes.cs b/source/ProSymbolEditor/Models/SymbolAttributes/DisplayAttributes.cs index ccbddc5..5b17e04 100644 --- a/source/ProSymbolEditor/Models/SymbolAttributes/DisplayAttributes.cs +++ b/source/ProSymbolEditor/Models/SymbolAttributes/DisplayAttributes.cs @@ -65,7 +65,7 @@ public string Name { // use an alternate (the SIDC) if Coded Domains not yet set if (ProSymbolUtilities.IsLegacyStandard()) - sb.Append(LegacySymbolIdCode); + sb.Append(SymbolIdCode); else sb.Append(SymbolSet + ProSymbolUtilities.NameSeparator + SymbolEntity); } @@ -134,68 +134,17 @@ public override int GetHashCode() public GeometryType SymbolGeometry { get; set; } - public string LegacySymbolIdCode + public string SymbolIdCode { get { - System.Text.StringBuilder sb = new System.Text.StringBuilder(); - - string extendedFunctionCode = ExtendedFunctionCode; - if ((ProSymbolUtilities.IsLegacyStandard()) - && (!String.IsNullOrEmpty(extendedFunctionCode)) && (extendedFunctionCode.Length >= 10)) - { - bool isWeather = (extendedFunctionCode[0] == 'W'); - - if (isWeather) - { - sb.Append(extendedFunctionCode.Substring(0, 10)); - - switch (this.SymbolGeometry) - { - case GeometryType.Point: sb.Append("P--"); break; - case GeometryType.Polyline: sb.Append("-L-"); break; - case GeometryType.Polygon: sb.Append("--A"); break; - default: sb.Append("---"); break; - } - - sb.Append("--"); - } - else - { - sb.Append(extendedFunctionCode[0]); - if (String.IsNullOrEmpty(Identity)) - sb.Append('U'); - else - sb.Append(Identity); - - sb.Append(extendedFunctionCode[2]); - - if (String.IsNullOrEmpty(Status)) - sb.Append('P'); - else - sb.Append(Status); - - sb.Append(extendedFunctionCode.Substring(4, 6)); - - if (String.IsNullOrEmpty(Indicator)) - sb.Append('-'); - else - sb.Append(Indicator); - - if (String.IsNullOrEmpty(Echelon)) - sb.Append('-'); - else - sb.Append(Echelon); - - sb.Append("---"); - } - } - - return sb.ToString(); + return getSymbolIdCodeFromAttributes(); } - } + // WORKAROUND: 2525B/C includes Country Code in SIDC so need this here + public string CountryCodeForSIDC { get; set; } + public string ExtendedFunctionCode { get @@ -205,7 +154,7 @@ public string ExtendedFunctionCode set { _extendedFunctionCode = value; - NotifyPropertyChanged(() => LegacySymbolIdCode); + NotifyPropertyChanged(() => SymbolIdCode); } } @@ -267,6 +216,7 @@ public string SymbolSet { _symbolSet = value; NotifyPropertyChanged(() => SymbolSet); + NotifyPropertyChanged(() => SymbolIdCode); } } @@ -280,6 +230,7 @@ public string SymbolEntity { _symbolEntity = value; NotifyPropertyChanged(() => SymbolEntity); + NotifyPropertyChanged(() => SymbolIdCode); } } @@ -617,5 +568,142 @@ public DomainCodedValuePair SelectedModifier2DomainPair } #endregion + + private string getSymbolIdCodeFromAttributes() + { + // Build SIDC from the symbol attributes + System.Text.StringBuilder sb = new System.Text.StringBuilder(); + + if (ProSymbolUtilities.IsLegacyStandard()) + { + string extendedFunctionCode = ExtendedFunctionCode; + if ((ProSymbolUtilities.IsLegacyStandard()) + && (!String.IsNullOrEmpty(extendedFunctionCode)) && (extendedFunctionCode.Length >= 10)) + { + bool isWeather = (extendedFunctionCode[0] == 'W'); + + if (isWeather) + { + sb.Append(extendedFunctionCode.Substring(0, 10)); + + switch (this.SymbolGeometry) + { + case GeometryType.Point: sb.Append("P--"); break; + case GeometryType.Polyline: sb.Append("-L-"); break; + case GeometryType.Polygon: sb.Append("--A"); break; + default: sb.Append("---"); break; + } + + sb.Append("--"); + } + else + { + sb.Append(extendedFunctionCode[0]); + if (String.IsNullOrEmpty(Identity)) + sb.Append('U'); + else + sb.Append(Identity); + + sb.Append(extendedFunctionCode[2]); + + if (String.IsNullOrEmpty(Status)) + sb.Append('P'); + else + sb.Append(Status); + + sb.Append(extendedFunctionCode.Substring(4, 6)); + + if (String.IsNullOrEmpty(Indicator)) + sb.Append('-'); + else + sb.Append(Indicator); + + if (String.IsNullOrEmpty(Echelon)) + sb.Append('-'); + else + sb.Append(Echelon); + + if (String.IsNullOrEmpty(CountryCodeForSIDC) || + CountryCodeForSIDC.Length != 2) + sb.Append("--"); + else + sb.Append(CountryCodeForSIDC); + + sb.Append("-"); + } + } + } + else + { + // 2525D / APP6D + + // Version - 1, 2 + sb.Append("10"); + + // identity-context - 3 + if (string.IsNullOrEmpty(_context)) + sb.Append("0"); + else + sb.Append(_context); + + // identity-affiliation - 4 + if (string.IsNullOrEmpty(_identity)) + sb.Append("0"); + else + sb.Append(_identity); + + // symbolset - 5, 6 + if (string.IsNullOrEmpty(_symbolSet)) + sb.Append("00"); + else + sb.Append(ProSymbolUtilities.ZeroPadLeft(_symbolSet, 2)); + + // status/operational condition - 7 + if (string.IsNullOrEmpty(_status) && string.IsNullOrEmpty(_operationalCondition)) + sb.Append("0"); + else + { + if (!string.IsNullOrEmpty(_status)) + sb.Append(_status); + else + sb.Append(_operationalCondition); + } + + // HQ, TF, FD indicator - 8 + if (string.IsNullOrEmpty(_indicator)) + sb.Append("0"); + else + sb.Append(_indicator); + + // Echelon/Mobility 9, 10 + if (string.IsNullOrEmpty(_echelon) && string.IsNullOrEmpty(_mobility)) + sb.Append("00"); + else + { + if (!string.IsNullOrEmpty(_echelon)) + sb.Append(ProSymbolUtilities.ZeroPadLeft(_echelon, 2)); + else + sb.Append(ProSymbolUtilities.ZeroPadLeft(_mobility, 2)); + } + + if (string.IsNullOrEmpty(_symbolEntity)) + sb.Append("000000"); + else + sb.Append(ProSymbolUtilities.ZeroPadLeft(_symbolEntity, 6)); + + if (string.IsNullOrEmpty(_modifier1)) + sb.Append("00"); + else + sb.Append(ProSymbolUtilities.ZeroPadLeft(_modifier1, 2)); + + if (string.IsNullOrEmpty(_modifier2)) + sb.Append("00"); + else + sb.Append(ProSymbolUtilities.ZeroPadLeft(_modifier2, 2)); + } + + return sb.ToString(); + } + } } diff --git a/source/ProSymbolEditor/Models/SymbolAttributes/LabelAttributes.cs b/source/ProSymbolEditor/Models/SymbolAttributes/LabelAttributes.cs index 2b9ae35..e07b997 100644 --- a/source/ProSymbolEditor/Models/SymbolAttributes/LabelAttributes.cs +++ b/source/ProSymbolEditor/Models/SymbolAttributes/LabelAttributes.cs @@ -35,6 +35,7 @@ public class LabelAttributes : PropertyChangedBase private string _type; private string _commonidentifier; private short? _speed; + private short? _direction; private string _higherFormation; private string _reinforced; private DomainCodedValuePair _selectedReinforcedDomainPair; @@ -42,6 +43,8 @@ public class LabelAttributes : PropertyChangedBase private DomainCodedValuePair _selectedCredibilityDomainPair; private string _reliability; private DomainCodedValuePair _selectedReliabilityDomainPair; + private string _signatureEquipment; + private DomainCodedValuePair _selectedSignatureEquipmentDomainPair; private string _countryCode; private DomainCodedValuePair _selectedCountryCodeDomainPair; private string lengthError = "The label entered is at the maximum allowable length for this feature field"; @@ -117,6 +120,7 @@ public override int GetHashCode() hashcode = (hashcode * PRIME) ^ (_type != null ? _type.GetHashCode() : 0); hashcode = (hashcode * PRIME) ^ (_commonidentifier != null ? _commonidentifier.GetHashCode() : 0); hashcode = (hashcode * PRIME) ^ (_speed != null ? _speed.GetHashCode() : 0); + hashcode = (hashcode * PRIME) ^ (_direction != null ? _direction.GetHashCode() : 0); hashcode = (hashcode * PRIME) ^ (_higherFormation != null ? _higherFormation.GetHashCode() : 0); hashcode = (hashcode * PRIME) ^ (_reinforced != null ? _reinforced.GetHashCode() : 0); hashcode = (hashcode * PRIME) ^ (_credibility != null ? _credibility.GetHashCode() : 0); @@ -259,6 +263,19 @@ public short? Speed } } + public short? Direction + { + get + { + return _direction; + } + set + { + _direction = value; + NotifyPropertyChanged(() => Direction); + } + } + public string HigherFormation { get @@ -382,6 +399,43 @@ public DomainCodedValuePair SelectedReliabilityDomainPair } } + public string SignatureEquipment + { + get + { + return _signatureEquipment; + } + set + { + _signatureEquipment = value; + NotifyPropertyChanged(() => SignatureEquipment); + } + } + + [ScriptIgnore, Browsable(false)] + public DomainCodedValuePair SelectedSignatureEquipmentDomainPair + { + get + { + return _selectedSignatureEquipmentDomainPair; + } + set + { + _selectedSignatureEquipmentDomainPair = value; + if (_selectedSignatureEquipmentDomainPair != null) + { + SignatureEquipment = _selectedSignatureEquipmentDomainPair.Code.ToString(); + } + else + { + SignatureEquipment = ""; + } + NotifyPropertyChanged(() => SelectedSignatureEquipmentDomainPair); + } + } + + public string CountryLabel { get; set; } + public string CountryCode { get @@ -408,10 +462,12 @@ public DomainCodedValuePair SelectedCountryCodeDomainPair if (_selectedCountryCodeDomainPair != null) { CountryCode = _selectedCountryCodeDomainPair.Code.ToString(); + CountryLabel = _selectedCountryCodeDomainPair.Name; } else { CountryCode = ""; + CountryLabel = ""; } NotifyPropertyChanged(() => SelectedCountryCodeDomainPair); } diff --git a/source/ProSymbolEditor/Models/SymbolAttributes/SymbolAttributeSet.cs b/source/ProSymbolEditor/Models/SymbolAttributes/SymbolAttributeSet.cs index 7e572b3..61ab6a9 100644 --- a/source/ProSymbolEditor/Models/SymbolAttributes/SymbolAttributeSet.cs +++ b/source/ProSymbolEditor/Models/SymbolAttributes/SymbolAttributeSet.cs @@ -85,7 +85,6 @@ public Dictionary AttributesDictionary { get { - Dictionary dict = new Dictionary(); dict.Add("SymbolType", this.Name); @@ -93,6 +92,11 @@ public Dictionary AttributesDictionary foreach (var prop in DisplayAttributes.GetType().GetProperties()) { string key = prop.Name; + + // WORKAROUND: Skip this property + if (key == "CountryCodeForSIDC") + continue; + object value = prop.GetValue(DisplayAttributes, null); if (value == null) continue; @@ -305,7 +309,7 @@ public async void GeneratePreviewSymbol() // WORKAROUND: Pro 2.3 broke exporting METOC by attribute "extendedfunctioncode" // so have to set "sidc" attribute instead if (ProSymbolUtilities.IsNewStyleFormat && attributeSet.ContainsKey("extendedfunctioncode")) - attributeSet.Add("sidc", DisplayAttributes.LegacySymbolIdCode); + attributeSet.Add("sidc", DisplayAttributes.SymbolIdCode); // METOC do not have identity/affiliation so have 1 less attribute minimumAttributeCount--; @@ -597,6 +601,12 @@ public void PopulateRowBufferWithAttributes(ref RowBuffer rowBuffer) rowBuffer["speed"] = LabelAttributes.Speed; } + if (LabelAttributes.Direction != null) + { + //Short + rowBuffer["direction"] = LabelAttributes.Direction; + } + if (!string.IsNullOrEmpty(LabelAttributes.HigherFormation)) { rowBuffer["higherFormation"] = LabelAttributes.HigherFormation; @@ -620,11 +630,21 @@ public void PopulateRowBufferWithAttributes(ref RowBuffer rowBuffer) rowBuffer["reliability"] = LabelAttributes.Reliability; } + if (!string.IsNullOrEmpty(LabelAttributes.SignatureEquipment) && + (LabelAttributes.SignatureEquipment != ProSymbolUtilities.NullFieldValueFlag)) + { + rowBuffer["signatureequipment"] = LabelAttributes.SignatureEquipment; + } + if (!string.IsNullOrEmpty(LabelAttributes.CountryCode) && (LabelAttributes.CountryCode != ProSymbolUtilities.NullFieldValueFlag)) { rowBuffer["countrycode"] = LabelAttributes.CountryCode; + + if (rowBuffer.FindField("countrylabel") >= 0) // does not exist in all versions of the database + rowBuffer["countrylabel"] = LabelAttributes.CountryLabel; } + } public void PopulateFeatureWithAttributes(ref Feature feature) @@ -816,6 +836,9 @@ public void PopulateFeatureWithAttributes(ref Feature feature) if (feature.FindField("speed") >= 0) feature["speed"] = LabelAttributes.Speed; + if (feature.FindField("direction") >= 0) + feature["direction"] = LabelAttributes.Direction; + if (feature.FindField("higherFormation") >= 0) feature["higherFormation"] = LabelAttributes.HigherFormation; @@ -846,6 +869,15 @@ public void PopulateFeatureWithAttributes(ref Feature feature) feature["reliability"] = LabelAttributes.Reliability; } + if (!string.IsNullOrEmpty(LabelAttributes.SignatureEquipment) && + (feature.FindField("signatureequipment") >= 0)) + { + if (LabelAttributes.SignatureEquipment == ProSymbolUtilities.NullFieldValueFlag) + feature["signatureequipment"] = null; + else + feature["signatureequipment"] = LabelAttributes.SignatureEquipment; + } + if (!string.IsNullOrEmpty(LabelAttributes.CountryCode) && (feature.FindField("countrycode") >= 0)) { @@ -854,6 +886,13 @@ public void PopulateFeatureWithAttributes(ref Feature feature) else feature["countrycode"] = LabelAttributes.CountryCode; } + + if (!string.IsNullOrEmpty(LabelAttributes.CountryLabel) && + (feature.FindField("countrylabel") >= 0)) + { + feature["countrylabel"] = LabelAttributes.CountryLabel; + } + } private void SetPropertiesFromFieldAttributes(Dictionary fieldValues) @@ -988,6 +1027,11 @@ private void SetPropertiesFromFieldAttributes(Dictionary fieldVa LabelAttributes.Speed = short.Parse(fieldValues["speed"]); } + if (fieldValues.ContainsKey("direction")) + { + LabelAttributes.Direction = short.Parse(fieldValues["direction"]); + } + if (fieldValues.ContainsKey("higherFormation")) { LabelAttributes.HigherFormation = fieldValues["higherFormation"]; @@ -1008,6 +1052,11 @@ private void SetPropertiesFromFieldAttributes(Dictionary fieldVa LabelAttributes.Reliability = fieldValues["reliability"]; } + if (fieldValues.ContainsKey("signatureequipment")) + { + LabelAttributes.SignatureEquipment = fieldValues["signatureequipment"]; + } + if (fieldValues.ContainsKey("countrycode")) { LabelAttributes.CountryCode = fieldValues["countrycode"]; @@ -1036,6 +1085,7 @@ public void ResetAttributes() DisplayAttributes.Context = ""; DisplayAttributes.Modifier1 = ""; DisplayAttributes.Modifier2 = ""; + DisplayAttributes.CountryCodeForSIDC = ""; //Reset label text attributes LabelAttributes.DateTimeValid = null; @@ -1046,11 +1096,14 @@ public void ResetAttributes() LabelAttributes.Type = ""; LabelAttributes.CommonIdentifier = ""; LabelAttributes.Speed = null; + LabelAttributes.Direction = null; LabelAttributes.HigherFormation = ""; LabelAttributes.Reinforced = ""; LabelAttributes.Credibility = null; LabelAttributes.Reliability = ""; + LabelAttributes.SignatureEquipment = ""; LabelAttributes.CountryCode = ""; + LabelAttributes.CountryLabel = ""; SymbolTags = ""; @@ -1079,6 +1132,10 @@ private void LabelAttributes_PropertyChanged(object sender, PropertyChangedEvent // Tell the proprties datagrids to get the updated info NotifyPropertyChanged(() => Name); NotifyPropertyChanged(() => AttributesDictionary); + + // WORKAROUND: 2525B/C includes Country Code in SIDC so need this here + if (e.PropertyName == "CountryCode") + DisplayAttributes.CountryCodeForSIDC = LabelAttributes.CountryCode; } } } diff --git a/source/ProSymbolEditor/Utilities/ProSymbolUtilities.cs b/source/ProSymbolEditor/Utilities/ProSymbolUtilities.cs index 7f24ddc..0472b4d 100644 --- a/source/ProSymbolEditor/Utilities/ProSymbolUtilities.cs +++ b/source/ProSymbolEditor/Utilities/ProSymbolUtilities.cs @@ -64,8 +64,8 @@ public static string GetStandardLabel(SupportedStandardsType standardIn) { case SupportedStandardsType.app6b: standardLabel = "APP-6(B)"; break; case SupportedStandardsType.app6d: standardLabel = "APP-6(D)"; break; - case SupportedStandardsType.mil2525c : standardLabel = "MIL-STD-2525C"; break; - case SupportedStandardsType.mil2525b : standardLabel = "MIL-STD-2525B w/ Change 2"; break; + case SupportedStandardsType.mil2525c: standardLabel = "MIL-STD-2525C"; break; + case SupportedStandardsType.mil2525b: standardLabel = "MIL-STD-2525B w/ Change 2"; break; default: break; } @@ -109,16 +109,16 @@ public static SupportedStandardsType GetStandardFromLabel(string standardString) return SupportedStandardsType.mil2525d; else if (standardString == GetStandardLabel(SupportedStandardsType.app6d)) - return SupportedStandardsType.app6d; + return SupportedStandardsType.app6d; else if (standardString == GetStandardLabel(SupportedStandardsType.mil2525c)) - return SupportedStandardsType.mil2525c; + return SupportedStandardsType.mil2525c; else if (standardString == GetStandardLabel(SupportedStandardsType.mil2525b)) - return SupportedStandardsType.mil2525b; + return SupportedStandardsType.mil2525b; else if (standardString == GetStandardLabel(SupportedStandardsType.app6b)) - return SupportedStandardsType.app6b; + return SupportedStandardsType.app6b; else { System.Diagnostics.Trace.WriteLine("Warning - GetStandardFromLabel unrecognized standard string: " + standardString); @@ -194,10 +194,10 @@ public static string GetLayerFileFromCurrentStandard() string layerFileStandard = "2525BChange2"; // this name format is slightly different if (ProSymbolUtilities.Standard != SupportedStandardsType.mil2525b) layerFileStandard = ProSymbolUtilities.StandardString; - - string layerFileName = "MilitaryOverlay-" + layerFileStandard + ".lpkx"; - string layerFilePath = System.IO.Path.Combine(ProSymbolUtilities.AddinAssemblyLocation(), + string layerFileName = "MilitaryOverlay-" + layerFileStandard + ".lpkx"; + + string layerFilePath = System.IO.Path.Combine(ProSymbolUtilities.AddinAssemblyLocation(), "LayerFiles", layerFileName); return layerFilePath; @@ -277,7 +277,7 @@ public static bool IsNewStyleFormat public static string NullFieldValueFlag { - get { return ""; } + get { return ""; } } public static CoordinateType GetCoordinateType(string input, out MapPoint point) @@ -452,7 +452,7 @@ public static bool ExecuteBuiltinCommand(string commandId) public static void SaveProject() { // Note: Must be called on Main/UI Thread - ArcGIS.Desktop.Framework.FrameworkApplication.Current.Dispatcher.Invoke(async() => + ArcGIS.Desktop.Framework.FrameworkApplication.Current.Dispatcher.Invoke(async () => { bool success = await ArcGIS.Desktop.Core.Project.Current.SaveAsync(); }); @@ -562,7 +562,7 @@ public static ArcGIS.Core.CIM.CIMDictionaryRenderer CreateDictionaryRenderer() foreach (KeyValuePair pair in fieldMapDictionary) { stringMap[count] = new ArcGIS.Core.CIM.CIMStringMap(); - stringMap[count].Key = pair.Key; + stringMap[count].Key = pair.Key; stringMap[count].Value = pair.Value; count++; } @@ -601,6 +601,64 @@ public static string BrowseItem(string itemFilter, string initialPath = "") return itemPath; } - + + public static bool IsSIDC(string checkString) + { + if (string.IsNullOrEmpty(checkString)) + return false; + + bool isSIDC = false; + bool isLegacy = IsLegacyStandard(); + + if (isLegacy && checkString.Length == 15) + { + string checkStringUpper = checkString.ToUpper(); + const string validSIDCExpression = @"^[SGWIOE][PUAFNSHGWMDLJKO\-][PAGSUFXTMOEVLIRNZ\-][APCDXF\-][A-Z0-9\-\*]{6}[A-Z\-\*]{2}[A-Z\-\*]{2}[AECGNSX\-\*]$"; + if (System.Text.RegularExpressions.Regex.IsMatch(checkStringUpper, validSIDCExpression)) + isSIDC = true; + } + else if (checkString.Length == 20) + { + // is it a 20 digit number? Then assume 2525D or later SIDC + UInt64 result; + if (UInt64.TryParse(checkString, out result)) + isSIDC = true; + } + + return isSIDC; + } + + public static string GetSearchStringFromSIDC(string sidc) + { + string searchString = string.Empty; + + // validate length + if (!IsSIDC(sidc)) + return searchString; + + string sidcUpper = sidc.ToUpper(); + + if (IsLegacyStandard()) + searchString = sidcUpper.Substring(4, 6); // Function Code + else + searchString = sidcUpper.Substring(4, 2) + sidcUpper.Substring(10, 6); // Symbol Set + Entity + + return searchString; + } + + public static string ZeroPadLeft(string original, int requiredLength) + { + if (string.IsNullOrEmpty(original)) + return string.Empty.PadLeft(requiredLength, '0'); + + string zeroPaddedString; + if (original.Length < requiredLength) + zeroPaddedString = original.PadLeft(requiredLength, '0'); + else + zeroPaddedString = original; + + return zeroPaddedString; + } + } } diff --git a/source/ProSymbolEditor/ViewModels/MilitarySymbolDockpaneViewModel.cs b/source/ProSymbolEditor/ViewModels/MilitarySymbolDockpaneViewModel.cs index ff1112a..156ec63 100644 --- a/source/ProSymbolEditor/ViewModels/MilitarySymbolDockpaneViewModel.cs +++ b/source/ProSymbolEditor/ViewModels/MilitarySymbolDockpaneViewModel.cs @@ -332,6 +332,7 @@ protected MilitarySymbolDockpaneViewModel() BindingOperations.EnableCollectionSynchronization(MilitaryFieldsInspectorModel.ReinforcedDomainValues, _lock); BindingOperations.EnableCollectionSynchronization(MilitaryFieldsInspectorModel.ReliabilityDomainValues, _lock); BindingOperations.EnableCollectionSynchronization(MilitaryFieldsInspectorModel.CredibilityDomainValues, _lock); + BindingOperations.EnableCollectionSynchronization(MilitaryFieldsInspectorModel.SignatureEquipmentDomainValues, _lock); BindingOperations.EnableCollectionSynchronization(MilitaryFieldsInspectorModel.CountryCodeDomainValues, _lock); BindingOperations.EnableCollectionSynchronization(MilitaryFieldsInspectorModel.ExtendedFunctionCodeValues, _lock); BindingOperations.EnableCollectionSynchronization(MilitaryFieldsInspectorModel.EntityCodeValues, _lock); @@ -462,8 +463,9 @@ public string SearchString NotifyPropertyChanged(() => SearchString); - if (_searchString.Length > 0) + if (!string.IsNullOrEmpty(_searchString)) { + _searchString = _searchString.Trim(); SearchStylesAsync(null); } else @@ -1424,6 +1426,15 @@ private async void SearchStylesAsync(object parameter) _progressDialogSearch.Show(); await SearchSymbols(); + if ((_styleItems.Count == 0) && ProSymbolUtilities.IsSIDC(_searchString)) + { + // If nothing found, but search text matches SIDC format, then do the search again + // with the search string set to the subset of the SIDC that each style item contains + _searchString = ProSymbolUtilities.GetSearchStringFromSIDC(_searchString); + await SearchSymbols(); + } + + StatusMessage = "Search Complete"; NotifyPropertyChanged(() => StyleItems); @@ -1828,6 +1839,7 @@ private void LoadSymbolIntoWorkflow(bool isEditSymbol) SymbolAttributeSet.LabelAttributes.Type = loadSet.LabelAttributes.Type; SymbolAttributeSet.LabelAttributes.CommonIdentifier = loadSet.LabelAttributes.CommonIdentifier; SymbolAttributeSet.LabelAttributes.Speed = loadSet.LabelAttributes.Speed; + SymbolAttributeSet.LabelAttributes.Direction = loadSet.LabelAttributes.Direction; SymbolAttributeSet.LabelAttributes.UniqueDesignation = loadSet.LabelAttributes.UniqueDesignation; SymbolAttributeSet.LabelAttributes.StaffComments = loadSet.LabelAttributes.StaffComments; SymbolAttributeSet.LabelAttributes.AdditionalInformation = loadSet.LabelAttributes.AdditionalInformation; @@ -1910,6 +1922,12 @@ private void DeleteFavoriteSymbol(object parameter) var favoritesJson = new JavaScriptSerializer().Serialize(Favorites); File.WriteAllText(_favoritesFilePath, favoritesJson); } + + SelectedFavoriteSymbol = null; + IsStyleItemSelected = false; + if (AddToMapToolEnabled) + FrameworkApplication.SetCurrentToolAsync("esri_mapping_exploreTool"); // select another tool to disable add to map tool + } private async void CreateTemplateFromFavorite(object parameter) @@ -2577,7 +2595,11 @@ await ArcGIS.Desktop.Framework.Threading.Tasks.QueuedTask.Run(() => SymbolAttributeSet.LabelAttributes.SelectedReliabilityDomainPair = MilitaryFieldsInspectorModel.ReliabilityDomainValues.FirstOrDefault(pair => pair.Code.ToString() == loadSet.LabelAttributes.Reliability); - if (loadSet.LabelAttributes.SelectedCountryCodeDomainPair != null) + if (loadSet.LabelAttributes.SignatureEquipment != null) + SymbolAttributeSet.LabelAttributes.SelectedSignatureEquipmentDomainPair = + MilitaryFieldsInspectorModel.SignatureEquipmentDomainValues.FirstOrDefault(pair => pair.Code.ToString() == loadSet.LabelAttributes.SignatureEquipment); + + if (loadSet.LabelAttributes.CountryCode != null) SymbolAttributeSet.LabelAttributes.SelectedCountryCodeDomainPair = MilitaryFieldsInspectorModel.CountryCodeDomainValues.FirstOrDefault(pair => pair.Code.ToString() == loadSet.LabelAttributes.CountryCode); } diff --git a/source/ProSymbolEditor/Views/CoordinateView.xaml b/source/ProSymbolEditor/Views/CoordinateView.xaml index 1c0d7f5..d5803a8 100644 --- a/source/ProSymbolEditor/Views/CoordinateView.xaml +++ b/source/ProSymbolEditor/Views/CoordinateView.xaml @@ -114,12 +114,18 @@ ItemsSource="{Binding SymbolAttributeSet.AttributesDictionary}" Style="{DynamicResource Esri_DataGridStyle}" HeadersVisibility="Column" - RowHeaderWidth="0" > + RowHeaderWidth="0" + SelectionUnit="FullRow" ClipboardCopyMode="ExcludeHeader" > + + + + + diff --git a/source/ProSymbolEditor/Views/FavoritesView.xaml b/source/ProSymbolEditor/Views/FavoritesView.xaml index 8db1877..2eb0e15 100644 --- a/source/ProSymbolEditor/Views/FavoritesView.xaml +++ b/source/ProSymbolEditor/Views/FavoritesView.xaml @@ -286,6 +286,7 @@ BorderThickness="0.5" Command="{Binding ActivateAddToMapToolCommand}" Content="Add to Map" + IsEnabled="{Binding IsFavoriteItemSelected}" IsChecked="{Binding AddToMapToolEnabled}" ToolTip="Add to Map" Visibility="{Binding Path=IsAddingNew, Converter={StaticResource BoolToVis}}"> @@ -299,6 +300,7 @@ Margin="0,0,-10,10" HorizontalAlignment="Right" Command="{Binding GoToTabCommand}" + IsEnabled="{Binding IsFavoriteItemSelected}" CommandParameter="2" Style="{DynamicResource Esri_ButtonBackSmall}" ToolTip="Go to Symbol Tab"> diff --git a/source/ProSymbolEditor/Views/LabelView.xaml b/source/ProSymbolEditor/Views/LabelView.xaml index 52d6fe2..615532f 100644 --- a/source/ProSymbolEditor/Views/LabelView.xaml +++ b/source/ProSymbolEditor/Views/LabelView.xaml @@ -35,20 +35,23 @@ + + + + - - +