Merge branch 'release/v5.1.1.1'

MapWindow · Nov 25, 2019 · 4e90972 · 4e90972
2 parents 304a974 + 69f4c2e
commit 4e90972
Show file tree

Hide file tree

Showing 50 changed files with 5,717 additions and 6,093 deletions.
diff --git a/docs/AxInterop.MapWinGIS/AxMap.cs b/docs/AxInterop.MapWinGIS/AxMap.cs
@@ -2319,6 +2319,18 @@ public virtual bool SetGeographicExtents(Extents pVal)
         /// \new491 Added in version 4.9.1
         public float Longitude { get; set; }
 
+        /// <summary>
+        /// Sets the Latitude and Longitude of the center of the screen in one operation
+        /// </summary>
+        /// <param name="latitude">Requested Latitude in decimal degrees</param>
+        /// <param name="longitude">Requested Longitude in decimal degrees</param>
+        /// <remarks>Map projection must be set in order for this method to work.</remarks>
+        /// \new510 Added in version 5.1.0
+        public void SetLatitudeLongitude(double latitude, double longitude)
+        {
+            throw new NotImplementedException();
+        }
+
         /// <summary>
         /// Gets or sets the current zoom level for the map. It corresponds to the zoom level of current tile provider.
         /// </summary>

diff --git a/docs/Examples/src/CalculateArea.cs b/docs/Examples/src/CalculateArea.cs
@@ -67,7 +67,7 @@ public void CalculateArea(AxMap axMap1, string dataPath)
                     }
 
                     //adding the new field in the end of the table
-                    fldIndex = sf.EditAddField("CalcArea", FieldType.DOUBLE_FIELD, 12, 12);
+                    fldIndex = sf.EditAddField("CalcArea", FieldType.DOUBLE_FIELD, 9, 12);
                     if (fldIndex == -1)
                     {
                         MessageBox.Show("Failed to insert field: " + sf.ErrorMsg[sf.LastErrorCode]);

diff --git a/docs/Interop.MapWinGIS/Com Classes/Identifier.cs b/docs/Interop.MapWinGIS/Com Classes/Identifier.cs
@@ -34,10 +34,11 @@ public class Identifier
         /// </summary>
         public uint OutlineColor { get; set; }
 
-        /// <summary>
-        /// Gets or sets the handle of active layer, which is used when Identifer.IdentifierMode set to imSingleLayer.
-        /// </summary>
-        public int ActiveLayer { get; set; }
+        ///// <summary>
+        ///// Gets or sets the handle of active layer, which is used when Identifer.IdentifierMode set to imSingleLayer.
+        ///// NOTE: this method has been hidden, and functionality replaced through use of the ChooseLayer event.
+        ///// </summary>
+        //public int ActiveLayer { get; set; }
     }
 #if nsp
 }

diff --git a/docs/Interop.MapWinGIS/Enumerations/Enumerations.cs b/docs/Interop.MapWinGIS/Enumerations/Enumerations.cs
@@ -2368,9 +2368,14 @@ public enum tkIdentifierMode
         /// </summary>
         imAllLayers = 0,
         /// <summary>
-        /// Only shapefile defined by Identifier.ActiveLayer will be identified.
+        /// Only shapefile specified in the context of AxMap.ChooseLayer event will be analyzed.
         /// </summary>
         imSingleLayer = 1,
+        /// <summary>
+        /// All shapefile layers with Shapefile.Identifiable property set to true will be analyzed,
+        /// but search will stop following the first (topmost) layer for which shapes are found.
+        /// </summary>
+        imAllLayersStopOnFirst = 2,
     }
 
     /// <summary>