Merge pull request #278 from Esri/dev

September 2017 Release

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,32 @@
+<!--- Provide a general summary of your changes in the Title above -->
+
+## Description
+<!--- Describe your changes in detail -->
+
+## Related Issue
+<!--- This project only accepts pull requests related to open issues -->
+<!--- If suggesting a new feature or change, please discuss it in an issue first -->
+<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
+<!--- Please link to the issue here: -->
+
+## Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+## Screenshots (if appropriate):
+
+## Types of changes
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+
+## Checklist:
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+- [ ] My change requires a change to the documentation.
+- [ ] I have updated the documentation accordingly.
+- [ ] I have read the **CONTRIBUTING** document.

README.md

@@ -1,95 +1,140 @@
 # military-features-data
 
-The ArcGIS Defense and Intelligence Military Features Data repository is a set of data and test applications for use in ArcGIS Desktop and ArcGIS Runtime. This data is used to create features for planning, operations and intelligence domains based on military symbology specifications such as MIL-STD-2525.
+An ArcGIS for Defense repository for managing data and tools used in ArcGIS Military Symbology solutions. These solutions are used in sketching, planning, monitoring, and publishing Military Symbology using the ArcGIS platform. This data is used to create ArcGIS solutions that require Military Symbology matching detailed specifications such as MIL-STD-2525.
 
 ![Image of Military Features Data](ScreenShot.png)
 
-## Features
-
-* This is the source data for the ArcGIS Defense and Intelligence military feature templates. This data is used to create features and derived data products using military symbology. 
-* Provides data files that let you create command and control (C2) operational features based on military symbology specifications MIL-STD-2525C/D in ArcGIS Desktop
-* Provides project/layer packages that include the database schema and sample data for military features
-* Provides symbology style files for displaying and creating military symbology in ArcGIS Desktop
-* Provides additional derived data products for use in ArcGIS Runtime
-* See each version of the standard for more information:
-    * [US MIL-STD-2525D "Delta" - mil2525d](./data/mil2525d)
-    * [US MIL-STD-2525C "Charlie" - mil2525c](./data/mil2525c)
-    * Important Note: MIL-STD-2525D is the current and actively maintained version. Other older standard versions are provided for legacy purposes.
-
 ## Sections
 
+* [Features](#features)
 * [Requirements](#requirements)
 * [Instructions](#instructions)
 * [Resources](#resources)
+    * [ArcGIS Military Symbology Solutions](#supported-solutions-using-this-data)
 * [Issues](#issues)
+* [New to Github?](#new-to-github)
 * [Contributing](#contributing)
+* [Acknowledgments](#acknowledgments)
 * [Licensing](#licensing)
 
+## Features
+
+* Solutions targeting Military Symbology in ArcGIS users:
+    * Planners and Analysts who sketch complex overlays and plans
+    * Operators who visualize real time situational awareness information
+    * Users of systems which exchange military overlays with other battlefield systems 
+* These solutions include:
+    * [Military Features](#military-features)
+    * [Military Overlay](#military-overlay)
+    * [Military Symbology Styles](#military-symbology-styles)
+* The source data and tools used to create ArcGIS Military Symbology data and solutions
+* Support for MIL-STD-2525 Military Symbology:
+    * MIL-STD-2525D (June, 2014)
+    * MIL-STD-2525C (November, 2008)
+    * MIL-STD-2525B Change 2 (March, 2007)
+
 ## Requirements
 
-* ArcGIS Desktop 10.1+ 
-    * If using the Style and Layer Files
-* ArcGIS Runtime 10.2 (or later)
-    * If using the Symbol Dictionary Files
-* ArcGIS Pro 1.2+ or ArcGIS Runtime Quartz
-    * If using the Stylx Files or Dictionary Renderers
+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
 
 ## Instructions
 
-### General Help
+**IMPORTANT NOTE:** If you just want to download the supported solution, please download the solution directly from the [ArcGIS Military Symbology Solutions site](#supported-solutions-using-this-data). This repo is primarily for editing, recreating, or logging issues with this data.
+
+* Clone/download the repository.
+* Determine the Military Symbology solution [(see below)](#arcgis-military-symbology-solutions).
+* Edit and/or use the solution in the desired product.
+-or-
+* Use the utilities provided in this repo to recreate derived data from source data.
+
+### ArcGIS Military Symbology Solutions
+
+#### Military Features
 
-[New to Github? Get started here.](http://htmlpreview.github.com/?https://github.com/Esri/esri.github.com/blob/master/help/esri-getting-to-know-github.html)
+* [Military Features](./military-features)
+    * A solution using the ArcGIS 10 standard symbology model
+    * A datamodel for drawing and labeling symbols using the ArcGIS Cartographic Renderer and Maplex Labeling Engine 
+    * Targets ArcGIS 10 (ArcMap and ArcGIS Engine) and legacy applications/users
+    * Data included with the [Military Features solution](http://solutions.arcgis.com/defense/help/military-features/)
+
+#### Military Overlay
 
-### Using the Source Data
+* [Military Overlay](./military-overlay)
+    * 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/)
+
+#### Military Symbology Styles
 
-* Clone/download the repository
-* Determine the version of the military symbology standard you are using:
-    * [US MIL-STD-2525D "Delta" - mil2525d](./data/mil2525d)
-    * [US MIL-STD-2525C "Charlie" - mil2525c](./data/mil2525c)
-* If using the source data with ArcGIS Runtime Quartz or ArcGIS Pro...
-    * If you are using MIL-STD-2525D "Delta" with ArcGIS Pro there is no additional configuration required - this is included with the product
-        * You may simply start using one of the included packages, templates, or other test data at
-            * [data/mil2525d/overlay_templates](./data/mil2525d/overlay_templates)
-            * [data/mil2525d/test_data](./data/mil2525d/test_data)
-* If using the source data with ArcGIS Desktop(ArcMap)...
-    * Update the local ArcGIS Military Style Files to the latest versions from the repository.
-        * Navigate to the folders
-            *  [military-features-data\data\mil2525d\stylefiles](./data/mil2525d/stylefiles)
-            *  [military-features-data\data\mil2525c\stylefiles](./data/mil2525c/stylefiles)
-        * Update/copy all of the .style files from each folder into your ArcGIS Desktop Style folder (overwrite if necessary - it is highly recommended that you create a backup of these files before this step)
-        * For example, copy the style files from above location into this Desktop Folder: `{ArcGIS Install Location}\ArcGIS\Desktop10.X\Styles`
-    * Create symbology using the ArcGIS Style Manager or open the provided layer packages to create military features
+* [Military Symbology Styles](./military-symbology-styles)
+    * The stand-alone style files used by the Dictionary Renderer included with ArcGIS Pro, Runtime, and Server to render Military Symbols
+    * Data included with the [Military Symbology Styles solution](http://solutions.arcgis.com/defense/help/military-symbology-styles/)
 
-### Test Applications
+#### Military Standard Support
 
-* There are several sample/test applications provided for the standalone test/verification/validation of this data.
-* For more information, see the instructions in the [test](./test) folder.
+The following table lists the versions of the standard supported by each solution.
 
+|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|
+|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
+
 ## Resources
 
-* The [Official Military Standard Documents](http://quicksearch.dla.mil/qsDocDetails.aspx?ident_number=114934)
-* [ArcGIS Solutions](http://solutions.arcgis.com/)
-* [ArcGIS Pro Dictionary Renderer Help Page](https://pro.arcgis.com/en/pro-app/help/mapping/symbols-and-styles/dictionary-renderer.htm) 
-* [ArcGIS Military Features Help Documentation](http://resources.arcgis.com/en/help/main/10.1/index.html#//000n0000000p000000)
-* Military Features Blog Posts 
-    * [Quick Introduction](http://blogs.esri.com/esri/arcgis/2011/02/18/a-quick-introduction-to-text-modifiers-for-unit-equipment-and-installation-features/)
-    * [Creating New Symbols](http://blogs.esri.com/esri/arcgis/2011/02/04/representing-c2-tactical-symbols-in-arcgis-as-uei-features/)
-    * [Symbol ID Codes](http://blogs.esri.com/esri/arcgis/2010/05/19/military-features-and-symbol-id-codes/)
-    * [Direction Indicator](http://blogs.esri.com/esri/arcgis/2011/04/01/creating-a-direction-of-movement-graphic-modifier/)
-* Learned more about Esri's [Solutions Templates](http://solutions.arcgis.com/)
-* Learn more about Esri's [ArcGIS for Defense maps and apps](http://resources.arcgis.com/en/communities/defense-and-intelligence/).
+* [ArcGIS for Defense Solutions Website](http://solutions.arcgis.com/defense)
+* [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-2525B Change 2 (March, 2007) 
+
+### Supported Solutions Using this Data
+
+Further documentation and supported downloads can be obtained from the solution page:
 
+* [Military Features solution](http://solutions.arcgis.com/defense/help/military-features/)
+* [Military Overlay solution](http://solutions.arcgis.com/defense/help/military-overlay/)
+* [Military Symbology Styles solution](http://solutions.arcgis.com/defense/help/military-symbology-styles/)
+
 ## Issues
 
 * Find a bug or want to request a new feature?  Please let us know by submitting an issue.
 
+## New to Github
+
+* [New to Github? Get started here.](https://github.com/Esri/esri.github.com/blob/master/help/esri-getting-to-know-github.html)
+
 ## Contributing
 
-Esri welcomes contributions from anyone and everyone. Please see our [guidelines for contributing](https://github.com/esri/contributing).
+Esri welcomes contributions from anyone and everyone. Please see our [guidelines for contributing](./CONTRIBUTING.md).
+
+## Acknowledgments 
+
+This repository reuses software from:
+
+1. [Joint Military Symbology XML](https://github.com/Esri/joint-military-symbology-xml/)
+    1. SVG image files and derived data
+    2. Governed by the [Apache License, Version 2.0](https://github.com/Esri/joint-military-symbology-xml/blob/master/license.txt)
 
 ## Licensing
 
-Copyright 2013-2015 Esri
+Copyright 2013-2017 Esri
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -105,6 +150,3 @@ limitations under the License.
 
 A copy of the license is available in the repository's
 [license.txt](license.txt) file.
-
-[](Esri Tags: ArcGIS Defense Intelligence Military Features 2525 2525C 2525D ArcGISSolutions)
-[](Esri Language: Java)