GMap.NET.WindowsForms: cleanup

radioman · May 11, 2015 · d0b12f3 · d0b12f3
1 parent 7bf2faa
commit d0b12f3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 40 deletions.
diff --git a/GMap.NET.WindowsForms/GMap.NET.WindowsForms/GMapControl.cs b/GMap.NET.WindowsForms/GMap.NET.WindowsForms/GMapControl.cs
@@ -634,9 +634,7 @@ public void UpdateMarkerLocalPosition(GMapMarker marker)
                     p.OffsetNegative(Core.renderOffset);
                 }
 #endif
-
-                var f = new System.Drawing.Point((int)(p.X + marker.Offset.X), (int)(p.Y + marker.Offset.Y));
-                marker.LocalPosition = f;
+                marker.LocalPosition = new System.Drawing.Point((int)(p.X + marker.Offset.X), (int)(p.Y + marker.Offset.Y));
             }
         }
 
@@ -646,32 +644,18 @@ public void UpdateMarkerLocalPosition(GMapMarker marker)
         /// <param name="route"></param>
         public void UpdateRouteLocalPosition(GMapRoute route)
         {
-            route.LocalPoints.Clear();
+          route.LocalPoints.Clear();
 
           for (int i = 0; i < route.Points.Count; i++)
           {
-                PointLatLng pg= route.Points[i];
-                GPoint p = FromLatLngToLocal(pg);
+                GPoint p = FromLatLngToLocal(route.Points[i]);
 
 #if !PocketPC
                 if (!MobileMode)
                 {
                     p.OffsetNegative(Core.renderOffset);
                 }
 #endif
-
-                //            if(IsRotated)
-                //            {
-                //#if !PocketPC
-                //               System.Drawing.Point[] tt = new System.Drawing.Point[] { new System.Drawing.Point(p.X, p.Y) };
-                //               rotationMatrix.TransformPoints(tt);
-                //               var f = tt[0];
-
-                //               p.X = f.X;
-                //               p.Y = f.Y;
-                //#endif
-                //            }
-
                 route.LocalPoints.Add(p);
             }
 #if !PocketPC
@@ -685,31 +669,17 @@ public void UpdateRouteLocalPosition(GMapRoute route)
         /// <param name="polygon"></param>
         public void UpdatePolygonLocalPosition(GMapPolygon polygon)
         {
-            polygon.LocalPoints.Clear();
-
-            foreach (GMap.NET.PointLatLng pg in polygon.Points)
-            {
-                GPoint p = FromLatLngToLocal(pg);
+          polygon.LocalPoints.Clear();
 
+          for (int i = 0; i < polygon.Points.Count; i++)
+          {
+                GPoint p = FromLatLngToLocal(polygon.Points[i]);
 #if !PocketPC
                 if (!MobileMode)
                 {
                     p.OffsetNegative(Core.renderOffset);
                 }
 #endif
-
-                //            if(IsRotated)
-                //            {
-                //#if !PocketPC
-                //               System.Drawing.Point[] tt = new System.Drawing.Point[] { new System.Drawing.Point(p.X, p.Y) };
-                //               rotationMatrix.TransformPoints(tt);
-                //               var f = tt[0];
-
-                //               p.X = f.X;
-                //               p.Y = f.Y;
-                //#endif
-                //            }
-
                 polygon.LocalPoints.Add(p);
             }
 #if !PocketPC

diff --git a/GMap.NET.WindowsForms/GMap.NET.WindowsForms/GMapMarker.cs b/GMap.NET.WindowsForms/GMap.NET.WindowsForms/GMapMarker.cs
@@ -216,7 +216,7 @@ public bool IsVisible
                   {
                      if(!Overlay.Control.HoldInvalidation)
                      {
-                        Overlay.Control.Core.Refresh.Set();
+                         Overlay.Control.Invalidate();
                      }
                   }
                }

diff --git a/GMap.NET.WindowsForms/GMap.NET.WindowsForms/GMapPolygon.cs b/GMap.NET.WindowsForms/GMap.NET.WindowsForms/GMapPolygon.cs
@@ -56,7 +56,7 @@ public bool IsVisible
                   {
                      if(!Overlay.Control.HoldInvalidation)
                      {
-                        Overlay.Control.Core.Refresh.Set();
+                         Overlay.Control.Invalidate();
                      }
                   }
                }

diff --git a/GMap.NET.WindowsForms/GMap.NET.WindowsForms/GMapRoute.cs b/GMap.NET.WindowsForms/GMap.NET.WindowsForms/GMapRoute.cs
@@ -69,7 +69,7 @@ public bool IsVisible
                         {
                             if (!Overlay.Control.HoldInvalidation)
                             {
-                                Overlay.Control.Core.Refresh.Set();
+                                Overlay.Control.Invalidate();
                             }
                         }
                     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -216,7 +216,7 @@ public bool IsVisible @@
                       {
                          if(!Overlay.Control.HoldInvalidation)
                          {
-                            Overlay.Control.Core.Refresh.Set();
+                             Overlay.Control.Invalidate();
                          }
                       }
                    }
@@ Expand Down @@