Merge pull request #380 from Esri/dev

Dev to Master merge

.gitignore

@@ -1,8 +1,6 @@
 # Defense Template specific ignores
 NuGet.exe
 *.pyt.xml
-*.zip
-*.zip
 *-old.*
 *-old
 *-sav

README.md

@@ -4,7 +4,7 @@
 
 A user-focused [ArcGIS Pro](http://pro.arcgis.com) add-in for quickly creating military symbols and overlays using MIL-STD-2525D, MILSTD-2525B Change 2, and APP-6(D).
 
-![Image of Military Symbol Editor Addin](screenshot.png)
+![Image of Military Symbol Editor Addin](MilitarySymbolEditor.png)
 
 ## Features
 
@@ -28,19 +28,14 @@ A user-focused [ArcGIS Pro](http://pro.arcgis.com) add-in for quickly creating m
 ### Build Requirements 
 
 * Visual Studio 2015
-    * Important Note: Visual Studio 2013 is required if building on ArcGIS 10.3.1
 * ArcGIS for Desktop 
-	* ArcMap 10.3.1+
-	* ArcGIS Pro 2.1+
-* ArcGIS Desktop SDK for .NET 10.3.1+
-	* [ArcGIS Desktop for .NET Requirements](https://desktop.arcgis.com/en/desktop/latest/get-started/system-requirements/arcobjects-sdk-system-requirements.htm)
+	* ArcGIS Pro 2.2+
 * [ArcGIS Pro SDK](http://pro.arcgis.com/en/pro-app/sdk/) 2.1+
 
 ### Run Requirements
 
 * ArcGIS for Desktop 
-	* ArcMap 10.3.1+
-	* ArcGIS Pro 2.1+
+	* ArcGIS Pro 2.2+
 
 ## Instructions
 

military-overlay/README.md

@@ -0,0 +1,36 @@
+# military-overlay
+
+Military Overlay is a solution for creating and sharing military overlays. It is primarily a datamodel for creating, drawing, and sharing Military Symbols. This datamodel is used by the Dictionary Renderer included with ArcGIS Pro, Runtime, and Server to render Military Symbols.
+
+![Image of Military Overlay](ScreenShot.png)
+
+## Features
+
+* A solution using a complex attribute renderer (the Dictionary Renderer) included with ArcGIS Pro, Runtime, and Server
+* A datamodel for drawing and labeling symbols using the Dictionary Renderer
+* Data included with the [Military Overlay solution](http://solutions.arcgis.com/defense/help/military-overlay/)
+* [Utilities for creating the Military Overlay datamodel and test data](./utils-source-and-test-data)
+
+## Requirements
+
+* ArcGIS Pro 1.4+ 
+* ArcGIS Server 10.5+
+
+## Using
+
+* For more information see the [Military Overlay solution](http://solutions.arcgis.com/defense/help/military-overlay/).
+
+Includes:
+
+* Layer packages - defining layers and data for drawing and labeling symbols
+* Geodatabases - geodatabases with datamodel for drawing and labeling symbols
+* Schema information for each version of the standard
+    * [mil2525d](./mil2525d)
+    * [mil2525c](./mil2525c)
+    * [mil2525b2](./mil2525b2)
+* [Utilities for creating the Military Overlay datamodel and test data](./utils-source-and-test-data)
+
+## Resources
+
+* [Military Overlay solution](http://solutions.arcgis.com/defense/help/military-overlay/)
+* [ArcGIS Pro Dictionary Renderer Help Page](https://pro.arcgis.com/en/pro-app/help/mapping/symbols-and-styles/dictionary-renderer.htm) 

military-overlay/app6b/README.md

@@ -0,0 +1,57 @@
+# app6b 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 | APP6 Field ID | Data Type | Range of Values | Default Value/Meaning | Sample Name | Sample Value/Meaning | Explanatory Notes |
+| -------------- | --------- | --------- | --------------- | ----------- | -------------------- | ----------------- | ----------------- |
+| affiliation  | A/E | char | A-P  | -/Not Set | "Friend" | "F" | **REQUIRED** | 
+| extendedfunctioncode  | A | string/TEXT | N/A | (per feature class) | "Military (Air) : Fixed-Wing" | "S-A-MF----"  | **REQUIRED** |
+| echelonmobility | A/R | char | A-T | - (None) | "Team" | "A" | Optional |
+| status | A | char | A/P | P(Present)  | "Present" | "P" | Optional |
+| hqtffd | A/S/AB | char | A-M | -/Not Set | Headquarters | Headquarters=A | Optional (="HQ/TF/FD") |
+| sidc | A | string/TEXT | string length(15) | N/A | "SFGPUCI---USG" | Friend Infantry Unit |  |
+| countrycode | A | char[2] | AA-ZZ | N/A | "US" | "United States" | Implementation Added to Standard  |
+| civilian | A | bool | T/F | F | True | Show Civilian Fill | True=Show Civilian Fill |
+| direction | Q | int | 0-360 | N/A | 90 | 90 degrees |  |
+
+## Text Amplifiers
+
+The following table lists the Modifier definitions from 2525C and their corresponding attributes in the symbol dictionary.
+
+| Property Name | APP6 Field ID | APP6 Field Title | Notes |
+| ------------- | -------------- | ----------------- | ----- |
+| additionalinformation2 | H2 | Additional Information 2 | Control Measures Only |
+| additionalinformation | H | Additional Information | |
+| combateffectiveness | K | Combat Effectiveness | |
+| countrylabel | * | Common Identifier | Implementation Added to Standard |
+| credibility | J | Evaluation Rating | Credibility rating is second character of Evaluation Rating (J) field. |
+| datetimeexpired | W2 | Date-Time Group (DTG) | Second half of Date-Time Group (DTG) (W) field. |
+| datetimevalid | W | Date-Time Group (DTG) | First half of Date-Time Group (DTG) (W) field. |
+| higherformation | M | Higher Formation | |
+| hostile | N | Hostile (ENY) | "ENY" added to Control Measures and Equipment |
+| idmode | P | IFF/SIF | |
+| platformtype | AD | Platform Type | |
+| quantity | C | Quantity | |
+| reinforced | F | Reinforced or Reduced | |
+| reliability | J | Evaluation Rating |  |
+| signatureequipment | L | Signature Equipment | Equipment Only |
+| speed | Z | Speed | |
+| staffcomment | G | Staff Comments | |
+| type | V | Type | |
+| uniquedesignation | T | Unique Designation | |
+| uniquedesignation2 | T2 | Unique Designation 2 | Used as an additional field for Control Measures. |
+| x | Y | Location | Longitude in degrees. |
+| y | Y | Location | Latitude in degrees. |
+| z | X | Altitude/Depth | |
+

military-overlay/app6b/geodatabase/.gitignore

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

military-overlay/app6b/lpkx/README.md

@@ -0,0 +1,3 @@
+### Important Note
+
+The MilitaryOverlay-APP6B.lpkx is only supported on version **2.4 or later** of ArcGIS Pro.

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/README.md

@@ -0,0 +1,58 @@
+# mil2525b 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 Field ID | Data Type | Range of Values | Default Value/Meaning | Sample Name | Sample Value/Meaning | Explanatory Notes |
+| -------------- | --------- | --------- | --------------- | ----------- | -------------------- | ----------------- | ----------------- |
+| affiliation  | A | char | A-Z  | -/Not Set | "Friend" | "F" | **REQUIRED** | 
+| extendedfunctioncode  | A | string/TEXT | N/A | (per feature class) | "Military (Air) : Fixed-Wing" | "S-A-MF----"  | **REQUIRED** |
+| echelonmobility | B | char | A-Z | - (None) | "Team" | "A" | Optional |
+| status | A/AL | char | A-Z | P(Present)  | "Present" | "P" | Optional |
+| hqtffd | A/AB | char | A-Z | -/Not Set | Headquarters | Headquarters=A | Optional (="HQ/TF/FD") |
+| sidc | | string/TEXT | string length(15) | N/A | "SFGPUCI---USG" | Friend Infantry Unit |  |
+
+## Text Amplifiers
+
+The following table lists the Modifier definitions from 2525C and their corresponding attributes in the symbol dictionary.
+
+| Property Name | 2525 Field ID | 2525 Field Title | Notes |
+| ------------- | -------------- | ----------------- | ----- |
+| additionalinformation2 | H2 | Additional Information 2 |  |
+| additionalinformation | H | Additional Information | |
+| combateffectiveness | K | Combat Effectiveness | |
+| commonidentifier | AF | Common Identifier | |
+| credibility | J | Evaluation Rating | Credibility rating is second character of Evaluation Rating (J) field. |
+| datetimeexpired | W | Date-Time Group (DTG) | Second half of Date-Time Group (DTG) (W) field. |
+| datetimevalid | W | Date-Time Group (DTG) | First half of Date-Time Group (DTG) (W) field. |
+| distance | AM | Distance | |
+| equipmentteardowntime | AE | Equipment Teardown Time | |
+| higherformation | M | Higher Formation | |
+| iff_sif | P | IFF/SIF | |
+| platformtype | AD | Platform Type | |
+| quantity | C | Quantity | |
+| reinforced | F | Reinforced or Reduced | |
+| reliability | J | Evaluation Rating | Reliability rating is first character of Evaluation Rating (J) field. |
+| sigintmobility | R2 | SIGINT Mobility Indicator | |
+| signatureequipment | L | Signature Equipment | |
+| speed | Z | Speed | |
+| staffcomment | G | Staff Comments | |
+| type | V | Type | |
+| uniquedesignation | T | Unique Designation | |
+| uniquedesignation2 | T2 | Unique Designation 2 | Used as an additional field for Fire Support Lines tactical graphics. |
+| x | Y | Location | Longitude in degrees. |
+| y | Y | Location | Latitude in degrees. |
+| z | X | Altitude/Depth | |
+| zmax | X | Altitude/Depth | Maximum altitude for aviation tactical graphics. |
+| zmin | X | Altitude/Depth | Minimum altitude for aviation tactical graphics. |
+

military-overlay/mil2525b2/geodatabase/.gitignore

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

military-overlay/mil2525c/README.md

@@ -0,0 +1,59 @@
+# mil2525c 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 C Field ID | Data Type | Range of Values | Default Value/Meaning | Sample Name | Sample Value/Meaning | Explanatory Notes |
+| -------------- | --------- | --------- | --------------- | ----------- | -------------------- | ----------------- | ----------------- |
+| affiliation  | A | char | A-Z  | -/Not Set | "Friend" | "F" | **REQUIRED** | 
+| extendedfunctioncode  | A | string/TEXT | N/A | (per feature class) | "Military (Air) : Fixed-Wing" | "S-A-MF----"  | **REQUIRED** |
+| echelonmobility | B | char | A-Z | - (None) | "Team" | "A" | Optional |
+| status | A/AL | char | A-Z | P(Present)  | "Present" | "P" | Optional |
+| hqtffd | A/AB | char | A-Z | -/Not Set | Headquarters | Headquarters=A | Optional (="HQ/TF/FD") |
+| sidc | | string/TEXT | string length(15) | N/A | "SFGPUCI---USG" | Friend Infantry Unit |  |
+
+## Text Amplifiers
+
+The following table lists the Modifier definitions from 2525C and their corresponding attributes in the symbol dictionary.
+
+| Property Name | 2525C Field ID | 2525C Field Title | Notes |
+| ------------- | -------------- | ----------------- | ----- |
+| additionalinfo2 | H2 | Additional Information 2 | Used in the Convoys and Airspace Coordination Area tactical graphics. |
+| additionalinformation | H | Additional Information | |
+| combateffectiveness | K | Combat Effectiveness | |
+| commonidentifier | AF | Common Identifier | |
+| credibility | J | Evaluation Rating | Credibility rating is second character of Evaluation Rating (J) field. |
+| datetimeexpired | W | Date-Time Group (DTG) | Second half of Date-Time Group (DTG) (W) field. |
+| datetimevalid | W | Date-Time Group (DTG) | First half of Date-Time Group (DTG) (W) field. |
+| distance | AM | Distance | |
+| equipmentteardowntime | AE | Equipment Teardown Time | |
+| higherformation | M | Higher Formation | |
+| iff_sif | P | IFF/SIF | |
+| platformtype | AD | Platform Type | |
+| quantity | C | Quantity | |
+| reinforced | F | Reinforced or Reduced | |
+| reliability | J | Evaluation Rating | Reliability rating is first character of Evaluation Rating (J) field. |
+| sigintmobility | R2 | SIGINT Mobility Indicator | |
+| signatureequipment | L | Signature Equipment | |
+| speed | Z | Speed | |
+| staffcomment | G | Staff Comments | |
+| type | V | Type | |
+| uniquedesignation | T | Unique Designation | |
+| uniquedesignation2 | T2 | Unique Designation 2 | Used as an additional field for Fire Support Lines tactical graphics. |
+| x | Y | Location | Longitude in degrees. |
+| y | Y | Location | Latitude in degrees. |
+| z | X | Altitude/Depth | |
+| zmax | X | Altitude/Depth | Maximum altitude for aviation tactical graphics. |
+| zmin | X | Altitude/Depth | Minimum altitude for aviation tactical graphics. |
+
+Note: Detailed label field descriptions with graphics are also shown in [this Military Features Blog Post](http://blogs.esri.com/esri/arcgis/2011/02/04/representing-c2-tactical-symbols-in-arcgis-as-uei-features/)

military-overlay/mil2525c/geodatabase/.gitignore

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