Merge branch 'release/v4.9.5.0'

Author: pmeems

.gitignore

@@ -164,4 +164,7 @@ $RECYCLE.BIN/
 # Custom
 *.dll
 support/GDAL_SDK/*
-docs/output
+docs/output
+demo/.nuget/
+*.zip
+unittests/MapWinGISTests/AkkerwebTests.cs

README.md

@@ -0,0 +1,27 @@
+# What is MapWinGIS?
+
+MapWinGIS.ocx is used to provide GIS and mapping functionality to any Windows Forms based application.
+
+MapWinGIS.ocx is a FREE and OPEN SOURCE C++ based geographic information system programming ActiveX Control and application programmer 
+interface (API) that can be added to a Windows Form in Visual Basic, C#, Delphi, or other languages that support ActiveX, providing your 
+app with a map.
+
+![ECW image with a vector overlays and labels displayed in the Demo .NET/C# app](http://download-codeplex.sec.s-msft.com/Download?ProjectName=mapwingis&DownloadId=1382142 "ECW image with a vector overlays and labels displayed in the Demo .NET/C# app")   
+_(ECW image with a vector overlays and labels displayed in the Demo .NET/C# app)_
+
+## Newsletter
+If you want to stay updated you can subscribe to our newsletter at http://www.mapwindow.org/documentation/mapwindow5/subscribe.php
+
+## Who is Working on MapWinGIS?
+The MapWinGIS Activex Control is a central product of the MapWindow GIS Open Source Project. The control is built entirely in C++ and 
+is a robust and powerful GIS component that serves as the primary element of the [MapWindow GIS Desktop Application](https://github.com/MapWindow/MapWindow5) and provides GIS functionality 
+to many other software applications.
+
+## Can I Use MapWinGIS?
+MapWinGIS.ocx is FREE and OPEN SOURCE under the MPL 2.0 license. This means that you can use it freely in your commercial and 
+non-commercial applications.
+
+## How can I help?
+MapWinGIS is very robust and well established - with several thousand downloads from the MapWindow.org web site over the past several 
+years. MapWinGIS still has potential for many new and interesting upgrades and improvements. So we are actively seeking developers who 
+want to work on this project with us.

docs/AxInterop.MapWinGIS.XML

@@ -325,10 +325,11 @@ public void LoadTilesForSnapshot(Extents extents, int width, string key, tkTileP
         /// <returns>1 if tiles are in cache, 0 if not, -1 if an there was an error.</returns>
         /// <remarks>The main purpose: loading of tiles for printing.</remarks>
         /// \new491 Added in version 4.9.1
-        public int TilesAreInCache(Extents extents, int width, tkTileProvider provider)
-        {
-            throw new NotImplementedException();
-        }
+        // Removed in v4.9.4 again
+        //public int TilesAreInCache(Extents extents, int width, tkTileProvider provider)
+        //{
+        //    throw new NotImplementedException();
+        //}
 
         /// <summary>
         /// Performs specific type of map redraw. 
@@ -677,6 +678,13 @@ public void ZoomToShape(int LayerHandle, int Shape)
         /// \new492 Added in version 4.9.2
         public bool ReuseTileBuffer { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether the legacy 'hand' cursor should be used
+        /// for map panning rather than the standard 'NSEW' four-point cursor.
+        /// </summary>
+        /// \new495 Added in version 4.9.5
+        public bool UseAlternatePanCursor { get; set; }
+
         /// <summary>
         /// Gets or sets the amount of information to be displayed in zoom bar tool tip.
         /// </summary>
@@ -2230,7 +2238,8 @@ public double ExtentPad
         /// Gets or sets the extents of the map using an Extents object. 
         /// </summary>
         /// <remarks>If the given extents do not fit the aspect ratio of the map, the map will fit the given extents as well as possible.</remarks>
-        public object Extents
+        /// \new495 Return value changed to IExtents in version 4.9.5
+        public MapWinGIS.Extents Extents
         {
             get { throw new NotImplementedException(); }
             set { throw new NotImplementedException(); }
@@ -2627,6 +2636,19 @@ public double GeodesicLength(Shape polyline)
         /// The value should be set to blnTrue in case some additional drawing is performed in client code.</param>
         public event _DMapEvents_AfterDrawingEventHandler AfterDrawing;
 
+        /// <summary>
+        /// This event is fired after the rendering of standard layers. Handle of device context is passed to allow the user to implement custom drawing. 
+        /// </summary>
+        /// <param name="hdc">Handle of device context of screen buffer.</param>
+        /// <param name="xMin">Minimum X coordinate of the rectangle being rendered.</param>
+        /// <param name="xMax">Maximum X coordinate of the rectangle being rendered.</param>
+        /// <param name="yMin">Minimum Y coordinate of the rectangle being rendered.</param>
+        /// <param name="yMax">Maximum Y coordinate of the rectangle being rendered.</param>
+        /// <param name="handled">Passed by reference. 
+        /// The value should be set to blnTrue in case some additional drawing is performed in client code.</param>
+        /// \new495 Added in version 4.9.5
+        public event _DMapEvents_AfterLayersEventHandler AfterLayers;
+
         /// <summary>
         /// This event is fired after interactive editing of shape is finished (AxMap.CursorMode is set to cmEditShape).
         /// </summary>
@@ -2686,6 +2708,19 @@ public double GeodesicLength(Shape polyline)
         /// The value should be set to blnTrue in case some additional drawing is performed in client code.</param>
         public event _DMapEvents_BeforeDrawingEventHandler BeforeDrawing;
 
+        /// <summary>
+        /// This event is fired before the rendering of standard layers. Handle of device context is passed to allow the user to implement custom drawing. 
+        /// </summary>
+        /// <param name="hdc">Handle of device context of screen buffer.</param>
+        /// <param name="xMin">Minimum X coordinate of the rectangle being rendered.</param>
+        /// <param name="xMax">Maximum X coordinate of the rectangle being rendered.</param>
+        /// <param name="yMin">Minimum Y coordinate of the rectangle being rendered.</param>
+        /// <param name="yMax">Maximum Y coordinate of the rectangle being rendered.</param>
+        /// <param name="handled">Passed by reference. 
+        /// The value should be set to blnTrue in case some additional drawing is performed in client code.</param>
+        /// \new495 Added in version 4.9.5
+        public event _DMapEvents_BeforeLayersEventHandler BeforeLayers;
+
         /// <summary>
         /// This event is fired before editing starts for particular shape (after user click on the shape when map cursor is set to cmEditShape). 
         /// </summary>