Merge pull request #333 from Esri/dev

June 2018 Release

.gitignore

@@ -13,6 +13,7 @@ arc.dir
 *.original
 *.mdb
 *.sav
+*.gdb
 
 #############
 ## Python

README.md

@@ -6,6 +6,7 @@ An ArcGIS for Defense repository for managing data and tools used in ArcGIS Mili
 
 ## Sections
 
+* [Releasability](#releasability)
 * [Features](#features)
 * [Requirements](#requirements)
 * [Instructions](#instructions)
@@ -17,6 +18,13 @@ An ArcGIS for Defense repository for managing data and tools used in ArcGIS Mili
 * [Acknowledgments](#acknowledgments)
 * [Licensing](#licensing)
 
+## Releasability
+
+* MIL-STD-2525: Approved for public release, distribution is unlimited.
+* APP-6:
+  * APP-6(D): Unmarked, denoting that it is approved for public release and unlimited distribution.
+  * Previous Versions: As of promulgation of APP-6(D)(1), the classification markings on all previous editions are invalid and no longer applicable.
+
 ## Features
 
 * Solutions targeting Military Symbology in ArcGIS users:
@@ -32,6 +40,9 @@ An ArcGIS for Defense repository for managing data and tools used in ArcGIS Mili
     * MIL-STD-2525D (June, 2014)
     * MIL-STD-2525C (November, 2008)
     * MIL-STD-2525B Change 2 (March, 2007)
+* Support APP-6 Military Symbology:
+    * APP-6(B) (June 2008)
+    * APP-6(D) (Version 1, Study Draft 2, June 2016)
 
 ## Requirements
 
@@ -40,13 +51,12 @@ Each solution has the following ArcGIS requirements:
 * Military Features
     * ArcGIS Desktop 10.3.1+
 * Military Overlay
-    * ArcGIS Pro 1.4+ 
-    * ArcGIS Server 10.5+
-* Military Symbology Styles `*`
-    * ArcGIS Pro 1.4+ 
-    * ArcGIS Runtime 100.0+ 
-    * ArcGIS Server 10.5+
-    * `*` Note: these styles are installed with these products and maintained here
+    * ArcGIS Pro 2.1+ 
+    * ArcGIS Server 10.6+
+* Military Symbology Styles 
+    * ArcGIS Pro 2.1+ 
+    * ArcGIS Runtime 100.2+ 
+    * ArcGIS Server 10.6+
 
 ## Instructions
 
@@ -88,8 +98,8 @@ The following table lists the versions of the standard supported by each solutio
 |Product||Standard||
 |---|---|---|---|
 ||2525D|2525C|2525Bc2|
-|Pro 1.4+/Server 10.5+|Military Overlay| Military Overlay `*` |Military Overlay|
-|Runtime 100.0+|Military Symbology Styles|Military Symbology Styles|Military Symbology Styles|
+|Pro 2.1+/Server 10.6+|Military Overlay| Military Overlay `*` |Military Overlay|
+|Runtime 100.2+|Military Symbology Styles|Military Symbology Styles|Military Symbology Styles|
 |ArcGIS Desktop/Engine 10.3.1+||Military Features||MyMiscellanea
 
 `*` Note The 2525C Military Overlay is not released with the solution download but is available in this repo
@@ -100,9 +110,11 @@ The following table lists the versions of the standard supported by each solutio
 * [ArcGIS for Defense Downloads](http://appsforms.esri.com/products/download/#ArcGIS_for_Defense)
 * Learn more about Esri's Solutions [Focused Maps and Apps for Your Organization](http://solutions.arcgis.com/)
 * The Official Military Standard Documents
-    * [MIL-STD-2525D (June, 2014)](http://www.dtic.mil/doctrine/doctrine/other/ms_2525d.pdf)
-    * [MIL-STD-2525C (November, 2008)](http://www.dtic.mil/doctrine/doctrine/other/ms_2525c.pdf)
+    * MIL-STD-2525D (June, 2014)
+    * MIL-STD-2525C (November, 2008)
     * MIL-STD-2525B Change 2 (March, 2007) 
+    * APP-6(B) (June 2008)
+    * APP-6(D) (Version 1, Study Draft 2, June 2016)
 
 ### Supported Solutions Using this Data
 
@@ -134,7 +146,7 @@ This repository reuses software from:
 
 ## Licensing
 
-Copyright 2013-2017 Esri
+Copyright 2013-2018 Esri
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

military-overlay/app6d/README.md

@@ -0,0 +1,83 @@
+# app6d schema
+=========================================
+
+# Purpose 
+
+This folder contains the Military Features Core Geodatabase Schema format and an empty geodatabase (in .zip format) and layer packages conforming to the current Military Features schema. 
+
+## Schema Information
+
+The following information is intended to capture the format of the Military Overlay Schema for other applications that may depend upon this format. 
+
+## Graphic Display Amplifiers
+
+The following fields control the display of symbols.
+
+| Attribute Name | 2525 D Field ID | Data Type | Range of Values | Default Value/Meaning | Sample Name | Sample Value/Meaning | Explanatory Notes |
+| -------------- | --------- | --------- | --------------- | ----------- | -------------------- | ----------------- | ----------------- |
+| symbolset | A/E/AC | short int | 00-99  | (per feature class) | "Air" | 01 ("air") | **REQUIRED** | 
+| entity  | A | long int | N/A | (per feature class) | "Military (Air) : Fixed-Wing" | "110100"  | **REQUIRED** |
+| modifier1 | A | long int | 00-99 | 00 (None) | "Mobility : Air Mobile/Air Assault" | Modifier "01" for Modifier 1 | Optional |
+| modifier2 | A | long int | 00-99 | 00 (None)  | "Close Range and Support : Casualty Staging" | Modifier "05" for Modifier 2 | Optional |
+| echelon | B | long int | 0-26 | 0 (None) | Squad  | Squad=12 | Optional |
+| indicator | D/S/AB | long int | 0-7 | 0 (None) | Headquarters | Headquarters=2 | Optional (="HQ/TF/FD") |
+| identity | E | long int | 0-9 | 1 (Unknown) | "Friend" | 3 ("friend") | **REQUIRED** |
+| context  | E | short int | 0-2 | 0 (Reality) | "Reality" | 0 ("reality") | Optional |
+| mobility | R | long int | 0,31-52 (None) | 0 | Rail  | Rail=36 |  Optional |
+| array | AG | long int | 0,61-62 | 0 (None) | Short Towed Array | Short Towed Array=61 | Optional |
+| operationalcondition | AL | long int | 0-5 | 0 (Present) | Planned | Planned=1 | Optional |
+| sidc | | string/TEXT | string length(8 or 20) | N/A | "01100110" | SymbolSet:"Air"/"01" + Entity:"100110" | Optional-allows len=20 or len=8(identity=unknown) SIDC format |
+
+## Text Amplifiers
+
+The following table lists the Modifier definitions from 2525D and their corresponding attributes in the symbol dictionary.
+
+| Attribute Name | 2525 D Field ID | Field Title | Notes |
+| ------------- | --- | ----------------- | ----- |
+| quantity | C | Quantity | |
+| reinforced | F | Reinforced or Reduced | |
+| staffcomment | G | Staff Comments | |
+| additionalinformation | H | Additional Information | |
+| additionalinformation2 | H1 | Additional Information 2 | Used in the Convoys and Airspace Coordination Area tactical graphics. |
+| credibility | J | Evaluation Rating | Credibility rating is second character of Evaluation Rating (J) field. |
+| reliability | J1 | Evaluation Rating | Reliability rating is first character of Evaluation Rating (J) field. |
+| combateffectiveness | K | Combat Effectiveness | |
+| signatureequipment | L | Signature Equipment | |
+| higherformation | M | Higher Formation | |
+| hostile | N | Hostile | |
+| idmode | P | IFF/SIF/AIS | |
+| direction | Q | Direction of Movement Indicator | |
+| sigintmobility | R2 | SIGINT Mobility Indicator | |
+| uniquedesignation | T | Unique Designation | |
+| uniquedesignation2 | T1 | Unique Designation 2 | Used as an additional field for Fire Support Lines tactical graphics. |
+| type | V | Type | |
+| datetimevalid | W | Date-Time Group (DTG) | First half of Date-Time Group (DTG) (W) field. |
+| datetimeexpired | W1 | Date-Time Group (DTG) | Second half of Date-Time Group (DTG) (W) field. Many systems use W1 as a trigger to delete symbol from map. |
+| z | X | Altitude/Depth | Maximum altitude for aviation tactical graphics. |
+| z2 | X1 | Altitude/Depth 2 | Minimum altitude for aviation tactical graphics. |
+| x | Y | Location | Longitude in degrees. |
+| x2 | Y1 | Location | Longitude in degrees 2. |
+| y | Y | Location | Latitude in degrees. |
+| y2 | Y1 | Location | Latitude in degrees 2. |
+| speed | Z | Speed | |
+| specialheadquarters | AA | Special C2 Headquarters | |
+| platformtype | AD | Platform Type | |
+| equipmentteardowntime | AE | Equipment Teardown Time | |
+| commonidentifier | AF | Common Identifier | |
+| distance | AM | Distance | |
+| distance2 | AM1 | Distance 2 | |
+| azimuth | AN | Azimuth | |
+| targetdesignator | AP | Target Designator |
+| guardedunit | AQ | Guarded Unit | |
+| specialdesignator | AR | Special Designator | |
+| country | AS | Country Code | |
+
+## Other/Special Cases
+
+| Attribute Name | 2525 D Field ID | Field Title | Notes |
+| ------------- | --- | ----------------- | ----- |
+| radius | AM | Distance | For special polygon symbols defined by attributes |
+| length | AM1 | Length | For special polygon symbols defined by attributes |
+| width | AM | Width | For special polygon symbols defined by attributes |
+| orientation | AN | Azimuth/Attitude | For special polygon symbols defined by attributes |
+

military-overlay/app6d/geodatabase/.gitignore

@@ -0,0 +1,3 @@
+# Ignore so the GDB can be unzipped and inspected here
+
+*.gdb

military-overlay/mil2525b2/geodatabase/.gitignore

@@ -0,0 +1,3 @@
+# Ignore so the GDB can be unzipped and inspected here
+
+*.gdb

military-overlay/mil2525c/geodatabase/.gitignore

@@ -0,0 +1,3 @@
+# Ignore so the GDB can be unzipped and inspected here
+
+*.gdb

military-overlay/mil2525d/geodatabase/.gitignore

@@ -0,0 +1,3 @@
+# Ignore so the GDB can be unzipped and inspected here
+
+*.gdb

military-overlay/utils-source-and-test-data/comprehensive-test-generation/README.md

@@ -0,0 +1,51 @@
+# military-overlay / utils-and-source-data / comprehensive-test-generation
+==========================
+
+# Purpose 
+
+The steps in this folder are used to create comprehensive (one symbol of each desired type) test datasets for military symbol data.
+
+# General Instructions 
+
+## Source Data, Scripts, Models for Creating Comprehensive Test Datasets
+
+* The source or "truth data" is tabular data (in a .csv file) containing verified information about symbols from the standard: symbol code, name, etc. This data is located in the repo at:
+    * [mil2525d](../../../military-symbology-styles/test-data/mil2525d/truth-data)
+    * [mil2525c](../../../military-symbology-styles/test-data/mil2525c/truth-data)
+    * [mil2525b2](../../../military-symbology-styles/test-data/mil2525b2/truth-data)
+    * [app6b](../../../military-symbology-styles/test-data/app6b/truth-data)
+* This [link](../pairwise-test-generation/Complete_test_scripts) will take you to the location of a script and a model that automates the manual process outlined below. 
+
+## Steps to create a Comprehensive Test Dataset (Manual)
+
+This is the manual workflow for test dataset creation for MIL-STD-2525 Projects (This workflow is the same for D, C, BC2 and App6 symbol sets).
+
+1. Open Microsoft Excel.
+2. Open a Master Excel file, containing information about all of the symbols in a particular version of the standard.
+3. Create a filter on Appendix, Affiliation, and Geometry.
+4. Sort on each field in the order above.
+5. Copy the results to a new tab in Excel.
+6. Rename the Count field to OID.
+7. In the OID field, create a sequential number for the first 3 records, then drag your cursor down, this will autopopulate the field (Ex. 1, 2, 3, ...)
+8. Save this as document as a .csv.
+9. Repeat steps until all desired appendices have been derived.
+10. Open ArcGIS Pro and create a new map.
+11. Add the csv files to the project using "add data." The tables will be added to your contents pane"
+12. Under Analysis, search for the Create Fishnet GP tool. 
+	* The output feature class will be the feature class you want to create for a particular appendix.
+	* Change the template extent to "Current Display"
+	* Use the attached spreadsheet for the appendix you want to test to figure out the number of rows and columns.
+		For example, if there are 100 symbols in an appendix, you could create a fishnet with 10 rows and 10 columns. 
+	* Select "Create Label Points"
+13. Run the Create Fishnet tool.
+	* the only output that is pertinent to this workflow are the label points.
+14. Join the .csv of your desired appendix to the Fishnet output.
+	* right-click on the Fishnet output and "Add Join"
+	* The input and output join fields will both be OID
+	* The join table will be the corresponding appendix .csv.
+	* Run to execute tool and check to make sure that all of the .csv fields were properly joined to the fishnet points.
+15. Use the Copy Features tool to create a new feature class from the join output. This will ensure that the attributes are editable in the future. 
+	* Right click the feature layer and select "Data, Export Features."
+16. Symbolize the points using the dictionary renderer
+	* Under the symbology pane for the fishnet feature layer, select your desired dictionary renderer and ensure the fields are properly matched up.
+17. Share/package the resulting dataset.

military-overlay/utils-source-and-test-data/layer-package-utilities/README.md

@@ -0,0 +1,21 @@
+### Tools for creating Pro Layer Packages (lpkx)
+
+These steps/tools are used to create a Schema-Only layer package for Military Overlay. 
+
+A layer package is a file that includes the layer properties (ex. drawing settings, renderer, etc.) and data. A schema-only layer package has an empty geodatabase (no data entries).
+
+To create the layer packages:
+
+1. Download the latest version of the Military Overlay solution: http://solutions.arcgis.com/defense/help/military-overlay/
+2. Create a Pro project, this will have 2 maps, one for each standard
+3. For each map/standard share the Military Overlay layer as a schema-only layer package after performing the workaround below.
+
+**Spatial Index Layer Packaging Workaround**
+
+There is currently a workaround to address an error "Spatial Index Invalid" (See: https://github.com/Esri/military-features-data/issues/287 )
+
+Run the following tools from the LayerPackageUtilities toolbox on each geodatabase being packaged. These tools/models should be run immediately before packaging the (schema only) Military Overlay Layer Packages in ArcGIS Pro:
+
+1. Delete All Features From Workspace
+2. Remove Spatial Index 
+    a. This is a model that will add a blank spatial index to a layer package

military-overlay/utils-source-and-test-data/pairwise-source-data/mil2525b2/extendedfunctioncodesBc2/ExtendedFunctionCodeActivities.csv

@@ -0,0 +1 @@
+OFIP------,OFIPD-----,OFIPF-----,OFIPG-----,OFIPI-----,OFIPR-----,OFIPS-----,OFIPV-----,OFLP------,OFLPB-----,OFLPG-----,OFLPM-----,OFLPW-----,OFOP------,OFOPA-----,OFOPD-----,OFOPE-----,OFOPF-----,OFOPH-----,OFOPHA----,OFOPHT----,OFOPHV----,OFOPK-----,OFOPM-----,OFOPO-----,OFOPP-----,OFOPR-----,OFOPRC----,OFOPRW----,OFOPS-----,OFOPU-----,OFOPY-----,OFOPYH----,OFOPYT----,OFOPYW----,OFVP------,OFVPA-----,OFVPB-----,OFVPD-----,OFVPM-----,OFVPMA----,OFVPMB----,OFVPMC----,OFVPP-----,OFVPS-----,OFVPY-----,OHVPEI----,OHPPF-----

military-overlay/utils-source-and-test-data/pairwise-source-data/mil2525b2/extendedfunctioncodesBc2/ExtendedFunctionCodeSIGINT.csv

@@ -0,0 +1 @@
+IFAP------,IFAPS-----,IFAPSC----,IFAPSCC---,IFAPSCO---,IFAPSCP---,IFAPSCS---,IFAPSR----,IFAPSRAI--,IFAPSRAS--,IFAPSRC---,IFAPSRD---,IFAPSRE---,IFAPSRF---,IFAPSRI---,IFAPSRMA--,IFAPSRMD--,IFAPSRMF--,IFAPSRMG--,IFAPSRMT--,IFAPSRTA--,IFAPSRTI--,IFAPSRTT--,IFAPSRU---,IFGP------,IFGPS-----,IFGPSC----,IFGPSCC---,IFGPSCO---,IFGPSCP---,IFGPSCS---,IFGPSCT---,IFGPSR----,IFGPSRAA--,IFGPSRAT--,IFGPSRB---,IFGPSRCA--,IFGPSRCS--,IFGPSRD---,IFGPSRE---,IFGPSRF---,IFGPSRH---,IFGPSRI---,IFGPSRMA--,IFGPSRMF--,IFGPSRMG--,IFGPSRMM--,IFGPSRMT--,IFGPSRS---,IFGPSRTA--,IFGPSRTI--,IFGPSRTT--,IFGPSRU---,IFPP------,IFPP------,IFPPS-----,IFPPSC----,IFPPSCD---,IFPPSR----,IFPPSRD---,IFPPSRE---,IFPPSRI---,IFPPSRM---,IFPPSRS---,IFPPSRT---,IFPPSRU---,IFSP------,IFSPS-----,IFSPSC----,IFSPSCC---,IFSPSCO---,IFSPSCP---,IFSPSCS---,IFSPSR----,IFSPSRAA--,IFSPSRAT--,IFSPSRCA--,IFSPSRCI--,IFSPSRD---,IFSPSRE---,IFSPSRF---,IFSPSRH---,IFSPSRI---,IFSPSRMA--,IFSPSRMF--,IFSPSRMG--,IFSPSRMM--,IFSPSRMT--,IFSPSRS---,IFSPSRTA--,IFSPSRTI--,IFSPSRTT--,IFSPSRU---,IFUP------,IFUPS-----,IFUPSC----,IFUPSCO---,IFUPSCP---,IFUPSCS---,IFUPSR----,IFUPSRD---,IFUPSRE---,IFUPSRM---,IFUPSRS---,IFUPSRT---,IFUPSRU---