Merge pull request #671 from Esri/dev

Dev to Master merge

Author: dfoll

DistanceAndDirection.jpg

@@ -2,7 +2,7 @@
 
 The Distance and Direction component provides the ability to create geodesic features such as lines, circles, ellipses and range rings.
 
-![Image of Distance and Direction](DistanceAndDirection.jpg) 
+![Image of Distance and Direction](DistanceDirection.png) 
 
 ## Features
 
@@ -26,19 +26,19 @@ The Distance and Direction component provides the ability to create geodesic fea
 ### Build Requirements 
 
 * Visual Studio 2015
-    * Important Note: Visual Studio 2013 is required if building on ArcGIS 10.3.1
+    * Important Note: Visual Studio 2013 [may also be required if building on ArcGIS 10.4.1-10.5.1](https://support.esri.com/en/technical-article/000012659)
 * ArcGIS for Desktop 
-	* ArcMap 10.3.1+
-	* ArcGIS Pro 2.1+
-* ArcGIS Desktop SDK for .NET 10.3.1+
+	* ArcMap 10.4.1+
+	* ArcGIS Pro 2.2+
+* ArcGIS Desktop SDK for .NET 10.4.1+
 	* [ArcGIS Desktop for .NET Requirements](https://desktop.arcgis.com/en/desktop/latest/get-started/system-requirements/arcobjects-sdk-system-requirements.htm)
-* [ArcGIS Pro SDK](http://pro.arcgis.com/en/pro-app/sdk/) 2.1+
+* [ArcGIS Pro SDK](http://pro.arcgis.com/en/pro-app/sdk/) 2.2+
 
 ### Run Requirements
 
 * ArcGIS for Desktop 
-	* ArcMap 10.3.1+
-	* ArcGIS Pro 2.1+
+	* ArcMap 10.4.1+
+	* ArcGIS Pro 2.2+
 
 ## Instructions
 

DistanceDirection.png

@@ -17,7 +17,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C37767BB-18E6-4743-A5EC-1D7F2B38F487}</ProjectGuid>
+    <ProjectGuid>{E319BB7C-DE2F-44F2-8A0E-EBD4F9E110B7}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ArcMapAddinDistanceAndDirection</RootNamespace>
@@ -264,7 +264,7 @@
     <AddInTargetVersion>10.3</AddInTargetVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\ESRI\ESRI.ArcGIS.AddIns.11.targets" Condition="Exists('$(MSBuildExtensionsPath)\ESRI\ESRI.ArcGIS.AddIns.11.targets')" />
+  <Import Project="$(MSBuildExtensionsPath)\ESRI\ESRI.ArcGIS.AddIns.targets" Condition="Exists('$(MSBuildExtensionsPath)\ESRI\ESRI.ArcGIS.AddIns.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   -->
@@ -284,7 +284,7 @@
   </Target>
   <Target Name="AfterBuild">
     <!-- Gives build warning when add-in targets file is not found. -->
-    <Warning Text="Unable to create .esriAddin; missing ESRI ArcGIS Add-in SDK component(s)." Condition="!Exists('$(MSBuildExtensionsPath)\ESRI\ESRI.ArcGIS.AddIns.11.targets')" />
+    <Warning Text="Unable to create .esriAddin; missing ESRI ArcGIS Add-in SDK component(s)." Condition="!Exists('$(MSBuildExtensionsPath)\ESRI\ESRI.ArcGIS.AddIns.targets')" />
   </Target>
   <ProjectExtensions>
     <!-- Default ESRI add-in properties -->

README.md

@@ -8,7 +8,7 @@
   <Company>Esri</Company>
   <Date>1/17/2017</Date>
   <Targets>
-    <Target name="Desktop" version="10.3" />
+    <Target name="Desktop" version="10.4" />
   </Targets>
   <AddIn language="CLR4.5" library="DistanceAndDirection.dll" namespace="ArcMapAddinDistanceAndDirection">
     <ArcMap>

source/addins/ArcMapAddinDistanceAndDirection/ArcMapAddinDistanceAndDirection/ArcMapAddinDistanceAndDirection.csproj

@@ -23,6 +23,7 @@
 using ESRI.ArcGIS.ArcMapUI;
 using ESRI.ArcGIS.Carto;
 using DistanceAndDirectionLibrary.Helpers;
+using System.Globalization;
 
 namespace ArcMapAddinDistanceAndDirection.ViewModels
 {
@@ -826,7 +827,7 @@ internal override void Reset(bool toolReset)
             base.Reset(toolReset);
             TravelTime = 0;
             TravelRate = 0;
-        }  
+        }
 
         /// <summary>
         /// Create a geodetic circle
@@ -838,6 +839,7 @@ private IGeometry CreateCircle()
                 return null;
             }
 
+            string unitLabel = "";
             // This section including UpdateDistance serves to handle Diameter appropriately
             var polyLine = (IPolyline)new Polyline();
             polyLine.SpatialReference = Point1.SpatialReference;
@@ -867,8 +869,8 @@ private IGeometry CreateCircle()
                         //Get centroid of polygon
                         var area = (IArea)newPoly;
 
-                        string unitLabel = "";
                         int roundingFactor = 0;
+                        DistanceTypes dtVal = (DistanceTypes)LineDistanceType;
                         // If Distance Calculator is in use, use the unit from the Rate combobox
                         // to label the circle
                         if (IsDistanceCalcExpanded)
@@ -888,7 +890,8 @@ private IGeometry CreateCircle()
                                     roundingFactor = 2;
                                     break;
                                 case DistanceTypes.NauticalMiles:
-                                    unitLabel = "Nautical Miles";
+                                    var displayValue = new EnumToFriendlyNameConverter();
+                                    unitLabel = Convert.ToString(displayValue.Convert(RateUnit, typeof(string), new object(), CultureInfo.CurrentCulture));
                                     roundingFactor = 2;
                                     break;
                                 default:
@@ -914,15 +917,16 @@ private IGeometry CreateCircle()
                                     roundingFactor = 2;
                                     break;
                                 case DistanceTypes.NauticalMiles:
-                                    unitLabel = "Nautical Miles";
+                                    unitLabel = RateUnit.ToString();
                                     roundingFactor = 2;
                                     break;
                                 default:
                                     break;
                             }
 
-                            DistanceTypes dtVal = (DistanceTypes)LineDistanceType;
-                            unitLabel = StringParser.GetStringValue(dtVal);
+
+                            var displayValue = new EnumToFriendlyNameConverter();
+                            unitLabel = Convert.ToString(displayValue.Convert(dtVal, typeof(string), new object(), CultureInfo.CurrentCulture));
                         }
 
                         string circleTypeLabel = circleType.ToString();
@@ -942,7 +946,7 @@ private IGeometry CreateCircle()
                         this.AddTextToMap(area.LabelPoint, string.Format("{0}:{1} {2}",
                             circleTypeLabel,
                             distanceLabel,
-                            unitLabel));
+                            StringParser.GetStringValue(dtVal)));
                     }
 
                     double radiusDistance = radiusOrDiameterDistance;
@@ -954,9 +958,9 @@ private IGeometry CreateCircle()
                     circleAttributes.Add("centerx", Point1.X);
                     circleAttributes.Add("centery", Point1.Y);
                     if (IsDistanceCalcExpanded)
-                        circleAttributes.Add("distanceunit", RateUnit.ToString());
+                        circleAttributes.Add("distanceunit", unitLabel.ToString());
                     else
-                        circleAttributes.Add("distanceunit", LineDistanceType.ToString());
+                        circleAttributes.Add("distanceunit", unitLabel.ToString());
                     var color = new RgbColorClass() { Red = 255 } as IColor;
                     this.AddGraphicToMap(construct as IGeometry, color, attributes: circleAttributes);
                     Point2 = null;

source/addins/ArcMapAddinDistanceAndDirection/ArcMapAddinDistanceAndDirection/Config.esriaddinx

@@ -23,6 +23,7 @@
 using DistanceAndDirectionLibrary;
 using System.Collections.Generic;
 using DistanceAndDirectionLibrary.Helpers;
+using System.Globalization;
 
 namespace ArcMapAddinDistanceAndDirection.ViewModels
 {
@@ -586,9 +587,17 @@ private void UpdateAzimuthFromTo(AzimuthTypes fromType, AzimuthTypes toType)
                 double angle = Azimuth;
 
                 if (fromType == AzimuthTypes.Degrees && toType == AzimuthTypes.Mils)
-                    angle *= 17.777777778;
+                    angle *= ValueConverterConstant.DegreeToMils;
+                else if (fromType == AzimuthTypes.Degrees && toType == AzimuthTypes.Gradians)
+                    angle *= ValueConverterConstant.DegreeToGradian;
                 else if (fromType == AzimuthTypes.Mils && toType == AzimuthTypes.Degrees)
-                    angle *= 0.05625;
+                    angle *= ValueConverterConstant.MilsToDegree;
+                else if (fromType == AzimuthTypes.Mils && toType == AzimuthTypes.Gradians)
+                    angle *= ValueConverterConstant.MilsToGradian;
+                else if (fromType == AzimuthTypes.Gradians && toType == AzimuthTypes.Degrees)
+                    angle *= ValueConverterConstant.GradianToDegree;
+                else if (fromType == AzimuthTypes.Gradians && toType == AzimuthTypes.Mils)
+                    angle *= ValueConverterConstant.GradianToMils;
 
                 Azimuth = angle;
             }
@@ -601,9 +610,9 @@ private void UpdateAzimuthFromTo(AzimuthTypes fromType, AzimuthTypes toType)
         private double GetAzimuthAsDegrees()
         {
             if (AzimuthType == AzimuthTypes.Mils)
-            {
-                return Azimuth * 0.05625;
-            }
+                return Azimuth * ValueConverterConstant.MilsToDegree;
+            else if (AzimuthType == AzimuthTypes.Gradians)
+                return Azimuth * ValueConverterConstant.GradianToDegree;
 
             return Azimuth;
         }
@@ -634,14 +643,11 @@ private double GetAngleDegrees(double angle)
                 bearing = 360.0 - (bearing - 90);
 
             if (AzimuthType == AzimuthTypes.Degrees)
-            {
                 return bearing;
-            }
-
-            if (AzimuthType == AzimuthTypes.Mils)
-            {
-                return bearing * 17.777777778;
-            }
+            else if (AzimuthType == AzimuthTypes.Mils)
+                return bearing * ValueConverterConstant.DegreeToMils;
+            else if (AzimuthType == AzimuthTypes.Gradians)
+                return bearing * ValueConverterConstant.DegreeToGradian;
 
             return 0.0;
         }
@@ -688,28 +694,23 @@ private IGeometry DrawEllipse()
                 var ellipticArc = (IConstructGeodetic)new Polyline();
 
                 double bearing;
-                if (AzimuthType == AzimuthTypes.Mils)
-                {
-                    bearing = GetAzimuthAsDegrees();
-                }
-                else
-                {
-                    bearing = Azimuth;
-                }
-
+                bearing = GetAzimuthAsDegrees();
                 ellipticArc.ConstructGeodesicEllipse(Point1, GetLinearUnit(), MajorAxisDistance, MinorAxisDistance, bearing, esriCurveDensifyMethod.esriCurveDensifyByAngle, 0.01);
                 var line = ellipticArc as IPolyline;
                 if (line != null)
                 {
                     var color = (IColor)new RgbColorClass() { Red = 255 };
 
+                    var displayValue = new EnumToFriendlyNameConverter();
+                    var unitLabel = Convert.ToString(displayValue.Convert(LineDistanceType, typeof(string), new object(), CultureInfo.CurrentCulture));
+
                     IDictionary<String, System.Object> ellipseAttributes = new Dictionary<String, System.Object>();
                     ellipseAttributes.Add("majoraxis", MajorAxisDistance);
                     ellipseAttributes.Add("minoraxis", MinorAxisDistance);
                     ellipseAttributes.Add("azimuth", Azimuth);
                     ellipseAttributes.Add("centerx", Point1.X);
                     ellipseAttributes.Add("centery", Point1.Y);
-                    ellipseAttributes.Add("distanceunit", LineDistanceType.ToString());
+                    ellipseAttributes.Add("distanceunit", unitLabel.ToString());
                     ellipseAttributes.Add("angleunit", AzimuthType.ToString());
 
                     AddGraphicToMap((IGeometry)line, color, attributes: ellipseAttributes);
@@ -727,9 +728,6 @@ private IGeometry DrawEllipse()
                         double majAxisDist = majorAxisDistance * 2;
                         double minAxisDist = minorAxisDistance * 2;
 
-                        DistanceTypes dtVal1 = dtVal;
-                        var temp = StringParser.GetStringValue(dtVal);
-
                         if (area != null)
                         {
                             AddTextToMap(area.LabelPoint, string.Format("{0}:{1} {2}{3}{4}:{5} {6}{7}{8}:{9} {10}",