Merge branch 'release/v5.0.0'

Author: pmeems

.gitignore

@@ -69,6 +69,8 @@ ipch/
 # ReSharper is a .NET coding add-in
 _ReSharper*/
 *.[Rr]e[Ss]harper
+*.idea
+*.vs
 
 # TeamCity is a build add-in
 _TeamCity*
@@ -136,8 +138,7 @@ UpgradeLog*.htm
 
 # SQL Server files
 App_Data/*.mdf
-App_Data/*.ldf
-
+App_Data/*.ldf  
 
 #LightSwitch generated files
 GeneratedArtifacts/
@@ -160,10 +161,22 @@ $RECYCLE.BIN/
 
 # Mac desktop service store files
 .DS_Store
+__MACOSX/
+
+# GDAL SDK
+support/GDAL_SDK/licenses/*.rtf
+support/GDAL_SDK/**/*.dll
+support/GDAL_SDK/**/*.exe
+support/GDAL_SDK/**/*.lib
+support/GDAL_SDK/**/*.h
+support/GDAL_SDK/**/*.hpp
+support/GDAL_SDK/**/*.c
+support/GDAL_SDK/**/*.inc
+support/GDAL_SDK/**/*.proto
+support/GDAL_SDK/**/*.pc
 
 # Custom
 *.dll
-support/GDAL_SDK/*
 docs/output
 demo/.nuget/
 *.zip
@@ -172,11 +185,8 @@ unittests/MapWinGISTests/AkkerwebTests.cs
 *.mwd
 *.mwx
 unittests/packages/
-unittests/.vs/unittests/v15/Server/sqlite3/storage.ide
-unittests/.vs/unittests/v15/Server/sqlite3/db.lock
-docs/.vs/MapWinGis Documentation/v15/Server/sqlite3/storage.ide-wal
-docs/.vs/MapWinGis Documentation/v15/Server/sqlite3/storage.ide-shm
-docs/.vs/MapWinGis Documentation/v15/Server/sqlite3/storage.ide
-docs/.vs/MapWinGis Documentation/v15/Server/sqlite3/db.lock
-src/MapWinGIS.vcxproj.filters
-unittests/.vs/
+*.VC.db
+*.VC.opendb
+docs/Assets/Syncfusion Logos/
+tmp/
+docs/OptimizedImages/

docs/AxInterop.MapWinGIS.XML

@@ -1,4 +1,9 @@
-using System;
+// ReSharper disable ArrangeAccessorOwnerBody
+// ReSharper disable DelegateSubtraction
+// ReSharper disable PossibleInvalidCastExceptionInForeachLoop
+// ReSharper disable CheckNamespace
+
+using System;
 using MapWinGIS;
 #pragma warning disable 67 // Never used warning
 
@@ -1470,7 +1475,9 @@ public bool get_LayerVisibleAtCurrentScale(int layerHandle)
 
         #region Drawing layer
         /// \addtogroup map_drawing_layers Drawing layers
-        /// Here is a list of methods and properties to interact with the drawing layers of the map. This module is a part of the documentation of AxMap class.
+        /// Here is a list of methods and properties to interact with the drawing layers of the map.
+        /// The drawing layers are more transient that the standard layers, intended for fast drawing of temporary elements on top of the map.
+        /// This module is a part of the documentation of AxMap class.
         /// \dot
         /// digraph map_drawing_layers {
         /// splines = true;
@@ -1506,24 +1513,27 @@ public Labels get_DrawingLabels(int DrawingLayerIndex)
         }
 
         /// <summary>
-        /// Clears all the drawings on the drawing layer specified.
+        /// Clears all drawings on the specified drawing layer, and removes the drawing layer. The drawing handle will no longer be valid.
+        /// Call AxMap.NewDrawing again to create a new drawing layer to continue adding new elements.
         /// </summary>
-        /// <param name="DrawHandle">Drawing handle of the drawing layer for which all drawings are to be cleared.</param>
+        /// <param name="DrawHandle">Drawing handle of the drawing layer to be cleared (and removed).</param>
         public void ClearDrawing(int DrawHandle)
         {
             throw new NotImplementedException();
         }
 
         /// <summary>
-        /// Clears all drawings on all drawing layers. This method is slower than using ClearDrawing on a specific layer
+        /// Clears all drawings on all drawing layers, and removes all drawing layers.
+        /// This method is slower than using ClearDrawing on a specific layer.
+        /// Call AxMap.NewDrawing again to create a new drawing layer to continue adding new elements.
         /// </summary>
         public void ClearDrawings()
         {
             throw new NotImplementedException();
         }
 
         /// <summary>
-        /// Draws a circle on the last drawing layer created by NewDrawing
+        /// Draws a circle on the last drawing layer created by AxMap.NewDrawing
         /// </summary>
         /// <param name="x">Center x coordinate for the circle to be drawn.</param>
         /// <param name="y">Center y coordinate for the circle to be drawn.</param>
@@ -1550,7 +1560,7 @@ public void DrawCircleEx(int LayerHandle, double x, double y, double pixelRadius
         }
 
         /// <summary>
-        /// Draws a line on the last drawing layer created using NewDrawing.
+        /// Draws a line on the last drawing layer created using AxMap.NewDrawing.
         /// </summary>
         /// <param name="x1">X coordinate of the first point used to draw the line</param>
         /// <param name="y1">Y coordinate of the first point used to draw the line.</param>
@@ -1579,7 +1589,7 @@ public void DrawLineEx(int LayerHandle, double x1, double y1, double x2, double
         }
 
         /// <summary>
-        /// Draws a point on the last drawing layer created by NewDrawing.
+        /// Draws a point on the last drawing layer created by AxMap.NewDrawing.
         /// </summary>
         /// <param name="x">The x coordinate of the point to draw</param>
         /// <param name="y">The y coordinate of the point to draw.</param>
@@ -1604,7 +1614,7 @@ public void DrawPointEx(int LayerHandle, double x, double y, int pixelSize, uint
         }
 
         /// <summary>
-        /// Draws a polygon on the last drawing layer created using NewDrawing.
+        /// Draws a polygon on the last drawing layer created using AxMap.NewDrawing.
         /// </summary>
         /// <param name="xPoints">An array containing x-coordinates for each point in the polygon.</param>
         /// <param name="yPoints">An array containing y-coordinates for each point in the polygon.</param>
@@ -1631,7 +1641,7 @@ public void DrawPolygonEx(int LayerHandle, ref object xPoints, ref object yPoint
         }
 
         /// <summary>
-        /// Draws a circle with custom outline width on the last drawing layer created by NewDrawing.
+        /// Draws a circle with custom outline width on the last drawing layer created by AxMap.NewDrawing.
         /// </summary>
         /// <param name="x">Center x coordinate for the circle to be drawn.</param>
         /// <param name="y">Center y coordinate for the circle to be drawn.</param>
@@ -1660,7 +1670,7 @@ public void DrawWideCircleEx(int LayerHandle, double x, double y, double radius,
         }
 
         /// <summary>
-        /// Draws a polygon with custom width of outline on the last drawing layer created using NewDrawing.
+        /// Draws a polygon with custom width of outline on the last drawing layer created using AxMap.NewDrawing.
         /// </summary>
         /// <param name="xPoints">An array containing x-coordinates for each point in the polygon.</param>
         /// <param name="yPoints">An array containing y-coordinates for each point in the polygon.</param>
@@ -1674,7 +1684,7 @@ public void DrawWidePolygon(ref object xPoints, ref object yPoints, int numPoint
         }
 
         /// <summary>
-        /// Draws a polygon with custom width of outline on the last drawing layer created using NewDrawing.
+        /// Draws a polygon with custom width of outline on the last drawing layer created using AxMap.NewDrawing.
         /// </summary>
         /// <param name="LayerHandle">The handle of the drawing layer created with AxMap.NewDrawing call.</param>
         /// <param name="xPoints">An array containing x-coordinates for each point in the polygon.</param>
@@ -1691,10 +1701,10 @@ public void DrawWidePolygonEx(int LayerHandle, ref object xPoints, ref object yP
         /// <summary>
         /// Creates a new drawing layer on the map returning its handle.
         /// </summary>
-        /// <param name="Projection">Sets the coordinate system to use for the new drawing layer to be created. (ScreenReferenced 
-        /// uses pixels in screen coordinates. SpatiallyReferenced uses projected map units.)</param>
+        /// <param name="projection">Sets the coordinate system to use for the new drawing layer to be created. (tkDrawReferenceList.dlScreenReferencedList 
+        /// uses pixels in screen coordinates. tkDrawReferenceList.dlSpatiallyReferencedList uses projected map units.)</param>
         /// <returns>The handle for the new drawing layer in the map.</returns>
-        public int NewDrawing(MapWinGIS.tkDrawReferenceList Projection)
+        public int NewDrawing(tkDrawReferenceList projection)
         {
             throw new NotImplementedException();
         }

docs/AxInterop.MapWinGIS/AxMap.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 #if nsp
 namespace AxMapWinGIS

docs/AxInterop.MapWinGIS/AxMap_Deprecated.cs

@@ -1,4 +1,10 @@
-/// <summary>
+// ReSharper disable ArrangeAccessorOwnerBody
+// ReSharper disable DelegateSubtraction
+// ReSharper disable PossibleInvalidCastExceptionInForeachLoop
+// ReSharper disable CheckNamespace
+
+
+/// <summary>
 /// Justification of the labels
 /// </summary>
 public enum tkHJustification { }

docs/AxInterop.MapWinGIS/Enums.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

docs/AxInterop.MapWinGIS/Properties/AssemblyInfo.cs

@@ -1,10 +1,12 @@
-
+// ReSharper disable ArrangeAccessorOwnerBody
+// ReSharper disable DelegateSubtraction
+// ReSharper disable PossibleInvalidCastExceptionInForeachLoop
+// ReSharper disable CheckNamespace
+
+// ReSharper disable UseNullPropagation
 namespace Examples
 {
-    using System;
     using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
 
     /// <summary>
     /// The groups of the examples for GUI
@@ -25,9 +27,8 @@ public enum ExampleGroup
     /// <summary>
     /// Holds description of the example to be displayed in the documentation and GUI of this project.
     /// </summary>
-    class Example
+    public class Example
     {
-        private string guiName;           // in the interface
         public string function;           // to call with reflection
         public string description;        // to generate documentation page and show in the GUI
         public bool image;                // whether an image should be attached to the page
@@ -38,24 +39,22 @@ public Example()
             image = true;
         }
 
-        public string GuiName
-        {
-            get { return guiName; }
-            set { guiName = value; }
-        }
+        public string GuiName { get; set; }
     }
 
-    class Description
+    internal class Description
     {
         // list of the examples
-        public List<Example> examples = new List<Example>();
+        public readonly List<Example> examples = new List<Example>();
 
         // event declaration
-        delegate void ExampleAddedEventHandler(Example ex, int index);
-        event ExampleAddedEventHandler ExampleAdded;
-        void FireExampleAdded(Example ex, int index)
+        private delegate void ExampleAddedEventHandler(Example ex, int index);
+
+        private event ExampleAddedEventHandler ExampleAdded;
+
+        private void FireExampleAdded(Example ex, int index)
         {
-            if (this.ExampleAdded != null)
+            if (ExampleAdded != null)
                 ExampleAdded(ex, index);
         }
 
@@ -64,10 +63,10 @@ void FireExampleAdded(Example ex, int index)
         /// </summary>
         public Description()
         {
-            this.ExampleAdded += Description_ExampleAdded;
-            for (int i = 0; i < 30; i++)
+            ExampleAdded += Description_ExampleAdded;
+            for (var i = 0; i < 30; i++)
             {
-                Example ex = new Example();
+                var ex = new Example();
                 FireExampleAdded(ex, i);
                 examples.Add(ex);
             }
@@ -76,7 +75,7 @@ public Description()
         /// <summary>
         /// Adds description of the examples
         /// </summary>
-        void Description_ExampleAdded(Example ex, int index)
+        private static void Description_ExampleAdded(Example ex, int index)
         {
             switch (index)
             {