Merge branch 'ArduPilot:master' into MyButton_add_DefaultValue_to_TextColorNotEnabled

Author: Godeffroy

ExtLibs/Controls/HUD.cs

@@ -3100,7 +3100,7 @@ internal void doPaint()
 
                     var newfontsize = calcfontsize(message, font, fontsize + 10, (SolidBrush) brush, Width - 50 - 50);
 
-                    var size = calcsize(message, newfontsize, (SolidBrush)Brushes.Red);
+                    var size = calcsize(message, newfontsize, (SolidBrush) brush);
 
                     drawstring(message, font, newfontsize, (SolidBrush) brush, size.Width / -2,
                         halfheight / 3);

ExtLibs/GMap.NET.Core/GMap.NET.Projections/NoProjection.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace GMap.NET.Core.GMap.NET.Projections
+{
+    public class NoProjection : PureProjection
+    {
+        public static PureProjection Instance { get; set; } = new NoProjection();
+
+        public override GSize TileSize => new GSize(256, 256);
+
+        public override double Axis => 6378137;
+
+        public override double Flattening => (1.0 / 298.257223563);
+
+
+        public override GPoint FromLatLngToPixel(double lat, double lng, int zoom)
+        
+        {
+            GPoint ret = GPoint.Empty;
+
+            double x = (lng + 180) / 360;
+            double y = (90 - lat) / 180;
+
+            GSize s = GetTileMatrixSizePixel(zoom);
+            long mapSizeX = s.Width;
+            long mapSizeY = s.Height;
+
+            ret.X = (long)Clip(x * mapSizeX + 0.5, 0, mapSizeX - 1);
+            ret.Y = (long)Clip(y * mapSizeY + 0.5, 0, mapSizeY - 1);
+
+            return ret;
+        }
+
+        public override PointLatLng FromPixelToLatLng(long x, long y, int zoom)
+        {
+            PointLatLng ret = PointLatLng.Empty;
+
+            GSize s = GetTileMatrixSizePixel(zoom);
+            double mapSizeX = s.Width;
+            double mapSizeY = s.Height;
+
+            double xx = (Clip(x, 0, mapSizeX - 1) / mapSizeX);
+            double yy = (Clip(y, 0, mapSizeY - 1) / mapSizeY);
+
+            ret.Lat = 90 - 180 * yy;
+            ret.Lng = 360 * xx - 180;
+
+            return ret;
+        }
+
+        public override GSize GetTileMatrixMaxXY(int zoom)
+        {
+            long xy = (1 << zoom);
+            return new GSize(xy - 1, xy - 1);
+        }
+
+        public override GSize GetTileMatrixMinXY(int zoom)
+        {
+            return new GSize(0, 0);
+        }
+    }
+}

ExtLibs/Maps/GMapMarkerRect.cs

@@ -78,7 +78,7 @@ public override void OnRender(IGraphics g)
             GPoint loc = new GPoint((int) (LocalPosition.X - (m2pixelwidth*wprad*2)), LocalPosition.Y);
             // MainMap.FromLatLngToLocal(wpradposition);
 
-            if (m2pixelheight > 0.001 && !double.IsInfinity(m2pixelheight))
+            if (m2pixelheight > 0.001 && !double.IsInfinity(m2pixelheight) && m2pixelheight < Int32.MaxValue)
             {
                 var rect = new System.Drawing.Rectangle(
                     LocalPosition.X - Offset.X - (int) (Math.Abs(loc.X - LocalPosition.X) / 2),

ExtLibs/Maps/NoMap.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace MissionPlanner.Maps
+{
+    using System;
+    using GMap.NET.Projections;
+    using System.Globalization;
+    using GMap.NET.MapProviders;
+    using GMap.NET;
+    using System.Reflection;
+    using GMap.NET.Core.GMap.NET.Projections;
+
+    /// <summary>
+    /// Custom
+    /// </summary>
+    public class NoMap : GMapProvider
+    {
+        public static readonly NoMap Instance;
+
+        NoMap()
+        {
+            MaxZoom = 22;
+        }
+
+        static NoMap()
+        {
+            Instance = new NoMap();
+
+            Type mytype = typeof (GMapProviders);
+            FieldInfo field = mytype.GetField("DbHash", BindingFlags.Static | BindingFlags.NonPublic);
+            Dictionary<int, GMapProvider> list = (Dictionary<int, GMapProvider>) field.GetValue(Instance);
+
+            list.Add(Instance.DbId, Instance);
+
+            
+        }
+
+        #region GMapProvider Members
+
+        readonly Guid id = new Guid("4574228D-B552-4CAF-89AE-F20BADBBDB2B");
+
+        public override Guid Id
+        {
+            get { return id; }
+        }
+
+        readonly string name = "NoMap";
+
+        public override string Name
+        {
+            get { return name; }
+        }
+
+        GMapProvider[] overlays;
+
+        public override GMapProvider[] Overlays
+        {
+            get
+            {
+                if (overlays == null)
+                {
+                    overlays = new GMapProvider[] {this};
+                }
+                return overlays;
+            }
+        }
+
+        public override PureProjection Projection
+        {
+            get { return NoProjection.Instance; }
+        }
+
+        public override PureImage GetTileImage(GPoint pos, int zoom)
+        {
+            return null;
+        }
+
+        #endregion
+    }
+}