Merge branch 'release/v4.9.6.0'

Author: pmeems

.gitignore

@@ -168,3 +168,15 @@ docs/output
 demo/.nuget/
 *.zip
 unittests/MapWinGISTests/AkkerwebTests.cs
+*.exe
+*.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/

demo/MWLite.Core/GeoLocation/GeoLocationHelper.cs

@@ -27,7 +27,7 @@ public static Extents FindLocation(string query)
         private static string ResquestLocation(string query)
         {
             //var url = "https://maps.googleapis.com/maps/api/geocode/json?address=" + query;
-            var url = string.Format("http://nominatim.openstreetmap.org/search/{0}?format=json&limit=1", query);
+            var url = string.Format("https://nominatim.openstreetmap.org/search/{0}?format=json&limit=1", query);
             var request = (HttpWebRequest)WebRequest.Create(url);
 
             request.Referer = "mapwingis.codeplex.com";

docs/AxInterop.MapWinGIS.XML

@@ -1,5 +1,6 @@
 using System;
 using MapWinGIS;
+#pragma warning disable 67 // Never used warning
 
 #if nsp
 namespace AxMapWinGIS
@@ -9,7 +10,8 @@ namespace AxMapWinGIS
     /// Map component for visualization of vector, raster or grid data.
     /// </summary>
     /// Here is a class diagram for the AxMap class:
-    /// \dot digraph map_diagram {
+    /// \dot 
+    /// digraph map_diagram {
     /// nodesep = 0.3;
     /// ranksep = 0.3;
     /// splines = ortho;
@@ -316,21 +318,6 @@ public void LoadTilesForSnapshot(Extents extents, int width, string key, tkTileP
             throw new NotImplementedException();
         }
 
-        /// <summary>
-        /// Checks whether tiles for specified extents and provider are already present in cache.
-        /// </summary>
-        /// <param name="extents">Extents to check for (map coordinates).</param>
-        /// <param name="width">Width of the canvas on which the extents will be displayed.</param>
-        /// <param name="provider">Provider to load tiles from.</param>
-        /// <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
-        // 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. 
         /// </summary>
@@ -713,6 +700,15 @@ public void ZoomToShape(int LayerHandle, int Shape)
         /// \new492 Added in version 4.9.2
         public int ZoomBarMaxZoom { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether to move the mouse click point to the center of the map 
+        /// when using the Zoom In or Zoom Out tools.
+        /// </summary>
+        /// <remarks>The default value is False, indicating that the map is not recentered,  
+        /// but instead keeps the click point at the mouse position and zooms around that point.</remarks>
+        /// \new495 Added in version 4.9.5
+        public bool RecenterMapOnZoom { get; set; }
+
         /// <summary>
         /// Reverts the last operation performed by user in interactive shape editor.
         /// </summary>
@@ -2074,7 +2070,7 @@ public uint get_ShapeLayerStippleColor(int LayerHandle)
         /// <remarks>This property corresponds to the ShapeDrawingOptions.FillBgTransparent property.</remarks>
         /// <remarks>This property corresponds to the ShapeDrawingOptions.FillHatchStyle property.</remarks>
         /// <param name="LayerHandle">The handle of the shapefile layer.</param>
-        /// <param name="newValue">The color of stipple.</returns>
+        /// <param name="newValue">The color of stipple.</param>
         /// \see Shapefile.DefaultDrawingOptions
         public void set_ShapeLayerStippleColor(int LayerHandle, uint newValue)
         {

docs/AxInterop.MapWinGIS/AxMap.cs

@@ -1,11 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-
-    
+/// <summary>
+/// Justification of the labels
+/// </summary>
 public enum tkHJustification { }
+
+/// <summary>
+/// Shape drawing method
+/// </summary>
 public enum tkShapeDrawingMethod { }
 
 

docs/AxInterop.MapWinGIS/Enums.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("AxInterop.MapWinGIS")]
-[assembly: AssemblyCopyright("Copyright ©  2011")]
+[assembly: AssemblyCopyright("Copyright ©  2011-2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]